asciidoctor-iso 0.6.1 → 0.7.0

data/lib/asciidoctor/iso/converter.rb

@@ -44,15 +44,12 @@ module Asciidoctor
       # alias_method :pass, :content
       alias_method :embedded, :content
       alias_method :verse, :quote
-      alias_method :literal, :content
       alias_method :audio, :skip
       alias_method :video, :skip
       alias_method :inline_button, :skip
       alias_method :inline_kbd, :skip
       alias_method :inline_menu, :skip
       alias_method :inline_image, :skip
-
-
     end
   end
 end

data/lib/asciidoctor/iso/front.rb

@@ -10,9 +10,10 @@ module Asciidoctor
   module ISO
     module Front
       def metadata_id(node, xml)
+        part, subpart = node&.attr("partnumber")&.split(/-/)
         xml.docidentifier do |i|
           i.project_number node.attr("docnumber"),
-            **attr_code(part: node.attr("partnumber"))
+            **attr_code(part: part, subpart: subpart)
           if node.attr("tc-docnumber")
             i.tc_document_number node.attr("tc-docnumber")
           end
@@ -33,7 +34,7 @@ module Asciidoctor
                       type: node.attr("#{compname}-type"))
       end
 
-      def metadata_author(node, xml)
+      def metadata_author(_node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }
           c.organization do |a|
@@ -68,8 +69,8 @@ module Asciidoctor
 
       def metadata_status(node, xml)
         xml.status do |s|
-          s.stage ( node.attr("docstage") || "60" )
-          s.substage ( node.attr("docsubstage") || "60" )
+          s.stage (node.attr("docstage") || "60")
+          s.substage (node.attr("docsubstage") || "60")
         end
       end
 
@@ -88,27 +89,39 @@ module Asciidoctor
         metadata_author(node, xml)
         metadata_publisher(node, xml)
         xml.language node.attr("language")
-        xml.script "Latn"
+        xml.script (node.attr("script") || "Latn")
         metadata_status(node, xml)
         metadata_copyright(node, xml)
         metadata_committee(node, xml)
       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}")
+        end
+      end
+
+      def title_main(node, t, lang, at)
+        t.title_main **attr_code(at) do |t1|
+          t1 << 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}")
+        end
+      end
+
       def title(node, xml)
         ["en", "fr"].each do |lang|
           xml.title do |t|
             at = { language: lang, format: "text/plain" }
-            node.attr("title-intro-#{lang}") and
-              t.title_intro **attr_code(at) do |t1|
-              t1 << node.attr("title-intro-#{lang}")
-            end
-            t.title_main **attr_code(at) do |t1|
-              t1 << node.attr("title-main-#{lang}")
-            end
-            node.attr("title-part-#{lang}") and
-              t.title_part **attr_code(at) do |t1|
-              t1 << node.attr("title-part-#{lang}")
-            end
+            title_intro(node, t, lang, at)
+            title_main(node, t, lang, at)
+            title_part(node, t, lang, at)
           end
         end
       end

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

@@ -239,6 +239,24 @@ p.AltTerms, li.AltTerms, div.AltTerms
 	mso-bidi-font-family:"Cambria";
 	mso-ansi-language:EN-GB;
 	mso-bidi-font-weight:normal;}
+p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
+	{mso-style-name:"DeprecatedTerm\(s\)";
+	mso-style-priority:8;
+	mso-style-unhide:no;
+	mso-style-next:Definition;
+	margin:0cm;
+	margin-bottom:.0001pt;
+	line-height:12.0pt;
+	mso-pagination:widow-orphan;
+	page-break-after:avoid;
+	mso-hyphenate:none;
+	tab-stops:20.15pt;
+	font-size:11.0pt;
+	font-family:"Cambria",serif;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Cambria";
+	mso-ansi-language:EN-GB;
+	mso-bidi-font-weight:normal;}
 p.TermNum, li.TermNum, div.TermNum
 	{mso-style-name:TermNum;
 	mso-style-priority:7;
@@ -662,3 +680,19 @@ a.TableFootnoteRef
 aside {
           font-size:10.0pt;
 }
+
+/*
+div.example {
+	border:solid black .25pt;
+	mso-border-alt:solid black .25pt;
+	padding:10pt;
+	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+	margin:10pt;
+	mso-margin-alt:10.0pt 10.0pt 10.0pt 10.0pt;
+}
+*/
+
+div.example {
+  margin-left:70.9pt;
+  text-indent:-70.9pt;
+}

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

@@ -438,16 +438,14 @@ a:link, span.MsoHyperlink
 	mso-style-unhide:no;
 	mso-style-parent:"";
 	mso-ansi-language:EN;
-	color:blue;
-	text-decoration:underline;
-	text-underline:single;}
+	color:black;
+	text-decoration:none;}
 a:visited, span.MsoHyperlinkFollowed
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
 	mso-themecolor:followedhyperlink;
