Skip to content

Commit 78e0144

Browse files
contrextcontrext
committed
New constraint test
1 parent 68a314e commit 78e0144

File tree

4 files changed

+261
-27
lines changed

4 files changed

+261
-27
lines changed

‎dita-rng-converter.xpr

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project version="20.1">
3+
<meta>
4+
<filters directoryPatterns="" filePatterns="dita-rng-converter.xpr" positiveFilePatterns="" showHiddenFiles="false"/>
5+
<options>
6+
<serialized version="20.1" xml:space="preserve">
7+
<serializableOrderedMap>
8+
<entry>
9+
<String>ask.open.ditamap.in.dita.manager</String>
10+
<Integer>0</Integer>
11+
</entry>
12+
<entry>
13+
<String>dita.ot.directory</String>
14+
<String>/Users/ekimber/dita-ot/dita-ot-3.1.2</String>
15+
</entry>
16+
<entry>
17+
<String>enable.project.master.files.support</String>
18+
<Boolean>true</Boolean>
19+
</entry>
20+
<entry>
21+
<String>key.dita.option.pane</String>
22+
<Boolean>true</Boolean>
23+
</entry>
24+
<entry>
25+
<String>key.xml.catalog.option.pane</String>
26+
<Boolean>true</Boolean>
27+
</entry>
28+
<entry>
29+
<String>keys.context</String>
30+
<String>${pdu}/docs/rng-converter-userguide/rng-converter-userguide.ditamap</String>
31+
</entry>
32+
<entry>
33+
<String>scenario.associations</String>
34+
<scenarioAssociation-array>
35+
<scenarioAssociation>
36+
<field name="url">
37+
<String>../../dita-ot/dita-ot-3.0.4/plugins/com.parson-europe.dita.rng/rng/technicalContent/rng/par_concept.rng</String>
38+
</field>
39+
<field name="scenarioIds">
40+
<list>
41+
<String>update domains value</String>
42+
</list>
43+
</field>
44+
<field name="scenarioTypes">
45+
<list>
46+
<String>XML_XQUERY</String>
47+
</list>
48+
</field>
49+
</scenarioAssociation>
50+
</scenarioAssociation-array>
51+
</entry>
52+
<entry>
53+
<String>scenarios</String>
54+
<scenario-array>
55+
<scenario>
56+
<field name="advancedOptionsMap">
57+
<serializableOrderedMap>
58+
<entry>
59+
<String>Saxon-PE XQuery</String>
60+
<xquerySaxonBAdvancedOptions>
61+
<field name="allowCallsOnExtensionFunctions">
62+
<Boolean>true</Boolean>
63+
</field>
64+
<field name="isEnabledLinkedTreeModel">
65+
<Boolean>false</Boolean>
66+
</field>
67+
<field name="errorRecoverPolicy">
68+
<String>saxon.recover.with.warning</String>
69+
</field>
70+
<field name="stripWS">
71+
<String>saxon.strip.ws.none</String>
72+
</field>
73+
<field name="optimizationEnabled">
74+
<Boolean>true</Boolean>
75+
</field>
76+
<field name="useConfigFile">
77+
<Boolean>false</Boolean>
78+
</field>
79+
<field name="configSystemID">
80+
<null/>
81+
</field>
82+
<field name="initializer">
83+
<String></String>
84+
</field>
85+
</xquerySaxonBAdvancedOptions>
86+
</entry>
87+
</serializableOrderedMap>
88+
</field>
89+
<field name="name">
90+
<String>update domains value</String>
91+
</field>
92+
<field name="baseURL">
93+
<String></String>
94+
</field>
95+
<field name="footerURL">
96+
<String></String>
97+
</field>
98+
<field name="fOPMethod">
99+
<String>pdf</String>
100+
</field>
101+
<field name="fOProcessorName">
102+
<String>Apache FOP</String>
103+
</field>
104+
<field name="headerURL">
105+
<String></String>
106+
</field>
107+
<field name="inputXSLURL">
108+
<String>${pdu}/xqy/updateDomainsValue.xquery</String>
109+
</field>
110+
<field name="inputXMLURL">
111+
<String>${currentFileURL}</String>
112+
</field>
113+
<field name="defaultScenario">
114+
<Boolean>false</Boolean>
115+
</field>
116+
<field name="isFOPPerforming">
117+
<Boolean>false</Boolean>
118+
</field>
119+
<field name="type">
120+
<String>XML_XQUERY</String>
121+
</field>
122+
<field name="saveAs">
123+
<Boolean>false</Boolean>
124+
</field>
125+
<field name="openInBrowser">
126+
<Boolean>false</Boolean>
127+
</field>
128+
<field name="outputFile">
129+
<null/>
130+
</field>
131+
<field name="outputResource">
132+
<null/>
133+
</field>
134+
<field name="openOtherLocationInBrowser">
135+
<Boolean>false</Boolean>
136+
</field>
137+
<field name="locationToOpenInBrowserURL">
138+
<null/>
139+
</field>
140+
<field name="openInEditor">
141+
<Boolean>false</Boolean>
142+
</field>
143+
<field name="showInHTMLPane">
144+
<Boolean>false</Boolean>
145+
</field>
146+
<field name="showInXMLPane">
147+
<Boolean>false</Boolean>
148+
</field>
149+
<field name="showInSVGPane">
150+
<Boolean>false</Boolean>
151+
</field>
152+
<field name="showInResultSetPane">
153+
<Boolean>true</Boolean>
154+
</field>
155+
<field name="useXSLTInput">
156+
<Boolean>true</Boolean>
157+
</field>
158+
<field name="xsltParams">
159+
<list/>
160+
</field>
161+
<field name="cascadingStylesheets">
162+
<String-array/>
163+
</field>
164+
<field name="xslTransformer">
165+
<String>Saxon-EE XQuery</String>
166+
</field>
167+
<field name="extensionURLs">
168+
<String-array/>
169+
</field>
170+
</scenario>
171+
</scenario-array>
172+
</entry>
173+
<entry>
174+
<String>use.default.catalog</String>
175+
<Boolean>false</Boolean>
176+
</entry>
177+
</serializableOrderedMap>
178+
</serialized>
179+
</options>
180+
</meta>
181+
<projectTree name="dita-rng-converter.xpr">
182+
<folder masterFiles="true" name="Master Files">
183+
<file name="doctypes/oasis/2.0/rng/base/rng/basetopic.rng"/>
184+
<file name="test/specializations/org.example/1.3/rng/myMap/rng/myMap.rng"/>
185+
<file name="test/specializations/org.example/1.3/dtd/mytopic/dtd/myTopic.dtd"/>
186+
<file name="docs/rng-converter-userguide/rng-converter-userguide.ditamap"/>
187+
<file name="xsl/rng2catalogs/rng2catalogs.xsl"/>
188+
<file name="xsl/rng2ditadtd/rng2ditadtd.xsl"/>
189+
<file name="xsl/rng2ditarnc/rng2ditarnc.xsl"/>
190+
<file name="xsl/rng2ditaxsd/rng2ditaxsd.xsl"/>
191+
</folder>
192+
<folder path="../../apps/"/>
193+
<folder path="../../dita-ot/"/>
194+
<folder path="../../dita-ot/dita-ot-3.0.4-dita20/"/>
195+
<folder path="../../dita-ot/dita-ot-3.1.2/"/>
196+
<folder path="../../dita-ot/DITA-OT/"/>
197+
<folder path="../ah-dita/"/>
198+
<folder path="../dita-12-spec-dev/"/>
199+
<folder path="."/>
200+
<folder path="../dita-wek/"/>
201+
<folder path="../makita-dita-rng-converter/"/>
202+
<folder path="../saxon-issue-2788/"/>
203+
<folder path="../../workspace/dita-12-spec/"/>
204+
<file name="../../Downloads/dita-oasis.zip"/>
205+
</projectTree>
206+
</project>

‎test/topicmod-constraint/restrictedbasicblockConstraintMod.rng

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@ All Rights Reserved.
2929
<domainsContribution>(topic restrictedBasicBlock-c)</domainsContribution>
3030
</moduleMetadata>
3131
</moduleDesc>
32-
<include href="urn:oasis:names:tc:dita:rng:commonElementsMod.rng">
32+
<include href="urn:oasis:names:tc:dita:rng:topicMod.rng">
3333
<a:documentation>Test Documenation Block</a:documentation>
34-
<define name="basic.block" combine="interleave">
35-
<choice>
36-
<ref name="dl"/>
37-
<ref name="div"/>
38-
</choice>
34+
<define name="basic.block">
35+
<choice>
36+
<ref name="dl"/>
37+
<ref name="div"/>
38+
</choice>
3939
</define>
4040
<a:documentation/>
41-
<define name="basic.block.notbl" combine="interleave">
41+
<define name="basic.block.notbl" >
4242
<choice>
4343
<ref name="dl"/>
44-
<ref name="div"/>
45-
<ref name="fig"/>
46-
<ref name="image"/>
47-
<ref name="lines"/>
48-
<ref name="lq"/>
49-
<ref name="note"/>
50-
<ref name="object"/>
51-
<ref name="ol"/>
52-
<ref name="p"/>
53-
<ref name="pre"/>
54-
<ref name="sl"/>
55-
<ref name="ul"/>
56-
</choice>
44+
<ref name="div"/>
45+
<ref name="fig"/>
46+
<ref name="image"/>
47+
<ref name="lines"/>
48+
<ref name="lq"/>
49+
<ref name="note"/>
50+
<ref name="object"/>
51+
<ref name="ol"/>
52+
<ref name="p"/>
53+
<ref name="pre"/>
54+
<ref name="sl"/>
55+
<ref name="ul"/>
56+
</choice>
5757
</define>
5858
</include>
5959
</grammar>

‎test/topicmod-constraint/test/topic.dita

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?xml-model href="../topic.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
3+
<topic id="topic">
4+
<title>Test of constrained topic</title>
5+
<body>
6+
<div>
7+
<div>
8+
<dl>
9+
<dlentry>
10+
<dt>asdf sa</dt>
11+
<dd/>
12+
</dlentry>
13+
</dl>
14+
</div>
15+
</div>
16+
<dl>
17+
<dlentry>
18+
<dt/>
19+
<dd/>
20+
</dlentry>
21+
</dl>
22+
<div></div>
23+
<dl>
24+
<dlentry>
25+
<dt></dt>
26+
<dd></dd>
27+
</dlentry>
28+
</dl>
29+
</body>
30+
</topic>

‎test/topicmod-constraint/topic.rng

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,15 @@ ORIGINAL CREATION DATE:
8383

8484
<div>
8585
<a:documentation>GROUP CONSTRAINT INTEGRATION</a:documentation>
86-
<include href="urn:dittostudio:dita:rng:restrictedBasicBlockConstraintMod.rng">
87-
<a:documentation/>
86+
<include href="restrictedBasicBlockConstraintMod.rng">
87+
<a:documentation>Constrains basic.block model. Overrides topicMod.</a:documentation>
88+
<define name="topic-info-types">
89+
<ref name="topic.element"/>
90+
</define>
8891
</include>
8992
</div>
9093
<div>
9194
<a:documentation>INCLUDE MODULES</a:documentation>
92-
<include href="urn:oasis:names:tc:dita:rng:topicMod.rng">
93-
<define name="topic-info-types">
94-
<ref name="topic.element"/>
95-
</define>
96-
</include>
9795
<include href="urn:oasis:names:tc:dita:rng:abbreviateDomain.rng"/>
9896
<include href="urn:oasis:names:tc:dita:rng:deliveryTargetAttDomain.rng" dita:since="1.3"/>
9997
<include href="urn:oasis:names:tc:dita:rng:equationDomain.rng" dita:since="1.3"/>

0 commit comments

Comments
 (0)