From f8a87eea1f12ca1dc5c7eb3b02be3b464be93b2d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Sun, 9 Oct 2022 12:34:44 +0200
Subject: [PATCH] chapters DTD: fix required ChapterLanguage & ChapLanguageIETF
 missing

---
 NEWS.md                         | 2 ++
 examples/example-chapters-1.xml | 6 +++---
 examples/matroskachapters.dtd   | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index df360ecd0..adfb0319a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,6 +9,8 @@
   DTD.
 * Chapters DTD: corrected the old name `EditionManaged` to
   `EditionFlagOrdered`.
+* Chapters DTD: fixed `ChapLanguageIETF` missing its element declaration &
+  `ChapterLanguage` being required.
 * XML DTDs: fixed elements representing binary data not allowing the `format`
   attribute.
 
diff --git a/examples/example-chapters-1.xml b/examples/example-chapters-1.xml
index 942729949..ec02cb827 100644
--- a/examples/example-chapters-1.xml
+++ b/examples/example-chapters-1.xml
@@ -30,7 +30,7 @@
       <ChapterTimeStart>00:01:00.000</ChapterTimeStart>
       <ChapterDisplay>
         <ChapterString>Act 1</ChapterString>
-        <ChapterLanguage>eng</ChapterLanguage>
+        <ChapLanguageIETF>en</ChapLanguageIETF>
       </ChapterDisplay>
       <ChapterSkipType>0</ChapterSkipType>
     </ChapterAtom>
@@ -38,7 +38,7 @@
       <ChapterTimeStart>00:05:30.000</ChapterTimeStart>
       <ChapterDisplay>
         <ChapterString>Act 2</ChapterString>
-        <ChapterLanguage>eng</ChapterLanguage>
+        <ChapLanguageIETF>en</ChapLanguageIETF>
       </ChapterDisplay>
       <ChapterSkipType>0</ChapterSkipType>
     </ChapterAtom>
@@ -47,7 +47,7 @@
       <ChapterTimeEnd>00:12:55.000</ChapterTimeEnd>
       <ChapterDisplay>
         <ChapterString>Credits</ChapterString>
-        <ChapterLanguage>eng</ChapterLanguage>
+        <ChapLanguageIETF>en</ChapLanguageIETF>
       </ChapterDisplay>
       <ChapterSkipType>2</ChapterSkipType>
     </ChapterAtom>
diff --git a/examples/matroskachapters.dtd b/examples/matroskachapters.dtd
index c9f687d2b..d63511b47 100644
--- a/examples/matroskachapters.dtd
+++ b/examples/matroskachapters.dtd
@@ -39,7 +39,7 @@
 
 <!ELEMENT ChapterDisplay (
           ChapterString,
-          ChapterLanguage+,
+          ChapterLanguage*,
           ChapLanguageIETF*,
           ChapterCountry*)>
 
@@ -73,4 +73,5 @@
 
 <!ELEMENT ChapterString (#PCDATA)>
 <!ELEMENT ChapterLanguage (#PCDATA)>
+<!ELEMENT ChapLanguageIETF (#PCDATA)>
 <!ELEMENT ChapterCountry (#PCDATA)>