Revision: 1613
http://daisymfc.svn.sourceforge.net/daisymfc/?rev=1613&view=rev
Author: markusgy
Date: 2007-12-08 10:02:13 -0800 (Sat, 08 Dec 2007)
Log Message:
-----------
Misc script updates, mainly integration of DTBookFix task into wordml, odf, and RTF related scripts
Modified Paths:
--------------
trunk/dmfc/scripts/conversion/advanced/Xhtml2Dtbook.taskScript
trunk/dmfc/scripts/conversion/simple/OdfToDtbook.taskScript
trunk/dmfc/scripts/conversion/simple/OdfToXhtml.taskScript
trunk/dmfc/scripts/conversion/simple/RtfToDtbook.taskScript
trunk/dmfc/scripts/conversion/simple/RtfToXhtml.taskScript
trunk/dmfc/scripts/conversion/simple/WordMLtoDTBook.taskScript
trunk/dmfc/scripts/conversion/simple/WordMLtoXhtml.taskScript
trunk/dmfc/scripts/manipulation/simple/DTBookfix.taskScript
Added Paths:
-----------
trunk/dmfc/scripts/manipulation/DTBookFixCategoryScriptParam.paramGroup
trunk/dmfc/scripts/manipulation/DTBookFixScriptParamsStatic.paramGroup
trunk/dmfc/scripts/manipulation/DTBookFixTaskParamsStatic.paramGroup
Modified: trunk/dmfc/scripts/conversion/advanced/Xhtml2Dtbook.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/advanced/Xhtml2Dtbook.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/advanced/Xhtml2Dtbook.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -19,7 +19,23 @@
</datatype>
</parameter>
- <!-- TODO add pre and post validation -->
+ <!-- Input XHTML validation -->
+ <task name="int_daisy_validator" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>${inputFile}</value>
+ </parameter>
+
+ <parameter>
+ <name>abortThreshold</name>
+ <value>ERROR</value>
+ </parameter>
+
+ <parameter>
+ <name>generateContextInfo</name>
+ <value>true</value>
+ </parameter>
+ </task>
<task name="no_hks_xhtml2dtbook" interactive="false">
@@ -34,4 +50,22 @@
</parameter>
</task>
+ <!-- Output DTBook validation -->
+ <task name="int_daisy_validator" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>${outputFile}</value>
+ </parameter>
+
+ <parameter>
+ <name>abortThreshold</name>
+ <value>NONE</value>
+ </parameter>
+
+ <parameter>
+ <name>generateContextInfo</name>
+ <value>true</value>
+ </parameter>
+ </task>
+
</taskScript>
\ No newline at end of file
Modified: trunk/dmfc/scripts/conversion/simple/OdfToDtbook.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/OdfToDtbook.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/OdfToDtbook.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -36,9 +36,21 @@
<parameter>
<name>dtbook</name>
- <value>${dtbook}</value>
+ <value>$parent{dtbook}/pipeline__temp/dtbook.xml</value>
</parameter>
</task>
+
+ <task name="se_tpb_dtbookFix" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>$parent{dtbook}/pipeline__temp/dtbook.xml</value>
+ </parameter>
+
+ <parameter>
+ <name>output</name>
+ <value>${dtbook}</value>
+ </parameter>
+ </task>
<task name="int_daisy_validator" interactive="false">
<parameter>
@@ -53,5 +65,12 @@
&ValidatorTaskParamsSimpleStatic;
</task>
+
+ <task name="pipeline_system_deleter" interactive="false">
+ <parameter>
+ <name>delete</name>
+ <value>$parent{dtbook}/pipeline__temp/</value>
+ </parameter>
+ </task>
</taskScript>
Modified: trunk/dmfc/scripts/conversion/simple/OdfToXhtml.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/OdfToXhtml.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/OdfToXhtml.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -44,15 +44,27 @@
</parameter>
</task>
+ <task name="se_tpb_dtbookFix" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>$parent{output}/pipeline__temp/1/$filename{output}</value>
+ </parameter>
+
+ <parameter>
+ <name>output</name>
+ <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ </parameter>
+ </task>
+
<task name="uk_rnib_dtbook2xhtml" interactive="false">
<parameter>
<name>xml</name>
- <value>$parent{output}/pipeline__temp/1/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
</parameter>
<parameter>
<name>out</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
@@ -69,7 +81,7 @@
<task name="se_tpb_charsetSwitcher" interactive="false">
<parameter>
<name>input</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
Modified: trunk/dmfc/scripts/conversion/simple/RtfToDtbook.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/RtfToDtbook.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/RtfToDtbook.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -3,6 +3,9 @@
[
<!ENTITY ValidatorScriptParamsSimpleStatic SYSTEM "../../validation/ValidatorScriptParamsSimpleStatic.paramGroup">
<!ENTITY ValidatorTaskParamsSimpleStatic SYSTEM "../../validation/ValidatorTaskParamsSimpleStatic.paramGroup">
+<!ENTITY DTBookFixCategoryScriptParam SYSTEM "../../manipulation/DTBookFixCategoryScriptParam.paramGroup">
+<!ENTITY DTBookFixScriptParamsStatic SYSTEM "../../manipulation/DTBookFixScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixTaskParamsStatic SYSTEM "../../manipulation/DTBookFixTaskParamsStatic.paramGroup">
]>
<taskScript version="2.0" name="RtfToDtbook">
<nicename>RTF to DTBook</nicename>
@@ -25,7 +28,9 @@
<file mime="application/x-dtbook+xml" type="output"/>
</datatype>
</parameter>
-
+
+ &DTBookFixCategoryScriptParam;
+ &DTBookFixScriptParamsStatic;
&ValidatorScriptParamsSimpleStatic;
<task name="ca_cnib_rtf2dtbook" interactive="false">
@@ -36,10 +41,29 @@
<parameter>
<name>dtbook</name>
- <value>${dtbook}</value>
+ <value>$parent{dtbook}/pipeline__temp/temp.xml</value>
</parameter>
</task>
+ <task name="se_tpb_dtbookFix" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>$parent{dtbook}/pipeline__temp/temp.xml</value>
+ </parameter>
+
+ <parameter>
+ <name>output</name>
+ <value>${dtbook}</value>
+ </parameter>
+
+ <parameter>
+ <name>runCategories</name>
+ <value>${dtbookFixRunCategories}</value>
+ </parameter>
+
+ &DTBookFixTaskParamsStatic;
+ </task>
+
<task name="int_daisy_validator" interactive="false">
<parameter>
<name>input</name>
Modified: trunk/dmfc/scripts/conversion/simple/RtfToXhtml.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/RtfToXhtml.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/RtfToXhtml.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -5,6 +5,9 @@
<!ENTITY ValidatorTaskParamsSimpleStatic SYSTEM "../../validation/ValidatorTaskParamsSimpleStatic.paramGroup">
<!ENTITY CharsetSwitcherScriptParamsStatic SYSTEM "../../manipulation/CharsetSwitcherScriptParamsStatic.paramGroup">
<!ENTITY DtbookToXhtmlScriptParamsStatic SYSTEM "../DtbookToXhtmlScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixCategoryScriptParam SYSTEM "../../manipulation/DTBookFixCategoryScriptParam.paramGroup">
+<!ENTITY DTBookFixScriptParamsStatic SYSTEM "../../manipulation/DTBookFixScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixTaskParamsStatic SYSTEM "../../manipulation/DTBookFixTaskParamsStatic.paramGroup">
]>
<taskScript version="2.0" name="RtfToXhtml">
<nicename>RTF to XHTML</nicename>
@@ -28,6 +31,8 @@
</datatype>
</parameter>
+ &DTBookFixCategoryScriptParam;
+ &DTBookFixScriptParamsStatic;
&DtbookToXhtmlScriptParamsStatic;
&CharsetSwitcherScriptParamsStatic;
&ValidatorScriptParamsSimpleStatic;
@@ -44,15 +49,34 @@
</parameter>
</task>
+ <task name="se_tpb_dtbookFix" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>$parent{output}/pipeline__temp/1/$filename{output}</value>
+ </parameter>
+
+ <parameter>
+ <name>output</name>
+ <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ </parameter>
+
+ <parameter>
+ <name>runCategories</name>
+ <value>${dtbookFixRunCategories}</value>
+ </parameter>
+
+ &DTBookFixTaskParamsStatic;
+ </task>
+
<task name="uk_rnib_dtbook2xhtml" interactive="false">
<parameter>
<name>xml</name>
- <value>$parent{output}/pipeline__temp/1/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
</parameter>
<parameter>
<name>out</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
@@ -69,7 +93,7 @@
<task name="se_tpb_charsetSwitcher" interactive="false">
<parameter>
<name>input</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
Modified: trunk/dmfc/scripts/conversion/simple/WordMLtoDTBook.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/WordMLtoDTBook.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/WordMLtoDTBook.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -145,8 +145,7 @@
<parameter>
<name>output</name>
<value>${output}/dtbook.xml</value>
- </parameter>
-
+ </parameter>
</task>
<task name="int_daisy_validator" interactive="false">
Modified: trunk/dmfc/scripts/conversion/simple/WordMLtoXhtml.taskScript
===================================================================
--- trunk/dmfc/scripts/conversion/simple/WordMLtoXhtml.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/conversion/simple/WordMLtoXhtml.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -5,6 +5,9 @@
<!ENTITY ValidatorTaskParamsSimpleStatic SYSTEM "../../validation/ValidatorTaskParamsSimpleStatic.paramGroup">
<!ENTITY CharsetSwitcherScriptParamsStatic SYSTEM "../../manipulation/CharsetSwitcherScriptParamsStatic.paramGroup">
<!ENTITY DtbookToXhtmlScriptParamsStatic SYSTEM "../DtbookToXhtmlScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixCategoryScriptParam SYSTEM "../../manipulation/DTBookFixCategoryScriptParam.paramGroup">
+<!ENTITY DTBookFixScriptParamsStatic SYSTEM "../../manipulation/DTBookFixScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixTaskParamsStatic SYSTEM "../../manipulation/DTBookFixTaskParamsStatic.paramGroup">
]>
<taskScript version="2.0" name="WordMLToXhtml">
<nicename>Word 2003 XML to XHTML</nicename>
@@ -28,8 +31,10 @@
</datatype>
</parameter>
+ &DTBookFixCategoryScriptParam;
+ &DTBookFixScriptParamsStatic;
&DtbookToXhtmlScriptParamsStatic;
- &CharsetSwitcherScriptParamsStatic;
+ &CharsetSwitcherScriptParamsStatic;
&ValidatorScriptParamsSimpleStatic;
<task name="se_tpb_wordml2dtbook" interactive="false">
@@ -44,15 +49,34 @@
</parameter>
</task>
+ <task name="se_tpb_dtbookFix" interactive="false">
+ <parameter>
+ <name>input</name>
+ <value>$parent{output}/pipeline__temp/1/dtbook.xml</value>
+ </parameter>
+
+ <parameter>
+ <name>output</name>
+ <value>$parent{output}/pipeline__temp/2/dtbook.xml</value>
+ </parameter>
+
+ <parameter>
+ <name>runCategories</name>
+ <value>${dtbookFixRunCategories}</value>
+ </parameter>
+
+ &DTBookFixTaskParamsStatic;
+ </task>
+
<task name="uk_rnib_dtbook2xhtml" interactive="false">
<parameter>
<name>xml</name>
- <value>$parent{output}/pipeline__temp/1/$filename{input}.dtbook.xml</value>
+ <value>$parent{output}/pipeline__temp/2/dtbook.xml</value>
</parameter>
<parameter>
<name>out</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
@@ -69,7 +93,7 @@
<task name="se_tpb_charsetSwitcher" interactive="false">
<parameter>
<name>input</name>
- <value>$parent{output}/pipeline__temp/2/$filename{output}</value>
+ <value>$parent{output}/pipeline__temp/3/$filename{output}</value>
</parameter>
<parameter>
Added: trunk/dmfc/scripts/manipulation/DTBookFixCategoryScriptParam.paramGroup
===================================================================
--- trunk/dmfc/scripts/manipulation/DTBookFixCategoryScriptParam.paramGroup (rev 0)
+++ trunk/dmfc/scripts/manipulation/DTBookFixCategoryScriptParam.paramGroup 2007-12-08 18:02:13 UTC (rev 1613)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paramGroup>
+
+ <parameter name="dtbookFixRunCategories" value="REPAIR_TIDY" required="true">
+ <nicename>DTBook Fix Active Categories</nicename>
+ <description>Select the type of manipulation to be performed (See documentation for more information)</description>
+ <datatype>
+ <enum>
+ <item nicename="Tidy only" value="TIDY" />
+ <item nicename="Repair only" value="REPAIR" />
+ <item nicename="Repair, then Tidy" value="REPAIR_TIDY" />
+ <item nicename="Dont apply DTBook fix at all" value="NOTHING" />
+ </enum>
+ </datatype>
+ </parameter>
+
+</paramGroup>
\ No newline at end of file
Added: trunk/dmfc/scripts/manipulation/DTBookFixScriptParamsStatic.paramGroup
===================================================================
--- trunk/dmfc/scripts/manipulation/DTBookFixScriptParamsStatic.paramGroup (rev 0)
+++ trunk/dmfc/scripts/manipulation/DTBookFixScriptParamsStatic.paramGroup 2007-12-08 18:02:13 UTC (rev 1613)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paramGroup>
+ <parameter name="forceRun" value="false" required="false">
+ <nicename>Force Execution</nicename>
+ <description>Check box to run all selected categories even if the input document is not in the expected state (valid, invalid, etc)</description>
+ <datatype>
+ <boolean/>
+ </datatype>
+ </parameter>
+
+ <parameter name="simplifyHeadingLayout" value="false" required="false">
+ <nicename>Simplify heading layout</nicename>
+ <description>Optional routine in the Tidy category. Check box to simplify heading layout by moving headings upward where possible</description>
+ <datatype>
+ <boolean/>
+ </datatype>
+ </parameter>
+
+ <parameter name="fixCharset" value="false" required="false">
+ <nicename>Fix Character set</nicename>
+ <description>Optional routine in the Repair category. Check box to attempt to fix an invalid stated character set</description>
+ <datatype>
+ <boolean/>
+ </datatype>
+ </parameter>
+</paramGroup>
\ No newline at end of file
Added: trunk/dmfc/scripts/manipulation/DTBookFixTaskParamsStatic.paramGroup
===================================================================
--- trunk/dmfc/scripts/manipulation/DTBookFixTaskParamsStatic.paramGroup (rev 0)
+++ trunk/dmfc/scripts/manipulation/DTBookFixTaskParamsStatic.paramGroup 2007-12-08 18:02:13 UTC (rev 1613)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paramGroup>
+ <parameter>
+ <name>forceRun</name>
+ <value>${forceRun}</value>
+ </parameter>
+
+ <parameter>
+ <name>simplifyHeadingLayout</name>
+ <value>${simplifyHeadingLayout}</value>
+ </parameter>
+
+ <parameter>
+ <name>fixCharset</name>
+ <value>${fixCharset}</value>
+ </parameter>
+</paramGroup>
\ No newline at end of file
Modified: trunk/dmfc/scripts/manipulation/simple/DTBookfix.taskScript
===================================================================
--- trunk/dmfc/scripts/manipulation/simple/DTBookfix.taskScript 2007-12-08 18:00:14 UTC (rev 1612)
+++ trunk/dmfc/scripts/manipulation/simple/DTBookfix.taskScript 2007-12-08 18:02:13 UTC (rev 1613)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE taskScript
[
+<!ENTITY DTBookFixScriptParamsStatic SYSTEM "../DTBookFixScriptParamsStatic.paramGroup">
+<!ENTITY DTBookFixTaskParamsStatic SYSTEM "../DTBookFixTaskParamsStatic.paramGroup">
<!ENTITY ValidatorScriptParamsSimpleStatic SYSTEM "../../validation/ValidatorScriptParamsSimpleStatic.paramGroup">
<!ENTITY ValidatorTaskParamsSimpleStatic SYSTEM "../../validation/ValidatorTaskParamsSimpleStatic.paramGroup">
]>
@@ -14,7 +16,7 @@
<nicename>Input File</nicename>
<description>Select input DTBook file</description>
<datatype>
- <file mime="application/xml" type="input"/>
+ <file mime="application/x-dtbook+xml" type="input"/>
</datatype>
</parameter>
@@ -22,11 +24,14 @@
<nicename>Output File</nicename>
<description>Select output file</description>
<datatype>
- <file mime="application/xml" type="output"/>
+ <file mime="application/x-dtbook+xml" type="output"/>
</datatype>
</parameter>
- <parameter name="cat" value="REPAIR_TIDY" required="true">
+ <!-- Dont use DTBookFixCategoryScriptParam here,
+ since there is no point in exposing the NOTHING alternative -->
+
+ <parameter name="runCategories" value="REPAIR_TIDY" required="true">
<nicename>Active Categories</nicename>
<description>Select the type of manipulation to be performed (See documentation for more information)</description>
<datatype>
@@ -38,30 +43,8 @@
</datatype>
</parameter>
- <parameter name="forceRun" value="false" required="false">
- <nicename>Force Execution</nicename>
- <description>Check box to run all selected categories even if the input document is not in the expected state (valid, invalid, etc)</description>
- <datatype>
- <boolean/>
- </datatype>
- </parameter>
+ &DTBookFixScriptParamsStatic;
- <parameter name="simplifyHeadingLayout" value="false" required="false">
- <nicename>Simplify heading layout</nicename>
- <description>Optional routine in the Tidy category. Check box to simplify heading layout by moving headings upward where possible</description>
- <datatype>
- <boolean/>
- </datatype>
- </parameter>
-
- <parameter name="fixCharset" value="false" required="false">
- <nicename>Fix Character set</nicename>
- <description>Optional routine in the Repair category. Check box to attempt to fix an invalid stated character set</description>
- <datatype>
- <boolean/>
- </datatype>
- </parameter>
-
&ValidatorScriptParamsSimpleStatic;
<task name="se_tpb_dtbookFix" interactive="false">
@@ -77,18 +60,11 @@
<parameter>
<name>runCategories</name>
- <value>${cat}</value>
+ <value>${runCategories}</value>
</parameter>
-
- <parameter>
- <name>simplifyHeadingLayout</name>
- <value>${simplifyHeadingLayout}</value>
- </parameter>
-
- <parameter>
- <name>fixCharset</name>
- <value>${fixCharset}</value>
- </parameter>
+
+ &DTBookFixTaskParamsStatic;
+
</task>
<task name="int_daisy_validator" interactive="false">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|