isodoc 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0256be2230e0c8757987eb82dee6f8ced68e1cc8794964fabbc446e78d53195
-  data.tar.gz: a8bc10c2952aacf1542b3a4a1edae6c363bee78604dea3c541f9fd769031ea13
+  metadata.gz: c880a51deba0cb3638cae9563b05e1216c34b631225bd1fecb28c8b070a2affb
+  data.tar.gz: f64deeac458969b8f9c396b3f72bea106fb50da295132092ea13dcc2daf38d4e
 SHA512:
-  metadata.gz: b54f7daa32cc4e7e80a560dfd660f76bf4acae581cda2c3b7f89012ab368da2d0951dec308982bea80e07b1e9d59eed1d170aecae686f42b82f31843a9fff4e9
-  data.tar.gz: 75bceea7c655e1bf34de59ed6eb185596966c70b09f4da3c786c80fb57394a8e28c7f87cd47b1a795bee0b5e72d08f372981c587f27e3fb31240a96668cebeaf
+  metadata.gz: 184392c1f9e0b216a32f80309e031f5ee9cf85679af2975dfa24ca58807094da25445f8a2068da7032f16484ccf91e83eae9dbb1f9d26b08856b2893f117ea58
+  data.tar.gz: b8cfd29ad7920acb05e192197d6332189cfcec4412980665a3251bae5c32a235fff257fffc0726195826b79a3405135409259aff3020eabf8949f8aa0cc85c55

data/lib/isodoc/function/blocks.rb

@@ -222,5 +222,10 @@ module IsoDoc::Function
         quote_attribution(node, out)
       end
     end
+
+    def passthrough_parse(node, out)
+      return if node["format"] and !(node["format"].split(/,/).include? @format.to_s)
+      out << HTMLEntities.new.decode(node.content)
+    end
   end
 end

data/lib/isodoc/function/references.rb

@@ -146,8 +146,7 @@ module IsoDoc::Function
     end
 
     def norm_ref(isoxml, out, num)
-      q = "//bibliography/references[title = 'Normative References' or "\
-        "title = 'Normative references']"
+      q = "//bibliography/references[@normative = 'true']"
       f = isoxml.at(ns(q)) or return num
       out.div do |div|
         num = num + 1
@@ -157,8 +156,8 @@ module IsoDoc::Function
       num
     end
 
-    BIBLIOGRAPHY_XPATH = "//bibliography/clause[title = 'Bibliography'] | "\
-      "//bibliography/references[title = 'Bibliography']".freeze
+    BIBLIOGRAPHY_XPATH = "//bibliography/clause[.//references[@normative = 'false']] | "\
+      "//bibliography/references[@normative = 'false']".freeze
 
     def bibliography(isoxml, out)
       f = isoxml.at(ns(BIBLIOGRAPHY_XPATH)) || return

data/lib/isodoc/function/section.rb

@@ -207,7 +207,8 @@ module IsoDoc::Function
 
     def preface(isoxml, out)
       title_attr = { class: "IntroTitle" }
-      isoxml.xpath(ns("//preface/clause")).each do |f|
+      isoxml.xpath(ns("//preface/clause | //preface/terms | //preface/definitions | "\
+                      "//preface/references")).each do |f|
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
           clause_name(nil, f&.at(ns("./title")), div, title_attr)

data/lib/isodoc/function/to_word_html.rb

@@ -21,7 +21,7 @@ module IsoDoc::Function
       filename = filepath.sub_ext('').to_s
       dir = "#{filename}_files"
       unless debug
-        Dir.mkdir(dir) unless File.exists?(dir)
+        Dir.mkdir(dir, 0777) unless File.exists?(dir)
         FileUtils.rm_rf "#{dir}/*"
       end
       @filename = filename
@@ -210,6 +210,7 @@ module IsoDoc::Function
         when "license-statement" then license_parse(node, out)
         when "legal-statement" then legal_parse(node, out)
         when "feedback-statement" then feedback_parse(node, out)
+        when "passthrough" then passthrough_parse(node, out)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/xref_gen.rb

@@ -40,6 +40,7 @@ module IsoDoc::Function
 
     SECTIONS_XPATH =
       "//foreword | //introduction | //acknowledgements | //preface/clause | "\
+      "//preface/terms | preface/definitions | preface/references | "\
       "//sections/terms | //annex | "\
       "//sections/clause | //sections/definitions | "\
       "//bibliography/references | //bibliography/clause".freeze
@@ -68,7 +69,7 @@ module IsoDoc::Function
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
       "xmlns:example | ./xmlns:example".freeze
 
-    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions"
+    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | ./references"
 
     def example_anchor_names(sections)
       sections.each do |s|

data/lib/isodoc/function/xref_sect_gen.rb

@@ -5,10 +5,9 @@ module IsoDoc::Function
         annex_names(c, (65 + i).chr.to_s)
       end
       docxml.xpath(
-        ns("//bibliography/clause[not(xmlns:title = 'Normative References' or "\
-           "xmlns:title = 'Normative references')] |"\
-           "//bibliography/references[not(xmlns:title = 'Normative References'"\
-           " or xmlns:title = 'Normative references')]")).each do |b|
+           ns("//bibliography/clause[.//references[@normative = 'false']] | "\
+           "//bibliography/references[@normative = 'false']"
+           )).each do |b|
         preface_names(b)
       end
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
@@ -17,23 +16,13 @@ module IsoDoc::Function
     end
 
     def initial_anchor_names(d)
-      preface_names(d.at(ns("//preface/abstract")))
-      preface_names(d.at(ns("//foreword")))
-      preface_names(d.at(ns("//introduction")))
-      d.xpath(ns("//preface/clause")).each do |c|
-      preface_names(c)
-      end
-      preface_names(d.at(ns("//acknowledgements")))
+      d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
-      sequential_asset_names(
-        d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                   "//preface/clause | //acknowledgements")))
+      sequential_asset_names(d.xpath(ns("//preface/*")))
       n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
       n = section_names(d.at(ns(
-        "//bibliography/clause[title = 'Normative References' or "\
-        "title = 'Normative references'] |"\
-        "//bibliography/references[title = 'Normative References' or "\
-        "title = 'Normative references']")), n, 1)
+        "//bibliography/clause[.//references[@normative = 'true']] | "\
+        "//bibliography/references[@normative = 'true']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
       n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -76,10 +65,8 @@ module IsoDoc::Function
 
     def middle_section_asset_names(d)
       middle_sections = "//clause[title = 'Scope'] | "\
-        "//references[title = 'Normative References' or title = "\
-        "'Normative references'] | "\
-        "//sections/terms | //preface/abstract | //foreword | "\
-        "//introduction | //preface/clause | //acknowledgements | "\
+        "//references[@normative = 'true'] | "\
+        "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end
@@ -120,12 +107,25 @@ module IsoDoc::Function
       l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
     end
 
+    def single_annex_special_section(clause)
+      a = clause.xpath(ns("./references | ./terms | ./definitions"))
+      a.size == 1 or return nil
+      clause.xpath(ns("./clause | ./p | ./table | ./ol | ./ul | ./dl | "\
+                      "./note | ./admonition | ./figure")).size == 0 or
+                     return nil
+      a[0]
+    end
+
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                  type: "clause",
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-        annex_names1(c, "#{num}.#{i + 1}", 2)
+      if a = single_annex_special_section(clause)
+        annex_names1(a, "#{num}", 1)
+      else
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", 2)
+        end
       end
       hierarchical_asset_names(clause, num)
     end

data/lib/isodoc/headlesshtml_convert.rb

@@ -14,6 +14,11 @@ module IsoDoc
       "_headlessimages"
     end
 
+    def initialize(options)
+      @format = :html
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)

data/lib/isodoc/html_convert.rb

@@ -14,6 +14,11 @@ module IsoDoc
       "_htmlimages"
     end
 
+    def initialize(options)
+      @format = :html
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       ret = super
       Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and

data/lib/isodoc/metadata_date.rb

@@ -14,14 +14,26 @@ module IsoDoc
         "10": @labels["month_october"],
         "11": @labels["month_november"],
         "12": @labels["month_december"],
