From 12c7bf2e6157d4402e099a82fd91a51ef3db4302 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Sat, 28 Oct 2023 19:35:17 -0400 Subject: [PATCH 1/5] An attempt at #640 fixing: * template showAttClasses is called from 6 different places (all in common_tagdocs); * generated debugging code for each of those places; * found which 2 were causing problem (li element as child of td instead of child of ul); * wrapped them in ul element. * Note: deliberately left debugging PIs in place, but they should maybe be removed before merging into dev. --- common/common_tagdocs.xsl | 36 +++++++++++++++++++++--------------- epub3/tei-to-epub3.xsl | 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl index aca410279..596a1cc48 100644 --- a/common/common_tagdocs.xsl +++ b/common/common_tagdocs.xsl @@ -594,7 +594,11 @@ - + + + calling showAttClasses 01 + + @@ -708,6 +712,7 @@ + calling showAttClasses 02 @@ -742,7 +747,11 @@ - + + + calling showAttClasses 03 + + @@ -756,7 +765,7 @@ ---> + --> @@ -1153,6 +1162,7 @@ 2 + calling showAttClasses 04 true @@ -1186,6 +1196,7 @@ /> + calling showAttClasses 05 true @@ -2125,6 +2136,7 @@ + calling showAttClasses 06 @@ -2739,8 +2751,7 @@ false - + @@ -2754,12 +2765,9 @@ - - - In addition to global attributes - and those inherited from - Global attributes and those inherited - from + + In addition to global attributes and those inherited from + Global attributes and those inherited from @@ -2777,10 +2785,8 @@ - - - In addition to global - attributes + + In addition to global attributes Global attributes only diff --git a/epub3/tei-to-epub3.xsl b/epub3/tei-to-epub3.xsl index c4230139f..f94f827ab 100644 --- a/epub3/tei-to-epub3.xsl +++ b/epub3/tei-to-epub3.xsl @@ -12,6 +12,7 @@ xpath-default-namespace="http://www.tei-c.org/ns/1.0" > + Date: Sat, 28 Oct 2023 23:32:40 -0400 Subject: [PATCH 2/5] Update an expected results file in Test/. --- Test/expected-results/test15.odd.html | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index ea13960b7..2af220dd4 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -643,7 +643,7 @@

Ejemplo -
+
<body>  <div  typ=" @@ -707,7 +707,7 @@

Content model - 
+                  
 <content>
  <sequence minOccurs="1" maxOccurs="1">
   <alternate minOccurs="0"
@@ -759,7 +759,7 @@ 

  </sequence>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -768,7 +768,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element div
 {
    
@@ -808,7 +808,7 @@ 

       )?
    )
 }
-⚓
+⚓
 

                 
               
@@ -1164,7 +1164,7 @@ 

                   Ejemplo
                 
                 
-                  

+                  

                   <para>Hallgerd was outside. 
                   <q>There is blood on your axe,
                   </q>she said. 
@@ -1208,12 +1208,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <macroRef key="macro.paraContent"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1222,7 +1222,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element para
 {
    
@@ -1236,7 +1236,7 @@ 

    
 macro.paraContent
 }
-⚓
+⚓
 

                 
               
@@ -1746,7 +1746,7 @@ 

                   Ejemplo
                 
                 
-                  
It is spelled 
+                  
It is spelled 
                   <q>Tübingen
                   </q>— to enter the letter 
                   <q>u
@@ -1762,12 +1762,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <macroRef key="macro.specialPara"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1776,7 +1776,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element q
 {
    
@@ -1798,7 +1798,7 @@ 

    
 macro.specialPara
 }
-⚓
+⚓
 

                 
               
@@ -1914,12 +1914,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <dataRef key="teidata.word"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1928,10 +1928,10 @@ 

                   Declaración
                 
                 
-                  
+                  
 teidata.enumerated = 
 teidata.word
-⚓
+⚓
 

                 
               

From 7ed5111fb257c9dee6ff830b7fb42a216b839f17 Mon Sep 17 00:00:00 2001
From: Syd Bauman 
Date: Fri, 3 Nov 2023 23:35:45 -0400
Subject: [PATCH 3/5] Direct test instead of key fix as discussed on PR

---
 common/common_tagdocs.xsl | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index 596a1cc48..2d62d7bbc 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -594,11 +594,11 @@
               
               
                 
-		  
-		    
-		     calling showAttClasses 01 
+                  
+                    
+                     calling showAttClasses 01 
                     
-		  
+                  
                 
                 
                   
@@ -712,7 +712,7 @@
           
             
               
-		 calling showAttClasses 02 
+                 calling showAttClasses 02 
                 
               
               
@@ -747,11 +747,11 @@
               
               
                 
-		  
-		    
-		     calling showAttClasses 03 
+                  
+                    
+                     calling showAttClasses 03 
                     
-		  
+                  
                 
                 
                   
@@ -765,7 +765,7 @@
               
                 
               
-	      -->
+              -->
             
           
         
@@ -1162,7 +1162,7 @@
                       
                         2
                       
-		       calling showAttClasses 04 
+                       calling showAttClasses 04 
                       
                         true
                       
@@ -1196,7 +1196,7 @@
             />
           
         
-	 calling showAttClasses 05 
+         calling showAttClasses 05 
         
           true
         
@@ -2154,7 +2154,7 @@
         
           
             
+                          to suppress copying tei:attRef, which were invalid in TEI lite-->
             
           
           
@@ -2797,7 +2797,16 @@
 
   
     
-      
+      
+      
+      
       
         
           

From 05231d48893abf22e89c128c3bcfc3b631fd4f61 Mon Sep 17 00:00:00 2001
From: Syd Bauman 
Date: Sat, 4 Nov 2023 00:20:51 -0400
Subject: [PATCH 4/5] Remove import of classatts.xsl, as no longer needed after
 7ed5111f.

---
 epub3/tei-to-epub3.xsl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epub3/tei-to-epub3.xsl b/epub3/tei-to-epub3.xsl
index f94f827ab..c4230139f 100644
--- a/epub3/tei-to-epub3.xsl
+++ b/epub3/tei-to-epub3.xsl
@@ -12,7 +12,6 @@
 		xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 >
   
-  
   
   
   
Date: Wed, 8 Nov 2023 08:39:06 -0800
Subject: [PATCH 5/5] With @sydb fix for issue #640.

---
 common/common_tagdocs.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index 2d62d7bbc..fe71fa67d 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -2806,7 +2806,7 @@
           importing other files, which in turn importing other files,
           etc.  —Syd, 2023-11-03
       -->
-      
+