asciidoctor-iso 0.7.0 → 0.7.1

data/lib/asciidoctor/iso/converter.rb

@@ -41,7 +41,6 @@ module Asciidoctor
         outfilesuffix ".xml"
       end
 
-      # alias_method :pass, :content
       alias_method :embedded, :content
       alias_method :verse, :quote
       alias_method :audio, :skip

data/lib/asciidoctor/iso/front.rb

@@ -34,11 +34,22 @@ module Asciidoctor
                       type: node.attr("#{compname}-type"))
       end
 
-      def metadata_author(_node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "author" }
-          c.organization do |a|
-            a.name "ISO"
+      def organization(org, orgname)
+        if ["ISO",
+            "International Organization for Standardization"].include? orgname
+          org.name "International Organization for Standardization"
+          org.abbreviation "ISO"
+        else
+          org.name orgname
+        end
+      end
+
+      def metadata_author(node, xml)
+        publishers = node.attr("publisher") || "ISO"
+        publishers.split(/,[ ]?/).each do |p|
+          xml.contributor do |c|
+            c.role **{ type: "author" }
+            c.organization { |a| organization(a, p) }
           end
         end
       end
@@ -48,20 +59,18 @@ module Asciidoctor
         publishers.split(/,[ ]?/).each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
-            c.organization do |a|
-              a.name p
-            end
+            c.organization { |a| organization(a, p) }
           end
         end
       end
 
       def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name "ISO"
+        publishers = node.attr("publisher") || "ISO"
+        publishers.split(/,[ ]?/).each do |p|
+          xml.copyright do |c|
+            c.from (node.attr("copyright-year") || Date.today.year)
+            c.owner do |owner|
+              owner.organization { |o| organization(o, p) }
             end
           end
         end

data/lib/asciidoctor/iso/html/html_iso_intro.html

@@ -35,39 +35,3 @@ at the address below or ISO’s member body in the country of the requester.
 
 <div class="rule"></div>
 
-<script type="text/javascript"
-  src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js">
-</script>
-
-<script>
-// http://tutorials.jenkov.com/jquery/generating-table-of-contents.html
-$(document).ready(function() {
-  $("#toc-list").empty();
-
-  var prevH2Item = null;
-  var prevH2List = null;
-
-  var index = 0;
-  $("h1, h2").each(function() {
-
-    if ($(this).hasClass("toc-contents")) {
-      return;
-    }
-    //insert an anchor to jump to, from the TOC link.
-    var anchor = "<a name='" + index + "'></a>";
-    $(this).before(anchor);
-
-    var li     = "<li><a href='#" + index + "'>" + $(this).text() + "</a></li>";
-
-    if ($(this).is("h1") ){
-      prevH2List = $("<ul></ul>");
-      prevH2Item = $(li);
-      prevH2Item.append(prevH2List);
-      prevH2Item.appendTo("#toc-list");
-    } else {
-      prevH2List.append(li);
-    }
-    index++;
-  });
-});
-</script>

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

@@ -431,6 +431,11 @@ p.Formula, li.Formula, div.Formula
 	mso-fareast-font-family:"Cambria";
 	mso-bidi-font-family:"Cambria";
 	mso-ansi-language:EN-GB;}