-	color:#954F72;
-	text-decoration:underline;
-	text-underline:single;}
+    text-decoration:none;
+    color:black;}
 span.MsoPlaceholderText
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
@@ -977,6 +975,140 @@ div.WordSection1
 	margin-left:0cm;
 	text-indent:0cm;
 	mso-bidi-font-family:"Cambria";}
+/* ordered list */
+@list l2
+	{mso-list-id:525294607;
+	mso-list-template-ids:67633181;}
+@list l2:level1
+	{mso-level-number-format:alpha-lower;
+	mso-level-text:"%1\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:18.0pt;
+	text-indent:-18.0pt;}
+@list l2:level2
+	{mso-level-text:"%2\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:36.0pt;
+	text-indent:-18.0pt;}
+@list l2:level3
+	{mso-level-number-format:roman-lower;
+	mso-level-text:"%3\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:54.0pt;
+	text-indent:-18.0pt;}
+@list l2:level4
+	{mso-level-number-format:alpha-upper;
+	mso-level-text:"%4\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:72.0pt;
+	text-indent:-18.0pt;}
+@list l2:level5
+	{mso-level-number-format:roman-upper;
+	mso-level-text:"%5\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:90.0pt;
+	text-indent:-18.0pt;}
+@list l2:level6
+	{mso-level-number-format:alpha-lower;
+	mso-level-text:"%6\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:108.0pt;
+	text-indent:-18.0pt;}
+@list l2:level7
+	{mso-level-tab-stop:none;
+	mso-level-text:"%7\)";
+	mso-level-number-position:left;
+	margin-left:126.0pt;
+	text-indent:-18.0pt;}
+@list l2:level8
+	{mso-level-number-format:roman-lower;
+	mso-level-text:"%8\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:144.0pt;
+	text-indent:-18.0pt;}
+@list l2:level9
+	{mso-level-number-format:alpha-upper;
+	mso-level-text:"%9\)";
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:162.0pt;
+	text-indent:-18.0pt;}
+/* Unordered list */
+@list l3
+	{mso-list-id:1308196397;
+	mso-list-type:hybrid;
+	mso-list-template-ids:-277327948 -457018030 67633155 67633157 67633153 67633155 67633157 67633153 67633155 67633157;}
+@list l3:level1
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:18.0pt;
+	text-indent:-18.0pt;}
+@list l3:level2
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:36.0pt;
+	text-indent:-18.0pt;}
+@list l3:level3
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:54.0pt;
+	text-indent:-18.0pt;}
+@list l3:level4
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:72.0pt;
+	text-indent:-18.0pt;}
+@list l3:level5
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:90.0pt;
+	text-indent:-18.0pt;}
+@list l3:level6
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:108.0pt;
+	text-indent:-18.0pt;}
+@list l3:level7
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:126.0pt;
+	text-indent:-18.0pt;}
+@list l3:level8
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:144.0pt;
+	text-indent:-18.0pt;}
+@list l3:level9
+	{mso-level-number-format:bullet;
+	mso-level-text:—;
+	mso-level-tab-stop:none;
+	mso-level-number-position:left;
+	margin-left:162.0pt;
+	text-indent:-18.0pt;}
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;

data/lib/asciidoctor/iso/inline.rb

@@ -1,10 +1,9 @@
-require 'asciidoctor/extensions'
+require "asciidoctor/extensions"
 
 module Asciidoctor
   module ISO
     module Inline
-
-      def is_refid?(x)
+      def refid?(x)
         @refids.include? x
       end
 
@@ -18,8 +17,6 @@ module Asciidoctor
           inline_anchor_link node
         when :bibref
           inline_anchor_bibref node
-        else
-          warning(node, "unknown anchor type", node.type.inspect)
         end
       end
 
@@ -30,12 +27,12 @@ module Asciidoctor
       end
 
       def inline_anchor_xref(node)
