Skip to content

Commit

Permalink
Grab latest from dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@sydb
sydb committed Jan 28, 2025
2 parents d295a8e + 76a18b7 commit 8594fa3
Show file tree
Hide file tree
Showing 39 changed files with 12,691 additions and 12,151 deletions.
172 changes: 172 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,175 @@
2025-01-24 Raff Viglianti <[email protected]>

updated p5subset

2025-01-22 Raff Viglianti <[email protected]>

Merge pull request #727 from TEIC/sydb_fix_constraintDecl_oversight_01
actually process `<constraintDecl>`

2025-01-20 Syd Bauman <[email protected]>

Seem to be two commits I don’t have

Stylesheets group figured out how to process constraintDecl when processing the Schematron that goes into RELAX NG output. Still no tests.

Try pulling in the various fixes made to ISOSCH processing of constraintDecl recently

Give warning (and don’t process) an sch:assert or sch:report that is directly in a constraint, without an sch:rule.

2025-01-19 Syd Bauman <[email protected]>

Tiny things: Minor bug-fix in call to makePatternID(), and re-generated an expected result (as IDs have changed).

More fixes. Mainly I re-worked a large for-each to use apply-templates. Much better. Also added code to handle queryBinding=.

Fixed some bugs, still more to go: * Yup, @joeytakeda’s version was right, need the “//” on the exception to avoid processing twice. * Removed entire “declarations:” block, as everything is already processed elsewhere. * Improved pattern name creation (in case there is no ancestor with ident=, but there is one with xml:id=, take that; if not, and if in constraintDecl, just say so). * Don’t process sch:ns elements in constraintDecl twice. HOWEVER, I am comitting this now as I have just decided to re-write the main "/key('CONSTRAINTs', )" loop, as it is giving me trouble, and probably should be an apply- templates, anyway.

2025-01-18 Syd Bauman <[email protected]>

Fix a bug that I introduced initially (caught by @joeytakeda), but also re-work how constraint declaration processing is handled altogether.

Fix omission rapidly found by @joeytakeda — process other contents of encodingDesc, too

Big changes: Merge constraintDecls from both customization ODD and base ODD into compiled output ODD, and extract from the resulting constraintDecls.

2025-01-17 Syd Bauman <[email protected]>

Bug fix: the warning message very clearly says that if there is more than one declared namespace with the same URI, only the prefix of the 1st is used. But the code didn’t actually **do** that. It tried to use both, and thus failed miserably.

2025-01-13 Patricia O Connor <[email protected]>

Merge pull request #721 from TEIC/gusr_717
Added normalize-space to gloss value

2025-01-11 Syd Bauman <[email protected]>

Updated P5 subset

2025-01-02 Syd Bauman <[email protected]>

Change how Makefile’s doc: target *looks* (#716)

2024-12-18 Syd Bauman <[email protected]>

Stylesheets group figured out how to process constraintDecl when processing the Schematron that goes into RELAX NG output. Still no tests.

2024-12-12 gustavo <[email protected]>

Modifying test2 to fit new results

Modified tests to include normalized whitespace for gloss

Added normalize-space to gloss value

2024-12-01 Elisa Beshero-Bondar <[email protected]>

Merge pull request #707 from TEIC/sydb_also_extract_und_mul_and_zxx
Handle 'und', 'mul', & 'zxx', too

2024-11-27 Syd Bauman <[email protected]>

Whatever dev has, put here

2024-11-26 Helena Bermúdez Sabel <[email protected]>

Merge pull request #714 from TEIC/sydb_598
Remove last vestiges of using altIdent element for FPI

2024-11-26 Syd Bauman <[email protected]>

Remove last vestigages of using altIdent element for FPI

2024-11-11 Syd Bauman <[email protected]>

complete merge of dev into this branch

updated p5 subset

2024-11-06 Raff Viglianti <[email protected]>

Merge pull request #709 from TEIC/jsonrng
passing rng declarations through to a JSON object as string literal

2024-11-05 Raff Viglianti <[email protected]>

more test fixes

updated test again

updated test

passing rng declarations through to a JSON object as string literal

2024-10-30 Syd Bauman <[email protected]>

forgot to check-in test result change; also minor tweaks in whitespace

Handle 'und', 'mul', & 'zxx', too

2024-10-29 Helena Bermúdez Sabel <[email protected]>

Merge pull request #704 from TEIC/sydb_702_extract_schematron
Improve SQF and language handling of Schematron extraction process

Merge branch 'dev' into sydb_702_extract_schematron

Merge pull request #706 from TEIC/issue_699_stylesheets_grp_fix
Stylesheets group fix of missing value list problem

2024-10-29 Syd Bauman <[email protected]>

Stylesheets group fix: When merging class attributes, treat missing mode attribute as mode=add.

2024-10-24 Syd Bauman <[email protected]>

Try to get Test/ and Test2/ to work with improved Schematron extraction routine. Test2/ seems to work, but Test/ does not, however the problem does not seem to have anything to do with Schematron extraction, and exists in the released branch as well.

In addressing #702, pass the language on from Ant to XSL, and re-work how languages and Schematron Quick Fixes are handled in extract-isosch.xsl.

2024-10-18 Magdalena Turska <[email protected]>

Merge pull request #698 from TEIC/sydb_handle_constraintDecl_696
handle `<constraintDecl>` from extract-isosch.xsl

2024-10-15 Syd Bauman <[email protected]>

Improve 2 comments.

2024-10-06 Hugh A. Cayless <[email protected]>

Remove link to obsolete website page.

2024-09-23 Syd Bauman <[email protected]>

bug fix and mild improvements per suggestion @joeytakeda

2024-09-21 Syd Bauman <[email protected]>

Fix tiny expected difference

2024-09-20 Syd Bauman <[email protected]>

Process constraintDecl element: use its queryBinding= attr, copy over its sch:ns elements into declared NS section, and all other child elements into a new declarations section.

2024-07-22 Helena Bermúdez Sabel <[email protected]>

Merge pull request #688 from rvdb/jTEI-fix-name
skip //name, since it is not supported in the OpenEdition schema

2024-07-18 Syd Bauman <[email protected]>
Elli Bleeker <[email protected]>

fix path in output transform pgm (#691)
* Changed to in Makefile #552

* Forgot to delete no-longer needed comment :-)

---------

2024-07-17 root <[email protected]>

TOC updated p5 subset
2024-07-08 helenasabel <[email protected]>

bump version
Expand Down
22 changes: 16 additions & 6 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,23 @@ profiles:

doc: oxygendoc linkcss
@echo BUILD Compile documentation
# Create the release directory in which to put this stuff
test -d release/xslcommon/doc/tei-xsl || mkdir -p release/xslcommon/doc/tei-xsl
$(SAXON) -o:Documentation/index.xml Documentation/teixsl.xml Documentation/param.xsl
$(SAXON) -o:Documentation/style.xml Documentation/teixsl.xml Documentation/paramform.xsl
$(SAXON) -o:release/xslcommon/doc/tei-xsl/index.html Documentation/index.xml profiles/tei/html5/to.xsl cssFile=tei.css
$(SAXON) -o:release/xslcommon/doc/tei-xsl/style.html Documentation/style.xml profiles/default/html/to.xsl
cp Documentation/*.png Documentation/teixsl.xml Documentation/style.xml release/xslcommon/doc/tei-xsl
cp VERSION tei.css ChangeLog LEGAL/LICENCE release/xslcommon/doc/tei-xsl
# Create the documentation index by inserting tables of the variables and templates into the various sections:
$(SAXON) -s:Documentation/teixsl.xml -xsl:Documentation/param.xsl -o:Documentation/index.xml
# Convert that index file into the main HTML documentation page (which uses tei.css):
$(SAXON) -s:Documentation/index.xml -xsl:profiles/tei/html5/to.xsl -o:release/xslcommon/doc/tei-xsl/index.html cssFile=tei.css
# Create the TEI Stylebear (style.html) using a two-step process:
$(SAXON) -s:Documentation/teixsl.xml -xsl:Documentation/paramform.xsl -o:Documentation/style.xml
$(SAXON) -s:Documentation/style.xml -xsl:profiles/default/html/to.xsl -o:release/xslcommon/doc/tei-xsl/style.html
# Copy the needed pieces into the target directory:
cp -p Documentation/*.png \
Documentation/teixsl.xml \
Documentation/style.xml \
VERSION tei.css \
ChangeLog \
LEGAL/LICENCE \
release/xslcommon/doc/tei-xsl/

oxygendoc:
# when building Debian packages, the script runs under
Expand Down
45 changes: 27 additions & 18 deletions Test/expected-results/oddbyexample.odd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@
<attDef ident="toWhom" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.datable" type="atts" mode="change">
<attList>
<attDef ident="period" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.dimensions" type="atts" mode="change">
<attList>
<attDef ident="unit" mode="delete"/>
Expand All @@ -97,24 +102,21 @@
<attDef ident="scope" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.damaged" type="atts" mode="change">
<attList>
<attDef ident="agent" mode="delete"/>
<attDef ident="degree" mode="delete"/>
<attDef ident="group" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.datable" type="atts" mode="change">
<attList>
<attDef ident="period" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.divLike" type="atts" mode="change">
<attList>
<attDef ident="org" mode="delete"/>
<attDef ident="sample" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.handFeatures" type="atts" mode="change">
<attList>
<attDef ident="scribe" mode="delete"/>
<attDef ident="scribeRef" mode="delete"/>
<attDef ident="script" mode="delete"/>
<attDef ident="scriptRef" mode="delete"/>
<attDef ident="medium" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.media" type="atts" mode="change">
<attList>
<attDef ident="width" mode="delete"/>
Expand All @@ -139,19 +141,26 @@
<attDef ident="function" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.timed" type="atts" mode="change">
<attList>
<attDef ident="start" mode="delete"/>
<attDef ident="end" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.transcriptional" type="atts" mode="change">
<attList>
<attDef ident="status" mode="delete"/>
<attDef ident="cause" mode="delete"/>
<attDef ident="seq" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.damaged" type="atts" mode="change">
<attList>
<attDef ident="agent" mode="delete"/>
<attDef ident="degree" mode="delete"/>
<attDef ident="group" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.timed" type="atts" mode="change">
<attList>
<attDef ident="start" mode="delete"/>
<attDef ident="end" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.personal" type="atts" mode="change">
<attList>
<attDef ident="full" mode="delete"/>
Expand Down
Loading

0 comments on commit 8594fa3

Please sign in to comment.