Skip to content

Commit

Permalink
Merge pull request #127 from ndw/fpwd-20141208
Browse files Browse the repository at this point in the history 
Final tweaks for FPWD published on 18 December 2014.
  • Loading branch information
@ndw
ndw committed Dec 17, 2014
2 parents e6a79ea + c771a80 commit a3177b7
Show file tree
Hide file tree
Showing 13 changed files with 603 additions and 153 deletions.
20 changes: 20 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
STYLES=$(wildcard style/*.xsl)
STAGETYPE=WD
STAGEROOT=/tmp/xproc20
STAGEDATE=19670616
STAGEXPROC=$(STAGEROOT)/$(STAGETYPE)-xproc20-$(STAGEDATE)
STAGESTEPS=$(STAGEROOT)/$(STAGETYPE)-xproc20-steps-$(STAGEDATE)

all: xproc20 req

Expand All @@ -20,6 +25,7 @@ xproc20:
cd langspec/xproc20 && tar cf - graphics \
| (cd ../../build/langspec/xproc20; tar xf -)
cp style/xproc.css build/langspec/xproc20/
cp style/prism.css build/langspec/xproc20/
cp js/prism.js build/langspec/xproc20/
cp langspec/schemas/xproc.rng build/langspec/xproc20/schemas/
cp langspec/schemas/steps.rng build/langspec/xproc20/schemas/
Expand All @@ -35,26 +41,40 @@ xproc20:
cp langspec/xproc20-steps/changelog.xml build/langspec/xproc20-steps/
cp langspec/xproc20-steps/changelog.html build/langspec/xproc20-steps/
cp style/xproc.css build/langspec/xproc20-steps/
cp style/prism.css build/langspec/xproc20-steps/
cp js/prism.js build/langspec/xproc20-steps/
@echo ==================================================
cp build/langspec/xproc20/base.css build/langspec/ns-p/
cp langspec/ns-p/Overview.html build/langspec/ns-p/index.html
cp langspec/ns-p/,xproc.xml build/langspec/ns-p/ns-p.xml
cp style/xproc.css build/langspec/ns-p/
cp style/prism.css build/langspec/ns-p/
cp js/prism.js build/langspec/ns-p/
@echo ==================================================
cp build/langspec/xproc20/base.css build/langspec/ns-c/
cp langspec/ns-c/Overview.html build/langspec/ns-c/index.html
cp langspec/ns-c/,xproc-step.xml build/langspec/ns-c/ns-c.xml
cp style/xproc.css build/langspec/ns-c/
cp style/prism.css build/langspec/ns-c/
cp js/prism.js build/langspec/ns-c/
@echo ==================================================
cp build/langspec/xproc20/base.css build/langspec/ns-err/
cp langspec/ns-err/Overview.html build/langspec/ns-err/index.html
cp langspec/ns-err/,xproc-error.xml build/langspec/ns-err/ns-err.xml
cp style/xproc.css build/langspec/ns-err/
cp style/prism.css build/langspec/ns-err/
cp js/prism.js build/langspec/ns-err/

stage-xproc20: xproc20
mkdir -p $(STAGEXPROC) $(STAGESTEPS)
rsync -ar build/langspec/xproc20/ $(STAGEXPROC)/
rsync -ar build/langspec/xproc20-steps/ $(STAGESTEPS)/
echo "<!DOCTYPE html>" > $(STAGEXPROC)/Overview.html
echo "<!DOCTYPE html>" > $(STAGESTEPS)/Overview.html
cat $(STAGEXPROC)/index.html >> $(STAGEXPROC)/Overview.html
cat $(STAGESTEPS)/index.html >> $(STAGESTEPS)/Overview.html
rm -f $(STAGEXPROC)/index.html $(STAGESTEPS)/index.html

req:
mkdir -p build/langreq
$(MAKE) -C schema
Expand Down
2 changes: 2 additions & 0 deletions langspec/xproc20-steps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Overview.html: ,steps.xml typed-pipeline-library.xml error-list.xml \
-pschemaext.schema=../../../../../schema/dbspec.rng \
-pxml.toc.filename=steps.toc.xml \
-potherspec=../xproc20/,xproc20.xml \
-potherprefix="../" \
-pothersuffix="" \
-potherlabel="XP" \
../../style/formatspec.xpl style=xproc-specs.xsl

Expand Down
75 changes: 50 additions & 25 deletions langspec/xproc20-steps/steps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@
xmlns:p="http://www.w3.org/ns/xproc"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink"
class="ed"
class="fpwd"
version="5.0-extension w3c-xproc">
<info>
<title>XProc 2.0: Standard Step Library</title>
<w3c-shortname>xproc20-steps</w3c-shortname>
<!-- defaults to date formatted <pubdate>2014-08-20</pubdate> -->
<pubdate>2014-12-18</pubdate>

<bibliorelation role="x-no-errata" type="references"
xlink:href="http://www.w3.org/XML/2010/xproc-errata.html">errata</bibliorelation>
<bibliorelation role="x-no-translations" type="references"
xlink:href="http://www.w3.org/2003/03/Translations/byTechnology?technology=xproc">translations</bibliorelation>

<bibliorelation type="isformatof" xlink:href="langsteps.xml">XML</bibliorelation>
<bibliorelation type="isformatof" xlink:href="xproc20-steps.xml">XML</bibliorelation>
<!--
<bibliorelation type="isformatof" xlink:href="changelog.html">ChangeLog</bibliorelation>
-->

<!--
<bibliorelation type="replaces" xlink:href="http://www.w3.org/TR/2010/PR-xproc-20100309/"/>
Expand Down Expand Up @@ -72,32 +75,50 @@
<para><emphasis>This section describes the status of this document at
the time of its publication. Other documents may supersede this
document. A list of current W3C publications and the latest revision
of this technical report can be found in the <link
xlink:href="http://www.w3.org/TR/">W3C technical reports index</link>
at http://www.w3.org/TR/.</emphasis></para>

<para>This document is an editor's draft without normative standing.
This document is a
of this technical report can be found in the
<link xlink:href="http://www.w3.org/TR/">W3C technical reports index</link> at
http://www.w3.org/TR/.</emphasis></para>

<para>Publication as a First Public Working Draft does not imply
endorsement by the W3C Membership. This is a draft document and may be
updated, replaced or obsoleted by other documents at any time. It is
inappropriate to cite this document as other than work in
progress.</para>

<para><!--This document is an editor's draft without normative standing.
-->This document is a
product of the
<link xlink:href="http://www.w3.org/XML/Processing/" >XML Processing Model
Working Group</link>
as part of the W3C
<link xlink:href="http://www.w3.org/XML/Activity">XML Activity</link>.
This draft is a first attempt to address some of the requirements of
<biblioref linkend="use-cases"/>. It is in many ways substantially incomplete.
The Working Group is publishing it in order to establish an intended direction
and to provide an official opportunity for comment.
</para>

<para>Please report errors in this document by
<link xlink:href="https://github.com/xproc/specification/issues">raising
issues</link> on the
<link xlink:href="https://github.com/xproc/specification">specification
repository</link>.</para>
repository</link>.
Alternatively, you may report errors in this document to the public
mailing list
<link xlink:href="mailto:public-xml-processing-model-comments@w3.org"
>public-xml-processing-model-comments@w3.org</link> (public
<link xlink:href="http://lists.w3.org/Archives/Public/public-xml-processing-model-comments/"
>archives</link> are available).</para>

<!--
<para>There is an
<link xlink:href="http://www.w3.org/XML/XProc/2010/02/ir.html">Implementation
Report for XProc 1.0</link>. It documents the performance of implementations
against the
<link xlink:href="http://tests.xproc.org/">XProc 1.0 Test Suite</link>.
At this time, there are no such reports for XProc 2.0.
</para>
-->

<para>This document was produced by a group operating under the <link
xlink:href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Expand All @@ -112,6 +133,8 @@ Claim(s)</link> must disclose the information in accordance with <link
xlink:href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
6 of the W3C Patent Policy</link>.</para>

<para>This document is governed by the
<link xml:id="w3c_process_revision" xlink:href="http://www.w3.org/2005/10/Process-20051014/">14 October 2005 W3C Process Document</link>.</para>
</legalnotice>
</info>

Expand Down Expand Up @@ -223,7 +246,7 @@ value of that existing attribute. That is, the value of the
existing attribute is changed to the <option>attribute-value</option>
value. </para>

<note><para>If multiple attributes need to be set on the same
<note xml:id="note-multattr"><para>If multiple attributes need to be set on the same
element(s), the <tag>p:set-attributes</tag> step can be used to set them
all at once.</para>
</note>
Expand All @@ -233,7 +256,7 @@ code="C0059">It is a <glossterm>dynamic error</glossterm> if the QName
value in the <option>attribute-name</option> option uses the prefix
“<literal>xmlns</literal>”
or any other prefix that resolves to the namespace name
“<uri>http://www.w3.org/2000/xmlns/</uri>”.
<uri>http://www.w3.org/2000/xmlns/</uri>.
</error> Note, however, that while namespace declarations cannot be
added explicitly by this step, adding an attribute whose name is in a
namespace for which there is no namespace declaration in scope on the
Expand Down Expand Up @@ -672,7 +695,7 @@ options control how the output markup is produced before it is escaped.
<para>produces:</para>
<programlisting language="xml"><xi:include href="examples/serialize.output.ex.txt" parse="text"/></programlisting>

<note>
<note xml:id="note-escaped">
<para>The result of this step is an XML document that contains the
Unicode characters that are the characters that result from escaping
the input. It is not encoded characters in a serialized octet stream,
Expand Down Expand Up @@ -740,7 +763,7 @@ occurs in constructing a request.</para>
if the document element of the document that arrives on the
<port>source</port> port is not <tag>c:request</tag>.</error></para>

<note role="editorial">
<note xml:id="ednote-json" role="editorial">
<title>Editorial Note</title>
<para>Can the input document be JSON?</para>
</note>
Expand Down Expand Up @@ -770,7 +793,8 @@ If the <code>href</code>
attribute is not absolute, it will be resolved against the base URI of
the element on which it is occurs.</para>

<note><para>In the case of simple “GET” requests, implementors are encouraged
<note xml:id="note-http-get">
<para>In the case of simple “GET” requests, implementors are encouraged
to support as many protocols as practical. In particular, pipeline authors may
attempt to use <tag>p:http-request</tag> to load documents with computed
URIs using the <literal>file:</literal> scheme.</para></note>
Expand Down Expand Up @@ -899,7 +923,7 @@ encoded string whose byte stream should be sent as the message body.
error</glossterm> if the encoding specified is not supported by the
implementation.</error></para>

<note>
<note xml:id="note-single-set-ser">
<para>The <tag>p:http-request</tag> step provides only a single set of
serialization options for XML media types. There's no direct support
for sending a multipart message with two XML parts encoded
Expand Down Expand Up @@ -970,7 +994,7 @@ Content-Type: application/xml; charset="utf-8"
<section xml:id="c.request_response">
<title>Managing the response</title>

<note role="editorial">
<note xml:id="ednote-non-xml" role="editorial">
<title>Editorial Note</title>
<para>This section hasn't been updated to reflect the fact that
non-XML documents are now possible.</para>
Expand Down Expand Up @@ -1083,7 +1107,7 @@ linkend="rfc1521"/>. In those situations, the result document will be
a <tag>c:multipart</tag> element that contains multiple
<tag>c:body</tag> elements inside.</para>

<note>
<note xml:id="note-multipart-multipart">
<para>Although it is technically possible for any of the individual
parts of a multipart message to <emphasis>also</emphasis> be
multipart, XProc does not provide a standard representation for such
Expand Down Expand Up @@ -1127,7 +1151,7 @@ specified, and it must include any parameters returned by the server.</para>
constructing a <tag>c:body</tag> element for each body part
encountered.</para>

<note>
<note xml:id="note-text-html">
<para>Given the above description, any content identified as
<code>text/html</code> will be encoded as (escaped) text or
base64-encoded in the <tag>c:body</tag> element, as HTML isn't always
Expand Down Expand Up @@ -1507,7 +1531,8 @@ not specified or has an empty string as its value) the namespace attribute is ab
</listitem>
</itemizedlist>

<note><para>The <option>apply-to</option> option is primarily intended to make
<note xml:id="note-apply-to">
<para>The <option>apply-to</option> option is primarily intended to make
it possible to avoid renaming attributes when the <option>from</option> option
specifies no namespace, since many attributes are in no namespace.</para>

Expand Down Expand Up @@ -1554,7 +1579,7 @@ in the <option>wrapper</option> option, and writes that element to the
other, then it simply wraps each of the remaining documents in the
longer sequence.</para>

<note>
<note xml:id="note-two-docs">
<para>In the common case, where the document element of a document in
the <port>result</port> sequence has two element children, any
comments, processing instructions, or white space text nodes that
Expand Down Expand Up @@ -1877,7 +1902,7 @@ with that document as the context document. The context position
sequence and the context size (<code>last()</code>) is the total
number of documents in the sequence.</para>

<note>
<note xml:id="note-stream">
<para>In principle, this component cannot stream because it must
buffer all of the input sequence in order to find the context size. In
practice, if the test expression does not use the
Expand Down Expand Up @@ -2094,7 +2119,7 @@ the specified <option>match</option> pattern is replaced by its children,
effectively “unwrapping” the children from their parent. Non-element nodes
and unmatched elements are passed through unchanged.</para>

<note>
<note xml:id="note-match-doc">
<para>The matching applies to the entire document, not just the “top-most”
matches. A pattern of the form <literal>h:div</literal> will replace
<emphasis>all</emphasis> <tag>h:div</tag> elements, not just the top-most
Expand Down Expand Up @@ -2795,7 +2820,7 @@ string value of the XPath expression is used. In text content, an
expression that selects nodes will cause those nodes to be copied into
the template document.</para>

<note>
<note xml:id="note-xpath-version">
<para>Depending on which version of XPath an implementation supports,
and possibly on the <tag class="attribute">xpath-version</tag> setting on
the <tag>p:template</tag>, some implementations may report errors, or
Expand All @@ -2804,7 +2829,7 @@ interpretation of an XPath expression differs between the versions of
XPath.</para>
</note>

<section xml:id="ex-in-scope-names" role="tocsuppress">
<section xml:id="ex-template" role="tocsuppress">
<title>Example</title>

<para>It's quite common to construct documents using values computed
Expand Down Expand Up @@ -3648,7 +3673,7 @@ output method.</para>
<para>If a processor chooses to implement an option for serialization,
it must conform to the semantics defined in the <biblioref linkend="xml-serialization"/> specification.</para>

<note>
<note xml:id="note-use-char-maps">
<para>The use-character-maps parameter in <biblioref linkend="xml-serialization"/> specification has not been provided in
the standard serialization options provided by this
specification.</para>
Expand Down
2 changes: 2 additions & 0 deletions langspec/xproc20/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Overview.html: ,xproc20.xml error-list.xml \
-pschemaext.schema=../../../../../schema/dbspec.rng \
-pxml.toc.filename=xproc20.toc.xml \
-potherspec=../xproc20-steps/,steps.xml \
-potherprefix="../" \
-pothersuffix="" \
-potherlabel="XPS" \
../../style/formatspec.xpl style=xproc-specs.xsl

Expand Down
10 changes: 5 additions & 5 deletions langspec/xproc20/mediatype.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<para>This parameter has identical semantics to the <code>charset</code>
parameter of the <code>application/xml</code> media type as
specified in <xref linkend="rfc3023"/> or its successors.
specified in <biblioref linkend="rfc3023"/> or its successors.
</para>
</listitem>
</varlistentry>
Expand All @@ -60,7 +60,7 @@ specified in <xref linkend="rfc3023"/> or its successors.
<listitem>
<para>By virtue of XProc content being XML, it has the same
considerations when sent as <quote><code>application/xproc+xml</code></quote>
as does XML. See <xref linkend="rfc3023"/>, Section 3.2.
as does XML. See <biblioref linkend="rfc3023"/>, Section 3.2.
</para>
</listitem>
</varlistentry>
Expand All @@ -69,7 +69,7 @@ as does XML. See <xref linkend="rfc3023"/>, Section 3.2.
<term>Security considerations:</term>
<listitem>
<para>Several XProc elements may refer to arbitrary URIs.
In this case, the security issues of <xref linkend="rfc2396"/>, section 7,
In this case, the security issues of <biblioref linkend="rfc2396"/>, section 7,
should be considered.</para>

<para>In addition, because of the extensibility features of XProc, it
Expand Down Expand Up @@ -103,7 +103,7 @@ document.</para>
<listitem>
<para>This media type registration is for XProc documents as described by
this specification which is located at
<link xlink:href="http://www.w3.org/TR/xproc"/>.</para>
<link xlink:href="http://www.w3.org/TR/xproc/"/>.</para>
</listitem>
</varlistentry>

Expand Down Expand Up @@ -186,6 +186,6 @@ over these specifications.</para>
the fragment
identifier notation is exactly that for
<quote><code>application/xml</code></quote>,
as specified in <xref linkend="rfc3023"/> or its successors.</para>
as specified in <biblioref linkend="rfc3023"/> or its successors.</para>
</section>
</appendix>
Loading

0 comments on commit a3177b7

Please sign in to comment.