diff --git a/Test/expected-results/test-pure.odd.html b/Test/expected-results/test-pure.odd.html index a9aa5aad5..102f2574a 100644 --- a/Test/expected-results/test-pure.odd.html +++ b/Test/expected-results/test-pure.odd.html @@ -1080,9 +1080,9 @@ 

-element t5 { text | ( 
+element t5 { text | ( ( 
 bit, 
-bob )+ }
+bob )+ ) }
 ⚓
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 9518c17ca..9eff6a5e0 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -4701,12 +4701,10 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke - - - - - - + + + + @@ -4955,12 +4953,10 @@ attributes @target and @cRef may be supplied on . - - - - - - + + + + @@ -4970,26 +4966,22 @@ attributes @target and @cRef may be supplied on . - - - - - - - - - - + + + + + + + + - - - - - - + + + + @@ -5121,12 +5113,10 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i (index entry) marks a location to be indexed for whatever purpose. [3.9.2. Index Entries] - - - - - - + + + + @@ -5354,19 +5344,17 @@ Elements] - - - - - - - - - - - - - + + + + + + + + + + + @@ -5522,18 +5510,16 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho - - - - - - - - - - - - + + + + + + + + + + @@ -5609,12 +5595,10 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho - - - - - - + + + + @@ -5649,16 +5633,14 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho - - - - - - - - - - + + + + + + + + @@ -5751,12 +5733,10 @@ relatedItem element must be empty - - - - - - + + + + @@ -5786,31 +5766,29 @@ relatedItem element must be empty - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + @@ -6104,12 +6082,10 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist(publication statement) groups information concerning the publication or distribution of an electronic or other text. [2.2.4. Publication, Distribution, Licensing, etc. 2.2. The File Description] - - - - - - + + + + @@ -7548,18 +7524,16 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - - - - - - - + + + + + + + + + + @@ -8143,49 +8117,41 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu (graph) encodes a graph, which is a collection of nodes, and arcs which connect the nodes. [19.1. Graphs and Digraphs] - - - - - - - - + + + + + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + @@ -8229,14 +8195,14 @@ Suggested values include: 1] undirected; 2] directed; 3] transitionNetwork; 4] t (node) encodes a node, a possibly labeled point in a graph. [19.1. Graphs and Digraphs] - - - + + + - + - - + + @@ -8322,14 +8288,14 @@ Suggested values include: 1] initial; 2] final (arc) encodes an arc, the connection from one node to another in a graph. [19.1. Graphs and Digraphs] - - - + + + - + - - + + gives the identifier of the node which is adjacent from this arc. @@ -8705,14 +8671,14 @@ Suggested values include: 1] initial; 2] final - - - - - - - - + + + + + + + + @@ -8720,14 +8686,14 @@ Suggested values include: 1] initial; 2] final - - - - - - - - + + + + + + + + @@ -8743,97 +8709,85 @@ Suggested values include: 1] initial; 2] final - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + - - - - - - + + + + @@ -8881,14 +8835,14 @@ Suggested values include: 1] initial; 2] final - - - - - - - - + + + + + + + + @@ -8896,14 +8850,14 @@ Suggested values include: 1] initial; 2] final - - - - - - - - + + + + + + + + @@ -8921,54 +8875,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + @@ -9002,54 +8946,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + @@ -9068,54 +9002,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + @@ -9134,54 +9058,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + @@ -9200,54 +9114,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + @@ -9266,54 +9170,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + @@ -9332,54 +9226,44 @@ Suggested values include: 1] initial; 2] final - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + @@ -9398,28 +9282,22 @@ Suggested values include: 1] initial; 2] final - - + + - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + @@ -9492,12 +9370,10 @@ Suggested values include: 1] initial; 2] final - - - - - - + + + + @@ -9594,12 +9470,10 @@ Suggested values include: 1] initial; 2] final - - - - - - + + + + @@ -9643,12 +9517,10 @@ Suggested values include: 1] initial; 2] final - - - - - - + + + + @@ -9764,43 +9636,41 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + - - + + @@ -9844,17 +9714,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat - - - - - - - - - - - + + + + + + + + + + + @@ -11390,29 +11260,23 @@ Suggested values include: 1] label; 2] data - - - - - - + + + + - - - - - - - - - - - + - + + + + + + + diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index 1f538641c..8ee89feea 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -688,24 +688,26 @@

model.global )*, ( ( - ( ( + ( + ( ( ( model.divLike | model.divGenLike ), -model.global* )+ - | ( - ( ( schemaSpec | +model.global* )+ ) + | ( + ( ( ( schemaSpec | model.common ), -model.global* )+, - ( ( +model.global* )+ ), + ( ( ( model.divLike | model.divGenLike ), -model.global* )* - ) - ), - ( +model.global* )* ) + ) + ), + ( ( model.divBottom, -model.global* )* - )? +model.global* )* ) + )? + ) ) } ⚓ diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index ccb3157f8..c318ee2d8 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -4744,7 +4744,7 @@ floatingText = element div { ((model.divTop | model.global)*, ((((model.divLike | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.divLike | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?) >> sch:pattern [ @@ -4809,7 +4809,7 @@ div1 = element div1 { ((model.divTop | model.global)*, ((((model.div2Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div2Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4824,7 +4824,7 @@ div2 = element div2 { ((model.divTop | model.global)*, ((((model.div3Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div3Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4839,7 +4839,7 @@ div3 = element div3 { ((model.divTop | model.global)*, ((((model.div4Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div4Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4854,7 +4854,7 @@ div4 = element div4 { ((model.divTop | model.global)*, ((((model.div5Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div5Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4869,7 +4869,7 @@ div5 = element div5 { ((model.divTop | model.global)*, ((((model.div6Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div6Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4884,7 +4884,7 @@ div6 = element div6 { ((model.divTop | model.global)*, ((((model.div7Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div7Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -4898,7 +4898,7 @@ div7 = ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions] element div7 { ((model.divTop | model.global)*, - (((model.common), model.global*)+, + ((model.common, model.global*)+, (model.divBottom, model.global*)*)?), att.global.attributes, att.divLike.attributes, diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index ca2539cca..6c5b5d4ca 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -8866,7 +8866,7 @@ group = element div { ((model.divTop | model.global)*, ((((model.divLike | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.divLike | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?) >> sch:pattern [ @@ -8929,7 +8929,7 @@ div1 = element div1 { ((model.divTop | model.global)*, ((((model.div2Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div2Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -8944,7 +8944,7 @@ div2 = element div2 { ((model.divTop | model.global)*, ((((model.div3Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div3Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -8959,7 +8959,7 @@ div3 = element div3 { ((model.divTop | model.global)*, ((((model.div4Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div4Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -8974,7 +8974,7 @@ div4 = element div4 { ((model.divTop | model.global)*, ((((model.div5Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div5Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -8989,7 +8989,7 @@ div5 = element div5 { ((model.divTop | model.global)*, ((((model.div6Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div6Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -9004,7 +9004,7 @@ div6 = element div6 { ((model.divTop | model.global)*, ((((model.div7Like | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.div7Like | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?), att.global.attributes, @@ -9018,7 +9018,7 @@ div7 = ## ( division du texte de niveau 7) contient la plus petite subdivision possible dans le texte préliminaire, dans le corps d’un texte ou dans le texte postliminaire, plus grande néanmoins qu’un paragraphe. [4.1.2. Numbered Divisions] element div7 { ((model.divTop | model.global)*, - (((model.common), model.global*)+, + ((model.common, model.global*)+, (model.divBottom, model.global*)*)?), att.global.attributes, att.divLike.attributes, diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc index 98941a8ab..3393d7460 100644 --- a/Test/expected-results/test30.rnc +++ b/Test/expected-results/test30.rnc @@ -7869,7 +7869,7 @@ Tdiv = element div { ((Tmodel.divTop | Tmodel.global)*, ((((Tmodel.divLike | Tmodel.divGenLike), Tmodel.global*)+ - | (((Tmodel.common), Tmodel.global*)+, + | ((Tmodel.common, Tmodel.global*)+, ((Tmodel.divLike | Tmodel.divGenLike), Tmodel.global*)*)), (Tmodel.divBottom, Tmodel.global*)*)?) >> sch:pattern [ diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc index 38fa83a57..2aec291f3 100644 --- a/Test/expected-results/test33.rnc +++ b/Test/expected-results/test33.rnc @@ -4975,7 +4975,7 @@ tei_div = element tei:div { ((tei_model.divTop | tei_model.global)*, ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.divLike | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) @@ -5036,7 +5036,7 @@ tei_div1 = element tei:div1 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5052,7 +5052,7 @@ tei_div2 = element tei:div2 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5068,7 +5068,7 @@ tei_div3 = element tei:div3 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5084,7 +5084,7 @@ tei_div4 = element tei:div4 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5100,7 +5100,7 @@ tei_div5 = element tei:div5 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5116,7 +5116,7 @@ tei_div6 = element tei:div6 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5131,7 +5131,7 @@ tei_div7 = ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions] element tei:div7 { ((tei_model.divTop | tei_model.global)*, - (((tei_model.common), tei_model.global*)+, + ((tei_model.common, tei_model.global*)+, (tei_model.divBottom, tei_model.global*)*)?), tei_att.global.attributes, tei_att.divLike.attributes, diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index d5449e88f..06db0f3d6 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -4978,7 +4978,7 @@ tei_div = element div { ((tei_model.divTop | tei_model.global)*, ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.divLike | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) @@ -5039,7 +5039,7 @@ tei_div1 = element div1 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5055,7 +5055,7 @@ tei_div2 = element div2 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5071,7 +5071,7 @@ tei_div3 = element div3 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5087,7 +5087,7 @@ tei_div4 = element div4 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5103,7 +5103,7 @@ tei_div5 = element div5 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5119,7 +5119,7 @@ tei_div6 = element div6 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5134,7 +5134,7 @@ tei_div7 = ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions] element div7 { ((tei_model.divTop | tei_model.global)*, - (((tei_model.common), tei_model.global*)+, + ((tei_model.common, tei_model.global*)+, (tei_model.divBottom, tei_model.global*)*)?), tei_att.global.attributes, tei_att.divLike.attributes, diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 5e1fdc73b..76a544508 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -4956,7 +4956,7 @@ tei_div = element tei:div { ((tei_model.divTop | tei_model.global)*, ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.divLike | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) @@ -5017,7 +5017,7 @@ tei_div1 = element tei:div1 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5033,7 +5033,7 @@ tei_div2 = element tei:div2 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5049,7 +5049,7 @@ tei_div3 = element tei:div3 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5065,7 +5065,7 @@ tei_div4 = element tei:div4 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5081,7 +5081,7 @@ tei_div5 = element tei:div5 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5097,7 +5097,7 @@ tei_div6 = element tei:div6 { ((tei_model.divTop | tei_model.global)*, ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+ - | (((tei_model.common), tei_model.global*)+, + | ((tei_model.common, tei_model.global*)+, ((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?), @@ -5112,7 +5112,7 @@ tei_div7 = ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions] element tei:div7 { ((tei_model.divTop | tei_model.global)*, - (((tei_model.common), tei_model.global*)+, + ((tei_model.common, tei_model.global*)+, (tei_model.divBottom, tei_model.global*)*)?), tei_att.global.attributes, tei_att.divLike.attributes, diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc index 5a3d22e98..ddaff567d 100644 --- a/Test/expected-results/testClass.rnc +++ b/Test/expected-results/testClass.rnc @@ -610,7 +610,7 @@ model.divGenLike = notAllowed element div { ((model.divTop | model.global)*, ((((model.divLike | model.divGenLike), model.global*)+ - | (((model.common), model.global*)+, + | ((model.common, model.global*)+, ((model.divLike | model.divGenLike), model.global*)*)), (model.divBottom, model.global*)*)?) >> sch:pattern [ diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng index b77f5f1aa..e0d048bc1 100644 --- a/Test2/expected-results/testAttValQuant.rng +++ b/Test2/expected-results/testAttValQuant.rng @@ -5222,12 +5222,14 @@ relatedItem element must be empty - - - - - - + + + + + + + + @@ -6889,12 +6891,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - + + + + + + + + @@ -6902,12 +6906,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - + + + + + + + + @@ -6923,24 +6929,28 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -7045,12 +7055,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - + + + + + + + + @@ -7058,12 +7070,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - + + + + + + + + @@ -7081,44 +7095,44 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - - - - - - - - - - - - + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7558,15 +7574,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat - - - - - - - - - + + + + + + + + + + + diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng index aadb94daf..70cacb603 100644 --- a/Test2/expected-results/testPure1.rng +++ b/Test2/expected-results/testPure1.rng @@ -6053,12 +6053,14 @@ relatedItem element must be empty - - - - - - + + + + + + + + @@ -6487,11 +6489,13 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] (series statement) [2.2.5. The Series Statement 2.2. The File Description] - - - - - + + + + + + + @@ -8974,12 +8978,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - + + + + + + + + @@ -8987,12 +8993,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - + + + + + + + + @@ -9008,24 +9016,28 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -9130,12 +9142,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - + + + + + + + + @@ -9143,12 +9157,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - + + + + + + + + @@ -9166,44 +9182,44 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - - - - - - - - - - - - + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9641,15 +9659,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat - - - - - - - - - + + + + + + + + + + + diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl index d2f5291e4..f0ee58533 100644 --- a/odds/odd2relax.xsl +++ b/odds/odd2relax.xsl @@ -64,6 +64,11 @@ of this software, even if advised of the possibility of such damage. + + @@ -169,86 +174,95 @@ of this software, even if advised of the possibility of such damage. - - - start importing moduleRef components - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + start importing moduleRef components + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - + - - - - - + - - - + - - - - ========= above is pass3, next is pass2 ========= - - - - ========= above is pass2, next is pass1 ========= - - - - ========= above is pass1, next is input ========= - - - + + + + + ========= above is pass4, next is pass3 ========= + + + + ========= above is pass3, next is pass2 ========= + + + + ========= above is pass2, next is pass1 ========= + + + + ========= above is pass1, next is input ========= + + + + @@ -501,7 +515,7 @@ of this software, even if advised of the possibility of such damage. - + @@ -513,11 +527,7 @@ of this software, even if advised of the possibility of such damage. - - - - - + @@ -532,9 +542,8 @@ of this software, even if advised of the possibility of such damage. - - + + @@ -570,14 +579,35 @@ of this software, even if advised of the possibility of such damage. - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + - + - + @@ -614,12 +644,11 @@ of this software, even if advised of the possibility of such damage. - + - - + + @@ -631,31 +660,27 @@ of this software, even if advised of the possibility of such damage. select="(ancestor::rng:element/@name,rng:ref/@name)"/> because it's repeated in following rule - + - + - + - + - + @@ -671,7 +696,7 @@ of this software, even if advised of the possibility of such damage. - + @@ -687,13 +712,13 @@ of this software, even if advised of the possibility of such damage. - + - + @@ -702,9 +727,9 @@ of this software, even if advised of the possibility of such damage. - + - + @@ -718,13 +743,13 @@ of this software, even if advised of the possibility of such damage. - + - + - + diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl index 646067c58..a206bf40a 100644 --- a/odds/teiodds.xsl +++ b/odds/teiodds.xsl @@ -827,7 +827,6 @@ of this software, even if advised of the possibility of such damage. -