asciidoctor-gb 0.1.5 → 0.2.2

data/lib/asciidoctor/gb/isostandard.rng

@@ -17,20 +17,6 @@
         <value>Latn</value>
       </element>
     </define>
-    <!-- draft into isodoc? To replace version/version? -->
-    <define name="version">
-      <element name="version">
-        <optional>
-          <ref name="edition"/>
-        </optional>
-        <optional>
-          <ref name="revision-date"/>
-        </optional>
-        <optional>
-          <ref name="draft"/>
-        </optional>
-      </element>
-    </define>
     <!-- add type to docidentifier in isodoc? -->
     <define name="docidentifier">
       <element name="docidentifier">
@@ -48,6 +34,9 @@
     <define name="organization">
       <element name="organization">
         <ref name="orgname"/>
+        <optional>
+          <ref name="abbreviation"/>
+        </optional>
         <optional>
           <ref name="uri"/>
         </optional>
@@ -84,7 +73,7 @@
         <ref name="formattedref"/>
       </choice>
       <optional>
-        <ref name="source"/>
+        <ref name="bsource"/>
       </optional>
       <zeroOrMore>
         <ref name="docidentifier"/>
@@ -101,9 +90,6 @@
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="partof"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="language"/>
       </zeroOrMore>
@@ -125,6 +111,9 @@
       <optional>
         <ref name="editorialgroup"/>
       </optional>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
     </define>
     <define name="BibData">
       <optional>
@@ -139,7 +128,7 @@
         <ref name="formattedref"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <ref name="bsource"/>
       </optional>
       <zeroOrMore>
         <ref name="docidentifier"/>
@@ -156,9 +145,6 @@
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="partof"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="language"/>
       </zeroOrMore>
@@ -176,18 +162,12 @@
         <ref name="docrelation"/>
       </zeroOrMore>
       <ref name="editorialgroup"/>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
     </define>
-    <define name="bdate">
-      <element name="date">
-        <attribute name="type">
-          <choice>
-            <value>published</value>
-            <value>accessed</value>
-            <value>created</value>
-            <value>activated</value>
-            <value>obsoleted</value>
-          </choice>
-        </attribute>
+    <define name="bfrom">
+      <element name="from">
         <choice>
           <data type="gYear"/>
           <data type="date"/>
@@ -213,6 +193,9 @@
             <optional>
               <ref name="substage"/>
             </optional>
+            <optional>
+              <ref name="iteration"/>
+            </optional>
           </group>
         </choice>
       </element>
@@ -236,15 +219,44 @@
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
-        <ref name="terms"/>
+        <choice>
+          <ref name="term-clause"/>
+          <ref name="terms"/>
+        </choice>
         <optional>
-          <ref name="symbols-abbrevs"/>
+          <ref name="definitions"/>
         </optional>
         <oneOrMore>
           <ref name="clause"/>
         </oneOrMore>
       </element>
     </define>
+    <define name="Basic-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <group>
+        <oneOrMore>
+          <ref name="BasicBlock"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </group>
+    </define>
     <define name="Content-Section">
       <optional>
         <attribute name="id">
@@ -276,6 +288,42 @@
         </oneOrMore>
       </choice>
     </define>
+    <define name="Clause-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <choice>
+        <group>
+          <oneOrMore>
+            <ref name="BasicBlock"/>
+          </oneOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <oneOrMore>
+          <ref name="clause-subsection"/>
+        </oneOrMore>
+      </choice>
+    </define>
     <define name="references">
       <element name="references">
         <optional>
@@ -302,8 +350,8 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="symbols-abbrevs">
-      <element name="symbols-abbrevs">
+    <define name="definitions">
+      <element name="definitions">
         <optional>
           <attribute name="id">
             <data type="ID"/>
@@ -338,9 +386,6 @@
         <optional>
           <ref name="section-title"/>
         </optional>
