Merge pull request #608 from TEIC/sydb_607

Fix #607, I hope: remove erroneous bits of text from version URL
TEIC · Sep 30, 2023 · ce346af · ce346af
2 parents 51cbab0 + e90a849
commit ce346af
Show file tree

Hide file tree

Showing 10 changed files with 180 additions and 212 deletions.
diff --git a/Test/Makefile b/Test/Makefile
@@ -751,11 +751,11 @@ test-namespaces: actual
 
 	$(BINDIR)/teitornc $(FLAGS) test35.odd $(AR)/test35.rnc
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test35.rnc
-	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test35.rnc
+	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test35.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
 	   then diff -bBw $(AR)/test35.rnc $(ER)/test35.rnc; \
 	   else echo "==deferring: \` diff -bBw $(AR)/test35.rnc $(ER)/test35.rnc \`"; fi
-	
+
 #HBS 2022-04-30 tests attributes @include and @except
 	$(BINDIR)/teitornc $(FLAGS) testClass.odd $(AR)/testClass.rnc
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/testClass.rnc

diff --git a/Test/expected-results/test-pure.rnc b/Test/expected-results/test-pure.rnc
@@ -6,8 +6,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-#
-
 sch:ns [ prefix = "tei" uri = "http://www.tei-c.org/ns/1.0" ]
 stuff =
 

diff --git a/Test/expected-results/test-pure2.rnc b/Test/expected-results/test-pure2.rnc
@@ -5,8 +5,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-#
-
 sch:ns [ prefix = "tei" uri = "http://www.tei-c.org/ns/1.0" ]
 stuffPart = bob | bit
 stuff =

diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
@@ -7,8 +7,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
-
-#
 macro.abContent = (text | model.paraPart | ab)*
 macro.paraContent = (text | model.paraPart)*
 macro.limitedContent = (text | model.limitedPhrase | model.inter)*

diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
@@ -7,8 +7,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
-
-#
 macro.abContent = (text | model.paraPart | ab)*
 macro.paraContent = (text | model.paraPart)*
 macro.limitedContent = (text | model.limitedPhrase | model.inter)*
@@ -8093,9 +8091,9 @@ facsimile =
            sch:report [
              test = "child::text()[ normalize-space(.) ne '']"
              "\x{a}" ~
-             "  	  A facsimile element represents a text with images, thus\x{a}" ~
-             "	  transcribed text should not be present within it.\x{a}" ~
-             "	"
+             "          A facsimile element represents a text with images, thus\x{a}" ~
+             "          transcribed text should not be present within it.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "

diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
@@ -8,8 +8,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
-
-#
 Tmacro.abContent = (text | Tmodel.paraPart | Tab)*
 Tmacro.paraContent = (text | Tmodel.paraPart)*
 Tmacro.limitedContent = (text | Tmodel.limitedPhrase | Tmodel.inter)*

diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
@@ -9,8 +9,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
-
-#
 tei_macro.abContent = (text | tei_model.paraPart | tei_ab)*
 tei_macro.paraContent = (text | tei_model.paraPart)*
 tei_macro.limitedContent =

diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
@@ -10,8 +10,6 @@ namespace teix = "http://www.tei-c.org/ns/Examples"
 namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
-
-#
 tei_macro.abContent = (text | tei_model.paraPart | tei_ab)*
 tei_macro.paraContent = (text | tei_model.paraPart)*
 tei_macro.limitedContent =

diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc
@@ -8,8 +8,6 @@ namespace xi = "http://www.w3.org/2001/XInclude"
 namespace xlink = "http://www.w3.org/1999/xlink"
 
 
-#
-
 sch:ns [ prefix = "tei" uri = "http://www.tei-c.org/ns/1.0" ]
 macro.paraContent = (text | model.paraPart)*
 att.written.attributes = att.written.attribute.hand