isodoc 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db2fc3806a2953f1cd51c3edc7a3f8abe930e7a85562f1e3786452a987eb427
-  data.tar.gz: 92247d33287542fec1bc39186ba8670dd2570e797895a49cfe3257156840099a
+  metadata.gz: fc1164b1e3776905b856a609bf053e2825f6885edf53a793ecf2ec9bb961d8c9
+  data.tar.gz: 91df81ab9d6ce87fb42b471fe08fca08e790b5372158bca5802380ee1189ec8d
 SHA512:
-  metadata.gz: 2a59a21657f9148c4ce184b4429aa1583b096b7ad2925c23be8b0744522efbd74e63aba7d958a9fdcb16ba6bf1d0165ef8e8ffeb059f0406c0068dbdad589188
-  data.tar.gz: 4c3dcacbc1e711db4618070f17f6b9e8d1b97c72745ed959b620e705fe4eb878a54c3f2ccdf17ff3fea6e3d510e0faf36afa1a7a2d87b2de1c979f3dfc2fee0b
+  metadata.gz: f68093afb5788e3d98095cd95afb2ded814f6107f5df39d4036328de31f7dfe91b8f0d49f9286447c516e1ace65cb30b55d39ab532fa614eeb4d82aaba3503bc
+  data.tar.gz: a49b38262be2f2c216f5a341d953523b03c83d0894d813d6a3a6fef1be750c558ad9dbb032720074748daf474fcdac226f21017d933282a635d3da10d75911fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.17)
+    isodoc (0.9.18)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -54,14 +54,14 @@ GEM
       uuidtools
     htmlentities (4.3.4)
     image_size (2.0.0)
-    json (2.1.0)
+    json (2.2.0)
     liquid (4.0.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.8)
