isodoc 1.6.7.1 → 1.7.0

data/lib/isodoc/xref/xref_counter.rb

@@ -1,33 +1,37 @@
 require "roman-numerals"
 
-module IsoDoc::XrefGen
-  class Counter
-    def initialize(num = 0, opts = { numerals: :arabic })
-      @num = num
-      @letter = ""
-      @subseq = ""
-      @letter_override = nil
-      @number_override = nil
-      @style = opts[:numerals]
-      @skip_i = opts[:skip_i]
-      @base = ""
-      if num.is_a? String
-        if /^\d+$/.match?(num)
-          @num = num.to_i
-        else
-          @num = nil
-          @base = num[0..-2]
-          @letter = num[-1]
+module IsoDoc
+  module XrefGen
+    class Counter
+      def initialize(num = 0, opts = { numerals: :arabic })
+        @num = num
+        @letter = ""
+        @subseq = ""
+        @letter_override = nil
+        @number_override = nil
+        @style = opts[:numerals]
+        @skip_i = opts[:skip_i]
+        @base = ""
+        if num.is_a? String
+          if /^\d+$/.match?(num)
+            @num = num.to_i
+          else
+            @num = nil
+            @base = num[0..-2]
+            @letter = num[-1]
+          end
         end
       end
-    end
 
-    def new_subseq_increment(node)
-      @subseq = node["subsequence"]
-      @num += 1 unless @num.nil?
-      @letter = node["subsequence"] ? "a" : ""
-      @base = ""
-      if node["number"]
+      def new_subseq_increment(node)
+        @subseq = node["subsequence"]
+        @num += 1 unless @num.nil?
+        @letter = node["subsequence"] ? "a" : ""
+        @base = ""
+        new_subseq_increment1(node) if node["number"]
+      end
+
+      def new_subseq_increment1(node)
         /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z]*)$/ =~ node["number"]
         if !n.empty? || !a.empty?
           @letter_override = @letter = a unless a.empty?
@@ -38,108 +42,114 @@ module IsoDoc::XrefGen
           @letter = @letter_override if /^[a-zA-Z]$/.match?(@letter_override)
         end
       end
-    end
 
-    def sequence_increment(node)
-      if node["number"]
-        @base = @letter_override = @number_override = ""
-        /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
-        if blank?(n)
-          @num = nil
-          @base = node["number"][0..-2]
-          @letter = @letter_override = node["number"][-1]
-        else
-          @number_override = @num = n.to_i
-          @base = b
-          @letter = ""
+      def sequence_increment(node)
+        if node["number"]
+          @base = @letter_override = @number_override = ""
+          /^(?<b>.*?)(?<n>\d+)$/ =~ node["number"]
+          if blank?(n)
+            @num = nil
+            @base = node["number"][0..-2]
+            @letter = @letter_override = node["number"][-1]
+          else
+            @number_override = @num = n.to_i
+            @base = b
+            @letter = ""
+          end
+        else @num += 1
         end
-      else
-        @num += 1
       end
-    end
 
-    def subsequence_increment(node)
-      if node["number"]
+      def subsequence_increment(node)
+        return increment_letter unless node["number"]
+
         @base = ""
         @letter_override = node["number"]
         /^(?<b>.*?)(?<n>\d*)(?<a>[a-zA-Z])$/ =~ node["number"]
-        if blank?(a)
-          if /^\d+$/.match?(node["number"])
-            @letter_override = @letter = ""
-            @number_override = @num = node["number"].to_i
-          else
-            /^(?<b>.*)(?<a>[a-zA-Z])$/ =~ node["number"]
-            unless blank?(a)
-              @letter = @letter_override = a
-              @base = b
-            end
-          end
+        if blank?(a) then subsequence_increment_no_letter(node)
         else
           @letter_override = @letter = a
           @base = b
           @number_override = @num = n.to_i unless n.empty?
         end
-      else
-        increment_letter
       end
-    end
 
