asciidoctor-iso 0.7.3 → 0.7.4

data/lib/asciidoctor/iso/front.rb

@@ -115,23 +115,30 @@ module Asciidoctor
         metadata_ics(node, xml)
       end
 
+      def asciidoc_sub(x)
+        return nil if x.nil?
+        d = Asciidoctor::Document.new(x.lines.entries, {header_footer: false})
+        b = d.parse.blocks.first
+        b.apply_subs(b.source)
+      end
+
       def title_intro(node, t, lang, at)
         return unless node.attr("title-intro-#{lang}")
         t.title_intro(**attr_code(at)) do |t1|
-          t1 << node.attr("title-intro-#{lang}")
+          t1 << asciidoc_sub(node.attr("title-intro-#{lang}"))
         end
       end
 
       def title_main(node, t, lang, at)
         t.title_main **attr_code(at) do |t1|
-          t1 << node.attr("title-main-#{lang}")
+          t1 << asciidoc_sub(node.attr("title-main-#{lang}"))
         end
       end
 
       def title_part(node, t, lang, at)
         return unless node.attr("title-part-#{lang}")
         t.title_part(**attr_code(at)) do |t1|
-          t1 << node.attr("title-part-#{lang}")
+          t1 << asciidoc_sub(node.attr("title-part-#{lang}"))
         end
       end
 

data/lib/asciidoctor/iso/html/isodoc.scss

@@ -47,6 +47,7 @@ p.FigureTitle
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
+        font-weight:bold;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
@@ -64,11 +65,12 @@ p.TableTitle
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
 	font-size:11.0pt;
+	font-weight:bold;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
-p.Note, div.Note, li.Note
+p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -663,3 +665,15 @@ div.example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
+p.example, li.example, div.example, td.example, td.example p
+	{	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:none;
+	font-size:10.0pt;
+	font-family:$bodyfont;}
+span.note_label, span.example_label, td.example_label, td.note_label
+{
+font-size: 10.0pt;
+font-family:$bodyfont;
+}
+

data/lib/asciidoctor/iso/html/word_iso_titlepage.html

@@ -1,5 +1,5 @@
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ agency }}&nbsp;{{ docnumber }}:{{ docnumber }}(E) {{ draftinfo }}</span></b><b
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"

data/lib/asciidoctor/iso/html/wordstyle.scss

@@ -1126,3 +1126,10 @@ br.section
 br.pagebreak
     {page-break-before:always;
     mso-special-character:line-break;}
+ol
+	{margin-bottom:0cm;
+	margin-left:18pt;}
+ul
+	{margin-bottom:0cm;
+	margin-left:18pt;}
+

data/lib/asciidoctor/iso/isodoc.rng

@@ -44,30 +44,6 @@
       <ref name="BibData"/>
     </element>
   </define>
-  <define name="docrelation">
-    <element name="relation">
-      <attribute name="type">
-        <choice>
-          <value>parent</value>
-          <value>child</value>
-          <value>obsoletes</value>
-          <value>updates</value>
-          <value>complements</value>
-          <value>derivedFrom</value>
-          <value>adoptedFrom</value>
-          <value>equivalent</value>
-          <value>identical</value>
-          <value>nonequivalent</value>
-        </choice>
-      </attribute>
-      <element name="bibitem">
-        <ref name="BibliographicItem"/>
-      </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
-    </element>
-  </define>
   <define name="status">
     <element name="status">
       <ref name="FormattedString"/>
@@ -137,10 +113,26 @@
     </element>
   </define>
   <define name="content-subsection">
-    <element name="subsection">
+    <element name="clause">
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="Basic-Section">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="section-title"/>
+    </optional>
+    <oneOrMore>
+      <ref name="BasicBlock"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="note"/>
+    </zeroOrMore>
+  </define>
   <define name="Content-Section">
     <optional>
       <attribute name="id">
@@ -193,7 +185,7 @@
     </choice>
   </define>
   <define name="clause-subsection">
-    <element name="subsection">
+    <element name="clause">
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -443,7 +435,7 @@
       <attribute name="reviewer"/>
       <optional>
         <attribute name="date">
-          <data type="date"/>
+          <data type="dateTime"/>
         </attribute>
       </optional>
       <attribute name="from">
@@ -1023,9 +1015,6 @@
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
-    <zeroOrMore>
-      <ref name="partof"/>
-    </zeroOrMore>
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>

data/lib/asciidoctor/iso/isostandard.rng

@@ -73,7 +73,7 @@
         <ref name="formattedref"/>
       </choice>
       <optional>
-        <ref name="source"/>
+        <ref name="bsource"/>
       </optional>
       <zeroOrMore>
         <ref name="docidentifier"/>
@@ -90,9 +90,6 @@
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="partof"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="language"/>
       </zeroOrMore>
@@ -131,7 +128,7 @@
         <ref name="formattedref"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <ref name="bsource"/>
       </optional>
       <zeroOrMore>
         <ref name="docidentifier"/>
@@ -148,9 +145,6 @@
       <zeroOrMore>
         <ref name="biblionote"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="partof"/>
-      </zeroOrMore>
       <zeroOrMore>
         <ref name="language"/>
       </zeroOrMore>
@@ -237,6 +231,32 @@
         </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">
@@ -457,6 +477,9 @@
         <zeroOrMore>
           <ref name="clause-hanging-paragraph-with-footnote"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="annex-appendix"/>
+        </zeroOrMore>
       </element>
     </define>
     <define name="figure">
@@ -634,16 +657,26 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
-      <ref name="foreword"/>
-      <optional>
-        <ref name="introduction"/>
-      </optional>
+      <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>
         <choice>
           <ref name="references"/>
