Re: [tei-council] [TEI] Sydb xenodata (#1)

That looks a bit terrifying. Are you sure you’re working off the right copy of the repo?

From where was this mail sent, and to where is it going? I'm CCing

No, I'm not at all sure; did I do it wrong? I'm was trying to request that someone merge syd-xenodata into master. But the commit messages below make it look like it's the right branch. They list everything that happened before it was branched off, too, but it does list up to the latest change in sydb-xenodata, which was to predeclare macro.anyXML. the council list in case it winds up in a bit bucket.

...

On Oct 1, 2015, at 17:37 , Syd Bauman wrote:

As there have been no complaints, I think the branch is now ready to be merged into master.

You can view, comment on, or merge this pull request online at:

https://github.com/TEIC/TEI/pull/1 https://github.com/TEIC/TEI/pull/1 Commit Summary

This commit was manufactured by cvs2svn to create branch 'P5'. Creating new branch in which to effect re-organizaztion of source files Prev commit altered paths in mergeLang, not sure if needed or not. This veresion of re-org does not work, as PER are not recognized in SYSTEM literals Switch re-org branch to XInclude fix bad link element not in TEI namespace Remove external-entities from re-org, as we're no longer using In re-org, move ChangeLogs to ReleaseNotes/ and odd2htmlp5.xsl.model to Utilities/ Fixing re-org makefiles; I think all works now except fasicules Have fascicules working at least somewhat make symlinks relative not absolute make symlink relative merged changes from trunk to re-org/; improvements to Makefile fixed commit of wrong chap files Fix move of FASFILE to main dir by allowing make to continue if pdflatex fails (which it always does, for me) Merge trunk 1436:1492 into re-org/ delete no longer needed branches; re-arrange tags/ directory Create a branch of P5 for fixing https://sourceforge.net/p/tei/bugs/751/ Proposed fix for https://sourceforge.net/p/tei/bugs/751/: 1) new model.eventLike has only 2 members, <event> and <listEvent> a member of model.personPart and model.orgPart and directly part of the content model of <place> 2) model.persEventLike removed; ND prose tweaked to match - reference to it from content of <person> changed to model.eventLike 3) model.placeEventLike removed - reference to it from content of <place> changed to model.eventLike 4) <birth> and <death> added to model.personPart Merge in changes from trunk for past few days (i.e., r13220 through r13230). Merge in changes from trunk for today, so far (i.e., r13231 through r13236). Creating a branch for the creation of <xenoData> first crack at xenoData Use real <egXML> (albeit with valid=false) instead of <eg> for <xenoData>; get it to validate by adding the namespaces used in the examples ot p5.nvdl Merged in changes from trunk -r r13237:HEAD = 13243 Merged in changes from trunk -r r13238:HEAD = 13244 merge -r 13243:HEAD (= 13251) from trunk (=https://svn.code.sf.net/p/tei/code/trunk/P5) merge -r 13244:HEAD (= 13251) from trunk (=https://svn.code.sf.net/p/tei/code/trunk/P5) svn merge -r 13251:HEAD (= 13270) https://svn.code.sf.net/p/tei/code/trunk/P5 ./; required a hand-fix to conflict in HD, which turned out to be only a whitespace difference svn merge -r 13251:HEAD (= 13270) https://svn.code.sf.net/p/tei/code/trunk/P5 ./ svn merge -r 13270:HEAD (= r13284) https://svn.code.sf.net/p/tei/code/trunk/P5 ./ svn merge -r 13270:HEAD (= r13285) https://svn.code.sf.net/p/tei/code/trunk/P5 ./ per recommendations of Martin Holmes and Lou Burnard on Council list: put <specDesc> back into prose section (don't know why it wasn't there); shorten long line in long example; improved prose a bit. 1) add xenoData to att.declarable 2) (temporarily?) add @describes to xenoData 3) add MODS namespace to p5.nvdl 4) add SVN properties to source files as needed Tweaked remarks back on 07-08, but forgot to check in until now. Change @describes to @type, at least for now, based on conversation of today on TEI Council mailing list. Add xenoData to list of att.declarable elements (which is not generated at build time, and probably should be). Add Martin's Colonial Despatches <xenoData> example from the ticket (SF FR 453); allow for well-balanced (as opposed to well-formed) content of <xenoData> -- i.e., anyXML+ instead of anyXML, thus removing the only-1-child restriction; fix SVN property which should have been "svn:keywords" not "svnkeywords". Minor improvements to the xenoData tagdoc; also add the new OAI namespace to p5.nvdl and p5valid.nvdl, including adding the namespaces I recently added to p5.nvdl to p5valid.nvdl merged trunk into this branch with 'time svn merge -r 13286:HEAD https://svn.code.sf.net/p/tei/code/trunk/P5 ./', with the current HEAD being r13314. Had to handle two conflicts (by 'svn revert FILE') as model.persEventLike.xml and model.placeEventLike.xml had been deleted in trunk. Preparing to switch xenodata work into a branch off master. Removing the for-bug-751 folder. Merging xenodata changes. 1) Allow <xenoData> to have non-XML (i.e., plain text) content. 2) Give <xenoData> a @scope attr for source vs transcription Umm ... I think this is a merge of current master into current xenodata, with 3 minor conflicts fixed. Tweak wording, change examples; change datatype to current ODD (instead of Pure ODD) Fix boo-boo in datatype of xenoData/@source tweak language discussion to *finally* match changes made to BCP (which Martin made to CH back in 2011-08) and updated some of the resource URLs Predaclare macro.anyXML so that <xenoData> can refer to it safely File Changes

