From b72a3f330d7c32623de98a2f891194650eeededf Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Tue, 22 Jul 2025 21:56:19 -0400 Subject: [PATCH 1/6] Use Pure ODD, rather than Schematron, to constrain content of content model elements --- P5/Source/Specs/alternate.xml | 19 +++++++++---------- P5/Source/Specs/interleave.xml | 9 +-------- P5/Source/Specs/sequence.xml | 12 ++---------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml index 3ea1baf232..29f202d028 100644 --- a/P5/Source/Specs/alternate.xml +++ b/P5/Source/Specs/alternate.xml @@ -10,18 +10,17 @@ - - - + + + + + + + + + - - - - The alternate element must have at least two child elements - - - diff --git a/P5/Source/Specs/interleave.xml b/P5/Source/Specs/interleave.xml index 9b4a19ebca..560e9d2eb4 100644 --- a/P5/Source/Specs/interleave.xml +++ b/P5/Source/Specs/interleave.xml @@ -9,15 +9,8 @@ - + - - - - The interleave element must have at least two child elements - - - diff --git a/P5/Source/Specs/sequence.xml b/P5/Source/Specs/sequence.xml index 3be9a76267..5942b4a08d 100644 --- a/P5/Source/Specs/sequence.xml +++ b/P5/Source/Specs/sequence.xml @@ -9,20 +9,12 @@ - + - - - - The sequence element must have at least two child elements - - - The preserveOrder on sequence has been deprecated. The interleave element should be used to denote unordered constructs. - if false, indicates that - component elements of a sequence may occur in any order. + if false, indicates that component elements of a sequence may occur in any order. From 95045c22cbb7c8cdaea4fa2c80bb44d270398365 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Tue, 22 Jul 2025 23:05:57 -0400 Subject: [PATCH 2/6] =?UTF-8?q?Ooops=20=E2=80=94=20forgot=20that=20alterna?= =?UTF-8?q?te=20element=20must=20have=202+=20children?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P5/Source/Specs/alternate.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml index 29f202d028..bc96d69d33 100644 --- a/P5/Source/Specs/alternate.xml +++ b/P5/Source/Specs/alternate.xml @@ -12,12 +12,18 @@ - - + + + + + + + + - - + + From dd9790496caac499b8a791b92584f1a7f41982f9 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Mon, 28 Jul 2025 14:31:24 +0100 Subject: [PATCH 3/6] Added byline to content model --- P5/Source/Specs/closer.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/P5/Source/Specs/closer.xml b/P5/Source/Specs/closer.xml index 28ab845448..ffcb6721ca 100644 --- a/P5/Source/Specs/closer.xml +++ b/P5/Source/Specs/closer.xml @@ -5,7 +5,7 @@ closer cierre formule finale - groups together salutations, datelines, and similar phrases appearing as a final group at + groups together salutations, datelines, bylines, and similar phrases appearing as a final group at the end of a division, especially of a letter. 구역의 마지막, 특히 편지의 종료부에 발문으로 나타나는 인사말, 날짜 표시란, 그리고 유사 구를 합하여 모아 놓는다. @@ -31,6 +31,7 @@ aparecen en la última sección al final de una división, especialmente en una + From 7e965b42d7b10c6c7350264368342e069eb8b9a7 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Mon, 28 Jul 2025 16:09:16 +0100 Subject: [PATCH 4/6] Add divBottomPart to classes in byline --- P5/Source/Specs/byline.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/P5/Source/Specs/byline.xml b/P5/Source/Specs/byline.xml index 4864cc13fc..ef1783d1e0 100644 --- a/P5/Source/Specs/byline.xml +++ b/P5/Source/Specs/byline.xml @@ -17,6 +17,7 @@ on its title page or at the head or end of the work. + From 861bd2ebe2586eecfe4a429fd91516bee310a0f6 Mon Sep 17 00:00:00 2001 From: Patricia O Connor Date: Tue, 29 Jul 2025 17:32:30 +0100 Subject: [PATCH 5/6] Remove div.modelBottomPart from byline list of classes --- P5/Source/Specs/byline.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/P5/Source/Specs/byline.xml b/P5/Source/Specs/byline.xml index ef1783d1e0..4864cc13fc 100644 --- a/P5/Source/Specs/byline.xml +++ b/P5/Source/Specs/byline.xml @@ -17,7 +17,6 @@ on its title page or at the head or end of the work. - From c99135b4fa06e010d988224265f908ff90e6756f Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Sun, 10 Aug 2025 13:37:17 -0400 Subject: [PATCH 6/6] Minor changes that should not effect what is considered valid or invalid, but make the content model more readable by humans. --- P5/Source/Specs/alternate.xml | 70 ++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml index bc96d69d33..86933fc913 100644 --- a/P5/Source/Specs/alternate.xml +++ b/P5/Source/Specs/alternate.xml @@ -10,20 +10,70 @@ + + - - - - - - - - + + + - - + + + + + + + + +