-        <zeroOrMore>
-          <ref name="termdocsource"/>
-        </zeroOrMore>
         <choice>
           <oneOrMore>
             <ref name="term"/>
@@ -350,7 +395,7 @@
               <ref name="terms"/>
             </zeroOrMore>
             <optional>
-              <ref name="symbols-abbrevs"/>
+              <ref name="definitions"/>
             </optional>
           </group>
         </choice>
@@ -432,6 +477,9 @@
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="annex-appendix"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="figure">
@@ -594,42 +642,6 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="Clause-Section">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="clause-subsection"/>
-        </oneOrMore>
-      </choice>
-    </define>
   </include>
   <!-- end overrides -->
   <!--
@@ -642,18 +654,34 @@
       <optional>
         <ref name="version"/>
       </optional>
-      <ref name="foreword"/>
-      <optional>
-        <ref name="introduction"/>
-      </optional>
+      <zeroOrMore>
+        <ref name="termdocsource"/>
+      </zeroOrMore>
+      <ref name="preface"/>
       <oneOrMore>
         <ref name="sections"/>
       </oneOrMore>
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
+      <ref name="bibliography"/>
+    </element>
+  </define>
+  <define name="preface">
+    <element name="preface">
+      <ref name="foreword"/>
+      <optional>
+        <ref name="introduction"/>
+      </optional>
+    </element>
+  </define>
+  <define name="bibliography">
+    <element name="bibliography">
       <oneOrMore>
-        <ref name="references"/>
+        <choice>
+          <ref name="references"/>
+          <ref name="reference-clause"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -683,7 +711,7 @@
   </define>
   <define name="foreword">
     <element name="foreword">
-      <ref name="Content-Section"/>
+      <ref name="Basic-Section"/>
     </element>
   </define>
   <define name="introduction">
@@ -691,11 +719,6 @@
       <ref name="Content-Section"/>
     </element>
   </define>
-  <define name="draft">
-    <element name="draft">
-      <text/>
-    </element>
-  </define>
   <define name="stage">
     <element name="stage">
       <choice>
@@ -725,6 +748,11 @@
       </choice>
     </element>
   </define>
+  <define name="iteration">
+    <element name="iteration">
+      <data type="int"/>
+    </element>
+  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>
@@ -792,7 +820,7 @@
     </element>
   </define>
   <define name="clause-hanging-paragraph-with-footnote">
-    <element name="subsection">
+    <element name="clause">
       <optional>
         <attribute name="id">
           <data type="ID"/>
@@ -838,8 +866,87 @@
     </element>
   </define>
   <define name="termdocsource">
-    <element name="source">
-      <ref name="erefType"/>
+    <element name="termdocsource">
+      <ref name="CitationType"/>
+    </element>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <text/>
+    </element>
+  </define>
+  <define name="term-clause">
+    <element name="clause">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <choice>
+        <oneOrMore>
+          <ref name="term-clause"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <choice>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+          </choice>
+        </zeroOrMore>
+      </choice>
+    </element>
+  </define>
+  <define name="reference-clause">
+    <element name="clause">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <choice>
+        <oneOrMore>
+          <ref name="reference-clause"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="references"/>
+        </zeroOrMore>
+      </choice>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/gb/section_input.rb

@@ -22,7 +22,7 @@ module Asciidoctor
         a = { id: Asciidoctor::ISO::Utils::anchor_or_uuid(node) }
         noko do |xml|
           case sectiontype(node)
-          when "引言" then
+          when "引言", "introduction" then
             if node.level == 1 then introduction_parse(a, xml, node)
             else
               clause_parse(a, xml, node)
@@ -54,50 +54,6 @@ module Asciidoctor
       end
 
 =begin
