isodoc 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 175371d554a61e1c0a3c2c7c2b3d549b632278d5cd7cc440dd60f2f6f8460757
-  data.tar.gz: e94494f0e00b97dc7f23154b47c331b08d3b5c53d3f2ac1846b5a7b1cf6b6ff3
+  metadata.gz: 3a4d3fa6c4156db3df86b058bd06ab31377db25525b066b42d1d1637480c1478
+  data.tar.gz: 84b5d564ab0ed4a7424cd5f9f451843c9923d6b373bf0e8492a07fffbd4667b5
 SHA512:
-  metadata.gz: ebf2dd5678bbd1b727fd1c70a41047c19bfc462fd38614508e5b234618a4c505413a6fb616adc0ced45db6328a01363467c00b20a4ee8f7ee9f096dea2f4b578
-  data.tar.gz: dcfcd9e5dec8df4179cba4dbfca9d41f0749060e739f894919e9650ad57d0bed0f31ab0ef3cc8847f4fe2365829171207cac42954e1fc579cf57427bc6eddedb
+  metadata.gz: a8b910524ad0cbc147395e8f240523a2081841d59417fb88664058053eb6ed9a9adcc6eebe047d3d8d372c045841a292f1872f73a3336a0e8253a0ff0a9f7682
+  data.tar.gz: b8d9bc5fa2af858c32e17df20f359fe6183dd740814b5b83e262a6c8b38d6fd6824fcee5ec5f40c67820c22cb737919c61b47263f74121d14ed9509d03ed1ade

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.8.8)
+    isodoc (0.8.9)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
@@ -10,7 +10,7 @@ PATH
       nokogiri
       roman-numerals
       ruby-xslt
-      sass
+      sassc (~> 1.12.1)
       thread_safe
       uuidtools
 
@@ -60,11 +60,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.2.7)
+    metanorma (0.2.8)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
     nokogiri (1.8.4)
@@ -114,6 +114,9 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (1.12.1)
+      ffi (~> 1.9.6)
+      sass (>= 3.3.0)
     shellany (0.0.1)
     simplecov (0.16.1)
       docile (~> 1.1)

data/isodoc.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 0.8.1"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
-  spec.add_dependency "sass"
+  spec.add_dependency "sassc", "~> 1.12.1"
   spec.add_dependency "metanorma", "~> 0.2.7"
 
   spec.add_development_dependency "bundler", "~> 1.15"

data/lib/isodoc/convert.rb

@@ -1,5 +1,5 @@
 require "isodoc/common"
-require "sass"
+require "sassc"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
@@ -101,7 +101,7 @@ module IsoDoc
       return nil unless filename
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
-      engine = Sass::Engine.new(fontheader + stylesheet, syntax: :scss)
+      engine = SassC::Engine.new(fontheader + stylesheet, syntax: :scss)
       outname = File.basename(filename, ".*") + ".css"
       File.open(outname, "w:UTF-8") { |f| f.write(engine.render) }
       @files_to_delete << outname

data/lib/isodoc/function/i18n.rb

@@ -69,20 +69,20 @@ module IsoDoc::Function
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(type, from, to)
+    def eref_localities1_zh(target, type, from, to)
       ret = ", 第#{from.text}" if from
       ret += "–#{to}" if to
-      ret += (@locality[type] || type.sub(/^locality:/, "").capitalize )
+      loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
+      ret += " #{loc}"
       ret
     end
 
     # TODO: move to localization file
-    def eref_localities1(type, from, to, lang = "en")
-      subsection = from&.text&.match(/\./)
-      return l10n(eref_localities1_zh(type, from, to)) if lang == "zh"
+    def eref_localities1(target, type, from, to, lang = "en")
+      return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
       ret = ","
       loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-      ret += " #{loc}" unless subsection && type == "clause"
+      ret += " #{loc}"
       ret += " #{from.text}" if from
       ret += "–#{to.text}" if to
       l10n(ret)

data/lib/isodoc/function/inline.rb