-    def increment_letter
-      case @letter
-      when "Z"
-        @letter = "@"
-        @base = @base.empty? ? "A" : @base[0..-2] + (@base[-1].ord + 1).chr.to_s
-      when "z"
-        @letter = "`"
-        @base = @base.empty? ? "a" : @base[0..-2] + (@base[-1].ord + 1).chr.to_s
+      def subsequence_increment_no_letter(node)
+        if /^\d+$/.match?(node["number"])
+          @letter_override = @letter = ""
+          @number_override = @num = node["number"].to_i
+        else
+          /^(?<b>.*)(?<a>[a-zA-Z])$/ =~ node["number"]
+          unless blank?(a)
+            @letter = @letter_override = a
+            @base = b
+          end
+        end
+      end
+
+      def string_inc(str, start)
+        return start if str.empty?
+
+        str[0..-2] + (str[-1].ord + 1).chr.to_s
       end
-      @letter = (@letter.ord + 1).chr.to_s
-      @skip_i && %w(i I).include?(@letter) and
+
+      def increment_letter
+        case @letter
+        when "Z"
+          @letter = "@"
+          @base = string_inc(@base, "A")
+        when "z"
+          @letter = "`"
+          @base = string_inc(@base, "a")
+        end
         @letter = (@letter.ord + 1).chr.to_s
-    end
+        @skip_i && %w(i I).include?(@letter) and
+          @letter = (@letter.ord + 1).chr.to_s
+      end
 
-    def blank?(str)
-      str.nil? || str.empty?
-    end
+      def blank?(str)
+        str.nil? || str.empty?
+      end
 
-    def increment(node)
-      return self if node["unnumbered"]
+      def increment(node)
+        return self if node["unnumbered"]
 
-      @letter_override = nil
-      @number_override = nil
-      if node["subsequence"] != @subseq &&
-          !(blank?(node["subsequence"]) && blank?(@subseq))
-        new_subseq_increment(node)
-      elsif @letter.empty? then sequence_increment(node)
-      else subsequence_increment(node)
+        @letter_override = nil
+        @number_override = nil
+        if node["subsequence"] != @subseq &&
+            !(blank?(node["subsequence"]) && blank?(@subseq))
+          new_subseq_increment(node)
+        elsif @letter.empty? then sequence_increment(node)
+        else subsequence_increment(node)
+        end
+        self
       end
-      self
-    end
 
-    def print
-      num = @number_override || @num
-      out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
-      "#{@base}#{out}#{@letter_override || @letter}"
-    end
+      def print
+        num = @number_override || @num
+        out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
+        "#{@base}#{out}#{@letter_override || @letter}"
+      end
 
-    def ol_type(list, depth)
-      return list["type"].to_sym if list["type"]
-      return :arabic if [2, 7].include? depth
-      return :alphabet if [1, 6].include? depth
-      return :alphabet_upper if [4, 9].include? depth
-      return :roman if [3, 8].include? depth
-      return :roman_upper if [5, 10].include? depth
+      def ol_type(list, depth)
+        return list["type"].to_sym if list["type"]
+        return :arabic if [2, 7].include? depth
+        return :alphabet if [1, 6].include? depth
+        return :alphabet_upper if [4, 9].include? depth
+        return :roman if [3, 8].include? depth
+        return :roman_upper if [5, 10].include? depth
 
-      :arabic
-    end
+        :arabic
+      end
 
-    def listlabel(list, depth)
-      case ol_type(list, depth)
-      when :arabic then @num.to_s
-      when :alphabet then (96 + @num).chr.to_s
-      when :alphabet_upper then (64 + @num).chr.to_s
-      when :roman then RomanNumerals.to_roman(@num).downcase
-      when :roman_upper then RomanNumerals.to_roman(@num).upcase
+      def listlabel(list, depth)
+        case ol_type(list, depth)
+        when :arabic then @num.to_s
+        when :alphabet then (96 + @num).chr.to_s
+        when :alphabet_upper then (64 + @num).chr.to_s
+        when :roman then RomanNumerals.to_roman(@num).downcase
+        when :roman_upper then RomanNumerals.to_roman(@num).upcase
+        end
       end
     end
   end

data/lib/isodoc/xref/xref_gen.rb

@@ -3,7 +3,7 @@ require_relative "xref_gen_seq"
 module IsoDoc::XrefGen
   module Blocks
     NUMBERED_BLOCKS = %w(termnote termexample note example requirement
-    recommendation permission figure table formula admonition sourcecode).freeze
+                         recommendation permission figure table formula admonition sourcecode).freeze
 
     def amend_preprocess(xmldoc)
       xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
@@ -60,9 +60,9 @@ module IsoDoc::XrefGen
 
           c.increment(n)
           idx = increment_label(examples, n, c, false)
-          @anchors[n["id"]] = {
-            type: "termexample", label: idx, value: c.print,
-            xref: l10n("#{anchor(t['id'], :xref)}, "\
+          @anchors[n["id"]] =
+            { type: "termexample", label: idx, value: c.print,
+              xref: l10n("#{anchor(t['id'], :xref)}, "\
                        "#{@labels['example_xref']} #{c.print}") }
         end
       end
@@ -86,9 +86,8 @@ module IsoDoc::XrefGen
 
     def note_anchor_names(sections)
       sections.each do |s|
-        notes = s.xpath(CHILD_NOTES_XPATH)
         c = Counter.new
-        notes.each do |n|
+        (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
           @anchors[n["id"]] =
@@ -105,13 +104,12 @@ module IsoDoc::XrefGen
       "xmlns:example | ./xmlns:example".freeze
 
     CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
-      "./references"
+      "./references".freeze
 
     def example_anchor_names(sections)
       sections.each do |s|
-        notes = s.xpath(CHILD_EXAMPLES_XPATH)
         c = Counter.new
-        notes.each do |n|
+        (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
           @anchors[n["id"]] =
@@ -145,14 +143,44 @@ module IsoDoc::XrefGen
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] and @anchors[li["id"]] =
-          { xref: "#{label})", type: "listitem", 
-            container: list_anchor[:container] }
+                       { xref: "#{label})", type: "listitem",
+                         container: list_anchor[:container] }
         li.xpath(ns("./ol")).each do |ol|
           list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
         end
       end
     end
 
+    def deflist_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
+          s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
+        c = Counter.new
+        notes.each do |n|
+          next if n["id"].nil? || n["id"].empty?
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["deflist"], "deflist", false)
+          deflist_term_anchor_names(n, @anchors[n["id"]])
+        end
+        deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+      end
+    end
+
+    def deflist_term_anchor_names(list, list_anchor)
+      list.xpath(ns("./dt")).each do |li|
+        label = li.text
+        label = l10n("#{list_anchor[:xref]}: #{label}")
+        li["id"] and @anchors[li["id"]] =
+                       { xref: label, type: "deflistitem",
+                         container: list_anchor[:container] }
+        li.xpath(ns("./dl")).each do |dl|
+          deflist_term_anchor_names(dl, list_anchor)
+        end
+      end
+    end
+
     def bookmark_anchor_names(docxml)
       docxml.xpath(ns(".//bookmark")).each do |n|
         next if n["id"].nil? || n["id"].empty?

data/spec/isodoc/inline_spec.rb

@@ -139,19 +139,27 @@ RSpec.describe IsoDoc do
           <preface><foreword>
           <p>
           <ul>
-          <li><concept term='term'>
+          <li><concept><refterm>term</refterm>
               <xref target='clause1'/>
             </concept></li>
-          <li><concept term='term'>
-              <xref target='clause1'>w[o]rd</xref>
+            <li><concept><refterm>term</refterm>
+              <renderterm>term</renderterm>
+              <xref target='clause1'/>
+            </concept></li>
+          <li><concept><refterm>term</refterm>
+              <renderterm>w[o]rd</renderterm>
+              <xref target='clause1'>Clause #1</xref>
             </concept></li>
-            <li><concept term='term'>
+            <li><concept><refterm>term</refterm>
+              <renderterm>term</renderterm>
               <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
             </concept></li>
-            <li><concept term='term'>
-              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">word</eref>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>
             </concept></li>
-            <li><concept>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
                 <locality type='clause'>
                   <referenceFrom>3.1</referenceFrom>
@@ -161,7 +169,8 @@ RSpec.describe IsoDoc do
                 </locality>
               </eref>
             </concept></li>
-            <li><concept>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
               <localityStack>
                 <locality type='clause'>
@@ -175,7 +184,8 @@ RSpec.describe IsoDoc do
               </localityStack>
               </eref>
             </concept></li>
-            <li><concept>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
               <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
               <localityStack>
                 <locality type='clause'>
@@ -187,14 +197,16 @@ RSpec.describe IsoDoc do
                   <referenceFrom>b</referenceFrom>
                 </locality>
               </localityStack>
-              <em>word</em>
+              The Aforementioned Citation
               </eref>
             </concept></li>
-            <li><concept term='term'>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
               <termref base='IEV' target='135-13-13'/>
             </concept></li>
-            <li><concept term='term'>
-              <termref base='IEV' target='135-13-13'><em>word</em> word</termref>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'>The IEV database</termref>
             </concept></li>
             </ul>
           </p>
@@ -219,190 +231,166 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <preface>
-            <foreword displayorder="1">
-              <p>
-                <ul>
-                  <li>
-                    <em>
-                      <xref target='clause1'>Clause 2</xref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <xref target='clause1'>w[o]rd</xref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>ISO 712</eref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>word</eref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
-                        <locality type='clause'>
-                          <referenceFrom>3.1</referenceFrom>
-                        </locality>
-                        <locality type='figure'>
-                          <referenceFrom>a</referenceFrom>
-                        </locality>
-                        ISO 712, Clause 3.1, Figure a
-                      </eref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
-                        <localityStack>
-                          <locality type='clause'>
-                            <referenceFrom>3.1</referenceFrom>
-                          </locality>
-                        </localityStack>
-                        <localityStack>
-                          <locality type='figure'>
-                            <referenceFrom>b</referenceFrom>
-                          </locality>
-                        </localityStack>
-                        ISO 712, Clause 3.1; Figure b
-                      </eref>
-                    </em>
-                  </li>
-                  <li>
-                    <em>
-                      <eref bibitemid='ISO712' type='inline' citeas='ISO 712'>
-                        <localityStack>
-                          <locality type='clause'>
-                            <referenceFrom>3.1</referenceFrom>
-                          </locality>
-                        </localityStack>
-                        <localityStack>
-                          <locality type='figure'>
-                            <referenceFrom>b</referenceFrom>
-                          </locality>
-                        </localityStack>
-                        <em>word</em>
-                      </eref>
-                    </em>
-                  </li>
-                  <li>
-                    [term defined in
-                    <termref base='IEV' target='135-13-13'/>
-                    ]
-                  </li>
-                  <li>
-                    <em>
-                      <termref base='IEV' target='135-13-13'>
-                        <em>word</em>
-                         word
-                      </termref>
-                    </em>
-                  </li>
-                </ul>
-              </p>
-            </foreword>
-          </preface>
-          <sections>
-            <clause id='clause1' displayorder="3">
-              <title depth='1'>
-                2.
-                <tab/>
-                Clause 1
-              </title>
-            </clause>
-          </sections>
-          <bibliography>
-            <references id='_normative_references' obligation='informative' normative='true' displayorder="2">
-              <title depth='1'>
-                1.
-                <tab/>
-                Normative References
-              </title>
-              <p>
-                The following documents are referred to in the text in such a way that
-                some or all of their content constitutes requirements of this document.
-                For dated references, only the edition cited applies. For undated
-                references, the latest edition of the referenced document (including any
-                amendments) applies.
-              </p>
-              <bibitem id='ISO712' type='standard'>
-                <title format='text/plain'>Cereals or cereal products</title>
-                <title type='main' format='text/plain'>Cereals and cereal products</title>
-                <docidentifier type='ISO'>ISO 712</docidentifier>
-                <contributor>
-                  <role type='publisher'/>
-                  <organization>
-                    <name>International Organization for Standardization</name>
-                  </organization>
-                </contributor>
-              </bibitem>
-            </references>
-          </bibliography>
-        </iso-standard>
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+           <preface><foreword displayorder="1">
+           <p>
+           <ul>
+           <li>
+               [term defined in <xref target="clause1">Clause 2</xref>]
+             </li>
+             <li>
+               <em>term</em>
+               [term defined in <xref target="clause1">Clause 2</xref>]
+             </li>
+           <li>
+               <em>w[o]rd</em>
+               [term defined in <xref target="clause1">Clause #1</xref>]
+             </li>
+             <li>
+               <em>term</em>
+               [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
+                   <referenceFrom>3.1</referenceFrom>
+                 </locality><locality type="figure">
+                   <referenceFrom>a</referenceFrom>
+                 </locality>ISO 712, Clause 3.1, Figure a</eref>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
+                 <locality type="clause">
+                   <referenceFrom>3.1</referenceFrom>
+                 </locality>
+               </localityStack><localityStack>
+                 <locality type="figure">
+                   <referenceFrom>b</referenceFrom>
+                 </locality>
+               </localityStack>ISO 712, Clause 3.1; Figure b</eref>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+               <localityStack>
+                 <locality type="clause">
+                   <referenceFrom>3.1</referenceFrom>
+                 </locality>
+               </localityStack>
+               <localityStack>
+                 <locality type="figure">
+                   <referenceFrom>b</referenceFrom>
+                 </locality>
+               </localityStack>
+               The Aforementioned Citation
+               </eref>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <termref base="IEV" target="135-13-13"/>]
+             </li>
+             <li>
+               <em>word</em>
+               [term defined in <termref base="IEV" target="135-13-13">The IEV database</termref>]
+             </li>
+             </ul>
+           </p>
+           </foreword></preface>
+           <sections>
+           <clause id="clause1" displayorder="3"><title depth="1">2.<tab/>Clause 1</title></clause>
+           </sections>
+           <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="2"><title depth="1">1.<tab/>Normative References</title>
+           <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+       <bibitem id="ISO712" type="standard">
+         <title format="text/plain">Cereals or cereal products</title>
+         <title type="main" format="text/plain">Cereals and cereal products</title>
+         <docidentifier type="ISO">ISO 712</docidentifier>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+           </organization>
+         </contributor>
+       </bibitem>
+       </references></bibliography>
+           </iso-standard>
     OUTPUT
     output = <<~OUTPUT
       #{HTML_HDR}
-             <br/>
+                  <br/>
              <div>
                <h1 class='ForewordTitle'>Foreword</h1>
                <p>
                  <ul>
                    <li>
-                     <i>
-                       <a href='#clause1'>Clause 2</a>
-                     </i>
+                      [term defined in
+                     <a href='#clause1'>Clause 2</a>
+                     ]
+                   </li>
+                   <li>
+                     <i>term</i>
+                      [term defined in
+                     <a href='#clause1'>Clause 2</a>
+                     ]
+                   </li>
+                   <li>
+                     <i>w[o]rd</i>
+                      [term defined in
+                     <a href='#clause1'>Clause #1</a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#clause1'>w[o]rd</a>
-                     </i>
+                     <i>term</i>
+                      [term defined in
+                     <a href='#ISO712'>ISO 712</a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#ISO712'>ISO 712</a>
-                     </i>
+                     <i>word</i>
+                      [term defined in
+                     <a href='#ISO712'>The Aforementioned Citation</a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#ISO712'>word</a>
-                     </i>
+                     <i>word</i>
+                      [term defined in
+                     <a href='#ISO712'>ISO 712, Clause 3.1, Figure a</a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#ISO712'> ISO 712, Clause 3.1, Figure a </a>
-                     </i>
+                     <i>word</i>
+                      [term defined in
+                     <a href='#ISO712'>ISO 712, Clause 3.1; Figure b</a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#ISO712'> ISO 712, Clause 3.1; Figure b </a>
-                     </i>
+                     <i>word</i>
+                      [term defined in
+                     <a href='#ISO712'> The Aforementioned Citation </a>
+                     ]
                    </li>
                    <li>
-                     <i>
-                       <a href='#ISO712'>
-                         <i>word</i>
-                       </a>
-                     </i>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
                    </li>
-                   <li> [term defined in Termbase IEV, term ID 135-13-13 ] </li>
                    <li>
-                     <i> Termbase IEV, term ID 135-13-13 </i>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
                    </li>
                  </ul>
                </p>
              </div>
              <p class='zzSTDTitle1'/>
              <div>
-               <h1> 1. &#160; Normative References </h1>
+               <h1>1.&#160; Normative References</h1>
                <p>
-                  The following documents are referred to in the text in such a way
-                 that some or all of their content constitutes requirements of this
+                 The following documents are referred to in the text in such a way that
+                 some or all of their content constitutes requirements of this
                  document. For dated references, only the edition cited applies. For
                  undated references, the latest edition of the referenced document
                  (including any amendments) applies.
@@ -413,7 +401,7 @@ RSpec.describe IsoDoc do
                </p>
              </div>
              <div id='clause1'>
-               <h1> 2. &#160; Clause 1 </h1>
+               <h1>2.&#160; Clause 1</h1>
              </div>
            </div>
          </body>