Update 'ef' note type to allow 'category' attribute

katherinejensen00 · Oct 10, 2018 · 0670bbc · 0670bbc
1 parent e571edb
commit 0670bbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/schema/usx_2.6.rnc b/schema/usx_2.6.rnc
@@ -522,6 +522,7 @@ Footnote =
     element note {
         attribute style { "f" | "fe" | "ef" },
         attribute caller { text },
+        (attribute category { text })?,
         (FootnoteChar | text )+
     }
 FootnoteChar =
@@ -605,7 +606,7 @@ Reference =
 Sidebar =
     element sidebar {
         attribute style { "esb" },
-        (attribute category { text })*,
+        (attribute category { text })?,
         (Para | Table | Footnote | CrossReference)+
     }
 Figure =

diff --git a/schema/usx_2.6.rng b/schema/usx_2.6.rng
@@ -752,6 +752,9 @@
         </choice>
       </attribute>
       <attribute name="caller"/>
+      <optional>
+        <attribute name="category"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="FootnoteChar"/>
@@ -893,9 +896,9 @@
       <attribute name="style">
         <value>esb</value>
       </attribute>
-      <zeroOrMore>
+      <optional>
         <attribute name="category"/>
-      </zeroOrMore>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="Para"/>