Skip to content

Commit

Permalink
Merge branch 'release-7.54.0' into released
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterstadler
peterstadler committed Oct 25, 2022
2 parents 33b8746 + 4c7e50c commit b870183
Show file tree
Hide file tree
Showing 50 changed files with 10,807 additions and 6,525 deletions.
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ doc: oxygendoc linkcss
cp VERSION tei.css ChangeLog LEGAL/LICENCE release/xslcommon/doc/tei-xsl

oxygendoc:
# when building Debian packages, the script runs under
# fakeroot, and the oxygen script then tries to look in /root/.com.oxygenxml, and fails.
# The answer is to tweak the stylesheetDocumentation.sh script
# when building Debian packages, the script runs under
# fakeroot, and the oxygen script then tries to look in /root/.com.oxygenxml, and fails.
# The answer is to tweak the stylesheetDocumentation.sh script
@echo test for existence of file $(OXY)/stylesheetDocumentation.sh and make stylesheet documentation if it exists
if test -f $(OXY)/stylesheetDocumentation.sh; then perl -pe "s+-Djava.awt+-Duser.home=/tmp/ -Djava.awt+; s+OXYGEN_HOME=.*+OXYGEN_HOME=/usr/share/oxygen+" < $(OXY)/stylesheetDocumentation.sh > ./runDoc.sh; chmod 755 runDoc.sh; cp -f $(OXY)/licensekey.txt .; $(MAKE) ${DOCTARGETS} ${PROFILEDOCTARGETS}; rm -f licensekey.txt runDoc.sh; fi

