lib/asciidoctor/iso/isostandard_diff.rnc in asciidoctor-iso-0.6.0 vs lib/asciidoctor/iso/isostandard_diff.rnc in asciidoctor-iso-0.6.1

@@ -4,27 +4,19 @@
 
 start = iso-standard
 
 iso-standard = 
   element iso-standard {
-    title+,
-    status,
-    creator,
-    language,
-    script,
-    type,
-    id,
-    version?,
-    copyright,
-    sections
+    #title+, status, creator, language, script, type, id, version?, copyright, sections
+    bibdata, version?, sections+
   }
 
 language =
   element language { ( "en" | "fr" ) }
 
 script =
-  element script { "latn" }
+  element script { "Latn" }
 
 # draft into isodoc? To replace version/version?
 version =
   element version {
     edition?,
@@ -32,48 +24,51 @@
     draft?
   }
 
 draft = element draft {text}
 
-copyright = 
-  element copyright {
-    from, owner
-}
+# TODO to docidentifier
+#id =
+  #element id {
+    #documentnumber,
+    #tc-documentnumber?
+  #}
 
-owner = 
-  element owner {
-    owner-affiliation  
+# add type to docidentifier in isodoc?
+docidentifier =
+  element docidentifier {
+    ( text | documentnumber | tc-documentnumber )
 }
 
-owner-affiliation = element affiliation { "ISO" }
+# TODO to orgname
+#creator =
+  #element creator { 
+    #attribute role { text },
+    #technical-committee,
+    #subcommittee?,
+    #workgroup?,
+    #secretariat?
+  #}
 
-id =
-  element id {
-    documentnumber,
-    tc-documentnumber?
-  }
+organization = 
+  element organization {
+    orgname, uri?, org-identifier*, contact*,
+    technical-committee?, subcommittee?, workgroup?, secretariat?  
+}
 
-creator =
-  element creator { 
-    attribute role { text },
-    technical-committee,
-    subcommittee?,
-    workgroup?,
-    secretariat?
-  }
+# Do not constrain in XML: add to validation
+# type =
+  # element type {
+     # ( "international-standard" | "technical-specification" | 
+       # "technical-report" | "publicly-available-specification" | 
+        # "international-workshop-agreement" | "guide" )
+  # }
 
-type =
-  element type {
-     ( "international-standard" | "technical-specification" | 
-       "technical-report" | "publicly-available-specification" | 
-        "international-workshop-agreement" | "guide" )
-  }
-
 status =
   element status {
-     stage,
-     substage?
+    FormattedString |
+     ( stage, substage? )
   }
 
 stage = 
   element stage {
     ("00" | "10" | "20" | "30" | "40" | "50" | "60" | "90" | "95" )
@@ -114,14 +109,14 @@
   }
 
 secretariat =
   element secretariat { text }
 
-title = 
+btitle = 
   element title { 
-    attribute language { text }, 
-    title-intro?, title-main, title-part? 
+     text | 
+    ( title-intro?, title-main, title-part? )
 }
 
 title-intro =
   element title-intro { text }
 
@@ -276,20 +271,9 @@
     section-title?,
     (
       BasicBlock+ |
        clause-subsection+
     )
-
-
-BibliographicItem =
-     attribute id { xsd:ID },
-     attribute type { "article" | "book" | "booklet" | "conference" | "manual" |
-                      "proceedings" | "presentation" | "thesis" | "techreport" |
-                      "standard" | "unpublished" }?,
-    (bname | formatted), source?, publishdate?, docidentifier*, accesseddate?, creator*,
-    publisher*, edition?,
-    biblionote*, partof*, creationdate?, language*, script*, abstract?
-
 
 # }