Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added normalize-space to gloss value #721

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Test/expected-results/test.rng
Original file line number Diff line number Diff line change
Expand Up @@ -4413,8 +4413,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
<choice>
<value>deprecationInfo</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
Expand Down Expand Up @@ -8650,8 +8649,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
</define>
<define name="triangle">
<element name="triangle">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its
characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> with information left out. [20.3. Another Tree Notation]</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> with information left out. [20.3. Another Tree Notation]</a:documentation>
<group>
<optional>
<ref name="label"/>
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/test15.odd.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2473,8 +2473,7 @@ desc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
12 changes: 4 additions & 8 deletions Test/expected-results/test21.odd.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2839,8 +2839,7 @@ desc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down Expand Up @@ -6336,8 +6335,7 @@ geoDecl =
## (Système Géodésique Mondial) couple de nombres destinés à être interprétés comme la latitude suivie de la longitude selon le Système Géodésique Mondial.
"WGS84"
|
## (Système de Référence du Réseau Militaire,
## (MGRS).) les valeurs fournies sont des codes objet d'entités geospatiales, fondées sur les coordonnées de la grille de projection transversale universelle de Mercator, (UTM).
## (Système de Référence du Réseau Militaire, (MGRS).) les valeurs fournies sont des codes objet d'entités geospatiales, fondées sur les coordonnées de la grille de projection transversale universelle de Mercator, (UTM).
"MGRS"
|
## (Système de coordonnées de Grande-Bretagne (OSGB) ) la valeur fournie est à interpréter selon le système "British national grid reference".
Expand Down Expand Up @@ -9427,15 +9425,13 @@ titlePart =
## (sous-titre de l’ouvrage.) sous-titre de l'oeuvre.
"sub"
|
## (titre alternatif de
## l’ouvrage.) autre titre de l'oeuvre.
## (titre alternatif de l’ouvrage.) autre titre de l'oeuvre.
"alt"
|
## (short) forme abrégée du titre.
"short"
|
## (description paraphrastique de
## l’ouvrage.) texte qui paraphrase l'oeuvre.
## (description paraphrastique de l’ouvrage.) texte qui paraphrase l'oeuvre.
"desc"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/test30.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2731,8 +2731,7 @@ Tdesc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/test33.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2456,8 +2456,7 @@ tei_desc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
4 changes: 2 additions & 2 deletions Test/expected-results/test34.combined.json
Original file line number Diff line number Diff line change
Expand Up @@ -3231,9 +3231,9 @@
{ "ident" : "deprecationInfo",
"desc" :
[ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2018-09-14\" xml:lang=\"en\">This element\n describes why or how its parent element is being deprecated,\n typically including recommendations for alternate\n encoding.<\/desc>" ],
"shortDesc" : "(deprecation\n information) This element\n describes why or how its parent element is being deprecated,\n typically including recommendations for alternate\n encoding.",
"shortDesc" : "(deprecation information) This element\n describes why or how its parent element is being deprecated,\n typically including recommendations for alternate\n encoding.",
"gloss" :
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2018-09-14\" xml:lang=\"en\">deprecation\n information<\/gloss>" ],
[ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2018-09-14\" xml:lang=\"en\">deprecation information<\/gloss>" ],
"altIdent" :
[ ] } ] } } ],
"content" :
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/test34.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2461,8 +2461,7 @@ tei_desc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/test35.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -2456,8 +2456,7 @@ tei_desc =
## Suggested values include: 1] deprecationInfo (deprecation information)
attribute type {

## (deprecation
## information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
## (deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
"deprecationInfo"
| xsd:token { pattern = "[^\p{C}\p{Z}]+" }
}?,
Expand Down
3 changes: 1 addition & 2 deletions Test/expected-results/testdrama.compiled.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8748,8 +8748,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
<attDef ident="type" mode="change">
<valList type="semi">
<valItem ident="deprecationInfo">
<gloss versionDate="2018-09-14" xml:lang="en">deprecation
information</gloss>
<gloss versionDate="2018-09-14" xml:lang="en">deprecation information</gloss>
<desc versionDate="2018-09-14" xml:lang="en">This element
describes why or how its parent element is being deprecated,
typically including recommendations for alternate
Expand Down
3 changes: 1 addition & 2 deletions Test2/expected-results/testAttValQuant.rng
Original file line number Diff line number Diff line change
Expand Up @@ -3834,8 +3834,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
<choice>
<value>deprecationInfo</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
Expand Down
31 changes: 10 additions & 21 deletions Test2/expected-results/testNonTeiOdd1.rng
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,7 @@
<ref name="att.identifiable.attributes"/>
<optional>
<attribute name="class">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS
stylesheet. ) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS stylesheet.) </a:documentation>
<list>
<oneOrMore>
<choice>
Expand Down Expand Up @@ -212,20 +211,17 @@
</attribute>
<optional>
<attribute name="data-lg-version">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path to a larger version of the image to show as a popup (usually a
relative path)) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path to a larger version of the image to show as a popup (usually a relative path)) </a:documentation>
</attribute>
</optional>
<optional>
<attribute name="alt">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of the image for visually-impaired users. If not
supplied, then figcaption will be used instead.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of the image for visually-impaired users. If not supplied, then figcaption will be used instead.) </a:documentation>
</attribute>
</optional>
<optional>
<attribute name="title">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of the image which will pop up on mouseover. If not
supplied, then figcaption will be used instead.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of the image which will pop up on mouseover. If not supplied, then figcaption will be used instead.) </a:documentation>
</attribute>
</optional>
<empty/>
Expand Down Expand Up @@ -253,8 +249,7 @@
</attribute>
<optional>
<attribute name="title">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(explanation of what is being linked to. Will pop up when mousing over
the link.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(explanation of what is being linked to. Will pop up when mousing over the link.) </a:documentation>
</attribute>
</optional>
<empty/>
Expand All @@ -272,19 +267,16 @@
<ref name="att.classable.attribute.style"/>
<ref name="att.identifiable.attributes"/>
<attribute name="class">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS
stylesheet. ) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS stylesheet.) </a:documentation>
<list>
<oneOrMore>
<choice>
<value>leftFloat</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Float this figure to the left and flow the text around
it.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Float this figure to the left and flow the text around it.) </a:documentation>
<value>center</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Centre this figure and do not float text around it.) </a:documentation>
<value>rightFloat</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Float this figure to the right and flow the text around
it.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Float this figure to the right and flow the text around it.) </a:documentation>
</choice>
</oneOrMore>
</list>
Expand Down Expand Up @@ -392,8 +384,7 @@
<define name="att.classable.attribute.class">
<optional>
<attribute name="class">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS
stylesheet. ) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The class attribute provides styles through rules in the CSS stylesheet.) </a:documentation>
<list>
<rng:empty xmlns:rng="http://relaxng.org/ns/structure/1.0"/>
</list>
Expand All @@ -403,9 +394,7 @@
<define name="att.classable.attribute.style">
<optional>
<attribute name="style">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The style attribute provides one-off style options for specific and
unusual cases. Do not use this unless you know that the element you're
styling is unlike any other element on the site.) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The style attribute provides one-off style options for specific and unusual cases. Do not use this unless you know that the element you're styling is unlike any other element on the site.) </a:documentation>
</attribute>
</optional>
</define>
Expand Down
3 changes: 1 addition & 2 deletions Test2/expected-results/testPure1.rng
Original file line number Diff line number Diff line change
Expand Up @@ -4579,8 +4579,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
<choice>
<value>deprecationInfo</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
<data type="token">
<param name="pattern">[^\p{C}\p{Z}]+</param>
</data>
Expand Down
3 changes: 1 addition & 2 deletions Test2/expected-results/testSpecificationDescription1.rng
Original file line number Diff line number Diff line change
Expand Up @@ -7754,8 +7754,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
</define>
<define name="triangle">
<element name="triangle">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its
characteristic shape when drawn) provides for an underspecified eTree, that is, an eTree with information left out. [19.3. Another Tree Notation]</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its characteristic shape when drawn) provides for an underspecified eTree, that is, an eTree with information left out. [19.3. Another Tree Notation]</a:documentation>
<group>