+    metanorma (0.3.9)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -75,7 +75,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.13.0)
+    parallel (1.14.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -128,7 +128,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/lib/isodoc-yaml/i18n-en.yaml

@@ -47,6 +47,9 @@ list: List
 figure: Figure
 formula: Formula
 table: Table
+requirement: Requirement
+recommendation: Recommendation
+permission: Permission
 key: Key
 example: EXAMPLE
 example_xref: Example

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -40,6 +40,9 @@ figure: Figure
 formula: Formule
 list: Liste
 table: Tableau
+requirement: Exigence
+recommendation: Recommandation
+permission: Autorisation
 key: Légende
 example: EXEMPLE
 example_xref: Exemple

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -40,6 +40,9 @@ figure: 图
 formula: 公式
 list: 列项
 table: 表
+requirement: 要求
+recommendation: 建议
+permission: 容許
 key: 说明
 example: 示例
 example_xref: 示例

data/lib/isodoc/function/blocks.rb

@@ -260,5 +260,58 @@ module IsoDoc::Function
       out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
+
+    def recommendation_name(node, out, type)
+      label = node.at(ns("./label"))
+      title = node.at(ns("./title"))
+      out.p **{ class: "AdmonitionTitle" }  do |b|
+        b << l10n("#{type} #{get_anchors[node['id']][:label]}:")
+        if label || title
+          b.br
+          label and label.children.each { |n| parse(n,b) }
+          b << "#{clausedelim} " if label && title
+          title and title.children.each { |n| parse(n,b) }
+        end
+      end
+    end
+
+    def recommendation_parse(node, out)
+      out.div **{ class: "recommend" } do |t|
+        recommendation_name(node, t, @recommendation_lbl)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def requirement_parse(node, out)
+      out.div **{ class: "require" } do |t|
+        recommendation_name(node, t, @requirement_lbl)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def permission_parse(node, out)
+      out.div **{ class: "permission" } do |t|
+        recommendation_name(node, t, @permission_lbl)
+        node.children.each do |n|
+          parse(n, t) unless %w(label title).include? n.name
+        end
+      end
+    end
+
+    def requirement_component_parse(node, out)
+      return if node["exclude"] == "true"
+      out.div do |div|
+        node.children.each do |n|
+          parse(n, div)
+        end
+      end
+    end
+
+    def requirement_skip_parse(node, out)
+    end
   end
 end

data/lib/isodoc/function/i18n.rb

@@ -65,6 +65,9 @@ module IsoDoc::Function
       @source_lbl = y["source"]
       @and_lbl = y["and"]
       @all_parts_lbl = y["all_parts"]
+      @permission_lbl = y["permission"]
+      @recommendation_lbl = y["recommendation"]
+      @requirement_lbl = y["requirement"]
       @locality = y["locality"]
       @admonition = y["admonition"]
       @labels = y

data/lib/isodoc/function/section.rb

@@ -1,11 +1,15 @@
 module IsoDoc::Function
   module Section
+    def clausedelim
+      "."
+    end
+
     def inline_header_title(out, node, c1)
       title = c1&.content || ""
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
           if get_anchors[node['id']][:label] && !@suppressheadingnumbers
-            b << "#{get_anchors[node['id']][:label]}. "
+            b << "#{get_anchors[node['id']][:label]}#{clausedelim} "
           end
           b << "#{title} "
         end
@@ -18,7 +22,7 @@ module IsoDoc::Function
       else
         div.send "h#{get_anchors[node['id']][:level]}" do |h|
           lbl = get_anchors[node['id']][:label]
-          h << "#{lbl}. " if lbl && !@suppressheadingnumbers
+          h << "#{lbl}#{clausedelim} " if lbl && !@suppressheadingnumbers
           c1&.children&.each { |c2| parse(c2, h) }
         end
       end
@@ -37,7 +41,7 @@ module IsoDoc::Function
       header_class = {} if header_class.nil?
       div.h1 **attr_code(header_class) do |h1|
         if num && !@suppressheadingnumbers
-          h1 << "#{num}."
+          h1 << "#{num}#{clausedelim}"
           insert_tab(h1, 1)
         end
         h1 << title

data/lib/isodoc/function/terms.rb

@@ -60,7 +60,7 @@ module IsoDoc::Function
 
     def termdef_parse(node, out)
       out.p **{ class: "TermNum", id: node["id"] } do |p|
-        p << get_anchors[node["id"]][:label]
+        p << "#{get_anchors[node["id"]][:label]}#{clausedelim}"
       end
       set_termdomain("")
       node.children.each { |n| parse(n, out) }

data/lib/isodoc/function/to_word_html.rb

@@ -235,6 +235,16 @@ module IsoDoc::Function
         when "definitions" then symbols_parse(node, out)
         when "references" then bibliography_parse(node, out)
         when "termdocsource" then termdocsource_parse(node, out)
+        when "requirement" then requirement_parse(node, out)
+        when "recommendation" then recommendation_parse(node, out)
+        when "permission" then permission_parse(node, out)
+        when "subject" then requirement_skip_parse(node, out)
+        when "inherit" then requirement_component_parse(node, out)
+        when "description" then requirement_component_parse(node, out)
+        when "specification" then requirement_component_parse(node, out)
+        when "measurement-target" then requirement_component_parse(node, out)
+        when "verification" then requirement_component_parse(node, out)
+        when "import" then requirement_component_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/xref_gen.rb

@@ -173,18 +173,51 @@ module IsoDoc::Function
       ret
     end
 
-    def sequential_asset_names(clause)
+    def sequential_table_names(clause)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl, "table")
       end
-      sequential_figure_names(clause)
+    end
+
+    def sequential_formula_names(clause)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl, "formula")
       end
     end
 
+    def sequential_permission_names(clause)
+      clause.xpath(ns(".//permission")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @permission_lbl, "permission")
+      end
+    end
+
+    def sequential_requirement_names(clause)
+      clause.xpath(ns(".//requirement")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @requirement_lbl, "requirement")
+      end
+    end
+
+    def sequential_recommendation_names(clause)
+      clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @recommendation_lbl, "recommendation")
+      end
+    end
+
+
+    def sequential_asset_names(clause)
+      sequential_table_names(clause)
+      sequential_figure_names(clause)
+      sequential_formula_names(clause)
+      sequential_permission_names(clause)
+      sequential_requirement_names(clause)
+      sequential_recommendation_names(clause)
+    end
+
     def hiersep
       "."
     end