-      }
+    }
     end
 
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
-                                     @lang, @script)
-      end
+    def monthyr(isodate)
+      m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
+      return isodate unless m && m[:yr] && m[:mo]
+      IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
+                                   @lang, @script)
+    end
+
+    def MMMddyyyy(isodate)
+      return nil if isodate.nil?
+      arr = isodate.split("-")
+      date = if arr.size == 1 and (/^\d+$/.match isodate)
+               Date.new(*arr.map(&:to_i)).strftime("%Y")
+             elsif arr.size == 2
+               Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+             else
+               Date.parse(isodate).strftime("%B %d, %Y")
+             end
+    end
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -22,6 +22,11 @@ module IsoDoc
       "_pdfimages"
     end
 
+    def initialize(options)
+      @format = :pdf
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.25".freeze
+  VERSION = "1.0.26".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -30,6 +30,11 @@ module IsoDoc
     include WordFunction::Body
     include WordFunction::Postprocess
 
+    def initialize(options)
+      @format = :doc
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       ret = super
       FileUtils.rm_rf tmpimagedir

data/lib/isodoc/xslfo_convert.rb

@@ -13,6 +13,11 @@ module IsoDoc
       "_pdfimages"
     end
 
+    def initialize(options)
+      @format = :pdf
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       docxml, outname_html, dir = convert_init(file, filename, debug)

data/spec/isodoc/blocks_spec.rb

@@ -1030,7 +1030,7 @@ World</p>
   </import>
 </permission>
     </foreword></preface>
-    <bibliography><references id="_bibliography" obligation="informative">
+    <bibliography><references id="_bibliography" obligation="informative" normative="false">
 <title>Bibliography</title>
 <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
 
@@ -1462,5 +1462,47 @@ INPUT
     OUTPUT
        end
 
+         it "processes passthrough with compatible format" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <passthrough format="html,rfc">&lt;A&gt;</passthrough>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+        <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <a/>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
+     it "ignore passthrough with incompatible format" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <passthrough format="doc,rfc">&lt;A&gt;</passthrough>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
+
 
 end

data/spec/isodoc/i18n_spec.rb

@@ -55,11 +55,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -191,11 +191,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -327,11 +327,11 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -464,7 +464,7 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
          <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
@@ -478,7 +478,7 @@ RSpec.describe IsoDoc do
 </bibitem>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>

data/spec/isodoc/inline_spec.rb

@@ -165,7 +165,7 @@ RSpec.describe IsoDoc do
     <sections>
     <clause id="clause1"><title>Clause 1</title></clause>
     </sections>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>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>
@@ -414,7 +414,7 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -469,7 +469,7 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>

data/spec/isodoc/ref_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe IsoDoc do
   <eref bibitemid="zip_ffs"/>
   </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>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>
@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
     <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
 
 
-</references><references id="_bibliography" obligation="informative">
+</references><references id="_bibliography" obligation="informative" normative="false">
   <title>Bibliography</title>
 <bibitem id="ISBN" type="ISBN">
   <title format="text/plain">Chemicals for analytical laboratory use</title>

data/spec/isodoc/section_spec.rb

@@ -112,16 +112,16 @@ RSpec.describe IsoDoc do
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a</title>
          </clause>
-         <references id="Q2"><title>Annex Bibliography</title></references>
+         <references id="Q2" normative="false"><title>Annex Bibliography</title></references>
        </clause>
        </annex>
        <annex id="P1" inline-header="false" obligation="normative">
        </annex>
-        <bibliography><references id="R" obligation="informative">
+        <bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -342,11 +342,11 @@ OUTPUT
        </annex>
  <annex id="P1" inline-header="false" obligation="normative">
        </annex>
-        <bibliography><references id="R" obligation="informative">
+        <bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -579,215 +579,225 @@ OUTPUT
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a<fn reference="17"><p>A</p></fn></title>
          </clause>
-         <references id="Q2"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
+         <references id="Q2" normative="false"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References<fn reference="19"><p>A</p></fn></title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography<fn reference="20"><p>A</p></fn></title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection<fn reference="21"><p>A</p></fn></title>
        </references>
        </clause>
        </bibliography>
        </iso-standard>
     INPUT