Expand Down Expand Up @@ -132,7 +132,7 @@ installxsl: build teioo.jar
(cd release/xsl; tar cf - .) | (cd ${PREFIX}/share; tar xf -)
cp --preserve=timestamps bin/transformtei ${PREFIX}/bin
cp --preserve=timestamps source/p5subset.xml ${PREFIX}/source
# Shouldn't the "/usr" in the following line be ${PREFIX} ? —Syd & Martin, 2020-07-03
# Shouldn't the "/usr" in the following line be ${PREFIX} ? —Syd & Martin, 2020-07-03
perl -p -i -e 's+^APPHOME=.*+APPHOME=/usr/share/xml/tei/stylesheet+' ${PREFIX}/bin/transformtei
chmod 755 ${PREFIX}/bin/transformtei
for i in $(SCRIPTS); do (cd ${PREFIX}/bin; rm -f `basename $$i`; ln -s transformtei `basename $$i`); done
Expand Down
40 changes: 24 additions & 16 deletions Test/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,15 +581,15 @@ test-oddity: actual css
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test21.odd.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test21.odd.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc; \
else echo "==deferring: \` diff $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc \`"; fi
then diff -bBw $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc \`"; fi

$(BINDIR)/teitornc $(FLAGS) test15.odd $(AR)/test15.odd.rnc
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test15.odd.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test15.odd.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc; \
else echo "==deferring: \` diff $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc \`"; fi
then diff -bBw $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc \`"; fi

$(BINDIR)/teitohtml5 $(FLAGS) --summaryDoc --lang=es --profile=tei --odd test15.odd $(AR)/test15.odd.html
tidy -config config_tidy.txt $(AR)/test15.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test15.odd.html
Expand Down Expand Up @@ -628,8 +628,8 @@ test-oddity: actual css
$(JING) -c $(AR)/test30.rnc test36.xml
xmllint --noout --dtdvalid $(AR)/test30.dtd test36.xml
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test30.rnc $(ER)/test30.rnc; \
else echo "==deferring: \` diff $(AR)/test30.rnc $(ER)/test30.rnc \`"; fi
then diff -bBw $(AR)/test30.rnc $(ER)/test30.rnc; \
else echo "==deferring: -bBw \` diff $(AR)/test30.rnc $(ER)/test30.rnc \`"; fi
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test30.dtd $(ER)/test30.dtd; \
else echo "==deferring: \` diff $(AR)/test30.dtd $(ER)/test30.dtd \`"; fi
Expand Down Expand Up @@ -660,8 +660,8 @@ test-oddity: actual css
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test-pure.rnc $(ER)/test-pure.rnc; \
else echo "==deferring: \` diff $(AR)/test-pure.rnc $(ER)/test-pure.rnc \`"; fi
then diff -bBw $(AR)/test-pure.rnc $(ER)/test-pure.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test-pure.rnc $(ER)/test-pure.rnc \`"; fi
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test-pure.dtd $(ER)/test-pure.dtd; \
else echo "==deferring: \` diff $(AR)/test-pure.dtd $(ER)/test-pure.dtd \`"; fi
Expand All @@ -681,8 +681,8 @@ test-oddity: actual css
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure2.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure2.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc; \
else echo "==deferring: \` diff $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc \`"; fi
then diff -bBw $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc \`"; fi
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test-pure2.dtd $(ER)/test-pure2.dtd; \
else echo "==deferring: \` diff $(AR)/test-pure2.dtd $(ER)/test-pure2.dtd \`"; fi
Expand Down Expand Up @@ -718,8 +718,8 @@ test-namespaces: actual
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test33.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test33.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test33.rnc $(ER)/test33.rnc; \
else echo "==deferring: \` diff $(AR)/test33.rnc $(ER)/test33.rnc \`"; fi
then diff -bBw $(AR)/test33.rnc $(ER)/test33.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test33.rnc $(ER)/test33.rnc \`"; fi
$(SAXON) test33.odd ../odds/odd2json.xsl > $(AR)/test33.json
perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test33.json
if [ $(DIFFNOW) -eq 1 ]; \
Expand All @@ -730,8 +730,8 @@ test-namespaces: actual
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test34.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test34.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test34.rnc $(ER)/test34.rnc; \
else echo "==deferring: \` diff $(AR)/test34.rnc $(ER)/test34.rnc \`"; fi
then diff -bBw $(AR)/test34.rnc $(ER)/test34.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/test34.rnc $(ER)/test34.rnc \`"; fi
$(SAXON) test34.odd ../odds/odd2json.xsl > $(AR)/test34.json
perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test34.json
if [ $(DIFFNOW) -eq 1 ]; \
Expand All @@ -753,8 +753,16 @@ test-namespaces: actual
perl -p -i -e 's/generated from ODD source .*//' $(AR)/test35.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test35.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/test35.rnc $(ER)/test35.rnc; \
else echo "==deferring: \` diff $(AR)/test35.rnc $(ER)/test35.rnc \`"; fi
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
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/testClass.rnc
if [ $(DIFFNOW) -eq 1 ]; \
then diff $(AR)/testClass.rnc $(ER)/testClass.rnc; \
else echo "==deferring: \` diff -bBw $(AR)/testClass.rnc $(ER)/testClass.rnc \`"; fi

test-scripts:
for i in $(SCRIPTS); do $(BINDIR)/$$i $(FLAGS) maria.xml $$i.result && rm $$i.result; done
Expand Down
74 changes: 48 additions & 26 deletions Test/expected-results/mdtest2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ I have endeavoured in this Ghostly little book, to raise the Ghost of an Idea, w
Their faithful Friend and Servant, C.D. December, 1843.
# Contents.
Stave I
* Marley's ghost 1
* Marley's ghost [1](#S1)
Stave II
* The first of the three spirits
Stave III
Expand All @@ -18,23 +18,33 @@ Stave IV
* The last of the spirits
Stave V
* The end of it

*(Bits of) A CHRISTMAS CAROL, and other things
# Simple rendition tests

Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.

Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.
EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is bold effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separatelyrend test 1bold italic smallcapsrend test 1 Cairns 2003: 11. My work is Muellner 1996.
EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is **bold** effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separately**rend test 1**bold italic smallcapsrend test 1
\[Cairns 2003: 11. My work is Muellner 1996.\]

# Quotations

A paragraph with a footnote containing a block-level objectWe start with a quotation:This is the way the world endsThis is the way the world endsThis is the way the world endsNot with a bang but a whimper. which is from TS Eliot's Hollow men
A paragraph with a footnote containing a block-level object
\[We start with a quotation:
This is the way the world ends
This is the way the world ends
This is the way the world ends
Not with a bang but a whimper.

which is from TS Eliot's Hollow men\]


Consider quotations: This is a quote which is run on within the text and will have quote marks of some kind around it.

Another quotation: This is a block quote set off as such from the rest of the text

Here, by contrast is an inline quotation. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!
Here, by contrast is an “inline quotation”. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!

# Use of xml:lang

Expand Down Expand Up @@ -64,36 +74,44 @@ I am changed: I'll go sell all my land.

# Footnotes and endnotes

## 1 Zur Entstehung der Philosophischen UntersuchungenZu Textauszeichnungen und Siglen siehe die Legende.
## 1 Zur Entstehung der Philosophischen Untersuchungen
\[Zu Textauszeichnungen und Siglen siehe die Legende.\]


Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismodIt is time to begin the beguine. Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
\[It is time to begin the beguine.\]
Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod

Iriure dolor in hendrerit in vulputateNot Vulture velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blanditNot Blandings praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
Iriure dolor in hendrerit in vulputate
\[Not Vulture\]
velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit
\[Not Blandings\]
praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod

# Assorted elements and links

Fit the first The emph element is used for linguistic emphasis. highlighting (soCalled) nor with shouting (mentioned), transmogrification, (a technical term), for which the gloss tag might be used to supply a technical definition).

Now for some links! We will start by cross-referring to a later section.

Here is a simple ptr to it: . Here is a simple ref, a reference to it.
Here is a simple ptr to it: . Here is a simple ref, a [reference to it](#P1).

An external link as ref and as ptr: .
An [external link](http://www.bbc.co.uk) as ref and as ptr: .

# Tables

Tables may have cells that span multiple columns and rows.
ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans HorizontallyHeader 3Spans HorizontallySpans VerticallyabcdeSpans bothfggijSpans Horizontallyklmno
ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans **Horizontally**Header 3Spans **Horizontally**Spans **Vertically**abcdeSpans **both**fggijSpans **Horizontally**klmno
# Lists

Various sorts of list are legal within paragraphs, and you can reference items in lists...
1. Dogs
Various sorts of list are legal within paragraphs, and you can reference [items in lists](#birds)...
1.Dogs

1. Zebras
1.Zebras

1. Birds
1.Birds

1. Cats
1.Cats

100
* first item
Expand Down Expand Up @@ -276,7 +294,11 @@ It's not my business, Scrooge returned. It's enough for a man to understand his

Seeing clearly that it would be useless to pursue their point, the gentlemen withdrew. Scrooge resumed his labours with an improved opinion of himself, and in a more facetious temper than was usual with him.

Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, test of a note instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of God bless you, merry gentleman! May nothing you dismay! Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.
Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that,
\[test of a note\]
instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of “God bless you, merry gentleman!
May nothing you dismay!
” Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.

# Linking

Expand All @@ -286,24 +308,24 @@ Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dun



Fred
[Fred](psn:fred)

Jones 76
[Jones 76](bibl:Jones76)

# Testing preservation of ID

Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. With references to
* Quotation
* [Quotation](#thisQuotation)

* Citation
* [Citation](#thisCitation)

* Paragraph
* [Paragraph](#thisParagraph)

* Reference
* [Reference](#thisReference)

* Anchor
* [Anchor](#movingAnchor)

* Title
* [Title](#thisTitle)


I wonder what are the xml-ids preserved in a transformation to XHTML, in particular in the case of quotations. So, let’s try :
Expand All @@ -324,6 +346,6 @@ an egXML in a list:

# divs with no heads

Ampersands: Fit the first& Fit the first& more Fit the first&amp; more Fit the first&& Fit the first&quot; Fit the first @ http://www.example.com/?foo=bar&bar=foo&#3.
Ampersands: Fit the first& Fit the first& more Fit the first&amp; more Fit the first&& Fit the first&quot; Fit the first @ [http://www.example.com/?foo=bar&bar=foo&#3](http://www.example.com/?foo=bar&bar=foo&#3).
Ampersands: Fit the first& Fit the first& more Fit the first&amp; more Fit the first&& Fit the first&quot; (as opposed to &quot;) Fit the first @ http://www.example.com/?foo=bar&bar=foo&#3.
Fit the second
2 changes: 1 addition & 1 deletion Test/expected-results/test-pure.odd.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ <h2>
<span xml:lang="en" lang="en" class="label">Schematron</span>
</td>
<td class="wovenodd-col2">
<div class="pre">&lt;s:report test="count(bob) !=1"&gt;Only one bob allowed&lt;/s:report&gt;</div>
<div class="pre">&lt;sch:report test="count(bob) !=1"&gt;Only one bob allowed&lt;/sch:report&gt;</div>
</td>
</tr>
<tr>
Expand Down
Binary file modified Test/expected-results/test.epub
View file
Binary file not shown.
Loading

0 comments on commit b870183

Please sign in to comment.