Merging release branch.

AUTHORS

@@ -4,10 +4,20 @@ IT Services <[email protected]>
 
 Other contributors include (but this is not an exhaustive list)
 
- Mikel L. Forcada <[email protected]>
- Barry Cornelius
+ Syd Bauman <[email protected]>
+ Elisa Beshero-Bondar <[email protected]>
  Peter Boot <[email protected]>
+ Lou Burnard <[email protected]>
+ Hugh Cayless <[email protected]>
+ Barry Cornelius
  James Cummings <[email protected]>
+ Mikel L. Forcada <[email protected]>
+ Martin Holmes <[email protected]>
+ Duncan Paterson <[email protected]>
+ Peter Stadler <[email protected]>
+ Magdalena Turska <[email protected]>
+ Ron Van den Branden <[email protected]>
+ Raffaele Viglianti <[email protected]>
 
 Unless otherwise indicated, the contributors
 have given the copyright to the Text Encoding

ChangeLog

@@ -1,3 +1,234 @@
+2019-01-29  Hugh Cayless  <[email protected]>
+
+	Set VERSION 7.47.0
+
+2019-01-28  Syd Bauman  <[email protected]>
+
+	Release note processing: Process <gi> and <ident type="class"> in readme-X.Y.Z.xml files such that they point to the X.Y.Z version of the Guidelines
+
+2019-01-24  Syd Bauman  <[email protected]>
+
+	Merge pull request #356 from TEIC/peterstadler-issue351
+	pull request to address #351
+
+2019-01-24  Peter Stadler  <[email protected]>
+
+	Merge branch 'dev' into peterstadler-issue351
+
+2019-01-20  raffazizzi  <[email protected]>
+
+	Adjusted odd2json to look for class types from a source file when not found in the local ODD. This will help supporting non-compiled ODDs. Updated tests.
+
+2019-01-12  Peter Stadler  <[email protected]>
+
+	create output directories if needed #351
+	this should be safe since `-p` does not throw an error for existing directories and creates parent directories if needed
+
+	set `-e` option #351
+	… to exit immediately if some command returns a non-zero status.
+
+2019-01-06  Syd Bauman  <[email protected]>
+
+	add test: Added better testing of minOccurs= and maxOccurs= (in part to set up testing for when we try to fix #354).
+
+2019-01-04  Syd Bauman  <[email protected]>
+
+	Fix #352: Changed “odd2odd.xsl” to “teiodds.xsl” in unused error message.
+
+2019-01-04  raffazizzi  <[email protected]>
+
+	only class name for memberOf
+
+	back to simple classes
+
+	returned to non-agnostic model with apologies for the revert attempts nonsense
+
+	Revert "Added more detail for memberOf"
+	This reverts commit 64dbff8bae86e3e65bbb838345e3342505986b6e.
+
+	Revert "fix expected results"
+	This reverts commit e422d4bfff5ccb372acf49efbf299eecf8b7c5dc.
+
+	New tests for odd2json
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+	Made representation of memberOf more agnostic. The XSLT does not attempt to sort class references by class type as that information may not always be available in customization ODDs.
+
+2019-01-04  Peter Stadler  <[email protected]>
+
+	fix expected results
+	aftermath of 64dbff8bae86e3e65bbb838345e3342505986b6e
+
+2019-01-03  raffazizzi  <[email protected]>
+
+	Added more detail for memberOf
+
+2018-12-30  Syd Bauman  <[email protected]>
+
+	Update testPure1, step 8: Add a Schematron constraint. (Also some tweaks to comments and added a <remarks>.)
+
+2018-12-21  Syd Bauman  <[email protected]>
+
+	Update README_build_odd.md
+	Typo fix.
+
+2018-12-21  martindholmes  <[email protected]>
+
+	Tweaks to test ODD readme.
+
+	Tweaks to test ODD readme.
+
+	More added to the ODD test readme file.
+
+2018-12-14  martindholmes  <[email protected]>
+
+	Markdown fix in readme.
+
+	Markdown fix in readme.
+
+	Adding a readme to document the ODD file processing.
+
+2018-12-08  Syd Bauman  <[email protected]>
+
+	Update testPure1, step 7: Add tests for <dataRef> with key= or name=, and restriction=. Note that one of these tests worked, in that it found a Stylesheets problem. See #349.
+
+	Update testPure1, step 6: 1) Delete att.lexicographic instead of att.deprecated, just to be clear that we are testing the deletion of something that is not included. (Since previous versions of this schema have included 'tagdocs', and even this version sucks in some elements therefrom.) 2) Change the alteration of synch= to be a deletion thereof to match the comment. I.e., synch= should not be included in output schemas, and thus invalid.
+
+2018-12-07  Syd Bauman  <[email protected]>
+
+	Update testPure1, step 5: Delete the <join> and <joinGrp> elements from testPure1 schema using <elementSpec>.
+
+	Update testPure1, step 4: Replace reference to module 'tagdocs' and replace with references to elements <gi>, <att>, and <val>. Add a test to ensure that <tag> is invalid.
+
+	Update testPure1, step 3: Move reference to module 'linking' from middle-of-pack to up where all the other simple <moduleRef>s are. This has profound effects on what the output RNG looks like, but should have no effect on what it validates. I have checked against all the XML files in the inputFiles/ directory, and the same number of error messages are issued for each.
+
+	Update testPure1, step 2: Change order of <moduleRef> declarations so that those that are simple (i.e., have no attrs) come first. This has profound effects on what the output RNG looks like, but should have no effect on what it validates. I have checked against all the XML files in the imnputFiles/ directory, and the same number of error messages are issued for each. Also use phrase-level encoding in the <desc>.
+
+	Update testPure1, step 1: Just a change to the order of and whitespace between the attributes and namespace declarations on the outermost <TEI> element. Nothing else. Should cause no appreciable change at all. But requires different expected results, as the order is propegated through to the output.
+
+	Revert testPure1: Revert the testPure1.odd file in preparation for re-introducing each change I made one at a time.
+
+2018-11-23  martindholmes  <[email protected]>
+
+	Removing -Dregenerate support, since it's risky and not the ideal approach.
+
+2018-11-23  Syd Bauman  <[email protected]>
+
+	Add more tests of ODD constructs
+
+2018-11-20  Syd Bauman  <[email protected]>
+
+	Updated AUTHORS: Added those who are listed in ChangeLog or have > 25 commits to the AUTHORS list.
+
+2018-11-19  Syd Bauman  <[email protected]>
+
+	Fix #334: During today's Stylesheets group conference call we fixed ticket #334 by adding a template that simply ingores <cb>, <gb>, and <milestone> elements. It is possible, if not outright likely, that in the future we will have to do better than just ignoring them, but at least now FO can be produced w/o this error forcing the build to fail.
+
+2018-11-19  James Cummings  <[email protected]>
+
+	Merge pull request #339 from cyocum/html-tei-ex
+	Make editorial expansions appear as italic in HTML
+
+2018-11-17  martindholmes  <[email protected]>
+
+	Adding test for valList in content models.
+
+2018-11-12  martindholmes  <[email protected]>
+
+	A bit more progress with Pure ODD testing.
+
+2018-11-11  martindholmes  <[email protected]>
+
+	Tweak to wording.
+
+	More work on Pure ODD test.
+
+	A bit more work on Pure ODD test.
+
+2018-11-02  martindholmes  <[email protected]>
+
+	Adding valid instance file for testPure1.
+
+	Adding beginnings of an invalid instance file for testPure1.
+
+2018-10-29  Peter Stadler  <[email protected]>
+
+	update expected results
+
+2018-10-27  Chris Yocum  <[email protected]>
+
+	Fixed expected html in test
+
+	Upated html expected results to match html ex output
+
+	Changed to use CSS rather than HTML element
+
+2018-10-26  Syd Bauman  <[email protected]>
+
+	Merge in @martindholmes changes, I think
+
+	With @martindholmes change name of validation output file so that Jenkins console doesn't parse it as an error
+
+2018-10-26  martindholmes  <[email protected]>
+
+	Changing nomenclature to avoid using the word 'error', which may trigger Jenkins log parser build failures.
+
+	@sydb and @martindholmes working on setting up for more ODD processing.
+
+2018-10-26  Syd Bauman  <[email protected]>
+
+	Merge branch 'dev' of https://github.com/TEIC/Stylesheets into dev
+
+	Change informational message for readability.
+
+2018-10-26  martindholmes  <[email protected]>
+
+	Fixes to expected results due to nomenclature and naming convention changes.
+
+2018-10-26  Syd Bauman  <[email protected]>
+
+	Merge branch 'dev' of https://github.com/TEIC/Stylesheets into dev
+
+2018-10-26  martindholmes  <[email protected]>
+
+	@sydb and @martindholmes changing nomenclature for clarity.
+
+2018-10-26  Syd Bauman  <[email protected]>
+
+	@martindholmes and I changing nomenclature for clarity
+
+2018-10-26  martindholmes  <[email protected]>
+
+	Tweak to readme.
+
+2018-10-23  Chris Yocum  <[email protected]>
+
+	Fixed last missing i tag
+
+2018-10-22  Chris Yocum  <[email protected]>
+
+	Updated html tests to use the new italics for editorial expansions
+
+2018-10-21  Chris Yocum  <[email protected]>
+
+	Make editorial expansions appear as italic in HTML
+	Make editorial expansions appear as italic in HTML. This allows
+	editorial interventions to be visible when a transcription is
+	translated into HTML.  This is common formating for printed critical
+	editions.
+
+2018-09-28  Syd Bauman  <[email protected]>
+
+	Update version to 7.47.0 as we just released 7.46.0
+
+	auto-updated changelog
+
+	Prepare for release
+
+2018-09-26  Syd Bauman  <[email protected]>
+
+	More work on #250
 2018-09-26  Syd Bauman  <[email protected]>
 
 	More work on #250

Test/expected-results/test-complex.html

@@ -768,7 +768,7 @@ <h2>
               <span class="headingNumber">15. </span>
               <span class="head">Choice, sic, corr, reg, orig</span>
             </h2>
-            <p>voro þav sammędd syskin in heilagri <br/> olafr konvngr ok fyrnefnd <span class="corr">[gvnnhilldr]</span>.</p>
+            <p>v<span class="ex">oro</span> þav sam<span class="ex">m</span>ędd syskin in hei<span class="ex">lagr</span>i <br/> ol<span class="ex">afr</span> k<span class="ex">onvng</span>r <span class="ex">ok</span> fyrnefnd <span class="corr">[gvn<span class="ex">n</span>hilldr]</span>.</p>
             <p>Lastly, That, upon his solemn oath to observe all the above articles, the said man-mountain shall have a daily allowance of meat and drink sufficient for the support of <span class="corr">[1728]</span> of our subjects, with free access to our royal person, and other marks of our <span class="reg">favor</span>.</p>
           </div>
           <div class="teidiv0" id="index.xml-body.1_div.16">

Test/expected-results/test-ota.html

@@ -767,7 +767,7 @@ <h2>
       <h2>
         <span class="head">Choice, sic, corr, reg, orig</span>
       </h2>
-      <p>voro &#xFE;av samm&#x119;dd syskin in heilagri <br/> olafr konvngr ok fyrnefnd <span class="corr">[gvnnhilldr]</span>.</p>
+      <p>v<span class="ex">oro</span> &#xFE;av sam<span class="ex">m</span>&#x119;dd syskin in hei<span class="ex">lagr</span>i <br/> ol<span class="ex">afr</span> k<span class="ex">onvng</span>r <span class="ex">ok</span> fyrnefnd <span class="corr">[gvn<span class="ex">n</span>hilldr]</span>.</p>
       <p>Lastly, That, upon his solemn oath to observe all the above articles, the said man-mountain shall have a daily allowance of meat and drink sufficient for the support of <span class="corr">[1728]</span> of our subjects, with free access to our royal person, and other marks of our <span class="reg">favor</span>.</p>
     </div>
     <div class="teidiv0" id="index.xml-body.1_div.16">

Test/expected-results/test.html

@@ -752,7 +752,7 @@ <h2>
         <span class="headingNumber">15. </span>
         <span class="head">Choice, sic, corr, reg, orig</span>
       </h2>
-      <p>voro þav sammędd syskin in heilagri <br/> olafr konvngr ok fyrnefnd <span class="corr">[gvnnhilldr]</span>.</p>
+      <p>v<span class="ex">oro</span> þav sam<span class="ex">m</span>ędd syskin in hei<span class="ex">lagr</span>i <br/> ol<span class="ex">afr</span> k<span class="ex">onvng</span>r <span class="ex">ok</span> fyrnefnd <span class="corr">[gvn<span class="ex">n</span>hilldr]</span>.</p>
       <p>Lastly, That, upon his solemn oath to observe all the above articles, the said man-mountain shall have a daily allowance of meat and drink sufficient for the support of <span class="corr">[1728]</span> of our subjects, with free access to our royal person, and other marks of our <span class="reg">favor</span>.</p>
     </div>
     <div class="teidiv0" id="index.xml-body.1_div.16">

Test/expected-results/test.html5

@@ -785,7 +785,7 @@
             <span class="head">Choice, sic, corr, reg, orig</span>
           </h1>
         </header>
-        <p>voro þav sammędd syskin in heilagri <br/> olafr konvngr ok fyrnefnd <span class="corr">[gvnnhilldr]</span>.</p>
+        <p>v<span class="ex">oro</span> þav sam<span class="ex">m</span>ędd syskin in hei<span class="ex">lagr</span>i <br/> ol<span class="ex">afr</span> k<span class="ex">onvng</span>r <span class="ex">ok</span> fyrnefnd <span class="corr">[gvn<span class="ex">n</span>hilldr]</span>.</p>
         <p>Lastly, That, upon his solemn oath to observe all the above articles, the said man-mountain shall have a daily allowance of meat and drink sufficient for the support of <span class="corr">[1728]</span> of our subjects, with free access to our royal person, and other marks of our <span class="reg">favor</span>.</p>
       </section>
       <section class="teidiv0" id="index.xml-body.1_div.16">

Test/expected-results/test31.html

@@ -1047,6 +1047,9 @@
 span.damage{
 border-bottom:1px dashed red;
 }
+span.ex {
+font-style: italic;
+}
 /* app crit */
 div.appcrit{
 border-top:solid black 1pt;
@@ -1111,25 +1114,25 @@ <h1 class="maintitle">Test for rendering sourceDoc</h1>
             <img src="img_0479.jpg" alt="" class="graphic"/>
           </div>
           <div class="line">
-            <span class="orig">Now <span class="damage">in the</span> name of ou<span class="damage">r</span>e l<span class="damage">or</span>d ihesus</span>
+            <span class="orig">Now <span class="damage">in the</span> name of ou<span class="damage">r</span>e l<span class="damage">or</span>d ih<span class="ex">esu</span>s</span>
           </div>
           <div class="line">
-            <span class="orig">of right hole herte &amp; in our <span class="damage">b</span>est entent</span>
+            <span class="orig">of right hole herte <span class="ex">&amp;</span> in our <span class="damage">b</span>est entent</span>
           </div>
           <div class="line">
-            <span class="orig">ou<span class="damage">r</span> <span class="damage">l</span>yf remembryng froward and vicious</span>
+            <span class="orig">ou<span class="damage">r</span> <span class="damage">l</span>yf reme<span class="ex">m</span>bryng froward and vicious</span>
           </div>
           <div class="line">
             <span class="orig">a<span class="damage">y</span> co<span class="damage">n</span>t<span class="damage">ra</span>rye to the commandement</span>
           </div>
           <div class="line">
-            <span class="orig">of crist ihes<span class="damage">u</span> now wy<span class="damage">th</span> aviseme<span class="damage">nt</span></span>
+            <span class="orig">of crist i<span class="ex">hes</span><span class="damage">u</span> now wy<span class="damage">th</span> aviseme<span class="damage">nt</span></span>
           </div>
           <div class="line">
             <span class="orig">the l<span class="damage">ord beseching of mercy and pete</span></span>
           </div>
           <div class="line">
-            <span class="orig">our you<span class="damage">th</span>e &amp; a<span class="damage">g</span>e tha<span class="damage">t</span> we have <span class="damage">myspent</span></span>
+            <span class="orig">our you<span class="damage">th</span>e <span class="ex">&amp;</span> a<span class="damage">g</span>e tha<span class="damage">t</span> we have <span class="damage">myspent</span></span>
           </div>
           <div class="line">
             <span class="orig">wyt<span class="damage">h this woord mercy knelyng o</span>n o<span class="damage">ur</span> kne</span>

Test/expected-results/test32.html

@@ -1047,6 +1047,9 @@
 span.damage{
 border-bottom:1px dashed red;
 }
+span.ex {
+font-style: italic;
+}
 /* app crit */
 div.appcrit{
 border-top:solid black 1pt;

Test/expected-results/test33.json

@@ -56,8 +56,10 @@
         [  ],
         "classes" : 
         { "model" : 
-          [  ],
+          [ "model.quoteLike" ],
           "atts" : 
+          [  ],
+          "unknown" : 
           [  ] },
         "attributes" : 
         [