-    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-  <head/>
-  <body lang='en'>
-    <div class='title-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='prefatory-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='main-section'>
-      <div class='authority'>
-        <div class='boilerplate-copyright'>
-          <div>
-            <h1>
-              Copyright
-              <a rel='footnote' href='#fn:1' epub:type='footnote'>
-                <sup>1</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-license'>
-          <div>
-            <h1>
-              License
-              <a rel='footnote' href='#fn:2' epub:type='footnote'>
-                <sup>2</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-legal'>
-          <div>
-            <h1>
-              Legal
-              <a rel='footnote' href='#fn:3' epub:type='footnote'>
-                <sup>3</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-        <div class='boilerplate-feedback'>
-          <div>
-            <h1>
-              Feedback
-              <a rel='footnote' href='#fn:4' epub:type='footnote'>
-                <sup>4</sup>
-              </a>
-            </h1>
-          </div>
-        </div>
-      </div>
-      <br/>
-      <div>
-        <h1 class='AbstractTitle'>Abstract</h1>
-      </div>
-      <br/>
-      <div>
-        <h1 class='ForewordTitle'>Foreword</h1>
-        <p id='A'>This is a preamble</p>
-      </div>
-      <br/>
-      <div class='Section3' id='B'>
-        <h1 class='IntroTitle'>Introduction</h1>
-        <div id='C'>
-          <h2>
-            Introduction Subsection
-            <a rel='footnote' href='#fn:8' epub:type='footnote'>
-              <sup>8</sup>
-            </a>
-          </h2>
-        </div>
-      </div>
-      <p class='zzSTDTitle1'/>
-      <div id='H'>
-      <h1>
-  1.&#160; Terms, Definitions, Symbols and Abbreviated Terms
-  <a rel='footnote' href='#fn:10' epub:type='footnote'>
-    <sup>10</sup>
-  </a>
-</h1>
-        <div id='I'>
-          <h2>
-            1.1.&#160; Normal Terms
-            <a rel='footnote' href='#fn:11' epub:type='footnote'>
-              <sup>11</sup>
-            </a>
-          </h2>
-          <p class='TermNum' id='J'>1.1.1.</p>
-          <p class='Terms' style='text-align:left;'>Term2</p>
-        </div>
-        <div id='K'>
-          <h2>
-            1.2.&#160; Definitions
-            <a rel='footnote' href='#fn:12' epub:type='footnote'>
-              <sup>12</sup>
-            </a>
-          </h2>
-          <dl>
-            <dt>
-              <p>Symbol</p>
-            </dt>
-            <dd>Definition</dd>
-          </dl>
-        </div>
-      </div>
-      <div id='L' class='Symbols'>
-        <h1>2.&#160; Symbols and abbreviated terms</h1>
-        <dl>
-          <dt>
-            <p>Symbol</p>
-          </dt>
-          <dd>Definition</dd>
-        </dl>
-      </div>
-      <div id='D'>
-        <h1>
-          3.&#160; Scope
-          <a rel='footnote' href='#fn:9' epub:type='footnote'>
-            <sup>9</sup>
-          </a>
-        </h1>
-        <p id='E'>Text</p>
-      </div>
-      <div id='M'>
-        <h1>
-          4.&#160; Clause 4
-          <a rel='footnote' href='#fn:13' epub:type='footnote'>
-            <sup>13</sup>
-          </a>
-        </h1>
-        <div id='N'>
-          <h2>
-            4.1.&#160; Introduction
-            <a rel='footnote' href='#fn:1' epub:type='footnote'>
-              <sup>1</sup>
-            </a>
-          </h2>
-        </div>
-        <div id='O'>
-          <h2>
-            4.2.&#160; Clause 4.2
-            <a rel='footnote' href='#fn:14' epub:type='footnote'>
-              <sup>14</sup>
-            </a>
-          </h2>
-        </div>
-        <div id='O1'>
-          <h2>4.3.&#160; </h2>
-        </div>
-      </div>
-      <br/>
-      <div id='P' class='Section3'>
-        <h1 class='Annex'>
-          <b>Annex A</b>
-          <br/>
-          (normative)
-          <br/>
-          <br/>
-          <b>
-            Annex
-            <a rel='footnote' href='#fn:15' epub:type='footnote'>
-              <sup>15</sup>
-            </a>
-          </b>
-        </h1>
-        <div id='Q'>
-          <h2>
-            A.1.&#160; Annex A.1
-            <a rel='footnote' href='#fn:16' epub:type='footnote'>
-              <sup>16</sup>
-            </a>
-          </h2>
-          <div id='Q1'>
-            <h3>
-              A.1.1.&#160; Annex A.1a
-              <a rel='footnote' href='#fn:17' epub:type='footnote'>
-                <sup>17</sup>
-              </a>
-            </h3>
-          </div>
-          <div>
-            <h3>
-              A.1.2.&#160; Annex Bibliography
-              <a rel='footnote' href='#fn:18' epub:type='footnote'>
-                <sup>18</sup>
-              </a>
-            </h3>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
+     <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+         <head/>
+         <body lang='en'>
+           <div class='title-section'>
+             <p>&#160;</p>
+           </div>
+           <br/>
+           <div class='prefatory-section'>
+             <p>&#160;</p>
+           </div>
+           <br/>
+           <div class='main-section'>
+             <div class='authority'>
+               <div class='boilerplate-copyright'>
+                 <div>
+                   <h1>
+                     Copyright
+                     <a rel='footnote' href='#fn:1' epub:type='footnote'>
+                       <sup>1</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-license'>
+                 <div>
+                   <h1>
+                     License
+                     <a rel='footnote' href='#fn:2' epub:type='footnote'>
+                       <sup>2</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-legal'>
+                 <div>
+                   <h1>
+                     Legal
+                     <a rel='footnote' href='#fn:3' epub:type='footnote'>
+                       <sup>3</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+               <div class='boilerplate-feedback'>
+                 <div>
+                   <h1>
+                     Feedback
+                     <a rel='footnote' href='#fn:4' epub:type='footnote'>
+                       <sup>4</sup>
+                     </a>
+                   </h1>
+                 </div>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='AbstractTitle'>Abstract</h1>
+             </div>
+             <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='A'>This is a preamble</p>
+             </div>
+             <br/>
+             <div class='Section3' id='B'>
+               <h1 class='IntroTitle'>Introduction</h1>
+               <div id='C'>
+                 <h2>
+                   Introduction Subsection
+                   <a rel='footnote' href='#fn:8' epub:type='footnote'>
+                     <sup>8</sup>
+                   </a>
+                 </h2>
+               </div>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1.&#160; Normative references</h1>
+             </div>
+             <div id='H'>
+               <h1>
+                 2.&#160; Terms, Definitions, Symbols and Abbreviated Terms
+                 <a rel='footnote' href='#fn:10' epub:type='footnote'>
+                   <sup>10</sup>
+                 </a>
+               </h1>
+               <div id='I'>
+                 <h2>
+                   2.1.&#160; Normal Terms
+                   <a rel='footnote' href='#fn:11' epub:type='footnote'>
+                     <sup>11</sup>
+                   </a>
+                 </h2>
+                 <p class='TermNum' id='J'>2.1.1.</p>
+                 <p class='Terms' style='text-align:left;'>Term2</p>
+               </div>
+               <div id='K'>
+                 <h2>
+                   2.2.&#160; Definitions
+                   <a rel='footnote' href='#fn:12' epub:type='footnote'>
+                     <sup>12</sup>
+                   </a>
+                 </h2>
+                 <dl>
+                   <dt>
+                     <p>Symbol</p>
+                   </dt>
+                   <dd>Definition</dd>
+                 </dl>
+               </div>
+             </div>
+             <div id='L' class='Symbols'>
+               <h1>3.&#160; Symbols and abbreviated terms</h1>
+               <dl>
+                 <dt>
+                   <p>Symbol</p>
+                 </dt>
+                 <dd>Definition</dd>
+               </dl>
+             </div>
+             <div id='D'>
+               <h1>
+                 4.&#160; Scope
+                 <a rel='footnote' href='#fn:9' epub:type='footnote'>
+                   <sup>9</sup>
+                 </a>
+               </h1>
+               <p id='E'>Text</p>
+             </div>
+             <div id='M'>
+               <h1>
+                 5.&#160; Clause 4
+                 <a rel='footnote' href='#fn:13' epub:type='footnote'>
+                   <sup>13</sup>
+                 </a>
+               </h1>
+               <div id='N'>
+                 <h2>
+                   5.1.&#160; Introduction
+                   <a rel='footnote' href='#fn:1' epub:type='footnote'>
+                     <sup>1</sup>
+                   </a>
+                 </h2>
+               </div>
+               <div id='O'>
+                 <h2>
+                   5.2.&#160; Clause 4.2
+                   <a rel='footnote' href='#fn:14' epub:type='footnote'>
+                     <sup>14</sup>
+                   </a>
+                 </h2>
+               </div>
+               <div id='O1'>
+                 <h2>5.3.&#160; </h2>
+               </div>
+             </div>
+             <br/>
+             <div id='P' class='Section3'>
+               <h1 class='Annex'>
+                 <b>Annex A</b>
+                 <br/>
+                 (normative)
+                 <br/>
+                 <br/>
+                 <b>
+                   Annex
+                   <a rel='footnote' href='#fn:15' epub:type='footnote'>
+                     <sup>15</sup>
+                   </a>
+                 </b>
+               </h1>
+               <div id='Q'>
+                 <h2>
+                   A.1.&#160; Annex A.1
+                   <a rel='footnote' href='#fn:16' epub:type='footnote'>
+                     <sup>16</sup>
+                   </a>
+                 </h2>
+                 <div id='Q1'>
+                   <h3>
+                     A.1.1.&#160; Annex A.1a
+                     <a rel='footnote' href='#fn:17' epub:type='footnote'>
+                       <sup>17</sup>
+                     </a>
+                   </h3>
+                 </div>
+                 <div>
+                   <h3>
+                     A.1.2.&#160; Annex Bibliography
+                     <a rel='footnote' href='#fn:18' epub:type='footnote'>
+                       <sup>18</sup>
+                     </a>
+                   </h3>
+                 </div>
+               </div>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <div>
+                 <h2 class='Section3'>Bibliography SubsectionA</h2>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
 OUTPUT
   end
 
@@ -845,11 +855,11 @@ OUTPUT
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>

data/spec/isodoc/xref_spec.rb

@@ -1631,6 +1631,9 @@ OUTPUT
          <xref target="P"/>
          <xref target="Q"/>
          <xref target="Q1"/>
+         <xref target="QQ"/>
+         <xref target="QQ1"/>
+         <xref target="QQ2"/>
          <xref target="R"/>
          <xref target="S"/>
          </p>
@@ -1679,11 +1682,17 @@ OUTPUT
          <title>Annex A.1a</title>
          </clause>
        </clause>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex>
+       <annex id="QQ">
+       <terms id="QQ1">
+       <term id="QQ2"/>
+       </terms>
+       </annex>
+        <bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -1709,6 +1718,9 @@ OUTPUT
     <a href="#P">Annex A</a>
     <a href="#Q">Annex A.1</a>
     <a href="#Q1">Annex A.1.1</a>
+    <a href='#QQ'>Annex B</a>
+<a href='#QQ1'>Annex B</a>
+<a href='#QQ2'>Annex B.1</a>
     <a href="#R">Clause 2</a>
     <a href="#S">Bibliography</a>
     </p>
@@ -1764,6 +1776,21 @@ OUTPUT
           <div id="Q1">
           <h3>A.1.1.&#160; Annex A.1a</h3>
           </div>
+                 </div>
+     </div>
+     <br/>
+     <div id='QQ' class='Section3'>
+       <h1 class='Annex'>
+         <b>Annex B</b>
+         <br/>
+         (informative)
+         <br/>
+         <br/>
+         <b/>
+       </h1>
+       <div id='QQ1'>
+         <h1>B.&#160; </h1>
+         <p class='TermNum' id='QQ2'>B.1.</p>
         </div>
                </div>
                <br/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath