metanorma-iso 1.5.6 → 1.5.11

data/spec/isodoc/postproc_spec.rb

@@ -611,9 +611,9 @@ documentation.</p>
     INPUT
 
     presxml = <<~OUTPUT
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
                <bibdata type="standard">
-               <status><stage>30</stage></status>
+               <status><stage language="">30</stage></status>
                </bibdata>
            <boilerplate>
          <copyright-statement>
@@ -661,7 +661,7 @@ documentation.</p>
 
      FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
     word = File.read("test.html", encoding: "UTF-8")
     expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'

data/spec/isodoc/ref_spec.rb

@@ -121,9 +121,9 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
          <preface>
            <foreword>
@@ -339,7 +339,7 @@ html = <<~OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

data/spec/isodoc/section_spec.rb

@@ -70,7 +70,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 obligation='informative'>
        <title>Foreword</title>
@@ -361,7 +361,7 @@ OUTPUT
 INPUT
 
 presxml = <<~OUTPUT
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='D' obligation='normative'>
       <title depth='1'>1<tab/>Scope</title>

data/spec/isodoc/table_spec.rb

@@ -61,7 +61,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>
              <table id='tableD-1' alt='tool tip' summary='long desc'>

data/spec/isodoc/terms_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-<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'>1<tab/>Terms and Definitions</title>

data/spec/isodoc/xref_spec.rb

@@ -56,7 +56,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>
@@ -202,7 +202,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>
@@ -322,7 +322,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>
@@ -435,7 +435,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>
@@ -568,7 +568,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>
@@ -729,7 +729,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>
@@ -863,7 +863,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>
@@ -998,7 +998,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 obligation='informative'>
               <title>Foreword</title>
@@ -1198,7 +1198,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>
@@ -1318,7 +1318,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>
@@ -1422,7 +1422,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>

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "iso.sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
     OUTPUT
   end
 

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"')
 end
 
+def metadata(x)
+  Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
+end
+
 def xmlpp(x)
   s = ""
   f = REXML::Formatters::Pretty.new(2)
@@ -114,10 +118,17 @@ BOILERPLATE =
   gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
 )
 
+BOILERPLATE_FR =
+  HTMLEntities.new.decode(
+  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iso", "boilerplate-fr.xml"), encoding: "utf-8").
+  gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
+  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
+  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+)
 
-BLANK_HDR = <<~"HDR"
+BLANK_HDR1 = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <contributor>
     <role type="author"/>
@@ -158,9 +169,18 @@ BLANK_HDR = <<~"HDR"
   <stagename>International standard</stagename>
   </ext>
 </bibdata>
+HDR
+
+BLANK_HDR = <<~"HDR"
+#{BLANK_HDR1}
 #{BOILERPLATE}
 HDR
 
+BLANK_HDR_FR = <<~"HDR"
+#{BLANK_HDR1.sub(%r{<language>en</language>}, "<language>fr</language>")}
+#{BOILERPLATE_FR}
+HDR
+
 TERM_BOILERPLATE = <<~END
   <p id="_">For the purposes of this document,
     the following terms and definitions apply.</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: tokenizer
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,7 @@ files:
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/basicdoc.rng
 - lib/asciidoctor/iso/biblio.rng
+- lib/asciidoctor/iso/boilerplate-fr.xml
 - lib/asciidoctor/iso/boilerplate.xml
 - lib/asciidoctor/iso/cleanup.rb
 - lib/asciidoctor/iso/converter.rb
@@ -327,6 +328,7 @@ files:
 - lib/isodoc/iso/init.rb
 - lib/isodoc/iso/iso.amendment.xsl
 - lib/isodoc/iso/iso.international-standard.xsl
+- lib/isodoc/iso/isosts_convert.rb
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/pdf_convert.rb
 - lib/isodoc/iso/presentation_xml_convert.rb
@@ -363,6 +365,7 @@ files:
 - spec/assets/word.css
 - spec/assets/wordcover.html
 - spec/assets/wordintro.html
+- spec/assets/xref_error.adoc
 - spec/examples/103_01_02.html
 - spec/examples/english.yaml
 - spec/examples/iso_123_.xml