isodoc 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd5c7cab435113879315a8de5d3219df7577d057df5adee3a87f7431b9d17f7
-  data.tar.gz: 22f07d9de5b5b8a26c57ca5321a53fafd591e6703615921d9a79d939c0276295
+  metadata.gz: 1f76ecc765fd3176ab1e46bd2b91b2a1d5746554772047b7137581ecc54a1ab9
+  data.tar.gz: b98fe5eee6522b4d5992c4213f3180e1c95f92f358b0c56ff3a2b5f66973a900
 SHA512:
-  metadata.gz: 1ca2bd4cf9b70ea4eb12d118c26e66e90340070453e132db89e7b6748a1a02f8a10f62c5944e2b1ffe6e18d4a69504b08f7b687ec6b8a573983f58d03de12b48
-  data.tar.gz: 1b6702e74e5041ad95509cf1b8655e044f36f27a0fa3cbd12e6ac82684e6b535ed1c3ad9ea6ad938ab2cb42a3880f2e0153ddb0424bf322d4238806616582a54
+  metadata.gz: 1a2649fdf7365e2554c0e0bdec19aa0cf6e50fad624d4252dd99aa88d436b95b1ff24e823c6a0a9be4afa7e875921b11310e67595b308a9c81c8758b6e8cf302
+  data.tar.gz: d21cdae8851e757e999a54809868e15a8004fcc387afa78e79e60a4605df07108c454fc3c04e0a3e79f3a5c14af9ca8cdbbb855eca9fa47e254e3ff4a40d3ac4

data/lib/isodoc/metadata.rb

@@ -98,8 +98,9 @@ module IsoDoc
 
     def doctype(isoxml, _out)
       b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
-      t = b.split(/[- ]/).map(&:capitalize).join(' ')
-      set(:doctype, t)
+      set(:doctype, status_print(b))
+      b = isoxml&.at(ns('//local_bibdata/ext/doctype'))&.text || return
+      set(:doctype_display, status_print(b))
     end
 
     def iso?(org)
@@ -135,9 +136,14 @@ module IsoDoc
       docstatus = isoxml.at(ns('//bibdata/status/stage'))
       set(:unpublished, true)
       if docstatus
+        docstatus_local = isoxml.at(ns('//local_bibdata/status/stage'))
         set(:stage, status_print(docstatus.text))
