diff --git a/components/fpspreadsheet/docs/README.txt b/components/fpspreadsheet/docs/README.txt index 957ccebfe..5b0bd5ae1 100644 --- a/components/fpspreadsheet/docs/README.txt +++ b/components/fpspreadsheet/docs/README.txt @@ -25,12 +25,17 @@ - You also have to copy the OpenSSL DLLs libeay32.dll and ssleay32.dll of the correct bitness to the folder docs/wiki of the fpspreadsheed installation. -- Run the script "make_docs.bat" (no Linux script at the moment, but it should +- Run the script "make_chms.bat" (no Linux script at the moment, but it should be easy to write one...) - This script downloads the current fpspreadsheet wiki articles and creates a chm help file. +- If you want to create a PDF file from the wiki articles run the script + "make_pdf.bat". Note that it requires the wkhtmltopdf utility: + download from https://wkhtmltopdf.org/ and specify the path to its binary + at the top of "make_pdf.bat". + -------------------------------------------------------------------------------- How to create fpspreadsheet-api diff --git a/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm b/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm index 6f84dc477..7f16346ea 100644 Binary files a/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm and b/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm differ diff --git a/components/fpspreadsheet/docs/fpspreadsheet-wiki.pdf b/components/fpspreadsheet/docs/fpspreadsheet-wiki.pdf new file mode 100644 index 000000000..b3c06466a Binary files /dev/null and b/components/fpspreadsheet/docs/fpspreadsheet-wiki.pdf differ diff --git a/components/fpspreadsheet/docs/wiki/css/wiki.css b/components/fpspreadsheet/docs/wiki/css/wiki.css index f2360eba6..4f3655a3f 100644 --- a/components/fpspreadsheet/docs/wiki/css/wiki.css +++ b/components/fpspreadsheet/docs/wiki/css/wiki.css @@ -3,7 +3,7 @@ body { color: #111111; background-color: #FFFFFF; font-family: "Segoe UI", "Trebuchet MS", Arial, Verdana, sans-serif; - font-size: 10pt; + font-size: 12pt; text-align: left; padding: 0.7em; } @@ -66,22 +66,22 @@ ul li { h1 { font-family: "Century Gothic", "Trebuchet MS", "Arial Narrow", Arial, sans-serif; - font-size:150%; - font-weight:normal; - text-transform:uppercase; - border-bottom:1px solid #eeeeee; + font-size:250%; + font-weight:bold; + color:#4D87CE; + border-bottom:1px solid #4D87CE; margin-top: 10px; } #content h1 { font-family:"Century Gothic", "Trebuchet MS", "Arial Narrow", Arial, sans-serif; - font-size:150%; + font-size:250%; margin-bottom: 10px; } h2 { font-family: "Century Gothic", "Trebuchet MS", "Arial Narrow", Arial, sans-serif; - font-size: 130%; + font-size: 170%; margin-top: 25px; margin-bottom: 10px; border-bottom: 1px solid #CCCCCC; @@ -89,7 +89,7 @@ h2 { h3 { font-family: "Century Gothic", "Trebuchet MS", "Arial Narrow", Arial, sans-serif; - font-size:120%; + font-size:150%; margin-top: 15px; margin-bottom: 5px; } diff --git a/components/fpspreadsheet/docs/wiki/make_chm.bat b/components/fpspreadsheet/docs/wiki/make_chm.bat new file mode 100644 index 000000000..4a5725312 --- /dev/null +++ b/components/fpspreadsheet/docs/wiki/make_chm.bat @@ -0,0 +1,20 @@ +echo off + +rem set FMT=html +set FMT=chm +echo Downloading wiki... + +wikiget --page=FPSpreadsheet --page=FPSpreadsheet:_Examples --page=FPSpreadsheet:_List_of_formulas --page=RPN_Formulas_in_FPSpreadsheet +wikiget --page=FPSpreadsheet:_Chart_Tutorial +wikiget --page=FPSpreadsheet_tutorial:_Writing_a_mini_spreadsheet_application +wikiget --page=TsWorksheetGrid --page=TsWorksheetChartSource + +echo. +echo Converting wiki to chm... + +wikiconvert --format=chm --css=css/wiki.css --root="FPSpreadsheet wiki pages" --title="FPSpreadsheet wiki pages (offline version, created %DATE%)" --chm="..\fpspreadsheet-wiki.chm" wikixml/*.xml + +wikiconvert --format=html --css=css/wiki.css --root="FPSpreadsheet wiki pages" --title="FPSpreadsheet wiki pages (offline version, created %DATE%)" --outputdir=wikihtml wikixml/*.xml + + +set FMT= \ No newline at end of file diff --git a/components/fpspreadsheet/docs/wiki/make_docs.bat b/components/fpspreadsheet/docs/wiki/make_docs.bat deleted file mode 100644 index 16ae06d3b..000000000 --- a/components/fpspreadsheet/docs/wiki/make_docs.bat +++ /dev/null @@ -1,17 +0,0 @@ -echo off - -rem set FMT=html -set FMT=chm -echo Downloading wiki... - -wikiget --page=FPSpreadsheet --page=FPSpreadsheet:_Examples --page=FPSpreadsheet:_List_of_formulas --page=RPN_Formulas_in_FPSpreadsheet -wikiget --page=FPSpreadsheet:_Chart_Tutorial -wikiget --page=FPSpreadsheet_tutorial:_Writing_a_mini_spreadsheet_application -wikiget --page=TsWorksheetGrid --page=TsWorksheetChartSource - -echo. -echo Converting wiki to chm... - -wikiconvert --format=%FMT% --css=css/wiki.css --root="FPSpreadsheet wiki pages" --title="FPSpreadsheet wiki pages (offline version, created %DATE%)" --chm="..\fpspreadsheet-wiki.chm" wikixml/FPSpreadsheet.s00.xml wikixml/FPSpreadsheet=3A_Examples.s0300.xml wikixml/FPSpreadsheet=3A_List_of_formulas.s03000.xml wikixml/RPN_Formulas_in_FPSpreadsheet.u03g00.xml wikixml/FPSpreadsheet_tutorial=3A_Writing_a_mini_spreadsheet_application.s000c0000000.xml wikixml/TsWorksheetGrid.k08.xml wikixml/FPSpreadsheet=3A_Chart_Tutorial.s03100.xml - -set FMT= \ No newline at end of file diff --git a/components/fpspreadsheet/docs/wiki/make_pdf.bat b/components/fpspreadsheet/docs/wiki/make_pdf.bat new file mode 100644 index 000000000..721d03bfb --- /dev/null +++ b/components/fpspreadsheet/docs/wiki/make_pdf.bat @@ -0,0 +1,30 @@ +echo off + +:: Download wkhtmltopdf from https://wkhtmltopdf.org/ and specify here the path to its binary +set html2pdf=d:\programme\wkhtmltox\bin\wkhtmltopdf.exe + +echo Downloading wiki... +wikiget --page=FPSpreadsheet --page=FPSpreadsheet:_Examples --page=FPSpreadsheet:_List_of_formulas --page=RPN_Formulas_in_FPSpreadsheet +wikiget --page=FPSpreadsheet:_Chart_Tutorial +wikiget --page=FPSpreadsheet_tutorial:_Writing_a_mini_spreadsheet_application +wikiget --page=TsWorksheetGrid --page=TsWorksheetChartSource + +echo. +echo Converting wiki to html... +wikiconvert --format=html --css=css/wiki.css --root="FPSpreadsheet wiki pages" --title="FPSpreadsheet wiki pages (offline version, created %DATE%)" --outputdir=wikihtml wikixml/*.xml + +echo Converting html to pdf... +cd wikihtml +set margins=-L 25 -T 25 -R 25 -B 25 +set f1=FPSpreadsheet.s00.html +set f2=FPSpreadsheet=3A_List_of_formulas.s03000.html +set f3=FPSpreadsheet=3A_Examples.s0300.html +set f4=FPSpreadsheet_tutorial=3A_Writing_a_mini_spreadsheet_application.s000c0000000.html +set f5=FPSpreadsheet=3A_Chart_Tutorial.s03100.html +set f6=TsWorksheetGrid.k08.html +set f7=TsWorksheetChartSource.k0880.html +set f8=RPN_Formulas_in_FPSpreadsheet.u03g00.html +%html2pdf% %margins% --enable-local-file-access %f1% %f2% %f3% %f4% %f5% %f6% %f7% %f8% ../fpspreadsheet-wiki.pdf +cd .. + +move fpspreadsheet-wiki.pdf ..