<optional>
Expand Down
2 changes: 1 addition & 1 deletion odds/odd2lite.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ of this software, even if advised of the possibility of such damage.
</xsl:if>

<xsl:copy-of select="@xml:lang"/>
<xsl:value-of select="."/>
<xsl:value-of select="normalize-space(.)"/>
</seg>
</xsl:template>

Expand Down
2 changes: 1 addition & 1 deletion odds/teiodds.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -2470,7 +2470,7 @@ of this software, even if advised of the possibility of such damage.
</xsl:template>

<xsl:template match="tei:gloss" mode="inLanguage">
<xsl:value-of select="."/>
<xsl:value-of select="normalize-space(.)"/>
</xsl:template>
<xsl:template match="tei:desc" mode="inLanguage">
<xsl:apply-templates/>
Expand Down
3 changes: 1 addition & 2 deletions source/p5subset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16810,8 +16810,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
<attDef ident="type" mode="change">
<valList type="semi">
<valItem ident="deprecationInfo">
<gloss versionDate="2018-09-14" xml:lang="en">deprecation
information</gloss>
<gloss versionDate="2018-09-14" xml:lang="en">deprecation information</gloss>
<desc versionDate="2018-09-14" xml:lang="en">This element
describes why or how its parent element is being deprecated,
typically including recommendations for alternate
Expand Down
Loading