asciidoctor-iso 0.7.2 → 0.7.3

data/lib/asciidoctor/iso/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">
@@ -128,9 +114,9 @@
       <optional>
         <ref name="editorialgroup"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="ics"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="BibData">
       <optional>
@@ -182,9 +168,9 @@
         <ref name="docrelation"/>
       </zeroOrMore>
       <ref name="editorialgroup"/>
-      <optional>
+      <zeroOrMore>
         <ref name="ics"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="bfrom">
       <element name="from">
@@ -213,6 +199,9 @@
             <optional>
               <ref name="substage"/>
             </optional>
+            <optional>
+              <ref name="iteration"/>
+            </optional>
           </group>
         </choice>
       </element>
@@ -236,9 +225,12 @@
     <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"/>
@@ -276,6 +268,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 +330,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 +366,6 @@
         <optional>
           <ref name="section-title"/>
         </optional>
-        <zeroOrMore>
-          <ref name="termdocsource"/>
-        </zeroOrMore>
         <choice>
           <oneOrMore>
             <ref name="term"/>
@@ -350,7 +375,7 @@
               <ref name="terms"/>
             </zeroOrMore>
             <optional>
-              <ref name="symbols-abbrevs"/>
+              <ref name="definitions"/>
             </optional>
           </group>
         </choice>
@@ -594,42 +619,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,6 +631,9 @@
       <optional>
         <ref name="version"/>
       </optional>
+      <zeroOrMore>
+        <ref name="termdocsource"/>
+      </zeroOrMore>
       <ref name="foreword"/>
       <optional>
         <ref name="introduction"/>
@@ -653,7 +645,10 @@
         <ref name="annex"/>
       </zeroOrMore>
       <oneOrMore>
-        <ref name="references"/>
+        <choice>
+          <ref name="references"/>
+          <ref name="reference-clause"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -691,11 +686,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 +715,11 @@
       </choice>
     </element>
   </define>
+  <define name="iteration">
+    <element name="iteration">
+      <data type="int"/>
+    </element>
+  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>
@@ -838,7 +833,7 @@
     </element>
   </define>
   <define name="termdocsource">
-    <element name="source">
+    <element name="termdocsource">
       <ref name="erefType"/>
     </element>
   </define>
@@ -847,4 +842,73 @@
       <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>
 </grammar>

data/lib/asciidoctor/iso/lists.rb

@@ -77,8 +77,8 @@ module Asciidoctor
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           t.docidentifier "#{m[:code]}:All Parts"
-          m[:year] and t.date **{ type: "published" } do |d|
-            set_date_range(d, m[:year])
+          if m.named_captures.has_key?("year")
+            t.date **{ type: "published" } { |d| set_date_range(d, m[:year]) }
           end
           iso_publisher(t, m[:code])
         end

data/lib/asciidoctor/iso/section.rb

@@ -98,7 +98,7 @@ module Asciidoctor
       end
 
       def symbols_parse(attrs, xml, node)
-        xml.symbols_abbrevs **attr_code(attrs) do |xml_section|
+        xml.definitions **attr_code(attrs) do |xml_section|
           xml_section << node.content
         end
       end
@@ -128,7 +128,7 @@ module Asciidoctor
         xml.terms **attr_code(attrs) do |section|
           section.title { |t| t << term_def_title(toplevel, node) }
           (s = node.attr("source")) && s.split(/,/).each do |s1|
-            section.source(nil, **attr_code(target: s1, type: "inline"))
+            section.termdocsource(nil, **attr_code(target: s1, type: "inline"))
           end
           section << node.content
         end

data/lib/asciidoctor/iso/validate_section.rb

@@ -32,7 +32,7 @@ module Asciidoctor
         "only contain a definition list".freeze
 
       def symbols_validate(root)
-        f = root.xpath("//symbols-abbrevs")
+        f = root.xpath("//definitions")
         f.empty? && return
         (f.size == 1) || warn(ONE_SYMBOLS_WARNING)
         f.first.elements.each do |e|
@@ -74,18 +74,23 @@ module Asciidoctor
             "Terms and Definitions",
             val: [
               { tag: "terms", title: "Terms and Definitions" },
+              { tag: "clause", title: "Terms and Definitions" },
               {
                 tag: "terms",
                 title: "Terms, Definitions, Symbols and Abbreviated Terms",
               },
+              {
+                tag: "clause",
+                title: "Terms, Definitions, Symbols and Abbreviated Terms",
+              },
             ],
           },
       ].freeze
 
       SECTIONS_XPATH =
-        " //foreword | //introduction | //sections/terms | "\
-        "//symbols-abbrevs | "\
-        "//sections/clause | ./references | ./annex".freeze
+        "//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(SECTIONS_XPATH)
@@ -98,7 +103,7 @@ module Asciidoctor
         end
         names = seqcheck(names, SEQ[3][:msg], SEQ[3][:val]) || return
         n = names.shift
-        if n == { tag: "symbols-abbrevs", title: nil }
+        if n == { tag: "definitions", title: nil }
           n = names.shift || return
         end
         unless n

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.7.2".freeze
+    VERSION = "0.7.3".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -36,7 +36,6 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.exist?("test.doc")).to be true
   end
 
-
   it "processes default metadata" do
     expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
       = Document title
@@ -62,6 +61,7 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-year: 2001
       :docstage: 10
       :docsubstage: 20
+      :iteration: 3
       :language: en
       :title-intro-en: Introduction
       :title-main-en: Main Title
@@ -69,6 +69,7 @@ RSpec.describe Asciidoctor::ISO do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
+      :library-ics: 1,2,3
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -105,6 +106,7 @@ RSpec.describe Asciidoctor::ISO do
          <status>
            <stage>10</stage>
            <substage>20</substage>
+           <iteration>3</iteration>
          </status>
          <copyright>
            <from>2001</from>
@@ -121,6 +123,9 @@ RSpec.describe Asciidoctor::ISO do
            <workgroup number="3" type="C">WG</workgroup>
            <secretariat>SECRETARIAT</secretariat>
          </editorialgroup>
+         <ics>1</ics>
+         <ics>2</ics>
+         <ics>3</ics>
        </bibdata><version>
          <edition>2</edition>
          <revision-date>2000-01-01</revision-date>
@@ -219,4 +224,67 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
+  it "uses default fonts" do
+    system "rm -f test.html"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+    INPUT
+    html = File.read("test.html")
+    expect(html).to match(%r[p\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html).to match(%r[p\.Biblio[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+  end
+
+  it "uses Chinese fonts" do
+    system "rm -f test.html"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+      :script: Hans
+    INPUT
+    html = File.read("test.html")
+    expect(html).to match(%r[p\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html).to match(%r[p\.Biblio[^{]+\{[^{]+font-family: "SimSun", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+  end
+
+  it "uses specified fonts" do
+    system "rm -f test.html"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+      :script: Hans
+      :body-font: Zapf Chancery
+      :header-font: Comic Sans
+      :monospace-font: Andale Mono
+    INPUT
+    html = File.read("test.html")
+    expect(html).to match(%r[p\.Sourcecode[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html).to match(%r[p\.Biblio[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
+  end
+
+  it "strips MS-specific CSS" do
+    system "rm -f test.html"
+    system "rm -f test.doc"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+    INPUT
+    word = File.read("test.doc", encoding: "utf-8")
+    html = File.read("test.html", encoding: "utf-8")
+    expect(word).to match(%r[mso-style-name: "Intro Title";]m)
+    expect(html).not_to match(%r[mso-style-name: "Intro Title";]m)
+  end
+
+
 end