See <http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/2281/display/redirect?page=changes>

Changes:

[martindholmes] Stage one for issue #296: new parameter added to tei:makeDescription,

[martindholmes] Stage two for issue #296: new param set to false at line 246 of

[martindholmes] Fix for spacing issue in bug #296. Will need a Jenkins build to confirm

[martindholmes] Fix for expected results in my Test2 set following bugfix for #296.

[martindholmes] Fixing expected results for changes arising out of bug #296.

------------------------------------------
Started by an SCM change
Building in workspace <http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/>
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://github.com/TEIC/Stylesheets.git # timeout=10
Fetching upstream changes from https://github.com/TEIC/Stylesheets.git
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/TEIC/Stylesheets.git +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/dev^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/dev^{commit} # timeout=10
Checking out Revision 219dd4aa5c558e2ef90b3adf0e18567d0885390a (refs/remotes/origin/dev)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 219dd4aa5c558e2ef90b3adf0e18567d0885390a
Commit message: "Merge pull request #307 from TEIC/bug296makeDescription"
 > git rev-list --no-walk d25fe11d497ceac19bdbb87476cc747c13f8fcb2 # timeout=10
 > git tag -a -f -m Jenkins Build #2281 jenkins-Stylesheets-dev-2281 # timeout=10
[workspace] $ /bin/bash -xe /tmp/jenkins1546793101432588534.sh
+ make clean test deb dist
(for i in css/*; do rm -f `basename $i`;done)
echo "" > test~
rm -f profile1.html profile2.html profile.xml
find . -name "*~"  | xargs rm
rm -f tei-xsl-*.zip	
rm -rf tei-xsl_*
rm -f Documentation/stylebear Documentation/style.xml Documentation/customize.xml Documentation/teixsl.html Documentation/index.xml
rm -rf release dist
(cd Test; make clean)
make[1]: Entering directory `<http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/Test'>
(cd ..; for i in css/*; do rm -f `basename $i`;done)
rm -f  test*.odd.rnc test*epub test*pdf test*rdf test*text test*.xml.docx test*.xml.odt test*.tex test*.fo *.html *.xhtml *~ dummy* test.html test3.html test4.html *aux *vrb *out *log *nav *ent *snm *toc *.end *.1 *.2 test.xsd test.zip test*.dtd test-indexes.xml test37.xml test38.xml test39.xml test40.xml
rm -f test*.rnc test*.json test*.rnc test*.combined.odd test*listing* test*.tei test*.rng test*.html5 test*.processedodd *.isosch
rm -f oddbyexample.* index*div*html
rm -f testdrama.compiled.xml
rm -f test5.odt test7.xml test18.xml test19.xml test-index.xml test7.zip test11.xml test9.docx test9.odt content.xml.odt.listing content.xml.odt test.xml.docx.core test7.docx
rm -f A54031.xml dcr.result test-rtf2tei.xml test29.xml dcr.tmp xml.tmp
rm -f xml.result
rm -rf charts/ embeddings/ media/ _rels/ \[Content_Types\].xml
rm -rf temp-dir-for-ant Pictures OEBPS META-INF mimetype files
rm -f test.xlsx.xml *.result.tex *.result.pdf _slidelogo.png
rm -f content.xml
rm -f cocoatest*.xml
make[1]: Leaving directory `<http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/Test'>
rm -rf tei-p5-xsl_*
rm -rf tei-p5-xsl2_*
(cd debian-tei-xsl/debian;  rm -rf tei-xsl)
rm -f teioo.jar
rm -rf docx/ImageInfo/bin
rm -f names.xml licensekey.txt runDoc.sh
(for i in sciencejournal/*.html; do rm -f sciencejournal/`basename $i`;done)
(for i in sciencejournal/*.xml; do rm -f sciencejournal/`basename $i`;done)
BUILD Copy main XSL files
test -d release/xsl/xml/tei/stylesheet || mkdir -p release/xsl/xml/tei/stylesheet/
for i in  bibtex cocoa common csv docx dtd docbook epub epub3 fo html wordpress markdown html5 json latex latex nlm odd odds odt p4 pdf profiles/default rdf relaxng rnc schematron simple slides tbx tcp tite tools txt html xsd xlsx pdf verbatimxml ; do \
		tar cf - $i | (cd release/xsl/xml/tei/stylesheet; tar xf - ); \
	done
java -jar lib/saxon9he.jar -it:main tools/getnames.xsl > names.xml
BUILD Copy common files and documentation
test -d release/xslcommon/xml/tei/stylesheet || mkdir -p release/xslcommon/xml/tei/stylesheet
cp names.xml catalog.xml VERSION css/*.css i18n.xml release/xslcommon/xml/tei/stylesheet
sh ./tools/mydch debian-tei-xsl/debian/changelog
BUILD Run tests
(cd Test; make)
make[1]: Entering directory `<http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/Test'>
../bin/teitorelaxng --odd test.odd test.rng
WARNING: No localsource set. Will get a copy from http://www.tei-c.org/Vault/P5/.
Convert test.odd to <http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/Test/test.rng> (tei to relaxng) using profile default
     [echo] Do ODD expand processing (schema ) 
Warning: XML resolver not found; external catalogs will be ignored

BUILD SUCCESSFUL
Total time: 16 seconds
perl -i -p -e 's/generated from ODD source.*//' test.rng
xmllint --format test.rng > temp; mv temp test.rng
perl -i -pe 'BEGIN{undef $/;} s/<!--\n ?Schema[^>]+>//smg' test.rng
if [ 0 -ne 1 ]; \
		then diff  test.rng expected-results/test.rng; fi
209c209
< Suggested values include: 1] cm (centimetres) ; 2] mm (millimetres) ; 3] in (inches) ; 4] lines; 5] chars (characters) </a:documentation>
---
> Suggested values include: 1] cm(centimetres) ; 2] mm(millimetres) ; 3] in(inches) ; 4] lines; 5] chars(characters) </a:documentation>
980c980
< Suggested values include: 1] m (metre) ; 2] kg (kilogram) ; 3] s (second) ; 4] Hz (hertz) ; 5] Pa (pascal) ; 6] Ω (ohm) ; 7] L (litre) ; 8] t (tonne) ; 9] ha (hectare) ; 10] Å (ångström) ; 11] mL (millilitre) ; 12] cm (centimetre) ; 13] dB (decibel) ; 14] kbit (kilobit) ; 15] Kibit (kibibit) ; 16] kB (kilobyte) ; 17] KiB (kibibyte) ; 18] MB (megabyte) ; 19] MiB (mebibyte) </a:documentation>
---
> Suggested values include: 1] m(metre) ; 2] kg(kilogram) ; 3] s(second) ; 4] Hz(hertz) ; 5] Pa(pascal) ; 6] Ω(ohm) ; 7] L(litre) ; 8] t(tonne) ; 9] ha(hectare) ; 10] Å(ångström) ; 11] mL(millilitre) ; 12] cm(centimetre) ; 13] dB(decibel) ; 14] kbit(kilobit) ; 15] Kibit(kibibit) ; 16] kB(kilobyte) ; 17] KiB(kibibyte) ; 18] MB(megabyte) ; 19] MiB(mebibyte) </a:documentation>
3227c3227
< Suggested values include: 1] full (full form) ; 2] pref (prefix) ; 3] suff (suffix) ; 4] inf (infix) ; 5] part (partial) </a:documentation>
---
> Suggested values include: 1] full(full form) ; 2] pref(prefix) ; 3] suff(suffix) ; 4] inf(infix) ; 5] part(partial) </a:documentation>
4506c4506
< Sample values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4] short; 5] desc (descriptive) </a:documentation>
---
> Sample values include: 1] main; 2] sub(subordinate) ; 3] alt(alternate) ; 4] short; 5] desc(descriptive) </a:documentation>
5850c5850
< Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military Grid Reference System) ; 3] OSGB36 (ordnance survey great britain) ; 4] ED50 (European Datum coordinate system) </a:documentation>
---
> Suggested values include: 1] WGS84(World Geodetic System) ; 2] MGRS(Military Grid Reference System) ; 3] OSGB36(ordnance survey great britain) ; 4] ED50(European Datum coordinate system) </a:documentation>
6564c6564
< Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineNum (line number) ; 5] sig (signature) ; 6] catch (catchword) </a:documentation>
---
> Sample values include: 1] header; 2] footer; 3] pageNum(page number) ; 4] lineNum(line number) ; 5] sig(signature) ; 6] catch(catchword) </a:documentation>
8356c8356
< Suggested values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4] short; 5] desc (descriptive) </a:documentation>
---
> Suggested values include: 1] main; 2] sub(subordinate) ; 3] alt(alternate) ; 4] short; 5] desc(descriptive) </a:documentation>
8741c8741
< Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s (seconds) ; 5] ms (milliseconds) </a:documentation>
---
> Suggested values include: 1] d(days) ; 2] h(hours) ; 3] min(minutes) ; 4] s(seconds) ; 5] ms(milliseconds) </a:documentation>
8800c8800
< Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s (seconds) ; 5] ms (milliseconds) </a:documentation>
---
> Suggested values include: 1] d(days) ; 2] h(hours) ; 3] min(minutes) ; 4] s(seconds) ; 5] ms(milliseconds) </a:documentation>
8986c8986
< Suggested values include: 1] main; 2] hom (homograph) ; 3] xref (cross reference) ; 4] affix; 5] abbr (abbreviation) ; 6] supplemental; 7] foreign</a:documentation>
---
> Suggested values include: 1] main; 2] hom(homograph) ; 3] xref(cross reference) ; 4] affix; 5] abbr(abbreviation) ; 6] supplemental; 7] foreign</a:documentation>
9532c9532
< Sample values include: 1] pos (part of speech) ; 2] gen (gender) ; 3] num (number) ; 4] animate; 5] proper</a:documentation>
---
> Sample values include: 1] pos(part of speech) ; 2] gen(gender) ; 3] num(number) ; 4] animate; 5] proper</a:documentation>
9709c9709
< Sample values include: 1] geo (geographic) ; 2] time; 3] dom (domain) ; 4] register; 5] style; 6] plev (preference level) ; 7] lang (language) ; 8] gram (grammatical) ; 9] syn (synonym) ; 10] hyper (hypernym) ; 11] colloc (collocation) ; 12] comp (complement) ; 13] obj (object) ; 14] subj (subject) ; 15] verb; 16] hint</a:documentation>
---
> Sample values include: 1] geo(geographic) ; 2] time; 3] dom(domain) ; 4] register; 5] style; 6] plev(preference level) ; 7] lang(language) ; 8] gram(grammatical) ; 9] syn(synonym) ; 10] hyper(hypernym) ; 11] colloc(collocation) ; 12] comp(complement) ; 13] obj(object) ; 14] subj(subject) ; 15] verb; 16] hint</a:documentation>
9754c9754
< Sample values include: 1] syn (synonym) ; 2] etym (etymological) ; 3] cf (compare or consult) ; 4] illus (illustration) </a:documentation>
---
> Sample values include: 1] syn(synonym) ; 2] etym(etymological) ; 3] cf(compare or consult) ; 4] illus(illustration) </a:documentation>
9799c9799
< Sample values include: 1] cap (capital) ; 2] noHyph (no hyphen) </a:documentation>
---
> Sample values include: 1] cap(capital) ; 2] noHyph(no hyphen) </a:documentation>
9824c9824
< Sample values include: 1] pt (past tense) ; 2] pp (past participle) ; 3] prp (present participle) ; 4] f (feminine) ; 5] pl (plural) </a:documentation>
---
> Sample values include: 1] pt(past tense) ; 2] pp(past participle) ; 3] prp(present participle) ; 4] f(feminine) ; 5] pl(plural) </a:documentation>
make[1]: *** [test.rng] Error 1
make[1]: Leaving directory `<http://teijenkins.hcmc.uvic.ca/job/Stylesheets-dev/ws/Test'>
make: *** [test] Error 2
Build step 'Execute shell' marked build as failure
Archiving artifacts