metanorma-iso 1.7.2 → 1.7.3

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -1,12 +1,9 @@
 require_relative "init"
 require "isodoc"
+require_relative "index"
 
 module IsoDoc
   module Iso
-
-    # A {Converter} implementation that generates HTML output, and a document
-    # schema encapsulation of the document for validation
-    #
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def initialize(options)
         super

data/lib/isodoc/iso/xref.rb

@@ -130,6 +130,11 @@ module IsoDoc
         @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
                                 sub(/ \(All Parts\)/i, "") }
       end
+
+      def back_anchor_names(docxml)
+        super
+        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
+      end
     end
   end
 end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.7.2".freeze
+    VERSION = "1.7.3".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake" #, "~> 12.0"
+  spec.add_development_dependency "rake" , "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"

data/spec/isodoc/section_spec.rb

@@ -655,4 +655,223 @@ RSpec.describe IsoDoc do
         </html>
       OUTPUT
   end
+
+  it "generates an index in English" do
+    input = <<~INPUT
+      <iso-standard xmlns="https://open.ribose.com/standards/bipm">
+        <bibdata>
+          <language>en</language>
+          <script>Latn</script>
+        </bibdata>
+        <sections>
+          <clause id="A">
+            <index><primary>&#xE9;long&#xE9;</primary></index>
+            <index><primary>&#xEA;tre</primary><secondary>Husserl</secondary><tertiary>en allemand</tertiary></index>
+            <index><primary><em>Eman</em>cipation</primary></index>
+            <index><primary><em>Eman</em>cipation</primary><secondary>dans la France</secondary></index>
+            <index><primary><em>Eman</em>cipation</primary><secondary>dans la France</secondary><tertiary>en Bretagne</tertiary></index>
+            <clause id="B">
+              <index><primary><em>Eman</em>cipation</primary></index>
+              <index><primary>zebra</primary></index>
+              <index><primary><em>Eman</em>cipation</primary><secondary>dans les &#xC9;tats-Unis</secondary></index>
+              <index><primary><em>Eman</em>cipation</primary><secondary>dans la France</secondary><tertiary>&#xE0; Paris</tertiary></index>
+              <index-xref also="true"><primary>&#xEA;tre</primary><secondary>Husserl</secondary><target>zebra</target></index-xref>
+              <index-xref also="true"><primary>&#xEA;tre</primary><secondary>Husserl</secondary><target><em>Eman</em>cipation</target></index-xref>
+              <index-xref also="false"><primary>&#xEA;tre</primary><secondary>Husserl</secondary><target>zebra</target></index-xref>
+              <index-xref also="false"><primary><em>Dasein</em></primary><target>&#xEA;tre</target></index-xref>
+              <index-xref also="false"><primary><em>Dasein</em></primary><target><em>Eman</em>cipation</target></index-xref>
+            </clause>
+          </clause>
+        </sections>
+      </bipm-standard>
+    INPUT
+    presxml = <<~OUTPUT
+   <iso-standard xmlns='https://open.ribose.com/standards/bipm' type='presentation'>
+  <bibdata>
+    <language current='true'>en</language>
+    <script current='true'>Latn</script>
+  </bibdata>
+  <sections>
+    <clause id='A'>
+      <title>1</title>
+      <bookmark id='_'/>
+      <bookmark id='_'/>
+      <bookmark id='_'/>
+      <bookmark id='_'/>
+      <bookmark id='_'/>
+      <clause id='B' inline-header='true'>
+        <title>1.1</title>
+        <bookmark id='_'/>
+        <bookmark id='_'/>
+        <bookmark id='_'/>
+        <bookmark id='_'/>
+      </clause>
+    </clause>
+  </sections>
+  <indexsect id='_'>
+    <title>Index</title>
+    <ul>
+      <li>
+        <em>Dasein</em>
+        , see
+        <em>Eman</em>
+        cipation, &#xEA;tre
+      </li>
+      <li>
+        &#xE9;long&#xE9;,
+        <xref target='_' pagenumber='true'>Clause 1</xref>
+      </li>
+      <li>
+        <em>Eman</em>
+        cipation,
+        <xref target='_' pagenumber='true'>Clause 1</xref>
+        ,
+        <xref target='_' pagenumber='true'>1.1</xref>
+        <ul>
+          <li>
+            dans la France,
+            <xref target='_' pagenumber='true'>Clause 1</xref>
+            <ul>
+              <li>
+                &#xE0; Paris,
+                <xref target='_' pagenumber='true'>1.1</xref>
+              </li>
+              <li>
+                en Bretagne,
+                <xref target='_' pagenumber='true'>Clause 1</xref>
+              </li>
+            </ul>
+          </li>
+          <li>
+            dans les &#xC9;tats-Unis,
+            <xref target='_' pagenumber='true'>1.1</xref>
+          </li>
+        </ul>
+      </li>
+      <li>
+        &#xEA;tre
+        <ul>
+          <li>
+            Husserl, see zebra, see also
+            <em>Eman</em>
+            cipation, zebra
+            <ul>
+              <li>
+                en allemand,
+                <xref target='_' pagenumber='true'>Clause 1</xref>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+      <li>
+        zebra,
+        <xref target='_' pagenumber='true'>1.1</xref>
+      </li>
+    </ul>
+  </indexsect>
+</iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+    <html 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'>
+      <p class='zzSTDTitle1'/>
+      <div id='A'>
+        <h1>1</h1>
+        <a id='_'/>
+        <a id='_'/>
+        <a id='_'/>
+        <a id='_'/>
+        <a id='_'/>
+        <div id='B'>
+          <span class='zzMoveToFollowing'>
+            <b>1.1&#160; </b>
+          </span>
+          <a id='_'/>
+          <a id='_'/>
+          <a id='_'/>
+          <a id='_'/>
+        </div>
+      </div>
+      <div id='_'>
+        <h1>Index</h1>
+        <ul>
+          <li>
+            <i>Dasein</i>
+             , see
+            <i>Eman</i>
+             cipation, &#234;tre
+          </li>
+          <li>
+             &#233;long&#233;,
+            <a href='#_'>Clause 1</a>
+          </li>
+          <li>
+            <i>Eman</i>
+             cipation,
+            <a href='#_'>Clause 1</a>
+             ,
+            <a href='#_'>1.1</a>
+            <ul>
+              <li>
+                 dans la France,
+                <a href='#_'>Clause 1</a>
+                <ul>
+                  <li>
+                     &#224; Paris,
+                    <a href='#_'>1.1</a>
+                  </li>
+                  <li>
+                     en Bretagne,
+                    <a href='#_'>Clause 1</a>
+                  </li>
+                </ul>
+              </li>
+              <li>
+                 dans les &#201;tats-Unis,
+                <a href='#_'>1.1</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+             &#234;tre
+            <ul>
+              <li>
+                 Husserl, see zebra, see also
+                <i>Eman</i>
+                 cipation, zebra
+                <ul>
+                  <li>
+                     en allemand,
+                    <a href='#_'>Clause 1</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+          <li>
+             zebra,
+            <a href='#_'>1.1</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </body>
+</html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)
+      .gsub(%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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -168,16 +168,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +320,7 @@ files:
 - lib/isodoc/iso/i18n-fr.yaml
 - lib/isodoc/iso/i18n-zh-Hans.yaml
 - lib/isodoc/iso/i18n.rb
+- lib/isodoc/iso/index.rb
 - lib/isodoc/iso/init.rb
 - lib/isodoc/iso/iso.amendment.xsl
 - lib/isodoc/iso/iso.international-standard.xsl
@@ -336,16 +337,16 @@ files:
 - lib/metanorma/iso/processor.rb
 - lib/metanorma/iso/version.rb
 - metanorma-iso.gemspec
-- spec/asciidoctor-iso/amd_spec.rb
-- spec/asciidoctor-iso/base_spec.rb
-- spec/asciidoctor-iso/blocks_spec.rb
-- spec/asciidoctor-iso/cleanup_spec.rb
-- spec/asciidoctor-iso/inline_spec.rb
-- spec/asciidoctor-iso/lists_spec.rb
-- spec/asciidoctor-iso/refs_spec.rb
-- spec/asciidoctor-iso/section_spec.rb
-- spec/asciidoctor-iso/table_spec.rb
-- spec/asciidoctor-iso/validate_spec.rb
+- spec/asciidoctor/amd_spec.rb
+- spec/asciidoctor/base_spec.rb
+- spec/asciidoctor/blocks_spec.rb
+- spec/asciidoctor/cleanup_spec.rb
+- spec/asciidoctor/inline_spec.rb
+- spec/asciidoctor/lists_spec.rb
+- spec/asciidoctor/refs_spec.rb
+- spec/asciidoctor/section_spec.rb
+- spec/asciidoctor/table_spec.rb
+- spec/asciidoctor/validate_spec.rb
 - spec/assets/header.html
 - spec/assets/html.css
 - spec/assets/htmlcover.html