metanorma-iso 1.7.2 → 1.8.2

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

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
+=begin
   config.around do |example|
     Dir.mktmpdir("rspec-") do |dir|
       tmp_assets = File.join(dir, "spec/assets/")
@@ -32,6 +33,7 @@ RSpec.configure do |config|
       Dir.chdir(dir) { example.run }
     end
   end
+=end
 end
 
 def strip_guid(xml)

metadata

@@ -1,73 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: tokenizer
+  name: mn2sts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,27 +67,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mn2sts
+  name: tokenizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: iev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   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
@@ -196,58 +196,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: iev
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.9'
 description: |
   metanorma-iso lets you write ISO standards in AsciiDoc syntax.
 
@@ -294,6 +294,7 @@ files:
 - lib/asciidoctor/iso/reqt.rng
 - lib/asciidoctor/iso/section.rb
 - lib/asciidoctor/iso/validate.rb
+- lib/asciidoctor/iso/validate_image.rb
 - lib/asciidoctor/iso/validate_requirements.rb
 - lib/asciidoctor/iso/validate_section.rb
 - lib/asciidoctor/iso/validate_style.rb
@@ -306,7 +307,6 @@ files:
 - lib/isodoc/iso/html/htmlstyle.scss
 - lib/isodoc/iso/html/isodoc.css
 - lib/isodoc/iso/html/isodoc.scss
-- lib/isodoc/iso/html/scripts.html
 - lib/isodoc/iso/html/style-human.css
 - lib/isodoc/iso/html/style-human.scss
 - lib/isodoc/iso/html/style-iso.css
@@ -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