+        docstatus_local and
+          set(:stage_display, status_print(docstatus_local.text))
         (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
           set(:substage, i)
+        (i = isoxml&.at(ns('//local_bibdata/status/substage'))&.text) &&
+          set(:substage_display, i)
         (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
           set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
@@ -148,7 +154,7 @@ module IsoDoc
 
     def stage_abbr(docstatus)
       status_print(docstatus).split(/ /)
-                             .map { |s| s[0].upcase }.join('')
+        .map { |s| s[0].upcase }.join('')
     end
 
     def unpublished(status)
@@ -156,7 +162,7 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/-/).map(&:capitalize).join(' ')
+      status.split(/[- ]/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)

data/lib/isodoc/presentation_function/bibdata.rb

@@ -0,0 +1,24 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def bibdata(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      b = a.dup
+      b.name = "local_bibdata"
+      bibdata_i18n(b)
+      a.next = b
+    end
+
+    def bibdata_i18n(b)
+      hash_translate(b, @i18n.get["doctype_dict"], "./ext/doctype")
+      hash_translate(b, @i18n.get["stage_dict"], "./status/stage")
+      hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
+    end
+
+    def hash_translate(bibdata, hash, xpath)
+      hash.is_a? Hash or return
+      x = bibdata.at(ns(xpath)) or return
+      hash[x.text] or return
+      x.children = hash[x.text]
+    end
+  end
+end

data/lib/isodoc/presentation_function/inline.rb

@@ -7,17 +7,25 @@ module IsoDoc
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"] ,:xref) || "???"
+      elsif node["target"] && node["droploc"]
+        return @xrefs.anchor(node["target"], :value) || 
+          @xrefs.anchor(node["target"], :label) || 
+          @xrefs.anchor(node["target"], :xref) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        linkend = @xrefs.anchor(node["target"], :xref)
-        container = @xrefs.anchor(node["target"], :container, false)
-        (container && get_note_container_id(node) != container &&
-         @xrefs.get[node["target"]]) &&
-        linkend = prefix_container(container, linkend, node["target"])
-        linkend = capitalise_xref(node, linkend)
+        linkend = anchor_linkend1(node)
       end
       linkend || "???"
     end
 
+    def anchor_linkend1(node)
+      linkend = @xrefs.anchor(node["target"], :xref)
+      container = @xrefs.anchor(node["target"], :container, false)
+      (container && get_note_container_id(node) != container &&
+       @xrefs.get[node["target"]]) &&
+      linkend = prefix_container(container, linkend, node["target"])
+      capitalise_xref(node, linkend)
+    end
+
     def capitalise_xref(node, linkend)
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
@@ -59,14 +67,19 @@ module IsoDoc
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        if r.name == "localityStack"
-          r.elements.each_with_index do |rr, j|
-            ret += eref_localities0(rr, j, target, delim)
-            delim = ","
-          end
-        else
-          ret += eref_localities0(r, i, target, delim)
+        ret = eref_locality_stack(r, i, target, delim, ret)
+      end
+      ret
+    end
+
+    def eref_locality_stack(r, i, target, delim, ret)
+      if r.name == "localityStack"
+        r.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim)
+          delim = ","
         end
+      else
+        ret += eref_localities0(r, i, target, delim)
       end
       ret
     end
@@ -79,7 +92,7 @@ module IsoDoc
       end
     end
 
-     # TODO: move to localization file
+    # TODO: move to localization file
     def eref_localities1_zh(target, type, from, to, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "–#{to.text}" if to

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.4".freeze
+  VERSION = "1.2.5".freeze
 end

data/lib/isodoc/xref/xref_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end

data/lib/isodoc/xref/xref_gen.rb

@@ -36,7 +36,7 @@ module IsoDoc::XrefGen
           return if n["id"].nil? || n["id"].empty?
           c.increment(n)
           @anchors[n["id"]] =
-            { label: termnote_label(c.print), type: "termnote",
+            { label: termnote_label(c.print), type: "termnote", value: c.print,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
                          "#{@labels["note_xref"]} #{c.print}") }
         end
@@ -52,7 +52,7 @@ module IsoDoc::XrefGen
           c.increment(n)
           idx = examples.size == 1 && !n["number"] ? "" : c.print
           @anchors[n["id"]] = {
-            type: "termexample", label: idx, 
+            type: "termexample", label: idx, value: c.print,
             xref: l10n("#{anchor(t['id'], :xref)}, "\
                        "#{@labels["example_xref"]} #{c.print}") }
         end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -113,7 +113,7 @@ module IsoDoc::XrefGen
 
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                 type: "clause",
+                                 type: "clause", value: num.to_s,
                                  xref: "#{@labels["annex"]} #{num}", level: 1 }
       if a = single_annex_special_section(clause)
         annex_names1(a, "#{num}", 1)

data/spec/assets/i18n.yaml

@@ -13,4 +13,13 @@ inform_annex: informa
 all_parts: ĉiuj partoj
 locality: {
   table: Tabelo
+  }
+doctype_dict: {
+  brochure: broŝuro
+  }
+stage_dict: {
+  published: publikigita
 }
+substage_dict: {
+  withdrawn: fortirita
+  }

data/spec/isodoc/blocks_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe IsoDoc do
        </standard-document>
     INPUT
     presxml = <<~OUTPUT
-    <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+    <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
             <bibdata type="standard">
               <title language="en" format="text/plain">Document title</title>
               <language>en</language>
@@ -99,6 +99,20 @@ RSpec.describe IsoDoc do
                 <doctype>article</doctype>
               </ext>
             </bibdata>
+            <local_bibdata type='standard'>
+  <title language='en' format='text/plain'>Document title</title>
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage>published</stage>
+  </status>
+  <copyright>
+    <from>2020</from>
+  </copyright>
+  <ext>
+    <doctype>article</doctype>
+  </ext>
+</local_bibdata>
             <sections>
               <clause id="A" inline-header="false" obligation="normative">
                 <title depth="1">1.<tab/>Change Clause</title>
@@ -249,7 +263,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='A' keep-with-next='true' keep-lines-together='true'>
@@ -352,7 +366,7 @@ OUTPUT
     </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <note id='note1'>
@@ -640,7 +654,7 @@ B</pre>
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-     <iso-standard xmlns="http://riboseinc.com/isoxml">
+     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
     <preface><foreword>
     <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
   <name>Figure 1&#xA0;&#x2014; Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
@@ -940,7 +954,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
@@ -1056,7 +1070,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode'>
@@ -1092,7 +1106,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <sourcecode lang='ruby' id='samplecode'>
@@ -1330,7 +1344,7 @@ Que?
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -1583,7 +1597,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <quote id='_044bd364-c832-4b78-8fea-92242402a1d1'>
@@ -1722,7 +1736,7 @@ it "processes blockquotes (Presentation XML)" do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <permission id='_' keep-with-next='true' keep-lines-together='true'>
@@ -2082,7 +2096,7 @@ Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <requirement id='A' unnumbered='true' keep-with-next='true' keep-lines-together='true'>
@@ -2282,11 +2296,15 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>fr</language>
            <script>Latn</script>
          </bibdata>
+         <local_bibdata>
+  <language>fr</language>
+  <script>Latn</script>
+</local_bibdata>
          <preface>
            <foreword>
              <requirement id='A' unnumbered='true'>
@@ -2351,6 +2369,10 @@ end
     <language>fr</language>
     <script>Latn</script>
     </bibdata>
+    <local_bibdata>
+  <language>fr</language>
+  <script>Latn</script>
+</local_bibdata>
     <preface><foreword>
     <requirement id="A" unnumbered="true">
     <name>Exigence</name>
@@ -2513,7 +2535,7 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <recommendation id='_' obligation='shall,could' keep-with-next='true' keep-lines-together='true'>
@@ -2677,10 +2699,13 @@ end
 </preface></itu-standard>
 INPUT
 <?xml version='1.0'?>
-<itu-standard xmlns='http://riboseinc.com/isoxml'>
+<itu-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
@@ -2709,6 +2734,9 @@ end
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
@@ -2751,6 +2779,9 @@ OUTPUT
   <bibdata>
     <language>en</language>
   </bibdata>
+  <local_bibdata>
+  <language>en</language>
+</local_bibdata>
   <preface>
     <foreword>
       <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>

data/spec/isodoc/i18n_spec.rb

@@ -68,10 +68,13 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>en</language>
          </bibdata>
+         <local_bibdata>
+  <language>en</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -296,10 +299,13 @@ PRESXML
        </iso-standard>
         INPUT
         <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>tlh</language>
          </bibdata>
+         <local_bibdata>
+  <language>tlh</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -449,10 +455,13 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>fr</language>
          </bibdata>
+         <local_bibdata>
+  <language>fr</language>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -689,11 +698,15 @@ PRESXML
         INPUT
 
         presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
            <language>zh</language>
            <script>Hans</script>
          </bibdata>
+         <local_bibdata>
+  <language>zh</language>
+  <script>Hans</script>
+</local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -872,6 +885,13 @@ PRESXML
       <bibdata>
       <language>eo</language>
       <script>Latn</script>
+      <status>
+      <stage>published</stage>
+      <substage>withdrawn</substage>
+      </status>
+      <ext>
+      <doctype>brochure</doctype>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -944,11 +964,29 @@ PRESXML
         INPUT
 
         presxml = <<~OUTPUT
-         <iso-standard xmlns="http://riboseinc.com/isoxml">
+         <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
              <bibdata>
              <language>eo</language>
              <script>Latn</script>
+             <status>
+  <stage>published</stage>
+  <substage>withdrawn</substage>
+</status>
+<ext>
+  <doctype>brochure</doctype>
+</ext>
              </bibdata>
+             <local_bibdata>
+  <language>eo</language>
+  <script>Latn</script>
+  <status>
+    <stage>publikigita</stage>
+    <substage>fortirita</substage>
+  </status>
+  <ext>
+    <doctype>bro&#x15D;uro</doctype>
+  </ext>
+</local_bibdata>
              <preface>
              <foreword obligation="informative">
                 <title>Foreword</title>

data/spec/isodoc/inline_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='A'>
     <title>1.</title>
@@ -57,6 +57,48 @@ INPUT
 OUTPUT
 end
 
+   it "droplocs xrefs" do
+  expect(xmlpp(IsoDoc::PresentationXMLConvert.new({i18nyaml: "spec/assets/i18n.yaml"}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <clause id="A">
+    <formula id="B">
+    </formula>
+    </clause>
+    <clause id="C">
+    <p>This is <xref target="A"/> and <xref target="B"/>.
+    This is <xref target="A" droploc="true"/> and <xref target="B" droploc="true"/>.</p>
+</clause>
+</sections>
+</iso-standard>
+INPUT
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+  <sections>
+    <clause id='A'>
+      <title>1.</title>
+      <formula id='B'>
+        <name>1</name>
+      </formula>
+    </clause>
+    <clause id='C'>
+      <title>2.</title>
+      <p>
+        This is
+        <xref target='A'>kla&#x16D;zo 1</xref>
+         and
+        <xref target='B'>kla&#x16D;zo 1, Formula (1)</xref>
+        . This is
+        <xref target='A' droploc='true'>1</xref>
+         and
+        <xref target='B' droploc='true'>(1)</xref>
+        .
+      </p>
+    </clause>
+  </sections>
+</iso-standard>
+OUTPUT
+   end
+
   it "processes inline formatting" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -238,7 +280,7 @@ end
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
            <preface><foreword>
            <p>
            <ul>
@@ -606,7 +648,7 @@ OUTPUT
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
            <preface><foreword>
            <p>
            <eref type="inline" bibitemid="ISO712" citeas="ISO 712">ISO 712</eref>
@@ -728,7 +770,7 @@ html = <<~OUTPUT
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>
@@ -955,7 +997,7 @@ it "cases xrefs" do
 </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='A'>
     <title>1.</title>

data/spec/isodoc/metadata_spec.rb

@@ -95,6 +95,8 @@ RSpec.describe IsoDoc do
   <doctype>international-standard</doctype>
   </ext>
 </bibdata>
+    <local_bibdata type="standard">
+    </local_bibdata>
 </iso-standard>
 INPUT
 {:accesseddate=>"2012",
@@ -127,7 +129,7 @@ INPUT
 :receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
-:stage=>"Committee draft",
+:stage=>"Committee Draft",
 :stageabbr=>"CD",
 :substage=>"Withdrawn",
 :transmitteddate=>"2020",

data/spec/isodoc/ref_spec.rb

@@ -125,10 +125,13 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~PRESXML
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <bibdata>
             <language>en</language>
           </bibdata>
+          <local_bibdata>
+  <language>en</language>
+</local_bibdata>
           <preface>
             <foreword>
               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>

data/spec/isodoc/section_spec.rb

@@ -260,7 +260,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <boilerplate>
     <copyright-statement>
       <clause>
@@ -755,7 +755,7 @@ OUTPUT
        </iso-standard>
     INPUT
     <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword obligation='informative'>
               <title>Foreword</title>
@@ -849,7 +849,7 @@ OUTPUT
        </iso-standard>
        INPUT
        <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <introduction id='B' obligation='informative'>
       <title>Introduction</title>
@@ -876,7 +876,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"OUTPUT"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <terms id='H' obligation='normative'>
     <title depth='1'>1.<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
@@ -921,7 +921,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"PRESXML"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='M' inline-header='false' obligation='normative'>
     <title depth='1'>1.<tab/>Clause 4</title>
@@ -973,7 +973,7 @@ OUTPUT
       </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='M' inline-header='false' obligation='normative'>
       <title depth="1">Clause 4</title>
@@ -991,7 +991,7 @@ OUTPUT
 
         it "processes sections without titles" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <preface>
        <introduction id="M" inline-header="false" obligation="normative"><clause id="N" inline-header="false" obligation="normative">
          <title>Intro</title>
@@ -1009,7 +1009,7 @@ OUTPUT
       </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <introduction id='M' inline-header='false' obligation='normative'>
       <clause id='N' inline-header='false' obligation='normative'>
@@ -1059,7 +1059,7 @@ OUTPUT
        </iso-standard>
 INPUT
 presxml = <<~OUTPUT
-<iso-standard xmlns="http://riboseinc.com/isoxml">
+<iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
             <bibliography>
         <clause id="D" obligation="informative">
          <title depth="1">Bibliography</title>

data/spec/isodoc/table_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <table id='tableD-1' alt='tool tip' summary='long desc' width='70%' keep-with-next='true' keep-lines-together='true'>

data/spec/isodoc/terms_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <sections>
            <terms id='_terms_and_definitions' obligation='normative'>
            <title depth='1'>

data/spec/isodoc/xref_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe IsoDoc do
     </iso-standard
     INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -167,7 +167,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -377,7 +377,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
      <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword id='fwd'>
              <p>
@@ -546,7 +546,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword id='fwd'>
              <p>
@@ -684,7 +684,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -844,7 +844,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -1002,7 +1002,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -1162,7 +1162,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -1322,7 +1322,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>
@@ -1465,7 +1465,7 @@ OUTPUT
     </iso-standard>
     INPUT
 <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>
@@ -1656,7 +1656,7 @@ OUTPUT
     </iso-standard>
     INPUT
        <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -1831,7 +1831,7 @@ OUTPUT
     </iso-standard>
     INPUT
            <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -1976,7 +1976,7 @@ OUTPUT
        </iso-standard>
     INPUT
     <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword obligation='informative'>
               <title>Foreword</title>
@@ -2191,7 +2191,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -2355,7 +2355,7 @@ OUTPUT
     </iso-standard>
     INPUT
  <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
           <preface>
             <foreword>
               <p>
@@ -2491,7 +2491,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <p>
@@ -2592,7 +2592,7 @@ OUTPUT
   </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword id='fwd'>
       <p>
@@ -2710,7 +2710,7 @@ INPUT
   </iso-standard>
 INPUT
 <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword id='fwd'>
       <p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -352,6 +352,7 @@ files:
 - lib/isodoc/metadata.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
+- lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/section.rb