XML DTDs: fix binary elements not allowing a "format" attribute

This commit is contained in:
Moritz Bunkus 2022-10-08 18:58:30 +02:00
parent 10cfd90c34
commit cf4b583532
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,4 @@
<!ENTITY % format "(ascii|base64|hex)">
<!ELEMENT Chapters (EditionEntry*)>
<!ELEMENT EditionEntry (
EditionUID?,
@ -59,13 +60,16 @@
<!ELEMENT ChapterSkipType (#PCDATA)>
<!ELEMENT ChapterSegmentUID (#PCDATA)>
<!ATTLIST ChapterSegmentUID format %format; "ascii">
<!ELEMENT ChapterSegmentEditionUID (#PCDATA)>
<!ELEMENT ChapterPhysicalEquiv (#PCDATA)>
<!ELEMENT ChapterProcessCodecID (#PCDATA)>
<!ELEMENT ChapterProcessPrivate (#PCDATA)>
<!ATTLIST ChapterProcessPrivate format %format; "ascii">
<!ELEMENT ChapterProcessTime (#PCDATA)>
<!ELEMENT ChapterProcessData (#PCDATA)>
<!ATTLIST ChapterProcessData format %format; "ascii">
<!ELEMENT ChapterString (#PCDATA)>
<!ELEMENT ChapterLanguage (#PCDATA)>

View File

@ -1,3 +1,4 @@
<!ENTITY % format "(ascii|base64|hex)">
<!ELEMENT Info (
SegmentUID?,
NextSegmentUID?,
@ -9,9 +10,13 @@
ChapterTranslate*)>
<!ELEMENT SegmentUID (#PCDATA)>
<!ATTLIST SegmentUID format %format; "ascii">
<!ELEMENT NextSegmentUID (#PCDATA)>
<!ATTLIST NextSegmentUID format %format; "ascii">
<!ELEMENT PreviousSegmentUID (#PCDATA)>
<!ATTLIST PreviousSegmentUID format %format; "ascii">
<!ELEMENT SegmentFamily (#PCDATA)>
<!ATTLIST SegmentFamily format %format; "ascii">
<!ELEMENT SegmentFilename (#PCDATA)>
<!ELEMENT NextSegmentFilename (#PCDATA)>
<!ELEMENT PreviousSegmentFilename (#PCDATA)>

View File

@ -1,3 +1,4 @@
<!ENTITY % format "(ascii|base64|hex)">
<!ELEMENT Tags (Tag*)>
<!ELEMENT Tag (
Targets,
@ -29,5 +30,6 @@
<!ELEMENT Name (#PCDATA)>
<!ELEMENT String (#PCDATA)>
<!ELEMENT Binary (#PCDATA)>
<!ATTLIST Binary format %format; "ascii">
<!ELEMENT TagLanguage (#PCDATA)>
<!ELEMENT DefaultLanguage (#PCDATA)>