Merge branch 'dev'

pageseeder · Oct 29, 2021 · 12dc601 · 12dc601
2 parents 4c58a77 + 1e6b426
commit 12dc601
Show file tree

Hide file tree

Showing 29 changed files with 623 additions and 74 deletions.
diff --git a/pso-docx-ant/src/test/export/cases/blocklabel-qualification/document.xml b/pso-docx-ant/src/test/export/cases/blocklabel-qualification/document.xml
diff --git a/pso-docx-ant/src/test/export/cases/comments-false/document.xml b/pso-docx-ant/src/test/export/cases/comments-false/document.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:bookmarkStart w:name="f-" w:id="0"/><w:bookmarkEnd w:id="0"/><w:bookmarkStart w:name="f-title" w:id="1"/><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test Case 1</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="BodyText"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Basic Document without any configuration.</w:t></w:r></w:p><w:bookmarkEnd w:id="1"/><w:sectPr xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" w:rsidR="00125F2B"><w:headerReference w:type="even" r:id="rId8"/><w:headerReference w:type="default" r:id="rId9"/><w:footerReference w:type="even" r:id="rId10"/><w:footerReference w:type="default" r:id="rId11"/><w:headerReference w:type="first" r:id="rId12"/><w:footerReference w:type="first" r:id="rId13"/><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="708" w:footer="708" w:gutter="0"/><w:cols w:space="708"/><w:docGrid w:linePitch="360"/></w:sectPr></w:body></w:document>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body><w:bookmarkStart w:name="f-" w:id="0"/><w:bookmarkEnd w:id="0"/><w:bookmarkStart w:name="f-title" w:id="1"/><w:p><w:pPr><w:pStyle w:val="Body Text"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Test Case 1</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="Body Text"/></w:pPr><w:r><w:rPr/><w:t xml:space="preserve">Basic Document without any configuration.</w:t></w:r></w:p><w:bookmarkEnd w:id="1"/><w:sectPr xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" w:rsidR="008253AC" w:rsidRPr="008253AC" w:rsidSect="003B2A37"><w:headerReference w:type="even" r:id="rId10"/><w:headerReference w:type="default" r:id="rId11"/><w:footerReference w:type="even" r:id="rId12"/><w:endnotePr><w:numFmt w:val="lowerLetter"/><w:numRestart w:val="eachSect"/></w:endnotePr><w:pgSz w:w="11907" w:h="16840" w:code="9"/><w:pgMar w:top="2466" w:right="2098" w:bottom="2466" w:left="2098" w:header="0" w:footer="0" w:gutter="0"/><w:cols w:space="720"/><w:noEndnote/><w:docGrid w:linePitch="272"/></w:sectPr></w:body></w:document>
diff --git a/pso-docx-ant/src/test/export/cases/comments-false/word-export-template.docx b/pso-docx-ant/src/test/export/cases/comments-false/word-export-template.docx
diff --git a/pso-docx-ant/src/test/export/cases/comments-false/word-export-template.dotx b/pso-docx-ant/src/test/export/cases/comments-false/word-export-template.dotx
diff --git a/pso-docx-ant/src/test/export/cases/comments-true/comments-true.psml b/pso-docx-ant/src/test/export/cases/comments-true/comments-true.psml
@@ -1,15 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document level="portable">
+<document id="61094" schemaversion="0.12" type="references"
+					date="2018-11-07T09:46:34+11:00" version="current" level="processed">
 	<documentinfo>
-		<uri title="empty-configuration-basic-document">
-			<displaytitle>empty-configuration-basic-document</displaytitle>
+		<uri id="61094" scheme="http" host="localhost" port="80"
+				 path="/ps/report/local1/test/xref-footnotes.psml" decodedpath="/ps/report/local1/test/xref-footnotes.psml"
+				 external="false" mediatype="application/vnd.pageseeder.psml+xml"
+				 documenttype="references" created="2018-06-19T14:45:38+10:00"
+				 modified="2018-11-07T09:46:34+11:00" title="XRef-footnotes">
+			<displaytitle>XRef-footnotes</displaytitle>
 		</uri>
 	</documentinfo>
-	<toc/>
-	<section id="title">
-		<fragment id="title">
-			<para>Test Case 1</para>
-			<para>Basic Document without any configuration.</para>
+	<fragmentinfo>
+		<locator id="45269" fragment="61094-2" editid="165862"
+						 modified="2018-11-07T09:46:34+11:00" />
+	</fragmentinfo>
+	<metadata />
+	<section id="61094-title">
+		<fragment id="61094-1">
+			<heading level="1">XRef-footnotes</heading>
 		</fragment>
-	</section>	
+	</section>
+	<toc />
+	<section id="61094-xrefs">
+		<xref-fragment id="61094-2">
+			<blockxref id="108288" frag="default" reversefrag="2"
+								 reversetitle="" reverselink="true" reversetype="none" display="document"
+								 type="embed" uriid="61095" href="footnotes-content.psml"
+								 urititle="Footnotes-content" mediatype="application/vnd.pageseeder.psml+xml">
+				<document id="61095" schemaversion="0.12"
+									date="2018-11-07T09:45:39+11:00" version="current" level="processed">
+					<documentinfo>
+						<uri id="61095" scheme="http" host="localhost" port="80"
+								 path="/ps/report/local1/test/footnotes-content.psml"
+								 decodedpath="/ps/report/local1/test/footnotes-content.psml"
+								 external="false" mediatype="application/vnd.pageseeder.psml+xml"
+								 created="2018-06-19T14:46:34+10:00" modified="2018-11-07T09:45:39+11:00"
+								 title="Footnotes-content">
+							<displaytitle>Footnotes-content</displaytitle>
+						</uri>
+						<reversexrefs>
+							<reversexref uriid="61094" href="xref-footnotes.psml"
+													 frag="2" urititle="XRef-footnotes" mediatype="application/vnd.pageseeder.psml+xml"
+													 documenttype="references" id="108288" title="" type="none"
+													 forwardtype="embed" forwarddisplay="document"
+													 forwardfrag="default" />
+						</reversexrefs>
+					</documentinfo>
+					<fragmentinfo>
+						<locator id="45270" fragment="61095-2" editid="165858"
+										 modified="2018-11-07T09:45:39+11:00" />
+					</fragmentinfo>
+					<metadata />
+					<section id="61095-title">
+						<fragment id="61095-1">
+							<heading level="1">Footnotes-content</heading>
+						</fragment>
+					</section>
+					<section id="61095-content">
+						<fragment id="61095-2">
+							<heading level="2">A heading</heading>
+							<para>A para</para>
+							<block label="block1">
+								<para>Block 1 para</para>
+							</block>
+							<list>
+								<item>List item 1
+									<list>
+										<item>List item 1A</item>
+									</list>
+								</item>
+								<item>List item 1</item>
+							</list>
+							<nlist>
+								<item>Numbered item 1
+									<nlist>
+										<item>Numbered item 1A</item>
+									</nlist>
+								</item>
+								<item>Numbered item 1</item>
+							</nlist>
+							<block label="block1">
+								<block label="block2">
+									<heading level="2">A heading</heading>
+									<para>A para</para>
+									<blockxref id="108288" frag="2" reversefrag="2"
+														 reversetitle="" reverselink="true" reversetype="none" display="document"
+														 type="transclude" uriid="62095" href="footnotes-transcluded.psml"
+														 urititle="Footnotes-transcluded" mediatype="application/vnd.pageseeder.psml+xml">
+										<fragment id="2">
+											<para>Transcluded para</para>
+										</fragment>
+									</blockxref>
+									<block label="block1">
+										<para>Block 1 para</para>
+									</block>
+									<list>
+										<item>List item 1
+											<list>
+												<item>List item 1A</item>
+											</list>
+										</item>
+										<item>List item 1</item>
+									</list>
+									<nlist>
+										<item>Numbered item 1
+											<nlist>
+												<item>Numbered item 1A</item>
+											</nlist>
+										</item>
+										<item>Numbered item 1</item>
+									</nlist>
+								</block>
+							</block>
+						</fragment>
+					</section>
+				</document>
+			</blockxref>
+			<blockxref id="108305" frag="default" reversefrag="2"
+								 reversetitle="" reverselink="true" reversetype="none" display="document"
+								 type="embed" uriid="61097" href="footnotes-content2.psml"
+								 urititle="Footnotes-content2" urilabels="appendix"
+								 mediatype="application/vnd.pageseeder.psml+xml">
+				<document id="61097" schemaversion="0.12"
+									date="2018-11-07T09:46:13+11:00" version="current" level="processed">
+					<documentinfo>
+						<uri id="61097" scheme="http" host="localhost" port="80"
+								 path="/ps/report/local1/test/footnotes-content2.psml"
+								 decodedpath="/ps/report/local1/test/footnotes-content2.psml"
+								 external="false" mediatype="application/vnd.pageseeder.psml+xml"
+								 created="2018-06-20T13:17:59+10:00" modified="2018-11-07T09:46:13+11:00"
+								 title="Footnotes-content2">
+							<displaytitle>Footnotes-content2</displaytitle>
+							<labels>test,appendix</labels>
+						</uri>
+						<reversexrefs>
+							<reversexref uriid="61094" href="xref-footnotes.psml"
+													 frag="2" urititle="XRef-footnotes" mediatype="application/vnd.pageseeder.psml+xml"
+													 documenttype="references" id="108305" title="" type="none"
+													 forwardtype="embed" forwarddisplay="document"
+													 forwardfrag="default" />
+						</reversexrefs>
+					</documentinfo>
+					<fragmentinfo>
+						<locator id="45274" fragment="61097-2" editid="165861"
+										 modified="2018-11-07T09:46:13+11:00" />
+					</fragmentinfo>
+					<metadata />
+					<section id="61097-title">
+						<fragment id="61097-1">
+							<heading level="1">Footnotes-content2</heading>
+						</fragment>
+					</section>
+					<section id="61097-content">
+						<fragment id="61097-2">
+							<heading level="2">A heading</heading>
+							<para>A para</para>
+							<block label="block1">
+								<para>Block 1 para</para>
+							</block>
+							<list>
+								<item>List item 1
+									<list>
+										<item>List item 1A</item>
+									</list>
+								</item>
+								<item>List item 1</item>
+							</list>
+							<nlist>
+								<item>Numbered item 1
+									<nlist>
+										<item>Numbered item 1A</item>
+									</nlist>
+								</item>
+								<item>Numbered item 1</item>
+							</nlist>
+							<block label="block1">
+								<block label="block2">
+									<heading level="2">A heading</heading>
+									<para>A para</para>
+									<blockxref id="108288" frag="2" reversefrag="2"
+														 reversetitle="" reverselink="true" reversetype="none" display="document"
+														 type="transclude" uriid="62095" href="footnotes-transcluded.psml"
+														 urititle="Footnotes-transcluded" mediatype="application/vnd.pageseeder.psml+xml">
+										<fragment id="2">
+											<para>Transcluded para</para>
+										</fragment>
+									</blockxref>
+									<block label="block1">
+										<para>Block 1 para</para>
+									</block>
+									<list>
+										<item>List item 1
+											<list>
+												<item>List item 1A</item>
+											</list>
+										</item>
+										<item>List item 1</item>
+									</list>
+									<nlist>
+										<item>Numbered item 1
+											<nlist>
+												<item>Numbered item 1A</item>
+											</nlist>
+										</item>
+										<item>Numbered item 1</item>
+									</nlist>
+								</block>
+							</block>
+						</fragment>
+					</section>
+				</document>
+			</blockxref>
+		</xref-fragment>
+	</section>
 </document>