isodoc 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07a78782a0c09a2c70525f1d7d4b8f5d34ea8d731c3dbc5860b7386250c1e56
-  data.tar.gz: bb3ddf0e119c8cf4b4d25c70ba381dba043020c132edd13fc4934bb08871594e
+  metadata.gz: b64ad76ffcf7c9f1ced2c15c41a263e49e62cfa4294d31066ba2e358e613fb35
+  data.tar.gz: f35ca08d240ae7cdb7ba9aa0c9e071ec284d051f0d61c82542d461e101d0da38
 SHA512:
-  metadata.gz: ba808db07e817492e8ceb891771ec1df67f8d4dfab34896eb2eca9accd45ccf110745a5844276e52f1f20c6542cf1d33fdaad816ea3ce0ff264465bd4f4c8d4c
-  data.tar.gz: 0124e13883ab5d0c5f0561c62b924920ae0d73bc4980024f77336a4aed919d175c0f51a464e3574f910ea77ba15bccbf0d86c7e14707a6f4b7bf038ff7f1d80a
+  metadata.gz: 3062ddc15478efad6f25fb39e37689fecab84750b34c2496f5693af1b52c864053f50acf3af141d876e8cb8d2d19f89ecdd19e630ab1b1da9e953e897f2ab68a
+  data.tar.gz: 14d688526a710b92cf2256e49df75e4abcf5a67ed7de40e6593cedf1a99e96561ba5024398ae7c767d78a4e0d74e18df344423cfbc83dd75e2afa28beeea0006

data/lib/isodoc/function/blocks.rb

@@ -23,7 +23,7 @@ module IsoDoc::Function
     end
 
     def figure_key(out)
-      out.p **{ style: "page-break-after:avoid;"} do |p|
+      out.p **{ style: "page-break-after:avoid;" } do |p|
         p.b { |b| b << @i18n.key }
       end
     end
@@ -61,7 +61,7 @@ module IsoDoc::Function
       @in_figure = false
     end
 
-    def sourcecode_name_parse(node, div, name)
+    def sourcecode_name_parse(_node, div, name)
       return if name.nil?
 
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
@@ -143,7 +143,7 @@ module IsoDoc::Function
 
     def formula_parse1(node, out)
       out.div **attr_code(class: "formula") do |div|
-        div.p do |p|
+        div.p do |_p|
           parse(node.at(ns("./stem")), div)
           if lbl = node&.at(ns("./name"))&.text
             insert_tab(div, 1)
@@ -219,7 +219,7 @@ module IsoDoc::Function
 
     def passthrough_parse(node, out)
       return if node["format"] &&
-        !(node["format"].split(/,/).include? @format.to_s)
+        !(node["format"].split(",").include? @format.to_s)
 
       out.passthrough node.text
     end

data/lib/isodoc/function/form.rb

@@ -1,48 +1,51 @@
-module IsoDoc::Function
-  module Form
-    def form_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+module IsoDoc
+  module Function
+    module Form
+      def form_parse(node, out)
+        out.div **attr_code(class: node["class"],
+                            id: node["id"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
+        end
       end
-    end
 
-    def input_parse(node, out)
-      case node["type"]
-      when "button" then out << "[#{node['value'] || 'BUTTON'}]"
-      when "checkbox" then out << "&#x2610; "
-      when "date" then text_input(out)
-      when "file" then text_input(out)
-      when "password" then text_input(out)
-      when "radio" then out << "&#x25CE; "
-      when "submit" # nop
-      when "text" then text_input(out, node["maxlength"])
+      def input_parse(node, out)
+        case node["type"]
+        when "button" then out << "[#{node['value'] || 'BUTTON'}]"
+        when "checkbox" then out << "&#x2610; "
+        when "date", "file", "password" then text_input(out)
+        when "radio" then out << "&#x25CE; "
+        when "submit" # nop
+        when "text" then text_input(out, node["maxlength"])
+        end
       end
-    end
 
-    def text_input(out, length = 10)
-      length ||= 10
-      length = length.to_i
-      length.zero? and length = 10
-      out << "_" * length
-      out << " "
-    end
+      def text_input(out, length = 10)
+        length ||= 10
+        length = length.to_i
+        length.zero? and length = 10
+        out << "_" * length
+        out << " "
+      end
 
-    def select_parse(node, out)
-      text_input(out, node["size"] || 10)
-    end
+      def select_parse(node, out)
+        text_input(out, node["size"] || 10)
+      end
 
-    def label_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+      def label_parse(node, out)
+        node.children.each do |n|
+          parse(n, out)
+        end
       end
-    end
 
-    def option_parse(node, out); end
+      def option_parse(node, out); end
 
-    def textarea_parse(_node, out)
-      out.table **{ border: 1, width: "50%" } do |t|
-        t.tr do |tr|
-          tr.td do |td|
+      def textarea_parse(_node, out)
+        out.table **{ border: 1, width: "50%" } do |t|
+          t.tr do |tr|
+            tr.td do |td|
+            end
           end
         end
       end

data/lib/isodoc/function/inline.rb

@@ -71,7 +71,11 @@ module IsoDoc::Function
     end
 
     def termrefelem_parse(node, out)
-      out << "Termbase #{node['base']}, term ID #{node['target']}"
+      if node.text.strip.empty?
+        out << "Termbase #{node['base']}, term ID #{node['target']}"
+      else
+        node.children.each { |n| parse(n, out) }
+      end
     end
 
     def stem_parse(node, out)

data/lib/isodoc/html_function/form.rb

@@ -1,61 +1,64 @@
-module IsoDoc::HtmlFunction
-  module Form
-    def form_parse(node, out)
-      out.form **attr_code(id: node["id"], name: node["name"],
-                           action: node["action"]) do |div|
-        node.children.each do |n|
-          parse(n, div)
+module IsoDoc
+  module HtmlFunction
+    module Form
+      def form_parse(node, out)
+        out.form **attr_code(id: node["id"], name: node["name"],
+                             class: node["class"],
+                             action: node["action"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def input_parse(node, out)
-      out.input nil, **attr_code(
-        id: node["id"], name: node["name"], type: node["type"],
-        value: node["value"], disabled: node["disabled"],
-        readonly: node["readonly"], checked: node["checked"],
-        maxlength: node["maxlength"], minlength: node["minlength"]
-      )
-    end
+      def input_parse(node, out)
+        out.input nil, **attr_code(
+          id: node["id"], name: node["name"], type: node["type"],
+          value: node["value"], disabled: node["disabled"],
+          readonly: node["readonly"], checked: node["checked"],
+          maxlength: node["maxlength"], minlength: node["minlength"]
+        )
+      end
 
-    def select_parse(node, out)
-      selected = node.at(ns("./option[@value = '#{node['value']}']"))
-      selected and selected["selected"] = true
-      out.select **attr_code(
-        id: node["id"], name: node["name"], size: node["size"],
-        disabled: node["disabled"], multiple: node["multiple"]
-      ) do |div|
-        node.children.each do |n|
-          parse(n, div)
+      def select_parse(node, out)
+        selected = node.at(ns("./option[@value = '#{node['value']}']"))
+        selected and selected["selected"] = true
+        out.select **attr_code(
+          id: node["id"], name: node["name"], size: node["size"],
+          disabled: node["disabled"], multiple: node["multiple"]
+        ) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def label_parse(node, out)
-      out.label **attr_code(for: node["for"]) do |div|
-        node.children.each do |n|
-          parse(n, div)
+      def label_parse(node, out)
+        out.label **attr_code(for: node["for"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def option_parse(node, out)
-      out.option **attr_code(
-        disabled: node["disabled"], selected: node["selected"],
-        value: node["value"]
-      ) do |o|
-        node.children.each do |n|
-          parse(n, o)
+      def option_parse(node, out)
+        out.option **attr_code(
+          disabled: node["disabled"], selected: node["selected"],
+          value: node["value"]
+        ) do |o|
+          node.children.each do |n|
+            parse(n, o)
+          end
         end
       end
-    end
 
-    def textarea_parse(node, out)
-      out.textarea **attr_code(
-        id: node["id"], name: node["name"], rows: node["rows"],
-        cols: node["cols"]
-      ) do |div|
-        node["value"] and div << node["value"]
+      def textarea_parse(node, out)
+        out.textarea **attr_code(
+          id: node["id"], name: node["name"], rows: node["rows"],
+          cols: node["cols"]
+        ) do |div|
+          node["value"] and div << node["value"]
+        end
       end
     end
   end

data/lib/isodoc/html_function/html.rb

@@ -74,6 +74,8 @@ module IsoDoc::HtmlFunction
     end
 
     def html_button
+      return "" if @bare
+
       '<button onclick="topFunction()" id="myBtn" '\
         'title="Go to top">Top</button>'.freeze
     end

data/lib/isodoc/html_function/postprocess.rb

@@ -74,6 +74,7 @@ module IsoDoc
         head = docxml.at("//*[local-name() = 'head']")
         head << htmlstylesheet(@htmlstylesheet)
         s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        @bare and head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
         docxml
       end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -160,14 +160,36 @@ module IsoDoc
     end
 
     def concept1(node)
+      xref = node&.at(ns("./xref/@target"))&.text or
+        return concept_render(node, node["ital"] || "true",
+                              node["ref"] || "true")
+      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
+        concept_render(node, node["ital"] || "false", node["ref"] || "false")
+      else concept_render(node, node["ital"] || "true", node["ref"] || "true")
+      end
+    end
+
+    def concept_render(node, ital, ref)
       node&.at(ns("./refterm"))&.remove
-      d = node&.at(ns("./renderterm"))
-      d&.name = "em"
-      r = node.at(ns("./xref | ./eref | ./termref"))
-      r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
+      r = node.at(ns("./renderterm"))
+      r&.next = " "
+      if ital == "true" then r&.name = "em"
+      else r&.replace(r&.children)
+      end
+      concept1_ref(node, ref)
       node.replace(node.children)
     end
 
+    def concept1_ref(node, ref)
+      r = node.at(ns("./xref | ./eref | ./termref")) or return
+      return r.remove if ref == "false"
+
+      if non_locality_elems(r).select { |c| !c.text? || /\S/.match(c) }.empty?
+        r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
+      else r.replace("[#{r.to_xml}]")
+      end
+    end
+
     def variant(docxml)
       docxml.xpath(ns("//variant")).each { |f| variant1(f) }
       docxml.xpath(ns("//variant[@remove = 'true']")).each(&:remove)

data/lib/isodoc/presentation_function/section.rb

@@ -44,8 +44,7 @@ module IsoDoc
       prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
-    def references(docxml)
-    end
+    def references(docxml); end
 
     def docid_prefixes(docxml)
       docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|

data/lib/isodoc/presentation_xml_convert.rb

@@ -53,10 +53,10 @@ module IsoDoc
     end
 
     def inline(docxml)
+      concept docxml
       xref docxml
       eref docxml
       origin docxml
-      concept docxml
       quotesource docxml
       mathml docxml
       variant docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.1".freeze
 end

data/spec/isodoc/form_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe IsoDoc do
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <sections>
           <clause id="A">
-          <form action="/action_page.php" id="F0" name="F1">
+          <form action="/action_page.php" id="F0" name="F1" class="C">
         <label for="fname">First name:</label><br/>
         <input type="text" id="fname" name="fname"/><br/>
         <label for="lname">Last name:</label><br/>
@@ -46,111 +46,115 @@ RSpec.describe IsoDoc do
     INPUT
 
     html = <<~HTML
-    #{HTML_HDR}
-                <p class='zzSTDTitle1'/>
-             <div id='A'>
-               <h1/>
-             <form id='F0' name='F1' action='/action_page.php'>
-                <label for='fname'>First name:</label>
+      #{HTML_HDR}
+                  <p class='zzSTDTitle1'/>
+               <div id='A'>
+                 <h1/>
+               <form id='F0' name='F1' action='/action_page.php' class="C">
+                  <label for='fname'>First name:</label>
+                   <br/>
+                   <input id='fname' name='fname' type='text'/>
+                   <br/>
+                   <label for='lname'>Last name:</label>
+                   <br/>
+                   <input id='lname' name='lname' type='text'/>
+                   <br/>
+                   <label for='pwd'>Password:</label>
+                   <br/>
+                   <input id='pwd' name='pwd' type='password'/>
+                   <br/>
+                   <input id='male' name='gender' type='radio' value='male'/>
+                   <label for='male'>Male</label>
+                   <br/>
+                   <input id='female' name='gender' type='radio' value='female'/>
+                   <label for='female'>Female</label>
+                   <br/>
+                   <input id='other' name='gender' type='radio' value='other'/>
+                   <label for='other'>Other</label>
+                   <br/>
+                   <input id='vehicle1' name='vehicle1' type='checkbox' value='Bike' checked='true'/>
+                   <label for='vehicle1'> I have a bike</label>
+                   <br/>
+                   <input id='vehicle2' name='vehicle2' type='checkbox' value='Car'/>
+                   <label for='vehicle2'> I have a car</label>
+                   <br/>
+                   <input id='vehicle3' name='vehicle3' type='checkbox' value='Boat'/>
+                   <label for='vehicle3'> I have a boat</label>
+                   <br/>
+                   <input id='birthday' name='birthday' type='date'/>
+                   <br/>
+                   <label for='myfile'>Select a file:</label>
+                   <input id='myfile' name='myfile' type='file'/>
+                   <br/>
+                   <label for='cars'>Select a car:</label>
+                   <select id='cars' name='cars'>
+                     <option value='volvo'>Volvo</option>
+                     <option value='saab'>Saab</option>
+                     <option selected='true' value='fiat'>Fiat</option>
+                     <option value='audi'>Audi</option>
+                   </select>
+                   <textarea id='t1' name='message' rows='10' cols='30'>The cat was playing in the garden.</textarea>
+                   <input type='button' value='Click Me!'/>
+                   <input type='button'/>
+                   <input type='submit' value='Submit'/>
+                  </form>
+               </div>
+             </div>
+           </body>
+         </html>
+    HTML
+
+    doc = <<~DOC
+      #{WORD_HDR}
+                  <p class='zzSTDTitle1'/>
+               <div id='A'>
+                 <h1/>
+                 <div class="C" id="F0">
+                  First name:
                  <br/>
-                 <input id='fname' name='fname' type='text'/>
+                  __________
                  <br/>
-                 <label for='lname'>Last name:</label>
+                  Last name:
                  <br/>
-                 <input id='lname' name='lname' type='text'/>
+                  __________
                  <br/>
-                 <label for='pwd'>Password:</label>
+                  Password:
                  <br/>
-                 <input id='pwd' name='pwd' type='password'/>
+                  __________
                  <br/>
-                 <input id='male' name='gender' type='radio' value='male'/>
-                 <label for='male'>Male</label>
+                  &#9678; Male
                  <br/>
-                 <input id='female' name='gender' type='radio' value='female'/>
-                 <label for='female'>Female</label>
+                  &#9678; Female
                  <br/>
-                 <input id='other' name='gender' type='radio' value='other'/>
-                 <label for='other'>Other</label>
+                  &#9678; Other
                  <br/>
-                 <input id='vehicle1' name='vehicle1' type='checkbox' value='Bike' checked='true'/>
-                 <label for='vehicle1'> I have a bike</label>
+                  &#9744; I have a bike
                  <br/>
-                 <input id='vehicle2' name='vehicle2' type='checkbox' value='Car'/>
-                 <label for='vehicle2'> I have a car</label>
+                  &#9744; I have a car
                  <br/>
-                 <input id='vehicle3' name='vehicle3' type='checkbox' value='Boat'/>
-                 <label for='vehicle3'> I have a boat</label>
+                  &#9744; I have a boat
                  <br/>
-                 <input id='birthday' name='birthday' type='date'/>
+                  __________
                  <br/>
-                 <label for='myfile'>Select a file:</label>
-                 <input id='myfile' name='myfile' type='file'/>
+                  Select a file: __________
                  <br/>
-                 <label for='cars'>Select a car:</label>
-                 <select id='cars' name='cars'>
-                   <option value='volvo'>Volvo</option>
-                   <option value='saab'>Saab</option>
-                   <option selected='true' value='fiat'>Fiat</option>
-                   <option value='audi'>Audi</option>
-                 </select>
-                 <textarea id='t1' name='message' rows='10' cols='30'>The cat was playing in the garden.</textarea>
-                 <input type='button' value='Click Me!'/>
-                 <input type='button'/>
-                 <input type='submit' value='Submit'/>
-                </form>
-             </div>
-           </div>
-         </body>
-       </html>
-    HTML
-
-    doc = <<~DOC
-    #{WORD_HDR}
-                <p class='zzSTDTitle1'/>
-             <div id='A'>
-               <h1/>
-                First name:
-               <br/>
-                __________
-               <br/>
-                Last name:
-               <br/>
-                __________
-               <br/>
-                Password:
-               <br/>
-                __________
-               <br/>
-                &#9678; Male
-               <br/>
-                &#9678; Female
-               <br/>
-                &#9678; Other
-               <br/>
-                &#9744; I have a bike
-               <br/>
-                &#9744; I have a car
-               <br/>
-                &#9744; I have a boat
-               <br/>
-                __________
-               <br/>
-                Select a file: __________
-               <br/>
-                Select a car: __________
-               <table border='1' width='50%'>
-                 <tr>
-                   <td/>
-                 </tr>
-               </table>
-                [Click Me!] [BUTTON]
+                  Select a car: __________
+                 <table border='1' width='50%'>
+                   <tr>
+                     <td/>
+                   </tr>
+                 </table>
+                  [Click Me!] [BUTTON]
+                  </div>
+               </div>
              </div>
-           </div>
-         </body>
-       </html>
+           </body>
+         </html>
     DOC
 
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(html)
-    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(doc)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(doc)
   end
 end

data/spec/isodoc/inline_spec.rb

@@ -139,7 +139,8 @@ RSpec.describe IsoDoc do
           <preface><foreword>
           <p>
           <ul>
-          <li><concept><refterm>term</refterm>
+          <li>
+          <concept><refterm>term</refterm>
               <xref target='clause1'/>
             </concept></li>
             <li><concept><refterm>term</refterm>
@@ -208,6 +209,11 @@ RSpec.describe IsoDoc do
               <renderterm>word</renderterm>
               <termref base='IEV' target='135-13-13'>The IEV database</termref>
             </concept></li>
+            <li><concept><refterm>term</refterm>
+              <renderterm>word</renderterm>
+              <strong>error!</strong>
+              </concept>
+              </li>
             </ul>
           </p>
           </foreword></preface>
@@ -231,98 +237,90 @@ 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>
-               [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>
+         <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> [<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> [<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> [<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> [<termref base="IEV" target="135-13-13">The IEV database</termref>]
+            </li>
+             <li> <em>word</em> <strong>error!</strong> </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>
@@ -340,7 +338,7 @@ RSpec.describe IsoDoc do
                    </li>
                    <li>
                      <i>w[o]rd</i>
-                      [term defined in
+                      [
                      <a href='#clause1'>Clause #1</a>
                      ]
                    </li>
@@ -352,7 +350,7 @@ RSpec.describe IsoDoc do
                    </li>
                    <li>
                      <i>word</i>
-                      [term defined in
+                      [
                      <a href='#ISO712'>The Aforementioned Citation</a>
                      ]
                    </li>
@@ -370,7 +368,7 @@ RSpec.describe IsoDoc do
                    </li>
                    <li>
                      <i>word</i>
-                      [term defined in
+                      [
                      <a href='#ISO712'> The Aforementioned Citation </a>
                      ]
                    </li>
@@ -380,8 +378,9 @@ RSpec.describe IsoDoc do
                    </li>
                    <li>
                      <i>word</i>
-                      [term defined in Termbase IEV, term ID 135-13-13]
+                      [The IEV database]
                    </li>
+                   <li> <i>word</i> <b>error!</b> </li>
                  </ul>
                </p>
              </div>
@@ -413,6 +412,216 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
+  it "processes concept attributes" do
+    input = <<~INPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <preface><foreword>
+       <p>
+       <ul>
+       <li>
+       <concept ital="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="true" ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        <li><concept ital="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="false" ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        </ul></p>
+         </foreword></preface>
+       <sections>
+       <clause id="clause1"><title>Clause 1</title></clause>
+       </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+           <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+        <preface><foreword displayorder="1">
+        <p>
+        <ul>
+        <li>
+
+            <em>term</em>
+            [term defined in <xref target="clause1">Clause 1</xref>]
+          </li>
+          <li>
+            <em>term</em>
+            [term defined in <xref target="clause1">Clause 1</xref>]
+          </li>
+        <li>
+            <em>term</em>
+            [term defined in <xref target="clause1">Clause 1</xref>]
+          </li>
+         <li>
+            term
+            [term defined in <xref target="clause1">Clause 1</xref>]
+          </li>
+          <li>
+            <em>term</em>
+
+          </li>
+        <li>
+            term
+
+          </li>
+         </ul></p>
+          </foreword></preface>
+        <sections>
+        <clause id="clause1" displayorder="2"><title depth="1">1.<tab/>Clause 1</title></clause>
+        </sections>
+       </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+                #{HTML_HDR}
+            <br/>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+                             <p>
+                 <ul>
+                   <li>
+                     <i>term</i>
+                      [term defined in
+                     <a href='#clause1'>Clause 1</a>
+                     ]
+                   </li>
+                   <li>
+                     <i>term</i>
+                      [term defined in
+                     <a href='#clause1'>Clause 1</a>
+                     ]
+                   </li>
+                   <li>
+                     <i>term</i>
+                      [term defined in
+                     <a href='#clause1'>Clause 1</a>
+                     ]
+                   </li>
+                   <li>
+                      term [term defined in
+                     <a href='#clause1'>Clause 1</a>
+                     ]
+                   </li>
+                   <li>
+                     <i>term</i>
+                   </li>
+                   <li> term </li>
+                 </ul>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div id='clause1'>
+               <h1>1.&#160; Clause 1</h1>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes concept markup for symbols" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <p>
+      <ul>
+      <li><concept>
+          <refterm>term</refterm>
+          <renderterm>ISO</renderterm>
+          <xref target='d1'/>
+        </concept></li>
+        </ul>
+        </p>
+        </foreword>
+        </preface>
+        <sections>
+        <definitions id="d">
+        <dl>
+        <dt id="d1">ISO</dt> <dd>xyz</xyz>
+        <dt id="d2">IEC</dt> <dd>abc</xyz>
+        </dl>
+        </definitions>
+        </sections>
+        </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <foreword displayorder='1'>
+            <p>
+              <ul>
+                <li>ISO</li>
+              </ul>
+            </p>
+          </foreword>
+          </preface>
+          <sections>
+            <definitions id='d' displayorder='2'>
+              <title>1.</title>
+              <dl>
+                <dt id='d1'>ISO</dt>
+                <dd>xyz</dd>
+                <dt id='d2'>IEC</dt>
+                <dd>abc</dd>
+              </dl>
+            </definitions>
+          </sections>
+      </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+          #{HTML_HDR}
+            <br/>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <p>
+                <ul>
+                  <li>ISO</li>
+                </ul>
+              </p>
+            </div>
+            <p class='zzSTDTitle1'/>
+            <div id='d' class='Symbols'>
+              <h1>1.</h1>
+              <dl>
+                <dt id='d1'>
+                  <p>ISO</p>
+                </dt>
+                <dd>xyz</dd>
+                <dt id='d2'>
+                  <p>IEC</p>
+                </dt>
+                <dd>abc</dd>
+              </dl>
+            </div>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
   it "processes embedded inline formatting" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -733,43 +942,43 @@ RSpec.describe IsoDoc do
           </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-          <preface><foreword displayorder="1">
-          <p>
-          <eref type="inline" bibitemid="ISO712" citeas="ISO 712">ISO 712</eref>
-          <eref type="inline" bibitemid="ISO712">ISO 712</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>ISO 712, Table 1</eref>
-          <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack>ISO 712, Table 1</eref>
-          <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack><localityStack><locality type="clause"><referenceFrom>1</referenceFrom></locality></localityStack>ISO 712, Table 1; Clause 1</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712, Table 1&#x2013;1</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="table"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1, Table 1</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1.5</referenceFrom></locality>ISO 712, Clause 1.5</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>A</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="whole"/>ISO 712, Whole of text</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="locality:prelude"><referenceFrom>7</referenceFrom></locality>ISO 712, Prelude 7</eref>
-          <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality>ISO 712</eref>
-          <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
-          <eref type="inline" droploc="true" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, 1</eref>
-          <eref type="inline" case="lowercase" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, clause 1</eref>
-          </p>
-          </foreword></preface>
-          <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder=
-"2"><title depth='1'>1.<tab/>Normative References</title>
-      <bibitem id="ISO712" type="standard">
-        <title format="text/plain">Cereals and cereal products</title>
-        <docidentifier>ISO 712</docidentifier>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <abbreviation>ISO</abbreviation>
-          </organization>
-        </contributor>
-      </bibitem>
-          </references>
-          </bibliography>
-          </iso-standard>
+            <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+                <preface><foreword displayorder="1">
+                <p>
+                <eref type="inline" bibitemid="ISO712" citeas="ISO 712">ISO 712</eref>
+                <eref type="inline" bibitemid="ISO712">ISO 712</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>ISO 712, Table 1</eref>
+                <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack>ISO 712, Table 1</eref>
+                <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack><localityStack><locality type="clause"><referenceFrom>1</referenceFrom></locality></localityStack>ISO 712, Table 1; Clause 1</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality>ISO 712, Table 1&#x2013;1</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="table"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1, Table 1</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1.5</referenceFrom></locality>ISO 712, Clause 1.5</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>A</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="whole"/>ISO 712, Whole of text</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="locality:prelude"><referenceFrom>7</referenceFrom></locality>ISO 712, Prelude 7</eref>
+                <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality>ISO 712</eref>
+                <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
+                <eref type="inline" droploc="true" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, 1</eref>
+                <eref type="inline" case="lowercase" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, clause 1</eref>
+                </p>
+                </foreword></preface>
+                <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder=
+      "2"><title depth='1'>1.<tab/>Normative References</title>
+            <bibitem id="ISO712" type="standard">
+              <title format="text/plain">Cereals and cereal products</title>
+              <docidentifier>ISO 712</docidentifier>
+              <contributor>
+                <role type="publisher"/>
+                <organization>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </contributor>
+            </bibitem>
+                </references>
+                </bibliography>
+                </iso-standard>
     OUTPUT
 
     html = <<~OUTPUT
@@ -1092,36 +1301,36 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-          <bibdata>
-            <language current='true'>en</language>
-            <script current='true'>Latn</script>
-          </bibdata>
-          <preface>
-            <clause id='A' displayorder='1'>
-              <title depth='1'>ABC</title>
-            </clause>
-            <clause id='A1' displayorder='2'>
-              <title depth='1'>ABC/DEF</title>
-            </clause>
-            <clause id='A2' displayorder='3'>
-              <title depth='1'>ABC</title>
-            </clause>
-            <clause id='B' displayorder='4'>
-              <title depth='1'>GHI/JKL</title>
-            </clause>
-            <clause id='C' displayorder='5'>
-              <title depth='1'>DEF</title>
-            </clause>
-            <clause id='C1' displayorder='6'>
-              <title depth='1'>ABC/DEF</title>
-            </clause>
-            <clause id='C2' displayorder='7'>
-              <title depth='1'>DEF</title>
-            </clause>
-            <p displayorder='8'>A B D E</p>
-          </preface>
-        </iso-standard>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <bibdata>
+          <language current='true'>en</language>
+          <script current='true'>Latn</script>
+        </bibdata>
+        <preface>
+          <clause id='A' displayorder='1'>
+            <title depth='1'>ABC</title>
+          </clause>
+          <clause id='A1' displayorder='2'>
+            <title depth='1'>ABC/DEF</title>
+          </clause>
+          <clause id='A2' displayorder='3'>
+            <title depth='1'>ABC</title>
+          </clause>
+          <clause id='B' displayorder='4'>
+            <title depth='1'>GHI/JKL</title>
+          </clause>
+          <clause id='C' displayorder='5'>
+            <title depth='1'>DEF</title>
+          </clause>
+          <clause id='C1' displayorder='6'>
+            <title depth='1'>ABC/DEF</title>
+          </clause>
+          <clause id='C2' displayorder='7'>
+            <title depth='1'>DEF</title>
+          </clause>
+          <p displayorder='8'>A B D E</p>
+        </preface>
+      </iso-standard>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true)

data/spec/isodoc/postproc_spec.rb

@@ -2271,7 +2271,6 @@ RSpec.describe IsoDoc do
     output = <<~OUTPUT
       <body lang='en' xml:lang='en'>
         <main class='main-section'>
-          <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
           <br/>
           <div>
             <h1 class='ForewordTitle'>Foreword</h1>

data/spec/isodoc/terms_spec.rb

@@ -189,7 +189,7 @@ RSpec.describe IsoDoc do
                <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>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+             <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/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>
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
                <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>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+             <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath