From 68c42cce07a7313a76296a1be8fb0c8d6b34ae26 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Tue, 31 Aug 2021 12:00:22 +0200 Subject: [PATCH] update of expected results and P5subset --- Test/expected-results/test.odd.html | 3 - Test/expected-results/test.rng | 9 -- Test/expected-results/test15.odd.html | 3 - Test/expected-results/test15.odd.rnc | 10 -- Test/expected-results/test21.odd.rnc | 10 -- Test/expected-results/test30.dtd | 4 - Test/expected-results/test30.rnc | 10 -- Test/expected-results/test33.rnc | 11 -- Test/expected-results/test34.combined.json | 151 ------------------- Test/expected-results/test34.odd.html | 3 - Test/expected-results/test34.rnc | 11 -- Test/expected-results/test35.rnc | 11 -- Test/expected-results/testdrama.compiled.xml | 18 +-- debian-tei-xsl/debian/changelog | 6 + source/p5subset.xml | 2 +- 15 files changed, 8 insertions(+), 254 deletions(-) diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html index 6a043b851..a20b0e94a 100644 --- a/Test/expected-results/test.odd.html +++ b/Test/expected-results/test.odd.html @@ -146,9 +146,6 @@

att.citeStructurePart: provides attributes for selecting particular elements within a document. - - att.citeStructurePart: provides attributes for selecting particular elements within a document. - att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes] diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 148863793..24af83f21 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -3251,15 +3251,6 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; - - - - - - (use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in @match, which will either be a sibling attribute in the case of or on the parent in the case of . - - - diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index c947e84a5..6b7607a93 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -1303,9 +1303,6 @@

att.citeStructurePart: provides attributes for selecting particular elements within a document. - - att.citeStructurePart: provides attributes for selecting particular elements within a document. - att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes] diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 34dfe4988..70592b2b3 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -1654,16 +1654,6 @@ model.standOffPart = | listChange | seg | listAnnotation -att.citeStructurePart.attributes = att.citeStructurePart.attribute.use -att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of or on the parent in the case of ." - ] - ] - attribute use { text } att.formula.attributes = att.formula.attribute.formula att.formula.attribute.formula = [ diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index 499743877..abc5c81fb 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -2048,16 +2048,6 @@ model.standOffPart = | seg | listAnnotation | zone -att.citeStructurePart.attributes = att.citeStructurePart.attribute.use -att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of or on the parent in the case of ." - ] - ] - attribute use { text } att.formula.attributes = att.formula.attribute.formula att.formula.attribute.formula = [ diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd index 22a1c37dc..84127b351 100644 --- a/Test/expected-results/test30.dtd +++ b/Test/expected-results/test30.dtd @@ -983,10 +983,6 @@ to %teidata.word; #IMPLIED'> - - contains a\n passage of base text along with its associated ruby gloss(es).<\/desc>" ], - "shortDesc" : "(ruby container) contains a\n passage of base text along with its associated ruby gloss(es).", - "gloss" : - [ "ruby container<\/gloss>" ], - "altIdent" : - [ ], - "classes" : - { "model" : - [ "model.phrase" ], - "atts" : - [ "att.global", - "att.typed" ], - "unknown" : - [ ] }, - "attributes" : - [ ], - "content" : - [ - { "type" : "alternate", - "minOccurs" : "1", - "maxOccurs" : "1", - "content" : - [ - { "type" : "elementRef", - "key" : "list" }, - - { "type" : "elementRef", - "key" : "listChange" }, - - { "type" : "elementRef", - "key" : "change" } ] } ] }, - - { "ident" : "rs", - "ns" : "http:\/\/foo.foo\/foo", - "type" : "elementSpec", - "module" : "core", - "desc" : - [ "contains a general purpose name or referring string.<\/desc>" ], - "shortDesc" : "(referencing string) contains a general purpose name or referring string.", - "gloss" : - [ "referencing string<\/gloss>" ], - "altIdent" : - [ ], - "classes" : - { "model" : - [ "model.nameLike" ], - "atts" : - [ "att.global", - "att.naming", - "att.typed" ], - "unknown" : - [ ] }, - "attributes" : - [ ], - "content" : - [ - { "type" : "macroRef", - "key" : "macro.phraseSeq" } ] }, - - { "ident" : "rt", - "ns" : "http:\/\/foo.foo\/foo", - "type" : "elementSpec", - "module" : "core", - "desc" : - [ "contains a ruby\n text, an annotation closely associated with a passage of the\n main text.<\/desc>" ], - "shortDesc" : "(ruby text) contains a ruby\n text, an annotation closely associated with a passage of the\n main text.", - "gloss" : - [ "ruby text<\/gloss>" ], - "altIdent" : - [ ], - "classes" : - { "model" : - [ ], - "atts" : - [ "att.global", - "att.typed", - "att.placement", - "att.transcriptional" ], - "unknown" : - [ ] }, - "attributes" : - [ - { "onElement" : true, - "ident" : "target", - "mode" : "add", - "ns" : "", - "usage" : "opt", - "desc" : - [ "supplies a pointer to the\n base being glossed by this ruby text.<\/desc>" ], - "shortDesc" : "supplies a pointer to the\n base being glossed by this ruby text.", - "gloss" : - [ ], - "altIdent" : - [ ], - "valDesc" : - [ ], - "datatype" : - { "min" : "1", - "max" : "1", - "dataRef" : - { "key" : "teidata.pointer" } } }, - - { "onElement" : true, - "ident" : "from", - "mode" : "add", - "ns" : "", - "usage" : "opt", - "desc" : - [ "points to the starting point of the span of text\n being glossed by this ruby text.<\/desc>" ], - "shortDesc" : "points to the starting point of the span of text\n being glossed by this ruby text.", - "gloss" : - [ ], - "altIdent" : - [ ], - "valDesc" : - [ ], - "datatype" : - { "min" : "1", - "max" : "1", - "dataRef" : - { "key" : "teidata.pointer" } } }, - - { "onElement" : true, - "ident" : "to", - "mode" : "add", - "ns" : "", - "usage" : "opt", - "desc" : - [ "points to the ending point of the span of text\n being glossed.<\/desc>" ], - "shortDesc" : "points to the ending point of the span of text\n being glossed.", - "gloss" : - [ ], - "altIdent" : - [ ], - "valDesc" : - [ ], - "datatype" : - { "min" : "1", - "max" : "1", - "dataRef" : - { "key" : "teidata.pointer" } } } ], - "content" : - [ - { "type" : "macroRef", - "key" : "macro.phraseSeq" } ] }, - { "ident" : "ruby", "ns" : "http:\/\/foo.foo\/foo", "type" : "elementSpec", diff --git a/Test/expected-results/test34.odd.html b/Test/expected-results/test34.odd.html index ec638b3b8..29c3884a8 100644 --- a/Test/expected-results/test34.odd.html +++ b/Test/expected-results/test34.odd.html @@ -1000,9 +1000,6 @@

att.citeStructurePart: provides attributes for selecting particular elements within a document. - - att.citeStructurePart: provides attributes for selecting particular elements within a document. - att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes] diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index 40d6cdc2d..b31420577 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -1756,17 +1756,6 @@ tei_model.standOffPart = | tei_listChange | tei_seg | tei_listAnnotation -tei_att.citeStructurePart.attributes = - tei_att.citeStructurePart.attribute.use -tei_att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of or on the parent in the case of ." - ] - ] - attribute use { text } tei_att.formula.attributes = tei_att.formula.attribute.formula tei_att.formula.attribute.formula = [ diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 935f3d0d1..a8df6ddfc 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -1750,17 +1750,6 @@ tei_model.standOffPart = | tei_listChange | tei_seg | tei_listAnnotation -tei_att.citeStructurePart.attributes = - tei_att.citeStructurePart.attribute.use -tei_att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of or on the parent in the case of ." - ] - ] - attribute use { text } tei_att.formula.attributes = tei_att.formula.attribute.formula tei_att.formula.attribute.formula = [ diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml index dfe022276..a7caa3538 100644 --- a/Test/expected-results/testdrama.compiled.xml +++ b/Test/expected-results/testdrama.compiled.xml @@ -6580,23 +6580,7 @@ which contain an XPath expression. - - provides attributes for selecting particular elements - within a document. - - - use - supplies an XPath selection pattern using the - syntax defined in . The XPath pattern is relative to the context given - in match, which will either be a sibling attribute in the case of - citeStructure or on the parent citeStructure in the case of - citeData. - - - - - - + provides attributes for defining a mathematical formula. diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog index dda8086e2..b9c3428e4 100644 --- a/debian-tei-xsl/debian/changelog +++ b/debian-tei-xsl/debian/changelog @@ -1,3 +1,9 @@ +tei-xsl (7.52.0) natty; urgency=low + + * new release from upstream + + -- TEI Tue, 31 Aug 2021 08:40:41 +0000 + tei-xsl (7.52.0a) natty; urgency=low * new release from upstream diff --git a/source/p5subset.xml b/source/p5subset.xml index 1e0808313..cacd55f48 100644 --- a/source/p5subset.xml +++ b/source/p5subset.xml @@ -7,7 +7,7 @@ Version 4.3.0a. Last updated on - 26th August 2021, revision 59a2becc4 + 30th August 2021, revision d07dfcf91 TEI Consortium