-        matched = /^fn(:  (?<text>.*))?$/.match node.text
+        matched = /^fn(:\s*(?<text>.*))?$/.match node.text
         f = matched.nil? ? "inline" : "footnote"
         c = matched.nil? ? node.text : matched[:text]
         t = node.target.gsub(/^#/, "").gsub(%r{(.)(\.xml)?#.*$}, "\\1")
-          noko do |xml| 
-          xml.xref c, **attr_code(target: t, type: f) 
+        noko do |xml|
+          xml.xref c, **attr_code(target: t, type: f)
         end.join
       end
 
@@ -66,7 +63,7 @@ module Asciidoctor
       def inline_footnote(node)
         noko do |xml|
           @fn_number += 1
-          xml.fn **{reference: @fn_number} do |fn|
+          xml.fn **{ reference: @fn_number } do |fn|
             fn.p { |p| p << node.text }
             footnote_style(node, node.text)
           end
@@ -80,22 +77,14 @@ module Asciidoctor
         end.join("\n")
       end
 
-      def page_break(node)
-        noko do |xml|
-          xml << node.text
-          xml.pagebreak
-        end.join("\n")
+      def page_break(_node)
+        noko { |xml| xml.pagebreak }.join("\n")
       end
 
-      def thematic_break(node)
-        noko do |xml|
-          xml << node.text
-          xml.hr
-        end.join("\n")
+      def thematic_break(_node)
+        noko { |xml| xml.hr }.join("\n")
       end
 
-
-
       def inline_quoted(node)
         noko do |xml|
           case node.type
@@ -122,7 +111,6 @@ module Asciidoctor
           end
         end.join
       end
-
     end
   end
 end

data/lib/asciidoctor/iso/isodoc.rng

@@ -24,9 +24,6 @@
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="docrelation"/>
-      </zeroOrMore>
       <optional>
         <ref name="version"/>
       </optional>
@@ -47,15 +44,27 @@
     </element>
   </define>
   <define name="docrelation">
-    <element 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>
-      <ref name="eref"/>
+      <element name="bibitem">
+        <ref name="BibliographicItem"/>
+      </element>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="status">
@@ -110,10 +119,24 @@
           <ref name="content"/>
           <ref name="clause"/>
           <ref name="terms"/>
+          <ref name="symbols-abbrevs"/>
         </choice>
       </oneOrMore>
     </element>
   </define>
+  <define name="symbols-abbrevs">
+    <element name="symbols-abbrevs">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <ref name="dl"/>
+    </element>
+  </define>
   <define name="section-title">
     <element name="title">
       <text/>
@@ -192,7 +215,7 @@
           <data type="ID"/>
         </attribute>
       </optional>
-      <attribute name="type">
+      <attribute name="obligation">
         <choice>
           <value>normative</value>
           <value>informative</value>
@@ -471,7 +494,9 @@
           <ref name="Alignments"/>
         </attribute>
       </optional>
-      <ref name="quote-source"/>
+      <optional>
+        <ref name="quote-source"/>
+      </optional>
       <optional>
         <ref name="quote-author"/>
       </optional>
@@ -1281,15 +1306,26 @@
           <value>chapter</value>
           <value>page</value>
           <value>whole</value>
+          <value>table</value>
+          <value>annex</value>
+          <value>figure</value>
+          <value>note</value>
+          <value>example</value>
         </choice>
       </attribute>
-      <zeroOrMore>
-        <ref name="localityreference"/>
-      </zeroOrMore>
+      <ref name="referenceFrom"/>
+      <optional>
+        <ref name="referenceTo"/>
+      </optional>
+    </element>
+  </define>
+  <define name="referenceFrom">
+    <element name="referenceFrom">
+      <text/>
     </element>
   </define>
-  <define name="localityreference">
-    <element name="reference">
+  <define name="referenceTo">
+    <element name="referenceTo">
       <text/>
     </element>
   </define>
@@ -1302,6 +1338,11 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="bibitem_no_id">
+    <element name="bibitem">
+      <ref name="BibliographicItem"/>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -1329,9 +1370,9 @@
       </oneOrMore>
       <ref name="formattedref"/>
     </choice>
-    <optional>
+    <zeroOrMore>
       <ref name="source"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
@@ -1365,6 +1406,9 @@
     <optional>
       <ref name="copyright"/>
     </optional>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
   </define>
   <define name="BibData">
     <optional>
@@ -1378,9 +1422,9 @@
     <optional>
       <ref name="formattedref"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="source"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
@@ -1412,6 +1456,9 @@
       <ref name="status"/>
     </optional>
     <ref name="copyright"/>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <element name="title">
@@ -1425,6 +1472,9 @@
   </define>
   <define name="source">
     <element name="source">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <data type="anyURI"/>
     </element>
   </define>