isodoc 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889ed14c0177867afde418d7d947a4f5963dc533c3c61c0b2d4bd320a1bb02a3
-  data.tar.gz: 8f9a41c95de57470b68cba90e890d8753c49a36ea7f33658a72877177b5a8aa2
+  metadata.gz: 709ee937cab542be14ef994074c62d60df2e26ad5d858fbfd9dc9966f100a9be
+  data.tar.gz: 809faa2a70a8d982909f15794928b19981f5e3aee33da0afdc9fc81d8a4d030b
 SHA512:
-  metadata.gz: aee9f7048977dabef0312c23c94e7d41b242e7623f7ec5daa252db232250ff9bd150e7d4750ac0000aa8463f79a8a716910b0e7a6929a3949353bbfe268b7327
-  data.tar.gz: 0be841a473792658efd1221ee01a9011e1744cbe3e9fd4e2d0657ac057f41c057aba67f52d0f712326af915b5df802fc2d352338255fd688b31c1867d6ffac36
+  metadata.gz: 3b3a2e409e96f3f4e79723b06ebce456559280855c384ede05cbc15d5f9e217b7673228190190f1df84cc298ed5c89dd08e22a4eb89df5f1ff95fc978bba91e6
+  data.tar.gz: 9d26571df295d108788bd45d527e2a9ac8ef4d8f6cc6b7ec1aabc18c508d505e88a09c909f96b1d252274f293dac1950fba9b52359c30625a4c185658a9536a2

data/.github/workflows/macos.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-linux:
@@ -25,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1
@@ -37,3 +36,15 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
+      - name: Trigger dependent repositories
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-windows:
@@ -26,9 +25,8 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/README.adoc

@@ -1,8 +1,9 @@
 = isodoc: Processor to generate HTML/Word from Metanorma XML
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
-image:https://travis-ci.com/metanorma/isodoc.svg["Build Status", link="https://travis-ci.com/metanorma/isodoc"]
-image:https://ci.appveyor.com/api/projects/status/f93bvu6qfwxij07x?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/isodoc"]
+image:https://github.com/metanorma/isodoc/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Aubuntu"]
+image:https://github.com/metanorma/isodoc/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Amacos"]
+image:https://github.com/metanorma/isodoc/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Awindows"]
 image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/isodoc.svg["Pull Requests", link="https://github.com/metanorma/isodoc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/isodoc/latest.svg["Commits since latest",link="https://github.com/metanorma/isodoc/releases"]

data/lib/isodoc-yaml/i18n-en.yaml

@@ -55,6 +55,21 @@ deprecated: DEPRECATED
 source: SOURCE
 and: and
 all_parts: All Parts
+month_january: January
+month_february: February
+month_march: March
+month_april: April
+month_may: May
+month_june: June
+month_july: July
+month_august: August
+month_september: September
+month_october: October
+month_november: November
+month_december: December
+obligation: Obligation
+subject: Subject
+inherits: Inherits
 admonition: {
   danger: Danger,
   warning: Warning,

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -48,6 +48,21 @@ deprecated: DÉCONSEILLÉ
 source: SOURCE
 and: et
 all_parts: toutes les parties
+month_january: Janvier
+month_february: Février
+month_march: Mars
+month_april: Avril
+month_may: Mai
+month_june: Juin
+month_july: Juillet
+month_august: Août
+month_september: Septembre
+month_october: Octobre
+month_november: Novembre
+month_december: Décembre
+obligation: Obligation
+subject: Sujet
+inherits: Hérite
 admonition: {
   danger: Danger,
   warning: Avertissement,

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -50,6 +50,21 @@ deprecated: 被取代
 source: 定义
 and: 和
 all_parts: 所有部分
+month_january: 一月
+month_february: 二月
+month_march: 三月
+month_april: 四月
+month_may: 五月
+month_june: 六月
+month_july: 七月
+month_august: 八月
+month_september: 九月
+month_october: 十月
+month_november: 十一月
+month_december: 十二月
+obligation: 义务
+subject: 主体
+inherits: 继承自
 admonition: {
   danger: 危险,
   warning: 警告,

data/lib/isodoc/base_style/bands.scss

@@ -7,7 +7,10 @@
   }
 
   font-weight: $fontWeight;
-  height: $length;
+
+  @if $length {
+    height: $length;
+  }
 
   color: $color;
   text-transform: uppercase;
@@ -28,9 +31,9 @@
 
 @mixin docBand(
     $order,
-    $textLength,
+    $textLength: null,
     $offset: 0,
-	$color: white,
+	  $color: white,
     $fontWeight: 400,
     $fontFamily: null) {
 

data/lib/isodoc/base_style/reset.scss

@@ -125,5 +125,5 @@ b, strong {
 }
 
 div.document-stage-band, div.document-type-band {
-  background-color: #FFFFFF;
+  background-color: #000000;
 }

data/lib/isodoc/function/cleanup.rb

@@ -23,7 +23,8 @@ module IsoDoc::Function
       docxml.xpath("//td | //th").each do |d|
         d.traverse do |n|
           next unless n.text?
-          n.replace(break_up_long_strings(n.text))
+          n.replace(HTMLEntities.new.encode(
+            break_up_long_strings(n.text)))
         end
       end
     end

data/lib/isodoc/function/inline.rb

@@ -55,12 +55,12 @@ module IsoDoc::Function
     end
 
     def get_linkend(node)
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality")), link)
       contents = node.children.select { |c| c.name != "locality" }.
         select { |c| !c.text? || /\S/.match(c) }
-      return link if contents.nil? || contents.empty?
-      Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+      !contents.empty? and
+        return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+      link + eref_localities(node.xpath(ns("./locality")), link)
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
     end

data/lib/isodoc/function/references.rb

@@ -15,6 +15,7 @@ module IsoDoc::Function
         identifier = render_identifier(id)
         if bibliography then ref_entry_code(r, ordinal, identifier, id)
         else
+          identifier = "[#{identifier}]" if id["type"] == "metanorma"
           r << "#{identifier}, "
         end
         reference_format(b, r)
@@ -26,6 +27,7 @@ module IsoDoc::Function
         prefix_bracketed_ref(ref, ordinal) if biblio
         id = bibitem_ref_code(b)
         identifier = render_identifier(id)
+        identifier = "[#{identifier}]" if id["type"] == "metanorma" && !biblio
         ref << identifier
         date_note_process(b, ref)
         ref << ", "

data/lib/isodoc/function/reqt.rb

@@ -20,17 +20,32 @@ module IsoDoc::Function
 
     def recommendation_attributes1(node) 
       out = [] 
-      oblig = node["obligation"] and out << "Obligation: #{oblig}" 
-      subj = node&.at(ns("./subject"))&.text and out << "Subject: #{subj}" 
-      node.xpath(ns("./inherit")).each { |i| out << "Inherit: #{i.text}" }
+      oblig = node["obligation"] and
+        out << l10n("#{@labels['obligation']}: #{oblig}")
+      subj = node&.at(ns("./subject"))&.text and
+        out << l10n("#{@labels['subject']}: #{subj}")
+      node.xpath(ns("./inherit")).each do |i|
+        out << recommendation_attr_parse(i, @labels["inherits"])
+      end
       node.xpath(ns("./classification")).each do |c|
-        tag = c.at(ns("./tag")) or next
-        value = c.at(ns("./value")) or next
-        out << "#{tag.text.capitalize}: #{value.text}"
+        line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
       end
       out
     end
 
+    def recommendation_attr_parse(node, label)
+      noko do |xml|
+        xml << "#{label}: "
+        node.children.each { |n| parse(n, xml) }
+      end.join
+    end
+
+    def recommendation_attr_keyvalue(node, key, value)
+      tag = node.at(ns("./#{key}")) or return nil
+      value = node.at(ns("./#{value}")) or return nil
+      "#{tag.text.capitalize}: #{value.text}"
+    end
+
     def recommendation_attributes(node, out)
       ret = recommendation_attributes1(node)
       return if ret.empty?

data/lib/isodoc/metadata.rb

@@ -1,3 +1,5 @@
+require_relative "./metadata_date"
+
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
@@ -7,6 +9,10 @@ module IsoDoc
       Common::ns(xpath)
     end
 
+    def l10n(a, b, c)
+      IsoDoc::Function::I18n::l10n(a, b, c)
+    end
+
     def initialize(lang, script, labels)
       @metadata = {}
       DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
@@ -20,6 +26,10 @@ module IsoDoc
       @metadata
     end
 
+    def labels
+      @labels
+    end
+
     def set(key, value)
       @metadata[key] = value
     end
@@ -93,14 +103,24 @@ module IsoDoc
 
     def agency(xml)
       agency = ""
+      publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
                    "organization")).each do |org|
         name = org&.at(ns("./name"))&.text
-        abbrev = org&.at(ns("./abbreviation"))&.text
-        agency1 = abbrev || name
+        agency1 = org&.at(ns("./abbreviation"))&.text || name
+        publisher << name if name
         agency = iso?(org) ?  "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       set(:agency, agency.sub(%r{/$}, ""))
+      set(:publisher, multiple_and(publisher, @labels["and"]))
+    end
+
+    def multiple_and(names, andword)
+      return "" if names.length == 0
+      return names[0] if names.length == 1
+      names.length == 2 and
+        return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script)
+      l10n(names[0..-2].join(", ") + " #{andword} #{names[-1]}", @lang, @script)
     end
 
     def docstatus(isoxml, _out)
@@ -148,14 +168,16 @@ module IsoDoc
         draftinfo += ", #{revdate}" if revdate
         draftinfo += ")"
       end
-      IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
+      l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)
       set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
       set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
       set(:draft, isoxml&.at(ns("//version/draft"))&.text)
-      set(:revdate, isoxml&.at(ns("//version/revision-date"))&.text)
+      revdate = isoxml&.at(ns("//version/revision-date"))&.text
+      set(:revdate, revdate)
+      set(:revdate_monthyear, monthyr(revdate))
       set(:draftinfo,
           draftinfo(get[:draft], get[:revdate]))
     end

data/lib/isodoc/metadata_date.rb

@@ -0,0 +1,27 @@
+module IsoDoc
+  class Metadata
+    def months
+    {
+        "01": @labels["month_january"],
+        "02": @labels["month_february"],
+        "03": @labels["month_march"],
+        "04": @labels["month_april"],
+        "05": @labels["month_may"],
+        "06": @labels["month_june"],
+        "07": @labels["month_july"],
+        "08": @labels["month_august"],
+        "09": @labels["month_september"],
+        "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
+  end
+end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.22".freeze
+  VERSION = "1.0.23".freeze
 end

data/lib/isodoc/word_function/table.rb

@@ -37,9 +37,7 @@ module IsoDoc::WordFunction
       super.merge(attr_code({
         summary: node["summary"],
         width: node["width"],
-        style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
-        "mso-table-rspace:15.0cm;margin-right:423.0pt;"\
-        "mso-table-anchor-horizontal:column;"\
+        style: "mso-table-anchor-horizontal:column;"\
         "mso-table-overlap:never;border-spacing:0;border-width:1px;"
       }))
     end

data/spec/isodoc/blocks_spec.rb

@@ -987,7 +987,7 @@ World</p>
     <permission id="_">
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
-  <inherit>/ss/584/2015/level/2</inherit>
+  <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
   <subject>user</subject>
   <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
   <description>
@@ -1030,6 +1030,12 @@ World</p>
   </import>
 </permission>
     </foreword></preface>
+    <bibliography><references id="_bibliography" obligation="informative">
+<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>
+
+
+</references></bibliography>
     </iso-standard>
     INPUT
     #{HTML_HDR}
@@ -1038,9 +1044,9 @@ World</p>
         <h1 class="ForewordTitle">Foreword</h1>
         <div class="permission"><p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
         <p><i>Subject: user<br/>
-Inherit: /ss/584/2015/level/1
+Inherits: /ss/584/2015/level/1
 <br/>
-Inherit: /ss/584/2015/level/2
+Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
 <br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
 
   <div class="requirement-description">
@@ -1064,6 +1070,14 @@ Inherit: /ss/584/2015/level/2
 </div>
       </div>
       <p class="zzSTDTitle1"/>
+       <br/>
+ <div>
+   <h1 class='Section3'>Bibliography</h1>
+   <p id='rfc2616' class='Biblio'>
+     [1]&#160; IETF RFC 2616,
+     <i>Hypertext Transfer Protocol&#8201;&#8212;&#8201;HTTP/1.1</i>
+   </p>
+ </div>
     </div>
   </body>
 </html>
@@ -1125,7 +1139,7 @@ Inherit: /ss/584/2015/level/2
         <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="require"><p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user<br/>Inherit: /ss/584/2015/level/1</i></p>
+        <div class="require"><p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user<br/>Inherits: /ss/584/2015/level/1</i></p>
 
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
@@ -1154,6 +1168,121 @@ Inherit: /ss/584/2015/level/2
     OUTPUT
   end
 
+   it "processes requirements in French" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>fr</language>
+    <script>Latn</script>
+    </bibdata>
+    <preface><foreword>
+    <requirement id="A" unnumbered="true">
+  <title>A New Requirement</title>
+  <label>/ogc/recommendation/wfs/2</label>
+  <inherit>/ss/584/2015/level/1</inherit>
+  <subject>user</subject>
+  <description>
+    <p id="_">I recommend <em>this</em>.</p>
+  </description>
+  <specification exclude="true" type="tabular">
+    <p id="_">This is the object of the recommendation:</p>
+    <table id="_">
+      <tbody>
+        <tr>
+          <td style="text-align:left;">Object</td>
+          <td style="text-align:left;">Value</td>
+        </tr>
+        <tr>
+          <td style="text-align:left;">Mission</td>
+          <td style="text-align:left;">Accomplished</td>
+        </tr>
+      </tbody>
+    </table>
+  </specification>
+  <description>
+    <p id="_">As for the measurement targets,</p>
+  </description>
+  <measurement-target exclude="false">
+    <p id="_">The measurement target shall be measured as:</p>
+    <formula id="B">
+      <stem type="AsciiMath">r/1 = 0</stem>
+    </formula>
+  </measurement-target>
+  <verification exclude="false">
+    <p id="_">The following code will be run for verification:</p>
+    <sourcecode id="_">CoreRoot(success): HttpResponse
+      if (success)
+      recommendation(label: success-response)
+      end
+    </sourcecode>
+  </verification>
+  <import exclude="true">
+    <sourcecode id="_">success-response()</sourcecode>
+  </import>
+</requirement>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+#{HTML_HDR.gsub(/"en"/, '"fr"')}
+             <br/>
+             <div>
+               <h1 class='ForewordTitle'>Avant-propos</h1>
+               <div class='require'>
+                 <p class='RecommendationTitle'>
+                   Exigence:
+                   <br/>
+                   /ogc/recommendation/wfs/2. A New Requirement
+                 </p>
+                 <p>
+                   <i>
+                     Sujet: user
+                     <br/>
+                     H&#233;rite: /ss/584/2015/level/1
+                   </i>
+                 </p>
+                 <div class='requirement-description'>
+                   <p id='_'>
+                     I recommend
+                     <i>this</i>
+                     .
+                   </p>
+                 </div>
+                 <div class='requirement-description'>
+                   <p id='_'>As for the measurement targets,</p>
+                 </div>
+                 <div class='requirement-measurement-target'>
+                   <p id='_'>The measurement target shall be measured as:</p>
+                   <div id='B' class='formula'>
+                     <p>
+                       <span class='stem'>(#(r/1 = 0)#)</span>
+                       &#160; (1)
+                     </p>
+                   </div>
+                 </div>
+                 <div class='requirement-verification'>
+                   <p id='_'>The following code will be run for verification:</p>
+                   <pre id='_' class='prettyprint '>
+                     CoreRoot(success): HttpResponse
+                     <br/>
+                     &#160;&#160;&#160;&#160;&#160; if (success)
+                     <br/>
+                     &#160;&#160;&#160;&#160;&#160; recommendation(label:
+                     success-response)
+                     <br/>
+                     &#160;&#160;&#160;&#160;&#160; end
+                     <br/>
+                     &#160;&#160;&#160;
+                   </pre>
+                 </div>
+               </div>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+OUTPUT
+end
+
       it "processes recommendation" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1210,7 +1339,7 @@ Inherit: /ss/584/2015/level/2
        <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-<div class="recommend"><p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Inherit: /ss/584/2015/level/1<br/>Type: text<br/>Language: BASIC</i></p>
+<div class="recommend"><p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Inherits: /ss/584/2015/level/1<br/>Type: text<br/>Language: BASIC</i></p>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
   </div>

data/spec/isodoc/cleanup_spec.rb

@@ -831,7 +831,7 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                      <tbody>
                      <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
                            http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
@@ -873,7 +873,7 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                      <tbody>
                        <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
                            http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB

data/spec/isodoc/metadata_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe IsoDoc do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :publisher=>"", :receiveddate=>"XXX", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -108,6 +108,10 @@ OUTPUT
   <title language="en" format="text/plain">Cereals and pulses</title>
   <docidentifier>17301-1-3</docidentifier>
   <docnumber>17301</docnumber>
+  <date type="published"><on>2011-01</on></date>
+  <version>
+  <revision-date>2016-05</revision-date>
+</version>
   <contributor>
     <role type="author"/>
     <organization>
@@ -117,14 +121,23 @@ OUTPUT
   <contributor>
     <role type="publisher"/>
     <organization>
+      <name>International Organization for Standardization</name>
       <abbreviation>ISO</abbreviation>
      </organization>
   </contributor>
   <contributor>
     <role type="publisher"/>
     <organization>
+      <name>International Electrotechnical Commission</name>
       <abbreviation>IEC</abbreviation>
     </organization>
+  </contributor>
+   <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>Institute of Electrical and Electronics Engineers</name>
+      <abbreviation>IEEE</abbreviation>
+    </organization>
   </contributor>
   <language>en</language>
   <script>Latn</script>
@@ -153,8 +166,68 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC/IEEE", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"May 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
 OUTPUT
   end
 
+    it "processes IsoXML metadata in French" do
+        c = IsoDoc::Convert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+  <language>fr</language>
+  <script>Latn</script>
+  </bibdata>
+  </iso-standard>
+    INPUT
+  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+  <title language="fr" format="text/plain">Céréales et légumineuses</ti>
+  <title language="en" format="text/plain">Cereals and pulses</title>
+  <docidentifier>17301-1-3</docidentifier>
+  <docnumber>17301</docnumber>
+  <date type="published"><on>2011-01</on></date>
+  <version>
+  <revision-date>2016-05</revision-date>
+</version>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+     </organization>
+  </contributor>
+   <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <language>fr</language>
+  <script>Latn</script>
+  <status><stage>Published</stage></status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+      </organization>
+    </owner>
+  </copyright>
+</bibdata>
+</iso-standard>
+INPUT
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization et International Electrotechnical Commission", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"Mai 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
+OUTPUT
+end
+
+
 end

data/spec/isodoc/postproc_spec.rb

@@ -1095,7 +1095,7 @@ word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div align="center" class="table_container">
-                 <table class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;"><a name="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7"></a>
+                 <table class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;"><a name="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7"></a>
                    <thead>
                      <tr>
                        <td rowspan="2" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;">
@@ -1149,7 +1149,7 @@ word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="
          <div>
            <h1 class='ForewordTitle'>Foreword</h1>
            <div align='center' class="table_container">
-             <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <a name='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7' id='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7'/>
                <thead>
                  <tr>
@@ -1351,7 +1351,7 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
          </div>
          <div class='WordSection2_1'>
            <div align='center' class='table_container'>
-             <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <tbody>
                  <tr>
                    <td style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>A</td>
@@ -1399,7 +1399,7 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
          <div class='WordSection3_1'>
            <p class='TableTitle' style='text-align:center;'>Table 1</p>
            <div align='center' class='table_container'>
-             <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+             <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <a name='_c09a7e60-b0c7-4418-9bfc-2ef0bc09a249' id='_c09a7e60-b0c7-4418-9bfc-2ef0bc09a249'/>
                <thead>
                  <tr>

data/spec/isodoc/ref_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe IsoDoc do
   <eref bibitemid="ref1"/>
   <eref bibitemid="ref10"/>
   <eref bibitemid="ref12"/>
+  <eref bibitemid="zip_ffs"/>
   </p>
     </foreword></preface>
     <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
@@ -24,6 +25,7 @@ RSpec.describe IsoDoc do
   <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>
+  <docidentifier type="metanorma">[110]</docidentifier>
   <contributor>
     <role type="publisher"/>
     <organization>
@@ -64,6 +66,8 @@ RSpec.describe IsoDoc do
   <docidentifier type="ICC">167</docidentifier>
 </bibitem>
 <note><p>This is an annotation of ISO 20483:2013-2014</p></note>
+    <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">
   <title>Bibliography</title>
@@ -125,26 +129,28 @@ RSpec.describe IsoDoc do
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-         <a href="#ISO712">ISO 712</a>
+         <a href="#ISO712">[110]</a>
          <a href="#ISBN">[1]</a>
          <a href="#ISSN">[2]</a>
          <a href="#ISO16634">ISO 16634:-- (all parts)</a>
          <a href="#ref1">ICC 167</a>
          <a href="#ref10">[10]</a>
          <a href="#ref12">[Citn]</a>
+         <a href='#zip_ffs'>[5]</a>
          </p>
              </div>
              <p class="zzSTDTitle1"/>
              <div>
                <h1>1.&#160; Normative references</h1>
                <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-               <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
+               <p id="ISO712" class="NormRef">[110], <i>Cereals and cereal products</i></p>
                <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
                <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
                <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                <div id="" class="Note">
                  <p><span class="note_label">NOTE</span>&#160; This is an annotation of ISO 20483:2013-2014</p>
                </div>
+               <p id='zip_ffs' class='NormRef'>[5], Title 5</p>
              </div>
              <br/>
              <div>

data/spec/isodoc/table_spec.rb

@@ -217,7 +217,7 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p class="TableTitle" style="text-align:center;">Table 1</p>
                  <div align="center" class="table_container">
-                 <table id="tableD-0" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;">
+                 <table id="tableD-0" class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;">
                    <tbody>
                      <tr>
                        <td style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">A</td>
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
  </span>
         </p>
                   <div align="center" class="table_container">
-                 <table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc" width="70%">
+                 <table id="tableD-1" class="MsoISOTable" style="mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc" width="70%">
                    <thead>
                      <tr>
                        <td rowspan="2" align="left" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Description</td>

data/spec/isodoc/xref_spec.rb

@@ -63,6 +63,17 @@ RSpec.describe IsoDoc do
     INPUT
   end
 
+  it "does not warn of missing crossreference if text is supplied" do
+    expect { IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true) }.not_to output(/No label has been processed for ID N1/).to_stderr
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1">abc</xref>
+    </preface>
+    </iso-standard>
+    INPUT
+  end
 
   it "cross-references notes" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -345,6 +345,7 @@ files:
 - lib/isodoc/html_function/html.rb
 - lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/metadata.rb
+- lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/version.rb
 - lib/isodoc/word_convert.rb