@@ -219,6 +252,9 @@ module IsoDoc::Function
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
+      hierarchical_permission_names(clause, num)
+      hierarchical_requirement_names(clause, num)
+      hierarchical_recommendation_names(clause, num)
     end
 
     def hierarchical_formula_names(clause, num)
@@ -228,5 +264,29 @@ module IsoDoc::Function
                                           t, @formula_lbl, "formula")
       end
     end
+
+    def hierarchical_permission_names(clause, num)
+      clause.xpath(ns(".//permission")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
+                                          t, @permission_lbl, "permission")
+      end
+    end
+
+    def hierarchical_requirement_names(clause, num)
+      clause.xpath(ns(".//requirement")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
+                                          t, @requirement_lbl, "requirement")
+      end
+    end
+
+    def hierarchical_recommendation_names(clause, num)
+      clause.xpath(ns(".//recommendation")).each_with_index do |t, i|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}",
+                                          t, @recommendation_lbl, "recommendation")
+      end
+    end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.17".freeze
+  VERSION = "0.9.18".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -733,7 +733,7 @@ World</p>
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="_extraneous_matter">1.1</p><p class="Terms" style="text-align:left;">extraneous matter</p><p class="AltTerms" style="text-align:left;">EM</p>
+       <p class="TermNum" id="_extraneous_matter">1.1.</p><p class="Terms" style="text-align:left;">extraneous matter</p><p class="AltTerms" style="text-align:left;">EM</p>
 
        <p id="_318b3939-be09-46c4-a284-93f9826b981e">&lt;rice&gt; organic and inorganic components other than whole or broken kernels</p>
        </div>
@@ -743,5 +743,258 @@ World</p>
     OUTPUT
   end
 
