Skip to content

Commit

Permalink
Merge branch 'dev' into stylesheets_group_on_592
Browse files Browse the repository at this point in the history
Reverted Test/expected-results/test15.odd.html since there were many conflicts, and will address those next.
  • Loading branch information
joeytakeda committed Oct 18, 2023
2 parents ee33972 + f1aa9a3 commit 91c5316
Show file tree
Hide file tree
Showing 55 changed files with 11,541 additions and 7,034 deletions.
350 changes: 350 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,353 @@
2023-04-04 Syd Bauman <[email protected]>

update p5subset before release (and update tests to match, after checking 'em)

2023-04-01 Joey Takeda <[email protected]>

Merge pull request #591 from TEIC/sydb_test_for_attr_val_quantification
test minOccurs= and maxOccurs= on datatype element

2023-03-30 Syd Bauman <[email protected]>

Change instances to match changes just made to ODD

2023-03-30 Helena Bermúdez Sabel <[email protected]>

Merge pull request #588 from rvdb/jtei-fixODTidenticalAuthors
aligned processing of bibl items with identical author(s) with common…

2023-03-30 Syd Bauman <[email protected]>

Per request @peterstadler (at Stylesheets meeting) add additional tests

2023-03-30 Elisa Beshero-Bondar <[email protected]>

Merge pull request #599 from TEIC/issue-553
update HTML output declaration to indent="no"

2023-03-30 Syd Bauman <[email protected]>

Grab latest from dev

2023-03-30 Helena Bermúdez Sabel <[email protected]>

Merge pull request #601 from TEIC/issue-561
explicitly process nested attList

2023-03-30 Peter Stadler <[email protected]>

explicitly process nested attList

2023-03-23 Peter Stadler <[email protected]>

whitespace fixes due to indentation changes

whitespace fixes due to indentation changes

update HTML output declaration to prevent indenting

2023-03-21 martindholmes <[email protected]>

Fix typo: angle bracket should be close parenthesis.

2023-02-03 Syd Bauman <[email protected]>

With @trishaoconnor update p5subset.xml to current, and a few expected results to match.

2023-01-26 Syd Bauman <[email protected]>
Helena Bermúdez Sabel <[email protected]>

XLSX→TEI drops empty cells, the PR (#587)
* Impliment (my interpretation of) @GVogeler’s suggestion on ticket #323

* Change the changelog? Not I.

2023-01-11 rvdb <[email protected]>

removed commented out stubs for FODT processing

2023-01-09 rvdb <[email protected]>

commented out unused extension function

2023-01-06 helenasabel <[email protected]>

update of p5subset

2023-01-05 Syd Bauman <[email protected]>

Add a new Test2/ ODD input file, valid instance, and invalid instance to stress-test validation of the number of occurences of a datatype in an attr value (fallout from #557 and #589).

2023-01-05 Joey Takeda <[email protected]>

Merge pull request #585 from TEIC/fix-419
Processing attRefs for attribute list on element spec pages. Fixes #419

2023-01-05 Helena Bermúdez Sabel <[email protected]>

Merge pull request #589 from TEIC/fix-557
Fix for attdef to relaxng (issue #557)

2022-12-14 raffazizzi <[email protected]>

fixed missing space

Merge branch 'dev' into fix-419

Added case for processing attributes with mixoccur 0 and maxoccur 1 and optional in rng. Fixes #557

2022-12-12 rvdb <[email protected]>

aligned processing of bibl items with identical author(s) with common code in jtei.common.xsl
This fixes erroneous "----,." output in ODT, for subsequent bibliographic entries with multiple identical authors. After this fix, the output is "----." (without the comma).

2022-12-06 Peter Stadler <[email protected]>

update GitHub actions
Node.js 12 actions are deprecated and update to Node.js 16 recommended.

2022-12-01 Syd Bauman <[email protected]>

Address #329

2022-10-27 Syd Bauman <[email protected]>

description of cssInlineFiles: With Stylesheets group, expand description of cssInlineFiles to advise from where a relative path is considered, per #538.

2022-10-27 raffazizzi <[email protected]>

Processing attRefs for attribute list on element spec pages. Fixes #419

2022-10-25 Peter Stadler <[email protected]>

bump version number after release

merging back current released into dev

Merge branch 'release-7.54.0' into released

Merge branch 'dev' into release-7.54.0

update expected results
after pulling in "Dead iso cat" https://github.com/TEIC/TEI/pull/2359

adjust version number for upcoming release 7.54.0

2022-10-24 Peter Stadler <[email protected]>

Merge pull request #583 from TEIC/update-p5subset
Update p5subset

incorporate recent changes from https://github.com/TEIC/TEI/pull/2342

2022-10-21 Peter Stadler <[email protected]>

update expected results from Test2

update p5subset and expected results

Merge pull request #577 from dmj/t/fix-382-testcase
Add testcase for #382 and PR #475

add testfile to tests

fix expected results

Merge branch 'dev' into pr/577

Merge pull request #475 from dmj/dev
Don't use content of tei:index in tei:head

Merge pull request #549 from TEIC/issue-140-except
Test @include and @except

2022-10-14 Syd Bauman <[email protected]>

Per #529, change prefix: (#532)
Change generated prefix for ISO Schematron namespace from 's:' to 'sch:'; correspondingly,
change generated prefix for Schematron 1.x namespace from 'sch:' to 'sch_1.x:'.

2022-09-30 Syd Bauman <[email protected]>

Add comment; whitespace changes.

Tweak for readability: With Stylesheets group yesterday (2022-09-29), use the already defined variable 'pagetitle' rather than repeating the 5 lines of code used to define that variable in 2 places where that information is used. This change passes all tests in Test/ and Test2/, and a complete Guidelines build (targets: clean, validate, html-web, test, exemplars, teiwebsiteguidelines, pdf, and epub).

2022-09-29 helenasabel <[email protected]>

update of expected results after last changes

addressed @sydb comments

2022-09-29 Syd Bauman <[email protected]>

Fix #479: We (Stylesheets group) inserted the U+FE0E character immediately after the anchor so it won’t show up as an emoji. We also made it a variable so it only has to be changed once, if it ever gets changed again. :-)

2022-09-27 David Maus <[email protected]>

Add testcase for #382 and PR #475

2022-09-23 Peter Stadler <[email protected]>

Merge pull request #575 from rvdb/jTEI-fixObjectEgxml
added workaround for a Lodel bug that distorts the string "&lt;/?obje…

2022-09-21 rvdb <[email protected]>

added workaround for a Lodel bug that distorts the string "&lt;/?object" in HTML rendering of jTEI articles

2022-09-15 Peter Stadler <[email protected]>

Merge pull request #559 from rvdb/jTEI-fix-citRef
fix processing of cit/ref for citations with paragraph-splitting content

2022-09-15 rvdb <[email protected]>

fix processing of cit/ref for citations with paragraph-splitting content

2022-09-15 Peter Stadler <[email protected]>

Merge pull request #573 from rettinghaus/patch-1
Beautify message by remove whitespace

2022-09-15 Klaus Rettinghaus <[email protected]>

remove whitespace in message

2022-09-15 Peter Stadler <[email protected]>

Merge pull request #558 from rvdb/jTEI-fix-nestedListNumbering
only increment multi-level numbering for directly nesting ordered lists

2022-08-29 martindholmes <[email protected]>

Fix expected results.

2022-08-29 Elli Bleeker <[email protected]>

updated elided text and elided XML in several Stylesheet files

2022-08-12 Peter Stadler <[email protected]>

add mode "xref" to text-template (#566)
this fixes #565 by applying the text template and its `tei:escapeChars` function to the computed link text of pointers which are processed in the "xref" mode

2022-07-30 Syd Bauman <[email protected]>

Update p5subset to latest from https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5subset.xml

2022-07-22 Martina Scholger <[email protected]>

Merge pull request #545 from TEIC/issue-541
Issue 541: fix bug when processing <constraintSpec>

2022-07-22 Peter Stadler <[email protected]>

Merge pull request #477 from dmj/t/fix-476-c
Gracefully fail if target if @facs does not exist

Merge pull request #432 from sanskrit-coders/dev
TEI to markdown improvements.

2022-07-22 helenasabel <[email protected]>

update of expected results

2022-07-19 Helena Bermúdez Sabel <[email protected]>

Merge branch 'dev' into issue-140-except

2022-07-16 Joey Takeda <[email protected]>

Addressing `@preserveOrder` for #241 (#507)
* Work on #241

* Copy over the context attributes (except (min|max)Occurs) in odd2odd-simplifyODD in order to retain attributes (like preserveOrder) declared on the source element

* Adding tests for preserveOrder (#241)

* In inputFiles/testPure1.odd: Constrain choice such that it must contain one of:
** abbr and expan
** expan and abbr
** corr and sic
** orig and reg

* Adding tests to both validInstance and invalidInstances for testPure1
* Updating the RNG and the RNG output files

* Fixes as requested by @sydb in PR #507

* Fixing prose (https://github.com/TEIC/Stylesheets/pull/507#discussion_r883669059)
* Test nodes, not names (https://github.com/TEIC/Stylesheets/pull/507#discussion_r883808314)

2022-07-01 Syd Bauman <[email protected]>

Merge in latest change to TEI-C/Stylesheets:dev: Namely, tweak to Makefile so that whitespace changes are ignored when comparing RNC files

Fix #560 by adding -bBw to RNC diff lines.

2022-07-01 Syd Bauman <[email protected]>

Merge pull request #550 from TEIC/issue-544-classpathref
Adding @classpathref to all XSLT calls

2022-07-01 Syd Bauman <[email protected]>

Update Test2/ expected result to reflect new, improved actual output.

Update expected result to reflect new, improved actual result.

2022-06-30 Vishvas Vasuki विश्वासः <[email protected]>

Merge branch 'TEIC:dev' into dev

2022-06-29 rvdb <[email protected]>

only increment multi-level numbering for directly nesting ordered lists

2022-06-17 Elli Bleeker <[email protected]>

Update P5subset w/ @sydb following the instructions in the Google doc.

2022-06-01 Syd Bauman <[email protected]>

What gives? Fix expected results test failure that I do not grok. When diffed from the Makefile running locally, no differences were found.

With @ebeshero update p5subset, which was a bear

2022-05-28 Syd Bauman <[email protected]>

Fix #551

2022-04-30 helenasabel <[email protected]>

merge dev into this branch

added @include and @except test to test suite

changed message of default behaviour and of P7 (which is indeed creating the expected results)

changed value of @expand

2022-04-23 martindholmes <[email protected]>

Bump version number following release.

2022-04-19 Hugh Cayless <[email protected]>

Merge release 7.53.0

Updating tests.

2022-04-19 Raff Viglianti <[email protected]>

v.7.53.0

regenerated log

set to v.7.53.0

updated p5 subset
2022-04-19 Raff Viglianti <[email protected]>

set to v.7.53.0
Expand Down
4 changes: 2 additions & 2 deletions Test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Test/expected-results/test-complex.html
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ <h2>
</div>
<div class="note" id="Note2">
<span class="noteLabel">2</span>
<div class="noteBody">We start with a quotation:
<div class="noteBody">We start with a quotation:
<div class="lg">
<div class="l">This is the way the world ends</div>
<div class="l">This is the way the world ends</div>
Expand Down
2 changes: 1 addition & 1 deletion Test/expected-results/test-ota.html
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ <h1>
</div>
<div class="note" id="Note2">
<span class="noteLabel">2</span>
<div class="noteBody">We start with a quotation:
<div class="noteBody">We start with a quotation:
<div class="lg">
<div class="l">This is the way the world ends</div>
<div class="l">This is the way the world ends</div>
Expand Down
2 changes: 0 additions & 2 deletions Test/expected-results/test-pure.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -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 =

Expand Down
Loading

0 comments on commit 91c5316

Please sign in to comment.