From 3b45bab7859fa1c1ce276750a9327462e4041992 Mon Sep 17 00:00:00 2001
From: eduarddrenth
Date: Thu, 23 Sep 2021 06:54:15 +0200
Subject: [PATCH 01/70] improve overridability for docx to TEI conversion
---
docx/build-from.xml | 1 +
docx/from/docxtotei.xsl | 4 ++--
docx/from/textruns.xsl | 45 ++++++++++++++++++++++++++---------------
3 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/docx/build-from.xml b/docx/build-from.xml
index e11a1df7d..0e8f10afb 100644
--- a/docx/build-from.xml
+++ b/docx/build-from.xml
@@ -25,6 +25,7 @@
+
diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl
index 4c3ec6043..77550bbe7 100644
--- a/docx/from/docxtotei.xsl
+++ b/docx/from/docxtotei.xsl
@@ -38,7 +38,8 @@
-
+
+
true
mml
@@ -65,7 +66,6 @@
-
diff --git a/docx/from/textruns.xsl b/docx/from/textruns.xsl
index f0214153b..0d6e9a9cb 100644
--- a/docx/from/textruns.xsl
+++ b/docx/from/textruns.xsl
@@ -96,7 +96,11 @@ of this software, even if advised of the possibility of such damage.
-
+
+ Creates appropriate elements from word style, calls basicStyles. When word style starts with "TEI " or "tei_" calls elementFromStyle.
+
+
+
@@ -128,27 +132,21 @@ of this software, even if advised of the possibility of such damage.
-
-
- true
-
-
+
+
+
-
-
- true
-
-
+
+
+
-
-
- true
-
-
+
+
+
@@ -166,12 +164,27 @@ of this software, even if advised of the possibility of such damage.
+
+
+ Creates an element named $style. $style is the word style name with prefix "TEI " or "tei_" stripped off.
+ Override this method if you need to, for example preprocess $style and call the super.
+
+
+
+
+
+
+ true
+
+
+
Look at the Word
underlying basic formatting. We can ignore the run's font change if
a) it's not a special para AND the font is the ISO default, OR
b) the font for the run is the same as its parent paragraph.
+ Param parented is true when calling template created an element.
false
From 71d837945c79bfde512f59aaecf249b236c2a289 Mon Sep 17 00:00:00 2001
From: eduarddrenth
Date: Thu, 23 Sep 2021 07:30:12 +0200
Subject: [PATCH 02/70] improve overridability for docx to TEI conversion
---
docx/from/textruns.xsl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docx/from/textruns.xsl b/docx/from/textruns.xsl
index 0d6e9a9cb..5f3d51879 100644
--- a/docx/from/textruns.xsl
+++ b/docx/from/textruns.xsl
@@ -166,8 +166,8 @@ of this software, even if advised of the possibility of such damage.
- Creates an element named $style. $style is the word style name with prefix "TEI " or "tei_" stripped off.
- Override this method if you need to, for example preprocess $style and call the super.
+ Creates an element named $style and calls basicStyles with parented=true. $style is the word style name with prefix "TEI " or "tei_" stripped off.
+ Override this method if you need to, for example preprocess $style.
From 1c8c069c3e996300a627e6384670c9ad1f15adba Mon Sep 17 00:00:00 2001
From: eduarddrenth
Date: Fri, 24 Sep 2021 11:08:10 +0200
Subject: [PATCH 03/70] no import needed (yet)
---
docx/from/docxtotei.xsl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl
index 77550bbe7..e5ce852d5 100644
--- a/docx/from/docxtotei.xsl
+++ b/docx/from/docxtotei.xsl
@@ -38,8 +38,7 @@
-
-
+
true
mml
@@ -55,8 +54,8 @@
false
false
890
- 576
-
+ 576
+
@@ -67,8 +66,9 @@
-
-
+
+
+
TEI stylesheet for converting Word docx files to TEI
From e6fc5516e3cc6cbe6a20d7f3a059fc91967e13ef Mon Sep 17 00:00:00 2001
From: eduarddrenth
Date: Fri, 24 Sep 2021 11:11:49 +0200
Subject: [PATCH 04/70] layout
---
docx/from/docxtotei.xsl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl
index e5ce852d5..213d603c7 100644
--- a/docx/from/docxtotei.xsl
+++ b/docx/from/docxtotei.xsl
@@ -55,7 +55,6 @@
false
890
576
-
@@ -65,8 +64,8 @@
-
+
From ba91e72bfa0810dfef9815b9228be1ccb2fbb4df Mon Sep 17 00:00:00 2001
From: eduarddrenth
Date: Fri, 24 Sep 2021 11:13:24 +0200
Subject: [PATCH 05/70] layout
---
docx/from/docxtotei.xsl | 1 -
1 file changed, 1 deletion(-)
diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl
index 213d603c7..b1e1b924c 100644
--- a/docx/from/docxtotei.xsl
+++ b/docx/from/docxtotei.xsl
@@ -38,7 +38,6 @@
-
true
mml
From ea44c76d06799cc8b22a78e2feeffe00cdc19705 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Sat, 2 Oct 2021 15:37:36 -0400
Subject: [PATCH 06/70] Attempt to fix TEIC/TEI#2070: Insert 'doc/tei-p5-doc/'
between the version number and the filename ("VERSION") in the URL that
points at the VERSION file for a given version.
---
profiles/readme/html/to.xsl | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/profiles/readme/html/to.xsl b/profiles/readme/html/to.xsl
index eaf2fd523..32502f008 100644
--- a/profiles/readme/html/to.xsl
+++ b/profiles/readme/html/to.xsl
@@ -62,8 +62,26 @@ of this software, even if advised of the possibility of such damage.
-
-
+
+
+
+
+
From fd1d1e2e2c7fd324ef488b2826915162c9d0e366 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Fri, 27 May 2022 12:45:41 -0400
Subject: [PATCH 07/70] Stylesheets grp work on #424: * There were 2
definitions of tei:uniqueName(), which look at a glance like they are
*exectly* the same. We deleted one. * Change how tei:uniqueName() works,
based on @dmj's idea.
---
odds/odd2odd.xsl | 41 +++++++++++++++++++++++++++--------------
odds/teiodds.xsl | 13 -------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index c483db72d..6b5c979a8 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -135,11 +135,11 @@ of this software, even if advised of the possibility of such damage.
-
-
-
-
-
+
+
+
+
+
@@ -281,16 +281,29 @@ of this software, even if advised of the possibility of such damage.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 7b1778490..e409ab00f 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -2018,25 +2018,12 @@ select="$makeDecls"/>
-
-
-
-
-
-
-
-
-
From bf8aab43476a46153e40c49087ba5084d78c11d3 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Sat, 10 Sep 2022 10:10:20 +0100
Subject: [PATCH 08/70] First steps towards #543. Repo is not in a working
state, here, but rather is in a state for debugging
---
bin/teitorelaxng | 5 +++-
bin/transformtei | 31 +++++++++++++++---------
profiles/default/{relaxng => rng}/to.xsl | 0
{relaxng => rng}/build-to.xml | 0
4 files changed, 23 insertions(+), 13 deletions(-)
mode change 120000 => 100755 bin/teitorelaxng
rename profiles/default/{relaxng => rng}/to.xsl (100%)
rename {relaxng => rng}/build-to.xml (100%)
diff --git a/bin/teitorelaxng b/bin/teitorelaxng
deleted file mode 120000
index cac68564d..000000000
--- a/bin/teitorelaxng
+++ /dev/null
@@ -1 +0,0 @@
-transformtei
\ No newline at end of file
diff --git a/bin/teitorelaxng b/bin/teitorelaxng
new file mode 100755
index 000000000..232cc0b9a
--- /dev/null
+++ b/bin/teitorelaxng
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+echo "$0 has been superceded by teitorng (and oddtorng, which is the same as teitorng --odd)"
+exit 13
diff --git a/bin/transformtei b/bin/transformtei
index f46511146..d9f9bcb5d 100755
--- a/bin/transformtei
+++ b/bin/transformtei
@@ -37,23 +37,18 @@ echo " --lang=$lang # which language to use "
echo " --oxygenlib=$oxygenlib # where is oxygenlib"
echo " --splitLevel=$splitLevel # splitting level "
case $format in
- teitorelaxng) ;;
- teitornc) ;;
- teitodtd) ;;
- teitoxsd) ;;
- *)
- echo " --odd # perform processing of ODD (if appropriate)"
+ rng|rnc|dtd|xsd)
+ if [ $from != odd ]; then echo " --odd # perform processing of ODD (if appropriate)"; fi
echo " --localsource=DIR # where is local copy of source of TEI Guidelines"
echo " --summaryDoc # only make summary, when doing ODD processing"
echo " --schema=NAME # process the schemaSpec called NAME"
;;
esac
-
case "$script" in
teitoepub*) # could be teitoepub or teitoepub3
-echo " --fileperpage # create output files one per page "
-echo " --nocompress # disable compression of epub output file"
- ;;
+ echo " --fileperpage # create output files one per page "
+ echo " --nocompress # disable compression of epub output file"
+ ;;
esac
echo
@@ -121,6 +116,12 @@ else
outsuffix=.$to
fi
+case $to in
+ rnc|rng|dtd|xsd)
+ if [ $from = odd ]; then odd=true; fi
+ ;;
+ *) ;;
+esac
while test $# -gt 0; do
case $1 in
@@ -209,7 +210,11 @@ D=`dirname "$in"`
indir=`(cd $D; pwd)`
if [ $# -eq 1 ]
then
- outfile=`basename "$1" .$from`$outsuffix
+ inputfilename=$1
+ inputfilename=${inputfilename%.odd}
+ inputfilename=${inputfilename%.tei}
+ inputfilename=${inputfilename%.xml}
+ outfile=`basename "$inputfilename"`$outsuffix
outdir=$indir
else
outfile=`basename $2`
@@ -237,9 +242,11 @@ case $format in
fi
;;
esac
+if [ $infile = $outfile ]; then die "Generated output filename same as input filename ($outfile)."; fi
+
echo Convert $infile to $outdir/$outfile \($from to $to\) using profile $profile $debug $fileperpage $splitLevel $viewportwidth $viewportheight
-ant $antflag -f "$APPHOME/$format/build-$direction.xml" \
+echo ant $antflag -f "$APPHOME/$format/build-$direction.xml" \
-lib "${SAXONJAR}" $debug \
$fileperpage $cssFile $splitLevel $viewportwidth $viewportheight $summaryDoc $mediaoverlay $nocompress \
-Dodd=$odd \
diff --git a/profiles/default/relaxng/to.xsl b/profiles/default/rng/to.xsl
similarity index 100%
rename from profiles/default/relaxng/to.xsl
rename to profiles/default/rng/to.xsl
diff --git a/relaxng/build-to.xml b/rng/build-to.xml
similarity index 100%
rename from relaxng/build-to.xml
rename to rng/build-to.xml
From dc4a3c4448ff338a35849f4b0cca3024e0037029 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Thu, 2 Mar 2023 15:39:56 -0500
Subject: [PATCH 09/70] Stylesheets group takes one giant leap towards a
structured attribute list. (More to do, but we got a lot done.)
---
common/common_tagdocs.xsl | 205 ++++++++++++++++++++------------------
1 file changed, 106 insertions(+), 99 deletions(-)
diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index f1ce661c0..4a4ee9839 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -2078,64 +2078,79 @@
-
-
-
-
-
-
-
- (
-
-
-
-
- unusedattribute
-
-
- ,
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ unusedattribute
+
+
+
+
+
-
-
- @
-
- ,
-
- )
-
-
-
+
+
+ -
+
+
+
+
+
[odds] display attribute list
+
-
-
-
-
-
-
-
- attList
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ attList
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUG::output
+
+
+
[odds] display list of model parents
@@ -2771,60 +2786,52 @@
+
- 1
-
-
-
-
-
- (
-
-
-
-
- (
-
-
- attribute
-
- @
-
-
-
-
- ,
-
-
- )
-
-
-
-
-
- (
-
-
+
+
+
+
+
+ -
+
+
+
+
- )
-
-
-
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
+
+
+
+ -
+
+ attribute
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
Date: Tue, 4 Apr 2023 14:53:47 -0400
Subject: [PATCH 10/70] Increment version to our best guess of next release
number (alpha)
---
VERSION | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index 3c089096a..85e9f42d1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.55.0
+7.56.0a
From 0cefdb27f9f8cd0ab39b16a9233415934e565da0 Mon Sep 17 00:00:00 2001
From: sabine seifert
Date: Mon, 24 Apr 2023 18:06:58 +0200
Subject: [PATCH 11/70] Update p5subset.xml
---
source/p5subset.xml | 50 ++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/source/p5subset.xml b/source/p5subset.xml
index 9c8140e2f..5c2d4cc50 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -6,8 +6,8 @@
The TEI Guidelines
- [Version](#ABTEI4) [4.6.0](../../readme-4.6.0.html). Last updated on
- 4th April 2023, revision [2129d5947](https://github.com/TEIC/TEI/commit/2129d5947)
+ [Version](#ABTEI4) [4.7.0a](../../readme-4.7.0.html). Last updated on
+ 11th April 2023, revision [bec660a72](https://github.com/TEIC/TEI/commit/bec660a72)
TEI Consortium
@@ -45266,23 +45266,24 @@ ou encodé.
- A facsimile element represents a text with images, thus
- transcribed text should not be present within it.
-
-
+ A facsimile element represents a text with images, thus
+ transcribed text should not be present within it.
+
+
@@ -45767,15 +45768,14 @@ element.
-
+
+ Since a path> represents a line with distinct start and
+ end points, the last coordinate should not be the same as the
+ first coordinate.
+
-
@@ -68118,9 +68118,9 @@ déclaration de même nom dans la définition courante.
-
+
-
+
which could be wrapped in a <sequence> element.
From 7d7586c8b3e1b6fa478f6b63b0f1fe5dab2b85d2 Mon Sep 17 00:00:00 2001
From: helenasabel
Date: Mon, 24 Apr 2023 18:29:32 +0200
Subject: [PATCH 12/70] updated expected results (only white space issues)
---
Test/expected-results/test.isosch | 6 +++---
Test/expected-results/test.rng | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
index 08e58a1a0..10001b2c6 100644
--- a/Test/expected-results/test.isosch
+++ b/Test/expected-results/test.isosch
@@ -183,9 +183,9 @@ On , either the @marks attribute should be used, or a paragraph of descri
- A facsimile element represents a text with images, thus
- transcribed text should not be present within it.
-
+ A facsimile element represents a text with images, thus
+ transcribed text should not be present within it.
+
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 85f665a33..0b5859fb1 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -7502,9 +7502,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
- A facsimile element represents a text with images, thus
- transcribed text should not be present within it.
-
+ A facsimile element represents a text with images, thus
+ transcribed text should not be present within it.
+
From f9bd5d573fe57e8c7fcad0797ac03dcdc7078474 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Mon, 1 May 2023 12:09:47 -0400
Subject: [PATCH 13/70] Fix #607, I hope: With @trishaoconnor, change the
"makeTEIVersion" template in odds/teiodds.xsl so that a) it does not output
the string "P5 Version
" as part of the version URL; and b) it outputs
the version information on 1 line instead of two.
---
odds/teiodds.xsl | 366 ++++++++++++++++++++++-------------------------
1 file changed, 175 insertions(+), 191 deletions(-)
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 679921114..f35173710 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -23,7 +23,7 @@
Unported License http://creativecommons.org/licenses/by-sa/3.0/
2. http://www.opensource.org/licenses/BSD-2-Clause
-
+
Redistribution and use in source and binary forms, with or without
@@ -153,7 +153,7 @@ of this software, even if advised of the possibility of such damage.
- /xml/tei/odd/p5subset.xml
+ /xml/tei/odd/p5subset.xml
@@ -194,13 +194,13 @@ of this software, even if advised of the possibility of such damage.
-
- This formatted version of the Guidelines was created on
- .
-
+
+ This formatted version of the Guidelines was created on
+ .
+
-
+
@@ -232,7 +232,7 @@ of this software, even if advised of the possibility of such damage.
/>
-
+
@@ -257,10 +257,10 @@ of this software, even if advised of the possibility of such damage.
-
+
-
+
@@ -272,10 +272,10 @@ of this software, even if advised of the possibility of such damage.
-
+
-
+
@@ -296,11 +296,11 @@ of this software, even if advised of the possibility of such damage.
-
-
+
+
-
+
@@ -308,7 +308,7 @@ of this software, even if advised of the possibility of such damage.
-
+
@@ -345,11 +345,11 @@ of this software, even if advised of the possibility of such damage.
-
+
-
+
@@ -432,7 +432,7 @@ of this software, even if advised of the possibility of such damage.
false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
TEI Edition:
-
-
TEI Edition Location:
-
-
-
-
-
Edition:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Edition:
+
+
-
+
@@ -1914,8 +1898,8 @@ select="$makeDecls"/>
@@ -1990,28 +1974,28 @@ select="$makeDecls"/>
-
-
-
-
-
- /@
-
-
-
-
-
- @
-
-
-
-
-
-
-
-
+
+
+
+
+
+ /@
+
+
+
+
+
+ @
+
+
+
+
+
+
+
+
@@ -2019,7 +2003,7 @@ select="$makeDecls"/>
-
+
@@ -2035,10 +2019,10 @@ select="$makeDecls"/>
+ if (@ns='http://www.tei-c.org/ns/1.0') then ''
+ else if (@ns) then @ns
+ else if (ancestor::tei:schemaSpec/@ns) then
+ ancestor::tei:schemaSpec/@ns else '',@ident)"/>
@@ -2062,21 +2046,21 @@ select="$makeDecls"/>
+ select="*|@*|processing-instruction()|text()" mode="justcopy"/>
+ select="*|@*|processing-instruction()|text()" mode="justcopy"/>
+ select="*|@*|processing-instruction()|text()" mode="justcopy"/>
@@ -2183,7 +2167,7 @@ select="$makeDecls"/>
-
+
@@ -2195,7 +2179,7 @@ select="$makeDecls"/>
-
+
@@ -2332,22 +2316,22 @@ select="$makeDecls"/>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -2374,40 +2358,40 @@ select="$makeDecls"/>
+ select="ancestor::*[@prefix][1]/@prefix"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2417,11 +2401,11 @@ select="$makeDecls"/>
- true
- true
- false
- false
- true
+ true
+ true
+ false
+ false
+ true
From 4d17c5f453bb24fd5fe3fde7e4b8c65eb8062d9c Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Mon, 1 May 2023 13:18:40 -0400
Subject: [PATCH 14/70] =?UTF-8?q?More=20work=20on=20#607:=20Get=20output?=
=?UTF-8?q?=20to=20pass=20tests:=20=20*=20Update=20routine=20so=20that=20i?=
=?UTF-8?q?t=20deals=20with=20both=20=E2=80=9CP5=20Version=20=E2=80=A6?=
=?UTF-8?q?=E2=80=9D=20and=20=E2=80=9CVersion=20=E2=80=A6=E2=80=9D=20=20*?=
=?UTF-8?q?=20Update=20Makefile=20so=20that=20test35.rnc=20has=20these=20c?=
=?UTF-8?q?omments=20stripped=20out=20correctly=20=20*=20Update=20some=20e?=
=?UTF-8?q?xpected=20results=20because=20of=20*slight*=20comment=20differe?=
=?UTF-8?q?nces=20that=20should=20be=20ignored?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Test/Makefile | 4 ++--
Test/expected-results/test-pure.rnc | 2 --
Test/expected-results/test-pure2.rnc | 2 --
Test/expected-results/test15.odd.rnc | 2 --
Test/expected-results/test21.odd.rnc | 8 +++-----
Test/expected-results/test30.rnc | 8 +++-----
Test/expected-results/test33.rnc | 2 --
Test/expected-results/test34.rnc | 2 --
debian-tei-xsl/debian/changelog | 6 ++++++
odds/teiodds.xsl | 4 ++--
10 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/Test/Makefile b/Test/Makefile
index 98de952aa..fda052bfd 100644
--- 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
index e2e64620b..0cf4f8342 100644
--- 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
index f2104220e..7458800bc 100644
--- 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
index 1a69302d5..97df284d6 100644
--- 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
index b6ed8ccd6..33cd31fbd 100644
--- 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
index 3d5ef19d6..0c8e66532 100644
--- 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)*
@@ -6488,9 +6486,9 @@ Tfacsimile =
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/test33.rnc b/Test/expected-results/test33.rnc
index d14e38820..c7920a1bc 100644
--- 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
index b8b34fac4..ca16a1306 100644
--- 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/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog
index 36f1cd55d..94cba8d54 100644
--- a/debian-tei-xsl/debian/changelog
+++ b/debian-tei-xsl/debian/changelog
@@ -1,3 +1,9 @@
+tei-xsl (7.56.0a) natty; urgency=low
+
+ * new release from upstream
+
+ -- TEI Mon, 01 May 2023 12:16:18 -0400
+
tei-xsl (7.55.0a) natty; urgency=low
* new release from upstream
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index f35173710..6990b6ae7 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -1869,13 +1869,13 @@ select="$makeDecls"/>
-
+
From 4c2488a5dc8be79a73685234020bdbcb826a822b Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Mon, 1 May 2023 18:16:20 -0400
Subject: [PATCH 15/70] Oops, forgot one
---
Test/expected-results/testClass.rnc | 2 --
1 file changed, 2 deletions(-)
diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc
index d508164ef..5a3d22e98 100644
--- 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
From c5b32d3d6355a76e4a9620cf0880898b0bf4d0b1 Mon Sep 17 00:00:00 2001
From: rvdb
Date: Fri, 19 May 2023 23:37:43 +0200
Subject: [PATCH 16/70] improvements for multilingual articles
---
profiles/jtei/openedition/to.xsl | 12 ---------
profiles/jtei/pdf/to.xsl | 42 ++++++++++++++++++--------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/profiles/jtei/openedition/to.xsl b/profiles/jtei/openedition/to.xsl
index 088b781e5..0b65f7076 100644
--- a/profiles/jtei/openedition/to.xsl
+++ b/profiles/jtei/openedition/to.xsl
@@ -162,18 +162,6 @@
-
-
-
-
- :
-
-
-
-
-
-
-
diff --git a/profiles/jtei/pdf/to.xsl b/profiles/jtei/pdf/to.xsl
index 017e4a2c6..ee33255aa 100644
--- a/profiles/jtei/pdf/to.xsl
+++ b/profiles/jtei/pdf/to.xsl
@@ -276,7 +276,7 @@
-
+
@@ -309,11 +309,13 @@
border-top="solid black 5px" border-bottom="solid black 3px"
padding-top="1cm" padding-bottom="1cm">
-
+
+
+
+
+
+
-
- :
-
@@ -334,7 +336,7 @@
-
+
@@ -1062,18 +1064,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 05fa02814f8b2fd9aa529cd8194559a33982aa98 Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Thu, 25 May 2023 15:44:14 -0400
Subject: [PATCH 17/70] Stylesheets group works on #592: * Use ATTCLASSES key
instead of CLASSES, as we are not playing with model classes * Use generic
output elements instead of output-specific output elements
---
common/common_tagdocs.xsl | 72 +++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 33 deletions(-)
diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index 4a4ee9839..32826697c 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -2079,7 +2079,7 @@
- -
+
@@ -2091,26 +2091,30 @@
-
+
+
- -
+
+
unusedattribute
-
+
-
+
-
+
+
- -
+
+
-
+
-
-
+
+
@@ -2144,12 +2148,12 @@
-
-
- DEBUG::output
-
-
-
+
+
+ DEBUG::output
+
+
+
@@ -2788,48 +2792,50 @@
-
+
+
-
+
- -
+
+
-
+
+
- -
+
+
attribute
-
+
-
+
-
+
+
-
+
-
+
+
+
-
+
-
- -
-
-
-
-
+
From e74d0451c49168ecc8f9fe35167eae8b6517ae70 Mon Sep 17 00:00:00 2001
From: John Bampton
Date: Fri, 26 May 2023 08:14:12 +1000
Subject: [PATCH 18/70] Fix spelling
---
docx/to/mml2omml.xsl | 2 +-
docx/tools/build.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docx/to/mml2omml.xsl b/docx/to/mml2omml.xsl
index 8faa9ab5a..4ca7e6926 100644
--- a/docx/to/mml2omml.xsl
+++ b/docx/to/mml2omml.xsl
@@ -181,7 +181,7 @@
-
diff --git a/docx/tools/build.xml b/docx/tools/build.xml
index bffa11166..f9879204a 100644
--- a/docx/tools/build.xml
+++ b/docx/tools/build.xml
@@ -1,7 +1,7 @@
From 1cff0a3b992cb94d4ac26af19f6950a6614b2c0b Mon Sep 17 00:00:00 2001
From: Syd Bauman
Date: Sat, 27 May 2023 15:57:51 -0400
Subject: [PATCH 19/70] =?UTF-8?q?Address=20#586:=20=20*=20Update=20tei:sty?=
=?UTF-8?q?lesheetVersion()=20with=20a=20fix=20based=20on=20@eduarddrenth?=
=?UTF-8?q?=E2=80=99s=20suggestion.=20=20*=20Remove=20parameter=20from=20t?=
=?UTF-8?q?hat=20function=20defintion,=20it=20was=20not=20being=20used.=20?=
=?UTF-8?q?=20*=20Remove=20parameter=20from=20the=201=20call=20to=20tath?=
=?UTF-8?q?=20function.=20=20*=20Some=20whitespace,=20too.=20=20*=20Fixed?=
=?UTF-8?q?=20my=20e-mail=20addr=20in=20AUTHORS.=20=20*=20Updated=20expect?=
=?UTF-8?q?ed-results/=20to=20match=20mildly=20different=20comment=20at=20?=
=?UTF-8?q?the=20end.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
LEGAL/AUTHORS | 2 +-
Test/expected-results/test-complex.html | 10 ++--
Test/expected-results/test-ota.html | 10 ++--
Test/expected-results/test.html | 10 ++--
Test/expected-results/test.html5 | 10 ++--
Test/expected-results/test14.html | 10 ++--
Test/expected-results/test20.html | 10 ++--
Test/expected-results/test22.html | 10 ++--
Test/expected-results/test23.html | 10 ++--
Test/expected-results/test24.html | 10 ++--
Test/expected-results/test25.html | 10 ++--
Test/expected-results/test27.html | 10 ++--
Test/expected-results/test28.html | 10 ++--
Test/expected-results/test31.html | 10 ++--
Test/expected-results/test32.html | 10 ++--
Test/expected-results/test34.odd.html | 10 ++--
Test/expected-results/test5.xhtml | 10 ++--
Test/expected-results/test6.html | 10 ++--
Test/expected-results/testnotes/index.html | 10 ++--
Test/expected-results/testnotes/one.html | 10 ++--
Test/expected-results/testnotes/three.html | 10 ++--
Test/expected-results/testnotes/two.html | 10 ++--
Test/expected-results/testnotes2/index.html | 10 ++--
Test/expected-results/testnotes2/one.html | 10 ++--
Test/expected-results/testnotes2/three.html | 10 ++--
Test/expected-results/testnotes3/index.html | 10 ++--
Test/expected-results/testnotes3/one.html | 10 ++--
Test/expected-results/testnotes3/three.html | 10 ++--
Test/expected-results/testnotes3/two.html | 10 ++--
common/functions.xsl | 57 +++++++++++----------
debian-tei-xsl/debian/changelog | 6 +++
html/html_textstructure.xsl | 37 +++++++------
32 files changed, 195 insertions(+), 187 deletions(-)
diff --git a/LEGAL/AUTHORS b/LEGAL/AUTHORS
index 2c42ad403..6a1ecc442 100644
--- a/LEGAL/AUTHORS
+++ b/LEGAL/AUTHORS
@@ -4,7 +4,7 @@ IT Services
Other contributors include (but this is not an exhaustive list)
- Syd Bauman
+ Syd Bauman
Elisa Beshero-Bondar
Peter Boot
Lou Burnard
diff --git a/Test/expected-results/test-complex.html b/Test/expected-results/test-complex.html
index 6c23d85b9..b8c590a93 100644
--- a/Test/expected-results/test-complex.html
+++ b/Test/expected-results/test-complex.html
@@ -1186,11 +1186,11 @@
Charles Dickens. Date: 1970-01-01
+ Generated from index.xml using XSLT stylesheets version 0
+ based on http://www.tei-c.org/Stylesheets/
+ on 1970-01-01.
+ SAXON.
+ -->
diff --git a/Test/expected-results/test-ota.html b/Test/expected-results/test-ota.html
index d15c3acdb..70cd160a8 100644
--- a/Test/expected-results/test-ota.html
+++ b/Test/expected-results/test-ota.html
@@ -1117,11 +1117,11 @@
Charles Dickens.
+ Generated from index.xml using XSLT stylesheets version 0
+ based on http://www.tei-c.org/Stylesheets/
+ on 1970-01-01.
+ SAXON.
+ -->