Merge pull request #732 from joewiz/fix-fo-render

Fix issues causing gulp to choke
eXist-db · Jan 24, 2022 · b92a88a · b92a88a
2 parents 2441265 + be39070
commit b92a88a
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 46 deletions.
diff --git a/src/main/xar-resources/data/documentation/documentation.xml b/src/main/xar-resources/data/documentation/documentation.xml
@@ -231,7 +231,7 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <link xlink:href="xsl-transform">FO Rendering</link>
+          <link xlink:href="fo-render">FO Rendering</link>
         </term>
         <listitem>
           <para>How to perform FO (Formatting Objects) Rendering with XQuery.</para>

diff --git a/src/main/xar-resources/data/fo-render/fo-render.xml b/src/main/xar-resources/data/fo-render/fo-render.xml
@@ -94,15 +94,13 @@
   <sect1 xml:id="apachefop">
     <title>Using the Apache FOP Renderer</title>
     <para>By default eXist-db ships with and is configured to use Apache FOP. It is configured in eXist-db's <code>conf.xml</code> file through the following configuration option:</para>
-      <programlisting language="xml"><![CDATA[<module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
-  <parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.ApacheFopProcessorAdapter"/>
-</module>]]></programlisting>
+      <programlisting language="xml" xlink:href="listings/listing-3.xml"/>
     <para>
       An example of using Apache FOP to transform FO and save the result to a PDF file in the database.
     </para>
     <example>
       <title>Using Apache FOP from XQuery</title>
-      <programlisting language="xquery" xlink:href="listings/listing-3.txt"/>
+      <programlisting language="xquery" xlink:href="listings/listing-4.txt"/>
     </example>
 
   </sect1>
@@ -116,18 +114,7 @@
       </listitem>
       <listitem>
         <para>eXist-db uses a number of configuration files, one per script, to determine which <code>jar</code> files to load. You should edit the XML files in the folder <code>$EXIST_HOME/etc</code> to add the following configuration (adjust the <emphasis>version</emphasis> numbers appropriately):</para>
-          <programlisting language="xml"><![CDATA[[<dependency>
-<groupId>com.renderx.xep</groupId>
-<artifactId>xep</artifactId>
-<version>4.30.961</version>
-<relativePath>xep.jar</relativePath>
-</dependency>
-<dependency>
-<groupId>com.renderx.xep.thirdparty.com.jclark.xsl</groupId>
-<artifactId>xt</artifactId>
-<version>4.30.961</version>
-<relativePath>xt.jar</relativePath>
-</dependency>]]></programlisting>
+          <programlisting language="xml" xlink:href="listings/listing-5.txt"/>
       </listitem>
       <listitem>
         <para>Create the folder <code>$EXIST_HOME/renderx</code></para>
@@ -139,26 +126,20 @@
         <para>Edit the file <code>$EXIST_HOME/renderx/xep.xml</code> to make the following changes:</para>
         <itemizedlist>
           <listitem>
-            <para>From:</para><programlisting language="xml"><![CDATA[<option name="LICENSE" value="license.xml"/>]]></programlisting>
-            <para>To:</para><programlisting language="xml"><![CDATA[<option name="LICENSE" value="renderx/license.xml"/>]]></programlisting>
+            <para>From:</para><programlisting language="xml" xlink:href="listings/listing-6.xml"/>
+            <para>To:</para><programlisting language="xml" xlink:href="listings/listing-7.xml"/>
           </listitem>
           <listitem>
-            <para>From:</para> <programlisting language="xml"><![CDATA[<option name="BROKENIMAGE" value="images/404.gif"/>
-<option name="LOGO" value="images/logo-renderx.svg"/>
-<option name="STAMP_PNG" value="images/stamp-renderx.png"/>
-<option name="ROLE_MAP" value="rolemap.xml"/>]]></programlisting>
-            <para>To:</para> <programlisting language="xml"><![CDATA[<option name="BROKENIMAGE" value="renderx/images/404.gif"/>
-<option name="LOGO" value="renderx/images/logo-renderx.svg"/>
-<option name="STAMP_PNG" value="renderx/images/stamp-renderx.png"/>
-<option name="ROLE_MAP" value="renderx/rolemap.xml"/>]]></programlisting>
+            <para>From:</para> <programlisting language="xml" xlink:href="listings/listing-8.txt"/>
+            <para>To:</para> <programlisting language="xml" xlink:href="listings/listing-9.txt"/>
           </listitem>
           <listitem>
-            <para>From:</para> <programlisting language="xml"><![CDATA[<fonts xml:base="fonts/" default-family="Helvetica">]]></programlisting>
-            <para>To:</para> <programlisting language="xml"><![CDATA[<fonts xml:base="renderx/fonts/" default-family="Helvetica">]]></programlisting>
+            <para>From:</para> <programlisting language="xml" xlink:href="listings/listing-10.xml"/>
+            <para>To:</para> <programlisting language="xml" xlink:href="listings/listing-11.xml"/>
           </listitem>
           <listitem>
-            <para>From:</para> <programlisting language="xml"><![CDATA[<languages default-language="en-US" xml:base="hyphen/">]]></programlisting>
-            <para>To:</para> <programlisting language="xml"><![CDATA[<languages default-language="en-US" xml:base="renderx/hyphen/">]]></programlisting>
+            <para>From:</para> <programlisting language="xml" xlink:href="listings/listing-12.xml"/>
+            <para>To:</para> <programlisting language="xml" xlink:href="listings/listing-13.xml"/>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -167,12 +148,8 @@
       </listitem>
       <listitem>
         <para>Edit the file <code>$EXIST_HOME/conf.xml</code> to make the following changes:</para>
-        <para>From:</para> <programlisting language="xml"><![CDATA[<module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
-<parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.ApacheFopProcessorAdapter"/>
-</module>]]></programlisting>
-        <para>To: </para><programlisting language="xml"><![CDATA[<module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
-<parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.RenderXXepProcessorAdapter"/>
-</module>]]></programlisting>
+        <para>From:</para> <programlisting language="xml" xlink:href="listings/listing-14.xml"/>
+        <para>To: </para><programlisting language="xml" xlink:href="listings/listing-15.xml"/>
       </listitem>
       <listitem>
         <para>If eXist-db was running whilst you were making these changes, then you will need to restart it for the change to take effect.</para>
@@ -183,7 +160,7 @@
     </para>
     <example>
       <title>Using RenderX XEP from XQuery</title>
-      <programlisting language="xquery" xlink:href="listings/listing-4.txt"/>
+      <programlisting language="xquery" xlink:href="listings/listing-16.txt"/>
     </example>
 
   </sect1>

diff --git a/src/main/xar-resources/data/fo-render/listings/listing-10.xml b/src/main/xar-resources/data/fo-render/listings/listing-10.xml
@@ -1 +1 @@
-<fonts xml:base="fonts/" default-family="Helvetica">
+<fonts xml:base="fonts/" default-family="Helvetica"/>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-11.xml b/src/main/xar-resources/data/fo-render/listings/listing-11.xml
@@ -1 +1 @@
-<fonts xml:base="renderx/fonts/" default-family="Helvetica">
+<fonts xml:base="renderx/fonts/" default-family="Helvetica"/>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-12.xml b/src/main/xar-resources/data/fo-render/listings/listing-12.xml
@@ -1 +1 @@
-<languages default-language="en-US" xml:base="hyphen/">
+<languages default-language="en-US" xml:base="hyphen"/>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-13.xml b/src/main/xar-resources/data/fo-render/listings/listing-13.xml
@@ -1 +1 @@
-<languages default-language="en-US" xml:base="renderx/hyphen/">
+<languages default-language="en-US" xml:base="renderx/hyphen"/>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-14.xml b/src/main/xar-resources/data/fo-render/listings/listing-14.xml
@@ -1,3 +1,3 @@
 <module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
   <parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.ApacheFopProcessorAdapter"/>
-</module>
+</module>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-15.xml b/src/main/xar-resources/data/fo-render/listings/listing-15.xml
@@ -1,3 +1,3 @@
 <module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
   <parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.RenderXXepProcessorAdapter"/>
-</module>
+</module>
diff --git a/...ces/data/fo-render/listings/listing-5.xml → ...ces/data/fo-render/listings/listing-5.txt b/...ces/data/fo-render/listings/listing-5.xml → ...ces/data/fo-render/listings/listing-5.txt
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-6.xml b/src/main/xar-resources/data/fo-render/listings/listing-6.xml
@@ -1 +1 @@
-<option name="LICENSE" value="license.xml"/>
+<option name="LICENSE" value="license.xml"/>
diff --git a/src/main/xar-resources/data/fo-render/listings/listing-7.xml b/src/main/xar-resources/data/fo-render/listings/listing-7.xml
@@ -1 +1 @@
-<option name="LICENSE" value="renderx/license.xml"/>
+<option name="LICENSE" value="renderx/license.xml"/>
diff --git a/...ces/data/fo-render/listings/listing-8.xml → ...ces/data/fo-render/listings/listing-8.txt b/...ces/data/fo-render/listings/listing-8.xml → ...ces/data/fo-render/listings/listing-8.txt
diff --git a/...ces/data/fo-render/listings/listing-9.xml → ...ces/data/fo-render/listings/listing-9.txt b/...ces/data/fo-render/listings/listing-9.xml → ...ces/data/fo-render/listings/listing-9.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<fonts xml:base="fonts/" default-family="Helvetica">
		<fonts xml:base="fonts/" default-family="Helvetica"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<fonts xml:base="renderx/fonts/" default-family="Helvetica">
		<fonts xml:base="renderx/fonts/" default-family="Helvetica"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<languages default-language="en-US" xml:base="hyphen/">
		<languages default-language="en-US" xml:base="hyphen"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<option name="LICENSE" value="license.xml"/>
		<option name="LICENSE" value="license.xml"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<option name="LICENSE" value="renderx/license.xml"/>
		<option name="LICENSE" value="renderx/license.xml"/>