Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use xsltproc instead of Saxon 6 to support encodings other than UTF-8
  • Loading branch information
sdottaka committed Sep 15, 2019
1 parent 794644c commit 4d496e7
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 31 deletions.
22 changes: 12 additions & 10 deletions Docs/Manual/JP/Plugins.xml
Expand Up @@ -656,10 +656,11 @@
<primary>IgnoreFieldsTab.dll plugin file</primary>
</indexterm></filename></title>

<para>This plugin is for files that use fields and tabs as delimiters
(<application>for examle, Excel</application> files saved in the <filename
class="extension">*.txt</filename> format). It ignores the delimiter
characters. The first field is number 1.</para>
<para>このプラグインは、フィールドとタブを区切り記号として使用するファイル用です
(<application>たとえばExcel </application>ファイルは<filename
class="extension">*.txt</filename>形式で保存されます)。 区切り文字は無視されます。
最初のフィールドの番号は1です。
</para>

<para>To specify the delimiters, use plugin settings dialog or rename the <filename>dll</filename> using
the same parameter fields used for <xref
Expand Down Expand Up @@ -687,8 +688,9 @@
<primary>IgnoreLeadingLineNumbers.dll plugin file</primary>
</indexterm></filename></title>

<para>This plugin ignores the leading line numbers in text files (for
example, NC and BASIC files).</para>
<para>このプラグインは、テキストファイル
(NCファイルやBASICファイルなど)の先頭の行番号を無視します。
</para>

<para><segmentedlist>
<segtitle>分類</segtitle>
Expand Down Expand Up @@ -716,11 +718,11 @@
<primary>insert datetime.sct plugin file</primary>
</indexterm></filename></title>

<para>Adds two functions to the <menuchoice>
<guimenu>Plugins</guimenu>
<para><menuchoice>
<guimenu>プラグイン</guimenu>

<guisubmenu>Scripts</guisubmenu>
</menuchoice> menu:</para>
<guisubmenu>スクリプト</guisubmenu>
</menuchoice> メニューに2つの機能を追加します:</para>

<itemizedlist>
<listitem>
Expand Down
3 changes: 3 additions & 0 deletions Docs/Manual/JP/xsl/htmlhelp.xsl
Expand Up @@ -15,6 +15,9 @@
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/param.xsl parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<xsl:param name="chunker.output.encoding" select="'Shift_JIS'"/>
<xsl:param name="l10n.gentext.language" select="'ja'"/>
<xsl:param name="l10n.gentext.default.language" select="'ja'"/>
<xsl:param name="suppress.navigation" select="1"/>
<xsl:param name="generate.toc">set nop</xsl:param>
<xsl:param name="use.id.as.filename" select="1"/>
Expand Down
6 changes: 5 additions & 1 deletion Docs/Manual/Tools/.gitignore
Expand Up @@ -2,4 +2,8 @@ dtd/
hhc/
saxon/
xerces/
xsl/
xsl/
bin/
include/
lib/
readme.txt
2 changes: 1 addition & 1 deletion Docs/Manual/build_html_en.bat
Expand Up @@ -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!

Expand Down
2 changes: 1 addition & 1 deletion Docs/Manual/build_html_jp.bat
Expand Up @@ -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!

Expand Down
2 changes: 1 addition & 1 deletion Docs/Manual/build_htmlhelp_en.bat
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Docs/Manual/build_htmlhelp_jp.bat
Expand Up @@ -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
Expand Down
19 changes: 4 additions & 15 deletions 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
set docbook_build_path=..\..\Build\Manual
2 changes: 1 addition & 1 deletion DownloadDeps.cmd
Expand Up @@ -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 ^
Expand Down

0 comments on commit 4d496e7

Please sign in to comment.