Skip to content

Commit

Permalink
Merge branch 'dev' into louSez
Browse files Browse the repository at this point in the history
  • Loading branch information
@lb42
lb42 authored Dec 20, 2023
2 parents 7fbd0db + 0bb1c9e commit 6421f30
Show file tree
Hide file tree
Showing 316 changed files with 6,631 additions and 4,668 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,4 @@ jobs:
- name: Run tests from the Test directory
run: |
cd P5
make clean validate test XSL=${GITHUB_WORKSPACE}/Stylesheets
- name: Slack Notification
if: always()
continue-on-error: true
uses: rtCamp/action-slack-notify@v2
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_COLOR: ${{ job.status }}
MSG_MINIMAL: commit,actions url
make clean validate test XSL=${GITHUB_WORKSPACE}/Stylesheets
24 changes: 0 additions & 24 deletions .travis.yml
View file

This file was deleted.

3 changes: 3 additions & 0 deletions Documents/pureODD/chainingTuto/metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<sourceDesc>
<p>Part of TEI Chaining tutorial</p>
</sourceDesc>
<xenoData xmlns:dc="http://dublincore.org/documents/dcmi-namespace/">
<dc:author>Jules Verne</dc:author>
</xenoData>
</fileDesc>
<xenoData xmlns:dc="dublineCore"><dc:wibble/></xenoData>
<profileDesc>
Expand Down
5 changes: 4 additions & 1 deletion Documents/pureODD/howtoChain-fr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
<fileDesc>
<titleStmt>
<title>Chaînage ODD pour les débutants</title>

<author>Lou Burnard et Emmanuel Chateau-Dutier</author>
</titleStmt>
<publicationStmt>
<p>Published at lb42.github.io</p>