D P5/Exemplars/tei_lite_fr.nvdl https://github.com/TEIC/TEI/pull/1/files#diff-0 (71) M P5/Makefile https://github.com/TEIC/TEI/pull/1/files#diff-1 (2) M P5/Source/Guidelines/en/CC-LanguageCorpora.xml https://github.com/TEIC/TEI/pull/1/files#diff-2 (1) M P5/Source/Guidelines/en/HD-Header.xml https://github.com/TEIC/TEI/pull/1/files#diff-3 (770) M P5/Source/Guidelines/en/TD-DocumentationElements.xml https://github.com/TEIC/TEI/pull/1/files#diff-4 (3) M P5/Source/Specs/att.global.rendition.xml https://github.com/TEIC/TEI/pull/1/files#diff-5 (4) M P5/Source/Specs/data.language.xml https://github.com/TEIC/TEI/pull/1/files#diff-6 (6) M P5/Source/Specs/dataNode.xml https://github.com/TEIC/TEI/pull/1/files#diff-7 (4) M P5/Source/Specs/dataRef.xml https://github.com/TEIC/TEI/pull/1/files#diff-8 (4) M P5/Source/Specs/dataSpec.xml https://github.com/TEIC/TEI/pull/1/files#diff-9 (4) M P5/Source/Specs/fvLib.xml https://github.com/TEIC/TEI/pull/1/files#diff-10 (4) M P5/Source/Specs/interleave.xml https://github.com/TEIC/TEI/pull/1/files#diff-11 (4) M P5/Source/Specs/langUsage.xml https://github.com/TEIC/TEI/pull/1/files#diff-12 (7) M P5/Source/Specs/macro.anyXML.xml https://github.com/TEIC/TEI/pull/1/files#diff-13 (2) M P5/Source/Specs/model.correspActionPart.xml https://github.com/TEIC/TEI/pull/1/files#diff-14 (4) M P5/Source/Specs/model.correspContextPart.xml https://github.com/TEIC/TEI/pull/1/files#diff-15 (4) M P5/Source/Specs/model.correspDescPart.xml https://github.com/TEIC/TEI/pull/1/files#diff-16 (4) A P5/Source/Specs/model.persEventLike.xml https://github.com/TEIC/TEI/pull/1/files#diff-17 (46) A P5/Source/Specs/model.placeEventLike.xml https://github.com/TEIC/TEI/pull/1/files#diff-18 (21) A P5/Source/Specs/xenoData.xml https://github.com/TEIC/TEI/pull/1/files#diff-19 (240) M P5/p5.nvdl https://github.com/TEIC/TEI/pull/1/files#diff-20 (42) M P5/p5valid.nvdl https://github.com/TEIC/TEI/pull/1/files#diff-21 (29) Patch Links:

https://github.com/TEIC/TEI/pull/1.patch https://github.com/TEIC/TEI/pull/1.patch https://github.com/TEIC/TEI/pull/1.diff https://github.com/TEIC/TEI/pull/1.diff —