@@ -37,7 +37,7 @@ module IsoDoc::Function
 
     def get_linkend(node)
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality")))
+      link += eref_localities(node.xpath(ns("./locality")), link)
       text = node.children.select { |c| c.text? && !c.text.empty? }
       link = text.join(" ") unless text.nil? || text.empty?
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
@@ -50,12 +50,12 @@ module IsoDoc::Function
       out.a(**{ "href": "#" + node["target"] }) { |l| l << linkend }
     end
 
-    def eref_localities(refs)
+    def eref_localities(refs, target)
       ret = ""
       refs.each do |r|
         ret += if r["type"] == "whole" then l10n(", #{@whole_of_text}")
                else
-                 eref_localities1(r["type"], r.at(ns("./referenceFrom")),
+                 eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
                                   r.at(ns("./referenceTo")), @lang)
                end
       end

data/lib/isodoc/function/lists.rb

@@ -2,7 +2,7 @@ module IsoDoc::Function
   module Lists
 
     def ul_parse(node, out)
-      out.ul do |ul|
+      out.ul **attr_code(id: node["id"]) do |ul|
         node.children.each { |n| parse(n, ul) }
       end
     end
@@ -37,13 +37,13 @@ module IsoDoc::Function
     def ol_parse(node, out)
       # style = ol_style(node["type"])
       style = ol_depth(node)
-      out.ol **attr_code(type: style) do |ol|
+      out.ol **attr_code(type: style, id: node["id"] ) do |ol|
         node.children.each { |n| parse(n, ol) }
       end
     end
 
     def li_parse(node, out)
-      out.li do |li|
+      out.li  **attr_code(id: node["id"]) do |li|
         node.children.each { |n| parse(n, li) }
       end
     end
@@ -64,10 +64,12 @@ module IsoDoc::Function
     end
 
     def dl_parse(node, out)
-      out.dl do |v|
+      out.dl  **attr_code(id: node["id"]) do |v|
         node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-          v.dt { |term| dt_parse(dt, term) }
-          v.dd do |listitem|
+          v.dt **attr_code(id: dt["id"]) do |term|
+            dt_parse(dt, term) 
+          end
+          v.dd  **attr_code(id: dd["id"]) do |listitem|
             dd.children.each { |n| parse(n, listitem) }
           end
         end

data/lib/isodoc/function/xref_gen.rb

@@ -27,12 +27,13 @@ module IsoDoc::Function
 
     def termexample_anchor_names(docxml)
       docxml.xpath(ns("//term[termexample]")).each do |t|
-        t.xpath(ns("./termexample")).each_with_index do |n, i|
+        examples = t.xpath(ns("./termexample"))
+        examples.each_with_index do |n, i|
           return if n["id"].nil? || n["id"].empty?
-          @anchors[n["id"]] =
-            { label: (i + 1).to_s,
-              xref: l10n("#{@anchors[t['id']][:xref]}, "\
-                         "#{@note_xref_lbl} #{i + 1}") }
+          idx = examples.size == 1 ? "" : (i + 1).to_s
+          @anchors[n["id"]] = {
+            label: idx, xref: l10n("#{@anchors[t['id']][:xref]}, "\
+                                   "#{@note_xref_lbl} #{i + 1}") }
         end
       end
     end
@@ -133,7 +134,7 @@ module IsoDoc::Function
           i += 1
         end
         label = i.to_s + (j.zero? ? "" : "-#{j}")
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl)
       end
     end
@@ -165,12 +166,12 @@ module IsoDoc::Function
 
     def sequential_asset_names(clause)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl)
       end
       sequential_figure_names(clause)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl)
       end
     end
@@ -184,19 +185,19 @@ module IsoDoc::Function
           i += 1
         end
         label = "#{num}.#{i}" + (j.zero? ? "" : "-#{j}")
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl)
       end
     end
 
     def hierarchical_asset_names(clause, num)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", nil, @table_lbl)
       end
       hierarchical_figure_names(clause, num)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
-          next if t["id"].nil? || t["id"].empty?
+        next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, @formula_lbl)
       end
     end

data/lib/isodoc/html_function/html.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module IsoDoc::HtmlFunction
   module Html
     def make_body1(body, _docxml)
@@ -201,7 +203,8 @@ module IsoDoc::HtmlFunction
     end
 
     def move_image1(i, new_full_filename)
-      system "cp #{i['src']} #{new_full_filename}"
+      #system "cp #{i['src']} #{new_full_filename}"
+      FileUtils.cp i["src"], new_full_filename
       i["src"] = new_full_filename
       i["width"], i["height"] = Html2Doc.image_resize(i, @maxheight, @maxwidth)
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.8".freeze
+  VERSION = "0.8.9".freeze
 end

data/spec/assets/html.css

@@ -1,2 +1,6 @@
 
 /* another empty stylesheet */
+
+p {
+  font-family: $bodyfont;
+}

data/spec/isodoc/blocks_spec.rb

@@ -519,7 +519,7 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
                  <p>where</p>
-                 <dl>
+                 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
                    <dt>
            <span class="stem">(#(r)#)</span>
          </dt>

data/spec/isodoc/inline_spec.rb

@@ -238,7 +238,7 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
            <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
            <a href="#ISO712">ISO 712, Clause 1</a>
-           <a href="#ISO712">ISO 712, 1.5</a>
+           <a href="#ISO712">ISO 712, Clause 1.5</a>
            <a href="#ISO712">A</a>
            <a href="#ISO712">ISO 712, </a>
            <a href="#ISO712">ISO 712, Prelude 7</a>

data/spec/isodoc/lists_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <ul>
+                 <ul id="_61961034-0fb1-436b-b281-828857a59ddb">
          <li>
            <p id="_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2">updated normative references;</p>
          </li>
@@ -62,7 +62,7 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <ol type="a">
+                 <ol type="a" id="_ae34a226-aab4-496d-987b-1aa7b6314026">
          <li>
            <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
          </li>
@@ -90,7 +90,7 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <ol id="_ae34a226-aab4-496d-987b-1aa7b6314026" type="roman_upper">
-  <li>
+  <li id="_ae34a226-aab4-496d-987b-1aa7b6314027">
     <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
   </li>
   <li>
@@ -107,8 +107,8 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <ol type="a">
-         <li>
+                 <ol type="a" id="_ae34a226-aab4-496d-987b-1aa7b6314026">
+         <li id="_ae34a226-aab4-496d-987b-1aa7b6314027">
            <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
          </li>
          <li>
@@ -148,7 +148,7 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <dl>
+                 <dl id="_732d3f57-4f88-40bf-9ae9-633891edc395">
                    <dt>
                      <p>
            W

data/spec/isodoc/postproc_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe IsoDoc do
   it "generates HTML output docs with complete configuration" do
     system "rm -f test.doc"
     system "rm -f test.html"
-    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({bodyfont: "Zapf", htmlstylesheet: "spec/assets/html.css", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -111,7 +111,30 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     html = File.read("test.html")
-    expect(html).to match(/a third empty stylesheet/)
+    expect(html).to match(/another empty stylesheet/)
+    expect(html).to match(/font-family: Zapf/)
+    expect(html).to match(/an empty html cover page/)
+    expect(html).to match(/an empty html intro page/)
+    expect(html).to match(/This is > a script/)
+    expect(html).not_to match(/CDATA/)
+    expect(html).to match(%r{Enkonduko</h1>})
+  end
+
+  it "generates HTML output docs with default fonts" do
+    system "rm -f test.doc"
+    system "rm -f test.html"
+    IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.css", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html")
+    expect(html).to match(/another empty stylesheet/)
+    expect(html).to match(/font-family: Arial/)
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
     expect(html).to match(/This is > a script/)
@@ -122,7 +145,30 @@ RSpec.describe IsoDoc do
   it "generates Word output docs with complete configuration" do
     system "rm -f test.doc"
     system "rm -f test.html"
-    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::WordConvert.new({bodyfont: "Zapf", wordstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    word = File.read("test.doc")
+    expect(word).to match(/another empty stylesheet/)
+    expect(word).to match(/font-family: Zapf/)
+    expect(word).to match(/a third empty stylesheet/)
+    expect(word).to match(/<title>test<\/title>/)
+    expect(word).to match(/test_files\/header.html/)
+    expect(word).to match(/an empty word cover page/)
+    expect(word).to match(/an empty word intro page/)
+    expect(word).to match(%r{Enkonduko</h1>})
+  end
+
+  it "generates Word output docs with default fonts" do
+    system "rm -f test.doc"
+    system "rm -f test.html"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -132,6 +178,8 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     word = File.read("test.doc")
+    expect(word).to match(/another empty stylesheet/)
+    expect(word).to match(/font-family: Arial/)
     expect(word).to match(/a third empty stylesheet/)
     expect(word).to match(/<title>test<\/title>/)
     expect(word).to match(/test_files\/header.html/)
@@ -251,7 +299,7 @@ RSpec.describe IsoDoc do
        </p> </li> </ul>
        <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, 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
+       <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>
     OUTPUT
   end

data/spec/isodoc/terms_spec.rb

@@ -81,13 +81,13 @@ RSpec.describe IsoDoc do
        </td></tr></table>
 
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
+         <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>
        <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>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -95,7 +95,7 @@ RSpec.describe IsoDoc do
        <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: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
        [/TERMREF]</p></div>
              </div>
            </body>
@@ -184,13 +184,13 @@ OUTPUT
        </td></tr></table>
 
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
+         <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>
        <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>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -198,7 +198,7 @@ OUTPUT
        <div class="Note"><p class="Note">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 class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
        [/TERMREF]</p></div>
            </div>
          </body>

data/spec/isodoc/xref_spec.rb

@@ -1248,25 +1248,25 @@ RSpec.describe IsoDoc do
            </p>
                </div>
                             <br/>
-             <div class="Section3" id="intro">
+                                         <div class="Section3" id="intro">
                <h1 class="IntroTitle">Introduction</h1>
-               <ol type="a">
+               <ol type="a" id="N1">
          <li><p>A</p></li>
        </ol>
-       <div id="xyz"><h2>Preparatory</h2>
-            <ol type="a">
+               <div id="xyz"><h2>Preparatory</h2>
+            <ol type="a" id="N2">
          <li><p>A</p></li>
        </ol>
        </div>
              </div>
-               <p class="zzSTDTitle1"/>
-               <div id="scope">
-                 <h1>1.&#160; Scope</h1>
-                 <ol type="a">
+             <p class="zzSTDTitle1"/>
+             <div id="scope">
+               <h1>1.&#160; Scope</h1>
+               <ol type="a" id="N">
          <li><p>A</p></li>
        </ol>
-               </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</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>
 
@@ -1277,35 +1277,35 @@ RSpec.describe IsoDoc do
          <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>
-           <ol type="a">
+             <div id="widgets">
+               <h1>3.&#160; Widgets</h1>
+               <div id="widgets1"><h2>3.1. </h2>
+           <ol type="a" id="note1">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
-           <ol type="a">
+           <ol type="a" id="note2">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
            </div>
-               </div>
-               <br/>
-               <div id="annex1" class="Section3">
-                 <div id="annex1a"><h2>A.1. </h2>
-           <ol type="a">
+             </div>
+             <br/>
+             <div id="annex1" class="Section3">
+               <div id="annex1a"><h2>A.1. </h2>
+           <ol type="a" id="AN">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
            </div>
-                 <div id="annex1b"><h2>A.2. </h2>
-           <ol type="a">
+               <div id="annex1b"><h2>A.2. </h2>
+           <ol type="a" id="Anote1">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
-           <ol type="a">
+           <ol type="a" id="Anote2">
          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
        </ol>
            </div>
-               </div>
              </div>
-           </body>
+           </div>
+         </body>
        </html>
     OUTPUT
   end
@@ -1388,25 +1388,25 @@ RSpec.describe IsoDoc do
            </p>
                </div>
                             <br/>
-             <div class="Section3" id="intro">
+                                         <div class="Section3" id="intro">
                <h1 class="IntroTitle">Introduction</h1>
-               <ol type="a">
-         <li><p>A</p></li>
+               <ol type="a" id="N01">
+         <li id="N1"><p>A</p></li>
        </ol>
                <div id="xyz"><h2>Preparatory</h2>
-     <ol type="a">
-        <li><p>A</p></li>
-        </ol>
-        </div>
+            <ol type="a" id="N02">
+         <li id="N2"><p>A</p></li>
+       </ol>
+       </div>
              </div>
-               <p class="zzSTDTitle1"/>
-               <div id="scope">
-                 <h1>1.&#160; Scope</h1>
-                 <ol type="a">
-         <li><p>A</p></li>
+             <p class="zzSTDTitle1"/>
+             <div id="scope">
+               <h1>1.&#160; Scope</h1>
+               <ol type="a" id="N0">
+         <li id="N"><p>A</p></li>
        </ol>
-               </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</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>
 
@@ -1417,35 +1417,35 @@ RSpec.describe IsoDoc do
          <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>
-           <ol type="a">
-         <li><p>A</p></li>
+             <div id="widgets">
+               <h1>3.&#160; Widgets</h1>
+               <div id="widgets1"><h2>3.1. </h2>
+           <ol type="a" id="note1l">
+         <li id="note1"><p>A</p></li>
        </ol>
-           <ol type="a">
-         <li><p>A</p></li>
+           <ol type="a" id="note2l">
+         <li id="note2"><p>A</p></li>
        </ol>
            </div>
-               </div>
-               <br/>
-               <div id="annex1" class="Section3">
-                 <div id="annex1a"><h2>A.1. </h2>
-           <ol type="a">
-         <li><p>A</p></li>
+             </div>
+             <br/>
+             <div id="annex1" class="Section3">
+               <div id="annex1a"><h2>A.1. </h2>
+           <ol type="a" id="ANl">
+         <li id="AN"><p>A</p></li>
        </ol>
            </div>
-                 <div id="annex1b"><h2>A.2. </h2>
-           <ol type="a">
-         <li><p>A</p></li>
+               <div id="annex1b"><h2>A.2. </h2>
+           <ol type="a" id="Anote1l">
+         <li id="Anote1"><p>A</p></li>
        </ol>
-           <ol type="a">
-         <li><p>A</p></li>
+           <ol type="a" id="Anote2l">
+         <li id="Anote2"><p>A</p></li>
        </ol>
            </div>
-               </div>
              </div>
-           </body>
+           </div>
+         </body>
        </html>
     OUTPUT
   end
@@ -1503,30 +1503,30 @@ RSpec.describe IsoDoc do
         </p>
                 </div>
                 <p class="zzSTDTitle1"/>
-                <div id="scope">
-                  <h1>1.&#160; Scope</h1>
-                  <ol type="a">
-          <li><p>A</p>
-          <ol type="1">
-          <li><p>A</p>
-          <ol type="i">
-          <li><p>A</p>
-          <ol type="A">
-          <li><p>A</p>
-          <ol type="I">
-          <li><p>A</p>
-          <ol type="a">
-          <li><p>A</p></li>
-          </ol></li>
-          </ol></li>
-          </ol></li>
-          </ol></li>
-          </ol></li>
-        </ol>
-                </div>
-              </div>
-            </body>
-        </html>
+                             <div id="scope">
+               <h1>1.&#160; Scope</h1>
+               <ol type="a" id="N1">
+         <li id="N"><p>A</p>
+         <ol type="1">
+         <li id="note1"><p>A</p>
+         <ol type="i">
+         <li id="note2"><p>A</p>
+         <ol type="A">
+         <li id="AN"><p>A</p>
+         <ol type="I">
+         <li id="Anote1"><p>A</p>
+         <ol type="a">
+         <li id="Anote2"><p>A</p></li>
+         </ol></li>
+         </ol></li>
+         </ol></li>
+         </ol></li>
+         </ol></li>
+       </ol>
+             </div>
+           </div>
+         </body>
+       </html>
     OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement