Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues causing gulp to choke #732

Merged
merged 5 commits into from
Jan 24, 2022
Merged

Fix issues causing gulp to choke #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35ef60e
Correct link to new article
joewiz Jan 13, 2022
9ee2488
Fix well-formedness
joewiz Jan 13, 2022
72456fa
Rename XML fragment docs from xml to txt
joewiz Jan 13, 2022
efea229
Replace CDATA programlistings with existing files
joewiz Jan 13, 2022
be39070
Accept gulp changes
joewiz Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/documentation/documentation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
51 changes: 14 additions & 37 deletions src/main/xar-resources/data/fo-render/fo-render.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-10.xml
View file
Open in desktop
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"/>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-11.xml
View file
Open in desktop
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"/>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-12.xml
View file
Open in desktop
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"/>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-13.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<languages default-language="en-US" xml:base="renderx/hyphen/">
<languages default-language="en-US" xml:base="renderx/hyphen"/>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-15.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 ...ces/data/fo-render/listings/listing-5.xml → ...ces/data/fo-render/listings/listing-5.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<option name="LICENSE" value="license.xml"/>
<option name="LICENSE" value="license.xml"/>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/fo-render/listings/listing-7.xml
View file
Open in desktop
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"/>
0 ...ces/data/fo-render/listings/listing-8.xml → ...ces/data/fo-render/listings/listing-8.txt
View file
Open in desktop
File renamed without changes.
0 ...ces/data/fo-render/listings/listing-9.xml → ...ces/data/fo-render/listings/listing-9.txt
View file
Open in desktop
File renamed without changes.