+table.dl
+	{margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:11.0pt;
+	margin-left:20.15pt;}
 .h2Annex
         {mso-style-priority:2;
         mso-style-unhide:no;

data/lib/asciidoctor/iso/inline.rb

@@ -1,4 +1,5 @@
 require "asciidoctor/extensions"
+require "HTMLEntities"
 
 module Asciidoctor
   module ISO
@@ -65,7 +66,6 @@ module Asciidoctor
           @fn_number += 1
           xml.fn **{ reference: @fn_number } do |fn|
             fn.p { |p| p << node.text }
-            footnote_style(node, node.text)
           end
         end.join("\n")
       end
@@ -85,6 +85,18 @@ module Asciidoctor
         noko { |xml| xml.hr }.join("\n")
       end
 
+      def stem_parse(text, xml)
+        if /&lt;([^:>&]+:)?math(\s+[^>&]+)?&gt; |
+          <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
+          math = HTMLEntities.new.encode(text, :basic, :hexadecimal).
+            gsub(/&amp;gt;/, ">").gsub(/\&amp;lt;/, "<").gsub(/&amp;amp;/, "&").
+            gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&")
+          xml.stem math, **{ type: "MathML" }
+        else
+          xml.stem text, **{ type: "AsciiMath" }
+        end
+      end
+
       def inline_quoted(node)
         noko do |xml|
           case node.type
@@ -95,7 +107,7 @@ module Asciidoctor
           when :single then xml << "'#{node.text}'"
           when :superscript then xml.sup node.text
           when :subscript then xml.sub node.text
-          when :asciimath then xml.stem node.text, **{ type: "AsciiMath" }
+          when :asciimath then stem_parse(node.text, xml)
           else
             case node.role
               # the following three are legacy, they are now handled by macros

data/lib/asciidoctor/iso/isodoc.rng

@@ -746,6 +746,11 @@
       <ref name="bookmark"/>
     </choice>
   </define>
+  <define name="source">
+    <element name="source">
+      <data type="anyURI"/>
+    </element>
+  </define>
   <define name="em">
     <element name="em">
       <text/>
@@ -1168,6 +1173,9 @@
   <define name="organization">
     <element name="organization">
       <ref name="orgname"/>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
       <optional>
         <ref name="uri"/>
       </optional>
@@ -1184,6 +1192,11 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
+  <define name="abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="uri">
     <element name="uri">
       <data type="anyURI"/>
@@ -1470,14 +1483,17 @@
       <ref name="FormattedString"/>
     </element>
   </define>
-  <define name="source">
-    <element name="source">
-      <optional>
-        <attribute name="type"/>
-      </optional>
-      <data type="anyURI"/>
+  <define name="link">
+    <element name="link">
+      <ref name="TypedUri"/>
     </element>
   </define>
+  <define name="TypedUri">
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <data type="anyURI"/>
+  </define>
   <define name="bdate">
     <element name="date">
       <attribute name="type">
@@ -1489,6 +1505,22 @@
           <value>obsoleted</value>
         </choice>
       </attribute>
+      <ref name="bfrom"/>
+      <optional>
+        <ref name="bto"/>
+      </optional>
+    </element>
+  </define>
+  <define name="bfrom">
+    <element name="from">
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
+  <define name="bto">
+    <element name="to">
       <choice>
         <data type="gYear"/>
         <data type="date"/>

data/lib/asciidoctor/iso/isostandard.rng

@@ -48,6 +48,9 @@
     <define name="organization">
       <element name="organization">
         <ref name="orgname"/>
+        <optional>
+          <ref name="abbreviation"/>
+        </optional>
         <optional>
           <ref name="uri"/>
         </optional>
@@ -125,6 +128,9 @@
       <optional>
         <ref name="editorialgroup"/>
       </optional>
+      <optional>
+        <ref name="ics"/>
+      </optional>
     </define>
     <define name="BibData">
       <optional>
@@ -176,18 +182,12 @@
         <ref name="docrelation"/>
       </zeroOrMore>
       <ref name="editorialgroup"/>
+      <optional>
+        <ref name="ics"/>
+      </optional>
     </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"/>
@@ -842,4 +842,9 @@
       <ref name="erefType"/>
     </element>
   </define>
+  <define name="ics">
+    <element name="ics">
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/iso/lists.rb

@@ -4,7 +4,6 @@ module Asciidoctor
     module Lists
       def li(xml_ul, item)
         xml_ul.li do |xml_li|
-          style(item, item.text)
           if item.blocks?
             xml_li.p(**id_attr(item)) { |t| t << item.text }
             xml_li << item.content
@@ -15,8 +14,7 @@ module Asciidoctor
       end
 
       def ulist(node)
-        return reference(node, true) if in_norm_ref
-        return reference(node, false) if in_biblio
+        return reference(node) if in_norm_ref? || in_biblio?
         noko do |xml|
           xml.ul **id_attr(node) do |xml_ul|
             node.items.each do |item|
@@ -27,10 +25,12 @@ module Asciidoctor
       end
 
       def iso_publisher(t, code)
-        t.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |aff|
-            aff.name code.gsub(%r{[/ \t].*$}, "")
+        code.sub(/ .*$/, "").split(/\//).each do |abbrev|
+          t.contributor do |c|
+            c.role **{ type: "publisher" }
+            c.organization do |org|
+              organization(org, abbrev)
+            end
           end
         end
       end
@@ -43,11 +43,20 @@ module Asciidoctor
         { id: m[:anchor], type: "standard" }
       end
 
+      def set_date_range(date, text)
+        matched = /^(?<from>[0-9]+)(-+(?<to>[0-9]+))?$/.match text
+        return unless matched[:from]
+        date.from matched[:from]
+        date.to matched[:to] if matched[:to]
+      end
+
       def isorefmatches(xml, m)
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           t.docidentifier m[:code]
-          t.date(m[:year], type: "published") if m[:year]
+          m[:year] and t.date **{ type: "published" } do |d|
+            set_date_range(d, m[:year])
+          end
           iso_publisher(t, m[:code])
         end
       end
@@ -56,7 +65,9 @@ module Asciidoctor
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           t.docidentifier m[:code]
-          t.date "--", type: "published"
+          t.date **{ type: "published" } do |d|
+            d.from "--"
+          end
           iso_publisher(t, m[:code])
           t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" }
         end
@@ -66,7 +77,9 @@ 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"
-          t.date(m[:year], type: "published") if m[:year]
+          m[:year] and t.date **{ type: "published" } do |d|
+            set_date_range(d, m[:year])
+          end
           iso_publisher(t, m[:code])
         end
       end
@@ -99,7 +112,7 @@ module Asciidoctor
       end
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+)(:(?<year>[0-9]+))?\]</ref>,?\s
+      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+)(:(?<year>[0-9][0-9-]+))?\]</ref>,?\s
       (?<text>.*)$}xm
 
       ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
@@ -107,7 +120,7 @@ module Asciidoctor
       <fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?(?<text>.*)$}xm
 
       ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>[0-9]+))?\s
+      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>[0-9][0-9-]+))?\s
       \(all\sparts\)\]</ref>,?\s
       (?<text>.*)$}xm
 
@@ -115,8 +128,6 @@ module Asciidoctor
       \[(?<code>[^\]]+)\]</ref>,?\s
       (?<text>.*)$}xm
 
-      NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze
-
       def reference1_matches(item)
         matched = ISO_REF.match item
         matched2 = ISO_REF_NO_YEAR.match item
@@ -124,7 +135,7 @@ module Asciidoctor
         [matched, matched2, matched3]
       end
 
-      def reference1(node, item, xml, normative)
+      def reference1(node, item, xml)
         matched, matched2, matched3 = reference1_matches(item)
         if matched3.nil? && matched2.nil? && matched.nil?
           refitem(xml, item, node)
@@ -132,15 +143,12 @@ module Asciidoctor
         elsif !matched2.nil? then isorefmatches2(xml, matched2)
         elsif !matched3.nil? then isorefmatches3(xml, matched3)
         end
-        if matched3.nil? && matched2.nil? && matched.nil? && normative
-          Utils::warning(node, NORM_ISO_WARN, item)
-        end
       end
 
-      def reference(node, normative)
+      def reference(node)
         noko do |xml|
           node.items.each do |item|
-            reference1(node, item.text, xml, normative)
+            reference1(node, item.text, xml)
           end
         end.join("\n")
       end
@@ -164,7 +172,6 @@ module Asciidoctor
 
       def dt(terms, xml_dl)
         terms.each_with_index do |dt, idx|
-          style(dt, dt.text)
           xml_dl.dt { |xml_dt| xml_dt << dt.text }
           if idx < terms.size - 1
             xml_dl.dd
@@ -178,7 +185,6 @@ module Asciidoctor
           return
         end
         xml_dl.dd do |xml_dd|
-          style(dd, dd.text) if dd.text?
           xml_dd.p { |t| t << dd.text } if dd.text?
           xml_dd << dd.content if dd.blocks?
         end
@@ -199,7 +205,6 @@ module Asciidoctor
         noko do |xml|
           node.items.each_with_index do |item, i|
             xml.annotation **attr_code(id: i + 1) do |xml_li|
-              style(item, item.text)
               xml_li.p { |p| p << item.text }
             end
           end

data/lib/asciidoctor/iso/section.rb

@@ -8,15 +8,15 @@ module Asciidoctor
       @term_def = false
       @norm_ref = false
 
-      def in_biblio
+      def in_biblio?
         @biblio
       end
 
-      def in_terms
+      def in_terms?
         @term_def
       end
 
-      def in_norm_ref
+      def in_norm_ref?
         @norm_ref
       end
 
@@ -66,14 +66,11 @@ module Asciidoctor
                              end
       end
 
-      SCOPE_WARN = "Scope contains subsections: should be succint".freeze
-
       # Not testing max depth of sections: Asciidoctor already limits
       # it to 5 levels of nesting
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         set_obligation(attrs, node)
-        style_warning(node, SCOPE_WARN, nil) if @scope
         sect = node.level == 1 ? "clause" : "subsection"
         xml.send sect, **attr_code(attrs) do |xml_section|
           xml_section.title { |n| n << node.title } unless node.title.nil?
@@ -106,8 +103,8 @@ module Asciidoctor
         end
       end
 
+      # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
-        # subclause contains subclauses
         sub = node.find_by(context: :section) { |s| s.level == node.level + 1 }
         sub.empty? || (return term_def_parse(attrs, xml, node, false))
         node.title.casecmp("symbols and abbreviated terms").zero? &&
@@ -151,9 +148,6 @@ module Asciidoctor
           xml_section.title = "Introduction"
           content = node.content
           xml_section << content
-          introduction_style(node,
-                             Utils::flatten_rawtext(content).
-                             join("\n"))
         end
       end
 
@@ -165,15 +159,11 @@ module Asciidoctor
       end
 
       def scope_parse(attrs, xml, node)
-        @scope = true
         xml.clause **attr_code(attrs) do |xml_section|
           xml_section.title { |t| t << "Scope" }
           content = node.content
           xml_section << content
-          c = Utils::flatten_rawtext(content).join("\n")
-          scope_style(node, c)
         end
-        @scope = false
       end
     end
   end