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.

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 reference expansions also in docbook 5 #186

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@
<filtering>true</filtering>
<includes>
<include>templates/**</include>
<include>data/**</include>
</includes>
</resource>
<resource>
<directory>src/main/xar-resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>templates/**</exclude>
<exclude>data/**</exclude>
</excludes>
</resource>
</resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<date>January 2018</date>
<keywordset>
<keyword>authoring</keyword>
<keyword>exist</keyword>
</keywordset>
</info>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
content:get-metadata($binary as xs:base64Binary) as document-node()
content:get-metadata-and-content($binary as xs:base64Binary) as document-node()
content:stream-content($binary as xs:base64Binary, $paths as xs:string*, $callback as function, $namespaces as element()?, $userData as item()*) as empty-sequence()
content:stream-content($binary as xs:base64Binary, $paths as xs:string*, $callback as function, $namespaces as element()?, $userData as item()*) as empty()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty() should be empty-sequence()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed something is foul in the state of denmark

Copy link
Member

@dizzzz dizzzz Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

closing the PR? 😱😳

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes the big one will have to wait another round

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include.feature.contentextraction = true</synopsis>
<para>The module provides three functions:</para>
<synopsis>content:get-metadata($binary as xs:base64Binary) as document-node()
content:get-metadata-and-content($binary as xs:base64Binary) as document-node()
content:stream-content($binary as xs:base64Binary, $paths as xs:string*, $callback as function, $namespaces as element()?, $userData as item()*) as empty-sequence()</synopsis>
content:stream-content($binary as xs:base64Binary, $paths as xs:string*, $callback as function, $namespaces as element()?, $userData as item()*) as empty()</synopsis>
<para>The first two functions need little explanation: get-metadata just returns some
metadata extracted from the resource, while get-metadata-and-content will also
provide the text body of the resource—if there is any. The third function is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</section>
<section id="all-documentation">
<title>All Documentation</title>
<para>Besides these articles, you can search eXist-db's XQuery <ulink url="{fundocs}/index.html">function module library</ulink>.</para>
<para>Besides these articles, you can search eXist-db's XQuery <ulink url="{${fundocs.pkg.abbrev}}/index.html">function module library</ulink>.</para>
<section id="getting-started">
<title>Getting Started</title>
<table class="documentation">
Expand Down Expand Up @@ -464,4 +464,4 @@
</section>
</section>
</chapter>
</book>
</book>
4 changes: 2 additions & 2 deletions src/main/xar-resources/data/db4-versions/extensions-db4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<para>eXist-db must also be told which modules to load, this is done in
<filename>conf.xml</filename> and the Class name and Namespace for each module is listed
below. Note – eXist-db will require a restart to load any new modules added. Once a Module is configured
and loaded eXist-db will display the module and its function definitions as part of the <ulink url="{fundocs}">function library</ulink> page or through
and loaded eXist-db will display the module and its function definitions as part of the <ulink url="{${fundocs.pkg.abbrev}}">function library</ulink> page or through
<command>util:decribe-function()</command>.</para>
</section>
<section id="module_example">
Expand Down Expand Up @@ -310,4 +310,4 @@
<command>Namespace:</command>  http://xmlcalabash.com </para>
</section>
</chapter>
</book>
</book>
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<para>The XQuery engine has been updated to support the changed syntax for <emphasis>maps in XQuery 3.1</emphasis>. The query parser will still accept the
old syntax for map constructors though (<code>map { x:= "y"}</code> instead of <code>map { x: "y" }</code> in XQuery 3.1), so old
code should run without modifications. All map module functions from XQuery 3.1 are
<ulink url="{fundocs}/view.html?uri=http://www.w3.org/2005/xpath-functions/map&amp;location=java:org.exist.xquery.functions.map.MapModule">available</ulink>.</para>
<ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://www.w3.org/2005/xpath-functions/map&amp;location=java:org.exist.xquery.functions.map.MapModule">available</ulink>.</para>
<para>The signatures for some <emphasis>higher-order utility functions</emphasis> like fn:filter, fn:fold-left and fn:fold-right have changed as well. Please review your
use of those functions. Also, fn:map is now called fn:for-each, though the old name is still accepted.</para>
<para>The bundled Lucene has been upgraded from 3.6.1
Expand Down Expand Up @@ -192,4 +192,4 @@ dbutil:scan-collections(xs:anyURI("/db"), function($collection) {
</section>
</section>
</chapter>
</book>
</book>
4 changes: 2 additions & 2 deletions src/main/xar-resources/data/db4-versions/validation-db4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<listitem>
<para>Jing</para>
</listitem>
</itemizedlist>Each of these options are discussed in the following sections. Consult the <ulink url="{fundocs}/view.html?uri=http://exist-db.org/xquery/validation">XQuery Function Documentation</ulink> for detailed functions
</itemizedlist>Each of these options are discussed in the following sections. Consult the <ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/validation">XQuery Function Documentation</ulink> for detailed functions
descriptions.</para>
<section>
<title>JAXP</title>
Expand Down Expand Up @@ -482,4 +482,4 @@
</para>
</section>
</chapter>
</book>
</book>
2 changes: 1 addition & 1 deletion src/main/xar-resources/data/db4-versions/xquery-db4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
currently not support the <ulink url="http://www.w3.org/TR/xquery/#id-schema-import-feature">schema import</ulink> and
<ulink url="http://www.w3.org/TR/xquery/#id-schema-validation-feature">schema validation features</ulink>
defined as <ulink url="http://www.w3.org/TR/xquery/#id-conform-optional-features">optional</ulink>
in the XQuery specification. eXist-db provides <ulink url="{fundocs}/view.html?uri=http://exist-db.org/xquery/validation&amp;location=java:org.exist.xquery.functions.validation.ValidationModule">extension functions</ulink>
in the XQuery specification. eXist-db provides <ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/validation&amp;location=java:org.exist.xquery.functions.validation.ValidationModule">extension functions</ulink>
to perform XML validation. The database does not
store type information along with the nodes. It therefore cannot know
the typed value of a node and has to assume
Expand Down
Loading