</publicationStmt>
<sourceDesc>
<p>authored from scratch</p>
Expand Down Expand Up @@ -38,7 +40,8 @@
</div>
<div>
<head>Traitement d’un ODD</head>
<p>Regardons d’un peu plus près la manière dont la TEI définit un schéma très léger appelé <ident>TEI Bare</ident>. Son élément de spécification de schéma commence comme suit : <egXML
<p>Regardons d’un peu plus près la manière dont la TEI définit un schéma très léger appelé <ident>TEI Bare</ident>.
Son élément de spécification de schéma commence comme suit : <egXML
xmlns="http://www.tei-c.org/ns/Examples"> <schemaSpec ident="tei_bare"
xml:lang="en">
<moduleRef key="core" include="p list item label head author title"/>
Expand Down
86 changes: 1 addition & 85 deletions Documents/pureODD/howtoGenerate-fr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,90 +376,6 @@
particulièrement utiles dans le processus de définition d’un schéma utile pour un
ensemble de documents TEI. </p>
</div>
<!-- <div>
<head>Paramètres configurables pour la feuille de style oddbyexample</head>
<p>Ceux-ci ne fonctionnent pas toujours... voir <ptr
target="https://github.com/TEIC/Stylesheets/issues/212"/></p>
<table>
<row role="label">
<cell>Paramètre</cell>
<cell>Fonction</cell>
<cell>Valeur par défaut</cell>
</row>
<row>
<cell>corpus</cell>
<cell>chemin vers le répetoire contenant les fichiers d’entrée</cell>
<cell>./</cell>
</row>
<row>
<cell>schema</cell>
<cell>nom du schéma à générer</cell>
<cell>oddbyexample</cell>
</row>
<row>
<cell>corpusList</cell>
<cell>traiter seulement ces fichiers d’entrées</cell>
<cell>(no constraint)</cell>
</row>
<row>
<cell>prefix</cell>
<cell>traiter seulement les fichiers dont le nom débute par</cell>
<cell>(no constraint)</cell>
</row>
<row>
<cell>suffix</cell>
<cell>traiter seulement les fichiers avec l’extension</cell>
<cell>xml</cell>
</row>
<row>
<cell>defaultSource</cell>
<cell>chemin pour faire référence à aux déclarations TEI</cell>
<cell>http://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml</cell>
</row>
<row>
<cell>keepGlobals</cell>
<cell>énumérer tous les attributs globaux</cell>
<cell>false</cell>
</row>
<row>
<cell>attributeList</cell>
<cell>attributs spécifiques dont les valeurs doivent être énumérées</cell>
<cell>(none)</cell>
</row>
<row>
<cell>enumerateRend</cell>
<cell>énumérer les valeurs utilisées pour le <att>rend</att></cell>
<cell>false</cell>
</row>
<row>
<cell>enumerateType</cell>
<cell>énumérer les valeurs utilisées pour <att>type</att></cell>
<cell>false</cell>
</row>
<row>
<cell>includeHeader</cell>
<cell>énumérer les attributs des éléments dans les headers TEI</cell>
<cell>true</cell>
</row>
<row>
<cell>processNonTEI</cell>
<cell>énumérer les éléments non-TEI</cell>
<cell>false</cell>
</row>
<!-\- <row><cell>method</cell><cell>should generated moduleRefs use @include or @except</cell><cell>include</cell></row>
-\->
<row>
<cell>debug</cell>
<cell>indiquer les informations de bugs</cell>
<cell>false</cell>
</row>
<row>
<cell>verbose</cell>
<cell>produire des messages en mode verbose</cell>
<cell>false</cell>
</row>
</table>
</div>
--> </body>
</body>
</text>
</TEI>
31 changes: 30 additions & 1 deletion P5/Exemplars/tei_jtei.odd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1948,12 +1948,14 @@
<attList>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="role" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <affliation> -->
</attList>
</elementSpec>
<elementSpec ident="application" mode="change">
<attList>
<attDef ident="type" mode="delete"/>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <application> -->
</attList>
</elementSpec>
<elementSpec ident="att" module="tagdocs" mode="change">
Expand All @@ -1971,6 +1973,7 @@
</attList>
</elementSpec>
<classSpec ident="att.breaking" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.cReferencing" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.canonical" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.citing" module="tei" type="atts" mode="change">
Expand All @@ -1993,9 +1996,28 @@
<attDef ident="group" mode="delete"/>
</attList>
</classSpec>
<!--
start @calendar removal section
This whole block should be removed along with the
2024-11-11 removal of @calendar from individual TEI
elements. Note that elements that have @calendar deleted
elsewhere in this ODD have been commented out here, and
those @calendars need to be removed wherever they are
declared in this ODD, too. —Syd, 2023-10-16
-->
<!-- elementSpec ident="affiliation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="application" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="orgName" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- end @calendar removal block -->
<classSpec ident="att.datable" module="tei" type="atts" mode="change">
<attList>
<attDef ident="calendar" mode="delete"/>
<attDef ident="period" mode="delete"/>
</attList>
</classSpec>
Expand Down Expand Up @@ -2143,6 +2165,7 @@
</constraintSpec>
<attList>
<attDef ident="role" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <author> -->
</attList>
</elementSpec>
<elementSpec ident="availability" mode="change">
Expand Down Expand Up @@ -2374,6 +2397,7 @@
<valItem ident="technical"/>
</valList>
</attDef>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <editor> -->
</attList>
</elementSpec>
<elementSpec ident="emph" module="core" mode="change">
Expand Down Expand Up @@ -2550,6 +2574,7 @@
<attDef ident="role" mode="delete"/>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="type" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <name> -->
</attList>
</elementSpec>
<elementSpec ident="note" mode="change">
Expand Down Expand Up @@ -2697,6 +2722,7 @@
<attDef ident="notAfter" mode="delete"/>
<attDef ident="role" mode="delete"/>
<attDef ident="type" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <orgName> -->
</attList>
</elementSpec>
<elementSpec ident="pubPlace" mode="change">
Expand Down Expand Up @@ -3098,6 +3124,9 @@
</sch:rule>
</constraint>
</constraintSpec>
<attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <idno> -->
</attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
</elementSpec>
<elementSpec ident="graphic" module="core" mode="change">
<constraintSpec ident="jtei.sch-graphic-dimensions" scheme="schematron">
Expand Down
26 changes: 21 additions & 5 deletions P5/Exemplars/tei_lite.odd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2929,6 +2929,8 @@ $Id$
<attDef ident="rendition" mode="delete"/>
</attList>
</classSpec>

<classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>

<classSpec type="atts"
ident="att.global.linking"
Expand All @@ -2950,11 +2952,25 @@ $Id$
<attDef ident="to" mode="delete"/>
</attList>
</classSpec>
<classSpec type="atts" ident="att.datable" module="tei" mode="change">
<attList>
<attDef ident="calendar" mode="delete"/>
</attList>
</classSpec>
<!--
start @calendar removal section
This whole block should be removed along with the
2024-11-11 removal of @calendar from individual TEI
elements. —Syd, 2023-10-16
-->
<elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="creation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="funder" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="principal" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="sponsor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="title" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- end @calendar removal block -->
<classSpec type="atts"
ident="att.internetMedia"
module="tei"
Expand Down
12 changes: 3 additions & 9 deletions P5/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,7 @@ html-web.stamp: check.stamp p5.xml Utilities/guidelines.xsl.model
@# remove vestiges of previous run
rm -rf Guidelines-web
@# generate XSL stylesheet by modifying paths in our model stylesheet
perl -p -e \
"s+http://www.tei-c.org/release/xml/tei/stylesheet+${XSL}+; \
s+/usr/share/xml/tei/stylesheet+${XSL}+;" \
Utilities/guidelines.xsl.model > Utilities/guidelines.xsl
java -jar Utilities/lib/${SAXONJAR} -s:Utilities/guidelines.xsl.model -xsl:Utilities/guidelines_model_2_executable.xslt -o:Utilities/guidelines.xsl XSL="${XSL}"
@# for each language, create a subdirectory and pre-populate it with CSS, source, and web navigation stuff
for i in $(ALLLANGUAGES) ;do \
mkdir -p Guidelines-web/$$i/html; \
Expand Down Expand Up @@ -142,10 +139,7 @@ fonttest:
pdf-init: check.stamp p5.xml Utilities/guidelines-latex.xsl
@echo check if XeLaTeX exist
@command -v xelatex || exit 1
perl -p -e \
"s+http://www.tei-c.org/release/xml/tei/stylesheet+${XSL}+; \
s+/usr/share/xml/tei/stylesheet+${XSL}+;" \
Utilities/guidelines-latex.xsl > Utilities/guidelines.xsl
java -jar Utilities/lib/${SAXONJAR} -s:Utilities/guidelines-latex.xsl -xsl:Utilities/guidelines_model_2_executable.xslt -o:Utilities/guidelines.xsl XSL="${XSL}"
@echo BUILD: build Lite version of Guidelines, then LaTeX version of Guidelines from Lite, then run to PDF using XeLaTeX
@echo Make sure you have Junicode and Noto CJK fonts installed
${ANT} -lib Utilities/lib/${SAXONJAR} -f antbuilder.xml -DXSL=${XSL} -DXELATEX=${XELATEX} pdfonce
Expand Down Expand Up @@ -263,7 +257,7 @@ readus:
cp VERSION release/tei-p5-doc/share/doc/tei-p5-doc
@echo BUILD: Make web pages for release notes
for i in ReleaseNotes/readme*xml; do \
echo ${ANT} -f ${XSL}/html/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=readme \
${ANT} -f ${XSL}/html/build-to.xml -lib Utilities/lib/${SAXONJAR} -Dprofiledir=${XSL}/profiles -Dprofile=readme \
-DinputFile=`pwd`/$$i -DoutputFile=`pwd`/release/tei-p5-doc/share/doc/tei-p5-doc/`basename $$i .xml`.html; \
done

Expand Down
3 changes: 1 addition & 2 deletions P5/ReleaseNotes/readme-0.4.1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
<list>
<item>Revision of the TEI class system continues, with the definition
of several new classes following on from a systematic review of all
content models by the Council (see <ptr
target="http://www.tei-c.org/Council/tcw07.xml"/>).</item>
content models by the Council (see <ptr target="http://www.tei-c.org/Council/tcw07.xml"/>).</item>

<item>
Detailed proposals for the encoding of personal data (for example in
Expand Down
4 changes: 1 addition & 3 deletions P5/ReleaseNotes/readme-0.6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
<body>

<p>Changes since the last packaged release (0.5, October 2006)
are listed briefly below (please refer to the file <name
type="file">ChangeLog</name> in directory <name
type="dir">ReleaseNotes</name> at the Sourceforge archive for a
are listed briefly below (please refer to the file <name type="file">ChangeLog</name> in directory <name type="dir">ReleaseNotes</name> at the Sourceforge archive for a
full list).</p>

<p>This (somewhat delayed) release contains a large number of
Expand Down
6 changes: 2 additions & 4 deletions P5/ReleaseNotes/readme-1.1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@
</sourceDesc>
</fileDesc>
<revisionDesc>
<change who="http://users.ox.ac.uk/~lou"
when="2007-07-28">created retrospectively from svn ChangeLog</change>
<change who="http://users.ox.ac.uk/~lou" when="2007-07-28">created retrospectively from svn ChangeLog</change>
</revisionDesc>
</teiHeader>
<text>
<body>

<p>This is a maintenance release, implementing several changes
agreed following the review of outstanding feature requests
undertaken at the Council meeting in Galway in April (see <ref
target="http://www.tei-c.org/Council/Working/tcw12.xml">Working
undertaken at the Council meeting in Galway in April (see <ref target="http://www.tei-c.org/Council/Working/tcw12.xml">Working
Paper TCW12</ref> for a complete list)</p>

<p>In addition to these specific responses to feature requests, a
Expand Down
Loading

0 comments on commit 6421f30

Please sign in to comment.