From 4d496e735714d9cad8c995d6065b0df5a4590a94 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 15 Sep 2019 11:12:01 +0900 Subject: [PATCH] Use xsltproc instead of Saxon 6 to support encodings other than UTF-8 --- Docs/Manual/JP/Plugins.xml | 22 ++++++++++++---------- Docs/Manual/JP/xsl/htmlhelp.xsl | 3 +++ Docs/Manual/Tools/.gitignore | 6 +++++- Docs/Manual/build_html_en.bat | 2 +- Docs/Manual/build_html_jp.bat | 2 +- Docs/Manual/build_htmlhelp_en.bat | 2 +- Docs/Manual/build_htmlhelp_jp.bat | 2 +- Docs/Manual/configuration.bat | 19 ++++--------------- DownloadDeps.cmd | 2 +- 9 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Docs/Manual/JP/Plugins.xml b/Docs/Manual/JP/Plugins.xml index bcfaeb076..b78cf20fd 100644 --- a/Docs/Manual/JP/Plugins.xml +++ b/Docs/Manual/JP/Plugins.xml @@ -656,10 +656,11 @@ IgnoreFieldsTab.dll plugin file - This plugin is for files that use fields and tabs as delimiters - (for examle, Excel files saved in the *.txt format). It ignores the delimiter - characters. The first field is number 1. + このプラグインは、フィールドとタブを区切り記号として使用するファイル用です + (たとえばExcel ファイルは*.txt形式で保存されます）。 区切り文字は無視されます。 + 最初のフィールドの番号は1です。 + To specify the delimiters, use plugin settings dialog or rename the dll using the same parameter fields used for IgnoreLeadingLineNumbers.dll plugin file - This plugin ignores the leading line numbers in text files (for - example, NC and BASIC files). + このプラグインは、テキストファイル + (NCファイルやBASICファイルなど)の先頭の行番号を無視します。 + 分類 @@ -716,11 +718,11 @@ insert datetime.sct plugin file - Adds two functions to the - Plugins + + プラグイン - Scripts - menu: + スクリプト + メニューに2つの機能を追加します: diff --git a/Docs/Manual/JP/xsl/htmlhelp.xsl b/Docs/Manual/JP/xsl/htmlhelp.xsl index 9f498fc6e..09dce1985 100644 --- a/Docs/Manual/JP/xsl/htmlhelp.xsl +++ b/Docs/Manual/JP/xsl/htmlhelp.xsl @@ -15,6 +15,9 @@ + + + set nop diff --git a/Docs/Manual/Tools/.gitignore b/Docs/Manual/Tools/.gitignore index 3e9c13fa9..1051c5622 100644 --- a/Docs/Manual/Tools/.gitignore +++ b/Docs/Manual/Tools/.gitignore @@ -2,4 +2,8 @@ dtd/ hhc/ saxon/ xerces/ -xsl/ \ No newline at end of file +xsl/ +bin/ +include/ +lib/ +readme.txt diff --git a/Docs/Manual/build_html_en.bat b/Docs/Manual/build_html_en.bat index 210af53f1..91ac60ed8 100644 --- a/Docs/Manual/build_html_en.bat +++ b/Docs/Manual/build_html_en.bat @@ -43,7 +43,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "EN\css\*.css" "%docbook_outputdir%\css" echo Create Manual HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ withads=%ads% +%docbook_xsltproc% --xinclude --nonet --stringparam base.dir %docbook_outputdir%/ --path .. %docbook_use_stylesheet% %docbook_inputfile% echo Finished! diff --git a/Docs/Manual/build_html_jp.bat b/Docs/Manual/build_html_jp.bat index f9f5d9c1a..e82401f1a 100644 --- a/Docs/Manual/build_html_jp.bat +++ b/Docs/Manual/build_html_jp.bat @@ -43,7 +43,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "JP\css\*.css" "%docbook_outputdir%\css" echo Create Manual HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ withads=%ads% +%docbook_xsltproc% --xinclude --nonet --stringparam base.dir %docbook_outputdir%/ --path .. %docbook_use_stylesheet% %docbook_inputfile% echo Finished! diff --git a/Docs/Manual/build_htmlhelp_en.bat b/Docs/Manual/build_htmlhelp_en.bat index 1eff4ef4f..d2eba6a78 100644 --- a/Docs/Manual/build_htmlhelp_en.bat +++ b/Docs/Manual/build_htmlhelp_en.bat @@ -29,7 +29,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "EN\css\*.css" "%docbook_outputdir%\css\." echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_xsltproc% --xinclude --nonet --stringparam base.dir %docbook_outputdir%/ --path .. %docbook_use_stylesheet% %docbook_inputfile% if exist "htmlhelp.hhp" goto compile :compile diff --git a/Docs/Manual/build_htmlhelp_jp.bat b/Docs/Manual/build_htmlhelp_jp.bat index 08190153d..e8027dd50 100644 --- a/Docs/Manual/build_htmlhelp_jp.bat +++ b/Docs/Manual/build_htmlhelp_jp.bat @@ -29,7 +29,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "JP\css\*.css" "%docbook_outputdir%\css\." echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_xsltproc% --xinclude --nonet --stringparam base.dir %docbook_outputdir%/ --path .. %docbook_use_stylesheet% %docbook_inputfile% if exist "htmlhelp.hhp" goto compile :compile diff --git a/Docs/Manual/configuration.bat b/Docs/Manual/configuration.bat index 54b5071aa..b47ae5a0f 100644 --- a/Docs/Manual/configuration.bat +++ b/Docs/Manual/configuration.bat @@ -1,20 +1,9 @@ -rem Java... -set docbook_java_exe=java.exe -set docbook_java_parameters=-Xms8m -Xmx256m - -rem Saxon... -set docbook_saxon_jar=.\Tools\saxon\saxon.jar -set docbook_saxon_xsl=.\Tools\xsl\extensions\saxon655.jar - -rem Xerces2 Java Parser... -set DBFACTORY=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -set SPFACTORY=org.apache.xerces.jaxp.SAXParserFactoryImpl -set XINCLUDE=org.apache.xerces.parsers.XIncludeParserConfiguration -set docbook_xerces_jar=.\Tools\xerces\xercesImpl.jar +rem xsltproc... +set docbook_xsltproc=.\Tools\bin\xsltproc rem HTML Help Compiler... -set docbook_hhc_exe=.\Tools\hhc\hhc.exe +set docbook_hhc_exe=.\Tools\bin\hhc.exe rem Build directory... rem Use "." for the current directory. -set docbook_build_path=..\..\Build\Manual \ No newline at end of file +set docbook_build_path=..\..\Build\Manual diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 48735d64f..c26b43173 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -2,7 +2,7 @@ setlocal set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path% set downloadsdir=%~dp0\build\WinMergeDownloadDeps set urls_destdirs=^ -https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_build_tools_v1/winmerge_manual_build_tools_v1.zip!Docs\Manual\Tools ^ +https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^ https://github.com/WinMerge/winmerge/releases/download/ShellExtension1.17.9.0/ShellExtension-1.17.9.0.zip!Build ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-win32.zip!Build ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.1/Merge7z1900.1-x64.zip!Build\X64 ^ -- 2.11.0