Permalink
Browse files

change mind about margin again

  • Loading branch information...
1 parent 74d2fe4 commit e3d1c4a48c444aaa118ee2203944a146673c8112 @sebastianrahtz sebastianrahtz committed May 25, 2015
Showing with 344 additions and 377 deletions.
  1. +2 −0 build.xml
  2. +1 −2 mapatts.xsl
  3. +2 −2 teisimple.html
  4. +2 −10 teisimple.odd
  5. +330 −332 teisimple.odd.html
  6. +1 −6 teisimple.rnc
  7. +1 −11 teisimple.rng
  8. +1 −11 teisimple.xsd
  9. +1 −1 tests/A10231.xml
  10. +2 −1 tests/testsimple.html
  11. +1 −1 tests/testsimple2.html
View
@@ -193,13 +193,15 @@
<runjing rngfile="teisimple.rng" file="tests/testsimple4.xml"/>
<runjing rngfile="teisimple.rng" file="tests/testsimple5.xml"/>
<runjing rngfile="teisimple.rng" file="tests/testsimple6.xml"/>
+ <runjing rngfile="teisimple.rng" file="tests/A10231.xml"/>
<echo>Validate instances against Schematron</echo>
<schematron file="tests/testsimple.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<schematron file="tests/testsimple2.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<schematron file="tests/testsimple3.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<schematron file="tests/testsimple4.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<schematron file="tests/testsimple5.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<schematron file="tests/testsimple6.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
+ <schematron file="tests/A10231.xml" queryLanguageBinding="xslt2" schema="teisimple.isosch" failonerror="true"/>
<echo>Validate an instance against DTD</echo>
<xmlvalidate failonerror="yes" file="tests/testsimple.xml"/>
<echo>Validate an instance against XSD</echo>
View
@@ -12,13 +12,12 @@
<XSL:when test=".='bot-center'">bottom-centre</XSL:when>
<XSL:when test=".='foot'">bottom</XSL:when>
<XSL:when test=".='tablefoot'">tablebottom</XSL:when>
- <XSL:when test=".='margin-outer'">margin-right</XSL:when>
<XSL:when test=".='right'">margin-right</XSL:when>
<XSL:when test=".='marg1'">margin-right</XSL:when>
<XSL:when test=".='marg2'">margin-right</XSL:when>
<XSL:when test=".='marg3'">margin-right</XSL:when>
<XSL:when test=".='marg4'">margin-right</XSL:when>
- <XSL:when test=".='margin'">margin-outer</XSL:when>
+ <XSL:when test=".='margin-outer'">margin</XSL:when>
<XSL:when test=".='left'">margin-left</XSL:when>
<XSL:when test=".='in'">inline</XSL:when>
<XSL:when test=".='display'">block</XSL:when>
View
@@ -411,7 +411,7 @@
and not(id(substring($t,2)))</span>"/&gt;</span>
 <span class="element">&lt;s:report <span class="attribute">test</span>="<span class="attributevalue">some $x in $results satisfies $x</span>"&gt;</span> Error: Every
   local pointer in "<span class="element">&lt;s:value-of <span class="attribute">select</span>="<span class="attributevalue">@target</span>"/&gt;</span>" must point to