+  it "processes permissions" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <permission id="_">
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <subject>user</subject>
+  <description>
+    <p id="_">I recommend <em>this</em>.</p>
+  </description>
+  <specification exclude="true" type="tabular">
+    <p id="_">This is the object of the recommendation:</p>
+    <table id="_">
+      <tbody>
+        <tr>
+          <td align="left">Object</td>
+          <td align="left">Value</td>
+        </tr>
+        <tr>
+          <td align="left">Mission</td>
+          <td align="left">Accomplished</td>
+        </tr>
+      </tbody>
+    </table>
+  </specification>
+  <description>
+    <p id="_">As for the measurement targets,</p>
+  </description>
+  <measurement-target exclude="false">
+    <p id="_">The measurement target shall be measured as:</p>
+    <formula id="_">
+      <stem type="AsciiMath">r/1 = 0</stem>
+    </formula>
+  </measurement-target>
+  <verification exclude="false">
+    <p id="_">The following code will be run for verification:</p>
+    <sourcecode id="_">CoreRoot(success): HttpResponse
+      if (success)
+      recommendation(label: success-response)
+      end
+    </sourcecode>
+  </verification>
+  <import exclude="true">
+    <sourcecode id="_">success-response()</sourcecode>
+  </import>
+</permission>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+       <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div class="permission"><p class="AdmonitionTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
+
+  <div>/ss/584/2015/level/1</div>
+  <div>
+    <p id="_">I recommend <i>this</i>.</p>
+  </div>
+
+  <div>
+    <p id="_">As for the measurement targets,</p>
+  </div>
+  <div>
+    <p id="_">The measurement target shall be measured as:</p>
+    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+
+
+  </div>
+  <div>
+    <p id="_">The following code will be run for verification:</p>
+    <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
+  </div>
+
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
+    it "processes requirements" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <requirement id="_">
+  <title>A New Requirement</title>
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <subject>user</subject>
+  <description>
+    <p id="_">I recommend <em>this</em>.</p>
+  </description>
+  <specification exclude="true" type="tabular">
+    <p id="_">This is the object of the recommendation:</p>
+    <table id="_">
+      <tbody>
+        <tr>
+          <td align="left">Object</td>
+          <td align="left">Value</td>
+        </tr>
+        <tr>
+          <td align="left">Mission</td>
+          <td align="left">Accomplished</td>
+        </tr>
+      </tbody>
+    </table>
+  </specification>
+  <description>
+    <p id="_">As for the measurement targets,</p>
+  </description>
+  <measurement-target exclude="false">
+    <p id="_">The measurement target shall be measured as:</p>
+    <formula id="_">
+      <stem type="AsciiMath">r/1 = 0</stem>
+    </formula>
+  </measurement-target>
+  <verification exclude="false">
+    <p id="_">The following code will be run for verification:</p>
+    <sourcecode id="_">CoreRoot(success): HttpResponse
+      if (success)
+      recommendation(label: success-response)
+      end
+    </sourcecode>
+  </verification>
+  <import exclude="true">
+    <sourcecode id="_">success-response()</sourcecode>
+  </import>
+</requirement>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+        <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div class="require"><p class="AdmonitionTitle">Requirement 1:<br/>/ogc/recommendation/wfs/2. A New Requirement</p>
+
+  <div>/ss/584/2015/level/1</div>
+  <div>
+    <p id="_">I recommend <i>this</i>.</p>
+  </div>
+
+  <div>
+    <p id="_">As for the measurement targets,</p>
+  </div>
+  <div>
+    <p id="_">The measurement target shall be measured as:</p>
+    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+
+
+  </div>
+  <div>
+    <p id="_">The following code will be run for verification:</p>
+    <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
+  </div>
+
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
+      it "processes recommendation" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <recommendation id="_">
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <subject>user</subject>
+  <description>
+    <p id="_">I recommend <em>this</em>.</p>
+  </description>
+  <specification exclude="true" type="tabular">
+    <p id="_">This is the object of the recommendation:</p>
+    <table id="_">
+      <tbody>
+        <tr>
+          <td align="left">Object</td>
+          <td align="left">Value</td>
+        </tr>
+        <tr>
+          <td align="left">Mission</td>
+          <td align="left">Accomplished</td>
+        </tr>
+      </tbody>
+    </table>
+  </specification>
+  <description>
+    <p id="_">As for the measurement targets,</p>
+  </description>
+  <measurement-target exclude="false">
+    <p id="_">The measurement target shall be measured as:</p>
+    <formula id="_">
+      <stem type="AsciiMath">r/1 = 0</stem>
+    </formula>
+  </measurement-target>
+  <verification exclude="false">
+    <p id="_">The following code will be run for verification:</p>
+    <sourcecode id="_">CoreRoot(success): HttpResponse
+      if (success)
+      recommendation(label: success-response)
+      end
+    </sourcecode>
+  </verification>
+  <import exclude="true">
+    <sourcecode id="_">success-response()</sourcecode>
+  </import>
+</recommendation>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+       <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div class="recommend"><p class="AdmonitionTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p>
+
+  <div>/ss/584/2015/level/1</div>
+  <div>
+    <p id="_">I recommend <i>this</i>.</p>
+  </div>
+
+  <div>
+    <p id="_">As for the measurement targets,</p>
+  </div>
+  <div>
+    <p id="_">The measurement target shall be measured as:</p>
+    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+
+
+  </div>
+  <div>
+    <p id="_">The following code will be run for verification:</p>
+    <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
+  </div>
+
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
 
 end

data/spec/isodoc/i18n_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
@@ -248,7 +248,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
@@ -394,7 +394,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>3.2. Symboles et termes abr&#233;g&#233;s</h2>
@@ -552,7 +552,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <div id="I">
                 <h2>3.1. Normal Terms</h2>
-                <p class="TermNum" id="J">3.1.1</p>
+                <p class="TermNum" id="J">3.1.1.</p>
                 <p class="Terms" style="text-align:left;">Term2</p>
 
               </div><div id="K"><h2>3.2. &#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h2>

data/spec/isodoc/postproc_spec.rb

@@ -300,7 +300,7 @@ RSpec.describe IsoDoc do
 
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> 
-       <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+       <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
        <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
              </div>
@@ -621,8 +621,8 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html")
-    expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1</h2>})
-    expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2</h2>})
+    expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1\.</h2>})
+    expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2\.</h2>})
   end
 
   it "creates continuation styles for multiparagraph list items in Word" do

data/spec/isodoc/section_spec.rb

@@ -136,7 +136,7 @@ RSpec.describe IsoDoc do
         </p> </li> </ul>
         <div id="I">
            <h2>3.1. Normal Terms</h2>