@@ -678,7 +711,7 @@
   </define>
   <define name="foreword">
     <element name="foreword">
-      <ref name="Content-Section"/>
+      <ref name="Basic-Section"/>
     </element>
   </define>
   <define name="introduction">
@@ -787,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"/>
@@ -911,4 +944,9 @@
       </choice>
     </element>
   </define>
+  <define name="annex-appendix">
+    <element name="appendix">
+      <ref name="Clause-Section"/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/iso/section.rb

@@ -49,6 +49,8 @@ module Asciidoctor
             elsif @biblio then bibliography_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
+            elsif node.option? "appendix"
+              appendix_parse(a, xml, node)
             else
               clause_parse(a, xml, node)
             end
@@ -71,7 +73,7 @@ module Asciidoctor
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         set_obligation(attrs, node)
-        sect = node.level == 1 ? "clause" : "subsection"
+        sect = node.level == 1 ? "clause" : "clause"
         xml.send sect, **attr_code(attrs) do |xml_section|
           xml_section.title { |n| n << node.title } unless node.title.nil?
           xml_section << node.content
@@ -87,6 +89,15 @@ module Asciidoctor
         end
       end
 
+      def appendix_parse(attrs, xml, node)
+        attrs["inline-header".to_sym] = node.option? "inline-header"
+        set_obligation(attrs, node)
+        xml.appendix **attr_code(attrs) do |xml_section|
+          xml_section.title { |name| name << node.title }
+          xml_section << node.content
+        end
+      end
+
       def bibliography_parse(attrs, xml, node)
         @biblio = true
         xml.references **attr_code(attrs) do |xml_section|

data/lib/asciidoctor/iso/utils.rb

@@ -113,6 +113,9 @@ module Asciidoctor
           out.p { |p| p << node.content }
         end
       end
+
+      SUBCLAUSE_XPATH = "//clause[ancestor::clause or ancestor::annex or "\
+        "ancestor::introduction]".freeze
     end
   end
 end

data/lib/asciidoctor/iso/validate.rb

@@ -64,7 +64,7 @@ module Asciidoctor
       def title_first_level_validate(root)
         root.xpath(SECTIONS_XPATH).each do |s|
           title = s&.at("./title")&.text || s.name
-          s.xpath("./subsection | ./terms").each do |ss|
+          s.xpath("./clause | ./terms | ./references").each do |ss|
             subtitle = ss.at("./title")
             !subtitle.nil? && !subtitle&.text&.empty? ||
               warn("#{title}: each first-level subclause must have a title")
@@ -76,11 +76,11 @@ module Asciidoctor
     notitle = false
     withtitle = false
     xpath.each do |s|
-      title_all_siblings(s.xpath("./subsection | ./terms"),
+      title_all_siblings(s.xpath("./clause | ./terms | ./references"),
                          s&.at("./title")&.text || s["id"])
       subtitle = s.at("./title")
       notitle = notitle || (!subtitle || subtitle.text.empty?)
-      withtitle = withtitle || !subtitle&.text&.empty?
+      withtitle = withtitle || (subtitle && !subtitle.text.empty?)
     end
     notitle && withtitle &&
       warn("#{label}: all subclauses must have a title, or none")
@@ -97,12 +97,12 @@ module Asciidoctor
   end
 
   def onlychild_clause_validate(root)
-    root.xpath("//subsection").each do |c|
-      next unless c.xpath("../subsection").size == 1
+    root.xpath(Utils::SUBCLAUSE_XPATH).each do |c|
+      next unless c.xpath("../clause").size == 1
       title = c.at("./title")
       location = c["id"] || c.text[0..60] + "..."
       location += ":#{title.text}" if c["id"] && !title.nil?
-      warn "ISO style: #{location}: subsection is only child"
+      warn "ISO style: #{location}: subclause is only child"
     end
   end
 

data/lib/asciidoctor/iso/validate_section.rb

@@ -15,14 +15,14 @@ module Asciidoctor
 
       def foreword_validate(root)
         f = root.at("//foreword") || return
-        s = f.at("./subsection")
-        warn "ISO style: foreword contains subsections" unless s.nil?
+        s = f.at("./clause")
+        warn "ISO style: foreword contains subclauses" unless s.nil?
       end
 
       def normref_validate(root)
         f = root.at("//references[title = 'Normative References']") || return
-        f.at("./references") &&
-          warn("ISO style: normative references contains subsections")
+        f.at("./references | ./clause") &&
+          warn("ISO style: normative references contains subclauses")
       end
 
       ONE_SYMBOLS_WARNING = "ISO style: only one Symbols and Abbreviated "\
@@ -143,13 +143,13 @@ module Asciidoctor
       end
 
       NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze
-      SCOPE_WARN = "Scope contains subsections: should be succint".freeze
+      SCOPE_WARN = "Scope contains subclauses: should be succint".freeze
 
       def section_style(root)
         foreword_style(root.at("//foreword"))
         introduction_style(root.at("//introduction"))
         scope_style(root.at("//clause[title = 'Scope']"))
-        scope = root.at("//clause[title = 'Scope']/subsection")
+        scope = root.at("//clause[title = 'Scope']/clause")
         scope.nil? || style_warning(scope, SCOPE_WARN, nil)
       end
 

data/lib/asciidoctor/iso/validate_style.rb

@@ -7,7 +7,7 @@ module Asciidoctor
     module Validate
       def extract_text(node)
         return "" if node.nil?
-        node1 = node.dup
+        node1 = Nokogiri::XML.fragment(node.to_s)
         node1.xpath("//link | //locality").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }

data/lib/asciidoctor/iso/version.rb

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