-   an ID in this document (<span class="element">&lt;s:value-of <span class="attribute">select</span>="<span class="attributevalue">$results</span>"/&gt;</span>)<span class="element">&lt;/s:report&gt;</span><span class="element">&lt;/s:rule&gt;</span><span class="element">&lt;/constraint&gt;</span></div></td></tr></table></td></tr></table></td></tr><tr><td colspan="3" class="norules">Constrained value lists are added to attribute classes where possible.</td></tr><tr><td><span class="orange">att.placement</span></td><td><table class="border"><tr><td>@<span class="orange">place</span></td><td><table class="border"><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">above</span></td><td>above the line</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">below</span></td><td>below the line</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top</span></td><td>at the top of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-right</span></td><td>at the top right of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-left</span></td><td>at the top left of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-centre</span></td><td>at the top center of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-right</span></td><td>at the bottom right of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-left</span></td><td>at the bottom left of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-centre</span></td><td>at the bottom centre of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom</span></td><td>at the foot of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">tablebottom</span></td><td>underneath a table</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-right</span></td><td>in the right-hand margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-outer</span></td><td>in the outer margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-inner</span></td><td>in the inner margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-left</span></td><td>in the left-hand margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">opposite</span></td><td>on the opposite, i.e. facing, page.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">overleaf</span></td><td>on the other side of the leaf.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">overstrike</span></td><td>superimposed on top of the current context</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">end</span></td><td>at the end of the volume.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">divend</span></td><td>at the end the current division.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">parend</span></td><td>at the end the current paragraph.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">inline</span></td><td>within the body of the text.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">inspace</span></td><td>in a predefined space, for example left by an earlier
+   an ID in this document (<span class="element">&lt;s:value-of <span class="attribute">select</span>="<span class="attributevalue">$results</span>"/&gt;</span>)<span class="element">&lt;/s:report&gt;</span><span class="element">&lt;/s:rule&gt;</span><span class="element">&lt;/constraint&gt;</span></div></td></tr></table></td></tr></table></td></tr><tr><td colspan="3" class="norules">Constrained value lists are added to attribute classes where possible.</td></tr><tr><td><span class="orange">att.placement</span></td><td><table class="border"><tr><td>@<span class="orange">place</span></td><td><table class="border"><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">above</span></td><td>above the line</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">below</span></td><td>below the line</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top</span></td><td>at the top of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-right</span></td><td>at the top right of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-left</span></td><td>at the top left of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">top-centre</span></td><td>at the top center of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-right</span></td><td>at the bottom right of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-left</span></td><td>at the bottom left of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom-centre</span></td><td>at the bottom centre of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">bottom</span></td><td>at the foot of the page</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">tablebottom</span></td><td>underneath a table</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-right</span></td><td>in the right-hand margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin</span></td><td>in the outer margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-inner</span></td><td>in the inner margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">margin-left</span></td><td>in the left-hand margin</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">opposite</span></td><td>on the opposite, i.e. facing, page.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">overleaf</span></td><td>on the other side of the leaf.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">overstrike</span></td><td>superimposed on top of the current context</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">end</span></td><td>at the end of the volume.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">divend</span></td><td>at the end the current division.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">parend</span></td><td>at the end the current paragraph.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">inline</span></td><td>within the body of the text.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">inspace</span></td><td>in a predefined space, for example left by an earlier
scribe.</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">block</span></td><td>formatted as an indented paragraph</td></tr></table></td></tr></table></td></tr><tr><td><span class="orange">att.dimensions</span></td><td><table class="border"><tr><td>@<span class="orange">unit</span></td><td><table class="border"><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">chars</span></td><td>characters</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">lines</span></td><td>lines</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">pages</span></td><td>pages</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">words</span></td><td>words</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">cm</span></td><td>centimetres</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">mm</span></td><td>millimetre</td></tr><tr xmlns=""><td><span xmlns="http://www.w3.org/1999/xhtml" class="green">in</span></td><td>inches</td></tr></table></td></tr></table></td></tr><tr><td><span class="orange">att.global.rendition</span></td><td><table class="border"><tr><td>[#renditionpointer]</td><td><div id="index.xml-egXML-d382e1" class="pre egXML_valid"><span class="element">&lt;constraint&gt;</span>
<span class="element">&lt;s:rule <span class="attribute">context</span>="<span class="attributevalue">tei:*[@rendition]</span>"&gt;</span>
 <span class="element">&lt;s:let <span class="attribute">name</span>="<span class="attributevalue">results</span>"
@@ -559,7 +559,7 @@
(<tt>content:"}";</tt>)
</td></tr></table></td></tr><tr><td>&lt;<span class="orange">table</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>table
(<tt>font-size: smaller; background-color: #F0F0F0; </tt>)
-</td></tr></table></td></tr><tr><td>&lt;<span class="orange">fileDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>title</td></tr></table></td></tr><tr><td>&lt;<span class="orange">profileDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">revisionDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">encodingDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">teiHeader</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>metadata</td></tr></table></td></tr><tr><td>&lt;<span class="orange">TEI</span>&gt;</td><td><table class="border"><tr><td>@<span class="green">scheme</span></td><td><table class="border"><tr><td>+ data.word</td></tr></table></td></tr><tr><td>[model] <i/></td><td>document</td></tr></table></td></tr><tr><td>&lt;<span class="orange">text</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>body
+</td></tr></table></td></tr><tr><td>&lt;<span class="orange">fileDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>title</td></tr></table></td></tr><tr><td>&lt;<span class="orange">profileDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">revisionDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">encodingDesc</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>omit</td></tr></table></td></tr><tr><td>&lt;<span class="orange">teiHeader</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>metadata</td></tr></table></td></tr><tr><td>&lt;<span class="orange">TEI</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>document</td></tr></table></td></tr><tr><td>&lt;<span class="orange">text</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>body
(<tt>max-width: 80%; margin: auto; font-family: Verdana, Tahoma, Geneva, Arial, Helvetica, sans-serif; </tt>)
</td></tr></table></td></tr><tr><td>&lt;<span class="orange">time</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>inline</td></tr></table></td></tr><tr><td>&lt;<span class="orange">title</span>&gt;</td><td><table class="border"><tr><td>[model] <i/></td><td>preceding-sibling::title ; text</td></tr> <tr><td>[model] <i/></td><td>text
(<tt>color: red; font-size: 2em;</tt>)
View
@@ -299,16 +299,15 @@
<?exactMatch tablefoot?>
</valItem>
<valItem ident="margin-right">
- <?exactMatch margin-outer?>
<?exactMatch right?>
<?exactMatch marg1?>
<?exactMatch marg2?>
<?exactMatch marg3?>
<?exactMatch marg4?>
<desc>in the right-hand margin</desc>
</valItem>
- <valItem ident="margin-outer">
- <?exactMatch margin?>
+ <valItem ident="margin">
+ <?exactMatch margin-outer?>
<desc>in the outer margin</desc>
</valItem>
<valItem ident="margin-inner">
@@ -1177,13 +1176,6 @@ border-bottom: solid 1pt blue;
<model behaviour="metadata"/>
</elementSpec>
<elementSpec mode="change" ident="TEI">
- <attList>
- <attDef ident="scheme" mode="add">
- <datatype maxOccurs="unbounded">
- <macroRef key="data.word"/>
- </datatype>
- </attDef>
- </attList>
<model behaviour="document"/>
</elementSpec>
<elementSpec mode="change" ident="text">
Oops, something went wrong.

0 comments on commit e3d1c4a

Please sign in to comment.