diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index ce88f6a95..5c34b072d 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -4420,8 +4420,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>
@@ -8657,8 +8656,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"/>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index da2140034..8615b4e0f 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -2476,8 +2476,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}]+" }
     }?,
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 0b406144d..66e4c2610 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -2842,8 +2842,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}]+" }
     }?,
@@ -6338,8 +6337,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".
@@ -9430,15 +9428,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}]+" }
     }?,
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 6b00e3acd..818309420 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -2734,8 +2734,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}]+" }
     }?,
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 841df4b6d..0e64fc709 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -2459,8 +2459,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}]+" }
     }?,
diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
index 720401c62..b0f54a164 100644
--- a/Test/expected-results/test34.combined.json
+++ b/Test/expected-results/test34.combined.json
@@ -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" : 
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 0de90c2aa..f62928d12 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -2464,8 +2464,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}]+" }
     }?,
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index 2d72d99a2..c57b0c66f 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -2459,8 +2459,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}]+" }
     }?,
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 1d26f163e..d9c4fa435 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -8746,8 +8746,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
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index 966150917..34e0c1909 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -3841,8 +3841,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>
diff --git a/Test2/expected-results/testNonTeiOdd1.rng b/Test2/expected-results/testNonTeiOdd1.rng
index 2c3984af0..b7deae7ef 100644
--- a/Test2/expected-results/testNonTeiOdd1.rng
+++ b/Test2/expected-results/testNonTeiOdd1.rng
@@ -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>
@@ -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/>
@@ -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/>
@@ -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>
@@ -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>
@@ -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>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 0b2c8c8ee..26147e197 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -4586,8 +4586,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>
diff --git a/Test2/expected-results/testSpecificationDescription1.rng b/Test2/expected-results/testSpecificationDescription1.rng
index 929198b9f..358580ae4 100644
--- a/Test2/expected-results/testSpecificationDescription1.rng
+++ b/Test2/expected-results/testSpecificationDescription1.rng
@@ -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>
diff --git a/odds/odd2lite.xsl b/odds/odd2lite.xsl
index 2b6bc465b..53242fbf8 100644
--- a/odds/odd2lite.xsl
+++ b/odds/odd2lite.xsl
@@ -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>
 
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index b309425f2..eb2484141 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -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/>
diff --git a/source/p5subset.xml b/source/p5subset.xml
index 4abbf018e..7ac1b230d 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -16814,8 +16814,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