-      def preamble(node)
-        noko do |xml|
-          xml.foreword do |xml_abstract|
-            xml_abstract.title { |t| t << "前言" }
-            content = node.content
-            xml_abstract << content
-            text = Asciidoctor::ISO::Utils::flatten_rawtext(content).join("\n")
-            foreword_style(node, text)
-          end
-        end.join("\n")
-      end
-=end
-
-      def normref_cleanup(xmldoc)
-        q = "//references[title = '规范性引用文件']"
-        r = xmldoc.at(q)
-        if r.nil?
-          warn "You have no normative references!"
-          return
-        end
-        r.elements.each do |n|
-          n.remove unless ["title", "bibitem"].include? n.name
-        end
-      end
-
-      def normref_validate(root)
-        f = root.at("//references[title = '规范性引用文件']") ||
-          return
-        f.at("./references") &&
-          warn("ISO style: normative references contains subsections")
-      end
-
-      def symbols_validate(root)
-        f = root.at("//clause[title = '符号、代号和缩略语']")
-        return if f.nil?
-        f.elements do |e|
-          unless e.name == "dl"
-            warn "ISO style: Symbols and Abbreviations can only contain "\
-              "a definition list"
-            return
-          end
-        end
-      end
-
       # spec of permissible section sequence
       SEQ = [
         { msg: "Initial section must be (content) 前言",
@@ -111,16 +67,22 @@ module Asciidoctor
         "术语和定义",
         val: [
           { tag: "terms", title: "术语和定义" },
+          { tag: "clause", title: "术语和定义" },
+          { tag: "clause",
+            title: "术语、定义、符号、代号和缩略语" },
           { tag: "terms",
             title: "术语、定义、符号、代号和缩略语" }
         ] },
       ]
 
+      SECTIONS_XPATH =
+        "//foreword | //introduction | //sections/terms | .//annex | "\
+        "//definitions | //sections/clause | //references[not(parent::clause)] | "\
+        "//clause[descendant::references][not(parent::clause)]".freeze
+
       def sections_sequence_validate(root)
-        f = root.xpath(" //foreword | //introduction | //sections/terms | "\
-                       "//sections/clause | ./references | "\
-                       "./annex")
-        names = f.map { |s| { tag: s.name, title: s.at("./title").text } }
+        f = root.xpath(SECTIONS_XPATH)
+        names = f.map { |s| { tag: s.name, title: s&.at("./title")&.text } }
         names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val]) || return
         n = names[0]
         names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) || return
@@ -129,31 +91,33 @@ module Asciidoctor
         end
         names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) || return
         n = names.shift
-        if n == { tag: "clause", title: "符号、代号和缩略语" }
-          n = names.shift
+        if n == { tag: "definitions", title: nil }
+          n = names.shift || return
         end
         unless n
           warn "ISO style: Document must contain at least one clause"
           return
         end
         n[:tag] == "clause" or
-          warn "ISO style: Document must contain at least one clause"
+          warn "ISO style: Document must contain clause after Terms and Definitions"
         (n == { tag: "clause", title: "范围" }) &&
           warn("ISO style: 范围 must occur before 术语和定义")
         n = names.shift or return
         while n[:tag] == "clause"
           (n[:title] == "范围") &&
             warn("ISO style: 范围 must occur before 术语和定义")
-          n[:title] == "符号、代号和缩略语" and
-            warn "ISO style: 符号、代号和缩略语 must occur "\
-            "right after Terms and Definitions"
           n = names.shift or return
         end
         unless n[:tag] == "annex" or n[:tag] == "references"
           warn "ISO style: Only annexes and references can follow clauses"
         end
         while n[:tag] == "annex"
-          n = names.shift or return
+          n = names.shift
+          if n.nil?
+            warn("ISO style: Document must include (references) "\
+                 "Normative References")
+            return
+          end
         end
         n == { tag: "references", title: "规范性引用文件" } or
           warn "ISO style: Document must include (references) 规范性引用文件"
@@ -163,6 +127,7 @@ module Asciidoctor
         names.empty? or
           warn "ISO style: There are sections after the final Bibliography"
       end
+=end
     end
   end
 end