-           <p class="TermNum" id="J">3.1.1</p>
+           <p class="TermNum" id="J">3.1.1.</p>
            <p class="Terms" style="text-align:left;">Term2</p>
       
          </div><div id="K"><h2>3.2. Definitions</h2>
@@ -305,7 +305,7 @@ OUTPUT
        </p> </li> </ul>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
@@ -457,7 +457,7 @@ OUTPUT
        </p> </li> </ul>
        <div id="I"><h2>Normal Terms</h2>
 
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>Symbols and abbreviated terms</h2>
@@ -531,7 +531,7 @@ OUTPUT
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="J">1.1</p>
+       <p class="TermNum" id="J">1.1.</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>
              </div>
@@ -599,7 +599,7 @@ end
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="J">2.1</p>
+       <p class="TermNum" id="J">2.1.</p>
                 <p class="Terms" style="text-align:left;">Term2</p>
               </div>
              </div>

data/spec/isodoc/terms_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe IsoDoc do
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+       <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
        <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p class="example-title">EXAMPLE 1</p>
@@ -83,7 +83,7 @@ RSpec.describe IsoDoc do
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-       [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
+       [/TERMREF]</p><p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
@@ -168,7 +168,7 @@ OUTPUT
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+       <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
        <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p class="example-title">EXAMPLE 1</p>
@@ -186,7 +186,7 @@ OUTPUT
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-       [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
+       [/TERMREF]</p><p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>

data/spec/isodoc/xref_spec.rb

@@ -680,20 +680,6 @@ RSpec.describe IsoDoc do
     </clause>
     </annex>
     </iso-standard>
-
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934">
-  <stem type="AsciiMath">r = 1 %</stem>
-<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
-  <dt>
-    <stem type="AsciiMath">r</stem>
-  </dt>
-  <dd>
-    <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-  </dd>
-</dl></formula>
-    </foreword>
-    </preface>
-    </iso-standard>
     INPUT
         #{HTML_HDR}
     <br/>
@@ -761,6 +747,446 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+    it "cross-references requirements" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <requirement id="N1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+  <clause id="xyz"><title>Preparatory</title>
+    <requirement id="N2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope"><title>Scope</title>
+    <requirement id="N">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+  <p><xref target="N"/></p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <requirement id="note1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+    <requirement id="note2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+  <p>    <xref target="note1"/> <xref target="note2"/> </p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <requirement id="AN">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+    </clause>
+    <clause id="annex1b">
+    <requirement id="Anote1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+    <requirement id="Anote2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </requirement>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+#{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <p>
+    <a href="#N1">Introduction, Requirement 1</a>
+    <a href="#N2">Preparatory, Requirement 2</a>
+    <a href="#N">Clause 1, Requirement 3</a>
+    <a href="#note1">Clause 3.1, Requirement 4</a>
+    <a href="#note2">Clause 3.1, Requirement 5</a>
+    <a href="#AN">Annex A.1, Requirement A.1</a>
+    <a href="#Anote1">Annex A.2, Requirement A.2</a>
+    <a href="#Anote2">Annex A.2, Requirement A.3</a>
+    </p>
+      </div>
+      <br/>
+      <div class="Section3" id="intro">
+        <h1 class="IntroTitle">Introduction</h1>
+        <div class="require"><p class="AdmonitionTitle">Requirement 1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <div id="xyz"><h2>Preparatory</h2>
+    <div class="require"><p class="AdmonitionTitle">Requirement 2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+      <div id="scope">
+        <h1>1.&#160; Scope</h1>
+        <div class="require"><p class="AdmonitionTitle">Requirement 3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <p>
+          <a href="#N">Requirement 3</a>
+        </p>
+      </div>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+<p>ISO and IEC maintain terminological databases for use in
+standardization at the following addresses:</p>
+
+<ul>
+<li> <p>ISO Online browsing platform: available at
+  <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
+<li> <p>IEC Electropedia: available at
+  <a href="http://www.electropedia.org">http://www.electropedia.org</a>
+</p> </li> </ul>
+</div>
+      <div id="widgets">
+        <h1>3.&#160; Widgets</h1>
+        <div id="widgets1"><h2>3.1. </h2>
+    <div class="require"><p class="AdmonitionTitle">Requirement 4:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="require"><p class="AdmonitionTitle">Requirement 5:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+  <p>    <a href="#note1">Requirement 4</a> <a href="#note2">Requirement 5</a> </p>
+    </div>
+      </div>
+      <br/>
+      <div id="annex1" class="Section3">
+        <div id="annex1a"><h2>A.1. </h2>
+    <div class="require"><p class="AdmonitionTitle">Requirement A.1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+        <div id="annex1b"><h2>A.2. </h2>
+    <div class="require"><p class="AdmonitionTitle">Requirement A.2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="require"><p class="AdmonitionTitle">Requirement A.3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    end
+
+        it "cross-references recommendations" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <recommendation id="N1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+  <clause id="xyz"><title>Preparatory</title>
+    <recommendation id="N2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope"><title>Scope</title>
+    <recommendation id="N">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+  <p><xref target="N"/></p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <recommendation id="note1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+    <recommendation id="note2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+  <p>    <xref target="note1"/> <xref target="note2"/> </p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <recommendation id="AN">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+    </clause>
+    <clause id="annex1b">
+    <recommendation id="Anote1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+    <recommendation id="Anote2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </recommendation>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+#{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <p>
+    <a href="#N1">Introduction, Recommendation 1</a>
+    <a href="#N2">Preparatory, Recommendation 2</a>
+    <a href="#N">Clause 1, Recommendation 3</a>
+    <a href="#note1">Clause 3.1, Recommendation 4</a>
+    <a href="#note2">Clause 3.1, Recommendation 5</a>
+    <a href="#AN">Annex A.1, Recommendation A.1</a>
+    <a href="#Anote1">Annex A.2, Recommendation A.2</a>
+    <a href="#Anote2">Annex A.2, Recommendation A.3</a>
+    </p>
+      </div>
+      <br/>
+      <div class="Section3" id="intro">
+        <h1 class="IntroTitle">Introduction</h1>
+        <div class="recommend"><p class="AdmonitionTitle">Recommendation 1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <div id="xyz"><h2>Preparatory</h2>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation 2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+      <div id="scope">
+        <h1>1.&#160; Scope</h1>
+        <div class="recommend"><p class="AdmonitionTitle">Recommendation 3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <p>
+          <a href="#N">Recommendation 3</a>
+        </p>
+      </div>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+<p>ISO and IEC maintain terminological databases for use in
+standardization at the following addresses:</p>
+
+<ul>
+<li> <p>ISO Online browsing platform: available at
+  <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
+<li> <p>IEC Electropedia: available at
+  <a href="http://www.electropedia.org">http://www.electropedia.org</a>
+</p> </li> </ul>
+</div>
+      <div id="widgets">
+        <h1>3.&#160; Widgets</h1>
+        <div id="widgets1"><h2>3.1. </h2>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation 4:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation 5:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+  <p>    <a href="#note1">Recommendation 4</a> <a href="#note2">Recommendation 5</a> </p>
+    </div>
+      </div>
+      <br/>
+      <div id="annex1" class="Section3">
+        <div id="annex1a"><h2>A.1. </h2>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+        <div id="annex1b"><h2>A.2. </h2>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="recommend"><p class="AdmonitionTitle">Recommendation A.3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    end
+
+        it "cross-references permissions" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <permission id="N1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+  <clause id="xyz"><title>Preparatory</title>
+    <permission id="N2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope"><title>Scope</title>
+    <permission id="N">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+  <p><xref target="N"/></p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <permission id="note1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+    <permission id="note2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+  <p>    <xref target="note1"/> <xref target="note2"/> </p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <permission id="AN">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+    </clause>
+    <clause id="annex1b">
+    <permission id="Anote1">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+    <permission id="Anote2">
+  <stem type="AsciiMath">r = 1 %</stem>
+  </permission>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+#{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <p>
+    <a href="#N1">Introduction, Permission 1</a>
+    <a href="#N2">Preparatory, Permission 2</a>
+    <a href="#N">Clause 1, Permission 3</a>
+    <a href="#note1">Clause 3.1, Permission 4</a>
+    <a href="#note2">Clause 3.1, Permission 5</a>
+    <a href="#AN">Annex A.1, Permission A.1</a>
+    <a href="#Anote1">Annex A.2, Permission A.2</a>
+    <a href="#Anote2">Annex A.2, Permission A.3</a>
+    </p>
+      </div>
+      <br/>
+      <div class="Section3" id="intro">
+        <h1 class="IntroTitle">Introduction</h1>
+        <div class="permission"><p class="AdmonitionTitle">Permission 1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <div id="xyz"><h2>Preparatory</h2>
+    <div class="permission"><p class="AdmonitionTitle">Permission 2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+</div>
+      </div>
+      <p class="zzSTDTitle1"/>
+      <div id="scope">
+        <h1>1.&#160; Scope</h1>
+        <div class="permission"><p class="AdmonitionTitle">Permission 3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+        <p>
+          <a href="#N">Permission 3</a>
+        </p>
+      </div>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+<p>ISO and IEC maintain terminological databases for use in
+standardization at the following addresses:</p>
+
+<ul>
+<li> <p>ISO Online browsing platform: available at
+  <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
+<li> <p>IEC Electropedia: available at
+  <a href="http://www.electropedia.org">http://www.electropedia.org</a>
+</p> </li> </ul>
+</div>
+      <div id="widgets">
+        <h1>3.&#160; Widgets</h1>
+        <div id="widgets1"><h2>3.1. </h2>
+    <div class="permission"><p class="AdmonitionTitle">Permission 4:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="permission"><p class="AdmonitionTitle">Permission 5:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+  <p>    <a href="#note1">Permission 4</a> <a href="#note2">Permission 5</a> </p>
+    </div>
+      </div>
+      <br/>
+      <div id="annex1" class="Section3">
+        <div id="annex1a"><h2>A.1. </h2>
+    <div class="permission"><p class="AdmonitionTitle">Permission A.1:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+        <div id="annex1b"><h2>A.2. </h2>
+    <div class="permission"><p class="AdmonitionTitle">Permission A.2:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    <div class="permission"><p class="AdmonitionTitle">Permission A.3:</p>
+  <span class="stem">(#(r = 1 %)#)</span>
+  </div>
+    </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    end
+
+
+
   it "cross-references tables" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
         <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1023,8 +1449,8 @@ RSpec.describe IsoDoc do
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum" id="_waxy_rice">2.1</p><p class="Terms" style="text-align:left;">waxy rice</p>
-       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
+       <p class="TermNum" id="_waxy_rice">2.1.</p><p class="Terms" style="text-align:left;">waxy rice</p>
+       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2.</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
        <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
        <div class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
              </div>
@@ -1166,7 +1592,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
-          <p class="TermNum" id="J">3.1.1</p>
+          <p class="TermNum" id="J">3.1.1.</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
@@ -1533,20 +1959,20 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
         #{HTML_HDR}
-    <br/>
-                <div>
-                  <h1 class="ForewordTitle">Foreword</h1>
-                  <p>
-        <a href="#N">Clause 1, a)</a>
-        <a href="#note1">Clause 1, a.1)</a>
-        <a href="#note2">Clause 1, a.1.i)</a>
-        <a href="#AN">Clause 1, a.1.i.A)</a>
-        <a href="#Anote1">Clause 1, a.1.i.A.I)</a>
-        <a href="#Anote2">Clause 1, a.1.i.A.I.a)</a>
-        </p>
-                </div>
-                <p class="zzSTDTitle1"/>
-                             <div id="scope">
+                     <br/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p>
+       <a href="#N">Clause 1, a)</a>
+       <a href="#note1">Clause 1, a.1)</a>
+       <a href="#note2">Clause 1, a.1.i)</a>
+       <a href="#AN">Clause 1, a.1.i.A)</a>
+       <a href="#Anote1">Clause 1, a.1.i.A.I)</a>
+       <a href="#Anote2">Clause 1, a.1.i.A.I.a)</a>
+       </p>
+             </div>
+             <p class="zzSTDTitle1"/>
+             <div id="scope">
                <h1>1.&#160; Scope</h1>
                <ol type="a" id="N1">
          <li id="N"><p>A</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath