isodoc 1.0.29 → 1.1.3.pre.alpha2

data/spec/isodoc/presentation_xml_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+  
+RSpec.describe IsoDoc do
+it "generates file based on string input" do
+  FileUtils.rm_f "test.presentation.xml"
+    IsoDoc::PresentationXMLConvert.new({filename: "test"}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+        <title language="en">test</title>
+        </bibdata>
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    expect(File.exist?("test.presentation.xml")).to be true
+  end
+end

data/spec/isodoc/ref_spec.rb

@@ -231,7 +231,7 @@ RSpec.describe IsoDoc do
           <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
         </p>
         <p id='ref12' class='Biblio'>
-          [6]&#160; Citn, IETF RFC 20, CitationWorks. 2019.
+          Citn&#160; IETF RFC 20, CitationWorks. 2019.
           <i>How to cite a reference</i>
           .
         </p>

data/spec/isodoc/section_spec.rb

@@ -1109,5 +1109,57 @@ OUTPUT
 OUTPUT
     end
 
+        it "processes clauses containing normative references" do
+            expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <bibliography>
+        <clause id="D" obligation="informative">
+         <title>Bibliography</title>
+         <references id="E" obligation="informative" normative="false">
+         <title>Bibliography Subsection 1</title>
+       </references>
+         <references id="F" obligation="informative" normative="false">
+         <title>Bibliography Subsection 2</title>
+       </references>
+       </clause>
+       <clause id="A" obligation="informative"><title>First References</title>
+        <references id="B" obligation="informative" normative="true">
+         <title>Normative References 1</title>
+       </references>
+        <references id="C" obligation="informative" normative="false">
+         <title>Normative References 2</title>
+       </references>
+        </clause>
+
+       </bibliography>
+INPUT
+    #{HTML_HDR}
+      <p class='zzSTDTitle1'/>
+      <div>
+        <h1>1.&#160; Normative references</h1>
+        <div>
+          <h2>1.1.&#160; Normative References 1</h2>
+        </div>
+        <div>
+          <h2>1.2.&#160; Normative References 2</h2>
+        </div>
+      </div>
+      <br/>
+      <div>
+        <h1 class='Section3'>Bibliography</h1>
+        <div>
+          <h2 class='Section3'>Bibliography Subsection 1</h2>
+        </div>
+        <div>
+          <h2 class='Section3'>Bibliography Subsection 2</h2>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
+OUTPUT
+            end
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.1.3.pre.alpha2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -123,61 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: metanorma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: metanorma
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :runtime
+        version: '9.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -306,14 +306,22 @@ files:
 - lib/isodoc-yaml/i18n-fr.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
+- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
+- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
+- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
+- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
+- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
+- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
+- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
+- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -333,11 +341,7 @@ files:
 - lib/isodoc/function/terms.rb
 - lib/isodoc/function/to_word_html.rb
 - lib/isodoc/function/utils.rb
-- lib/isodoc/function/xref_anchor.rb
-- lib/isodoc/function/xref_counter.rb
-- lib/isodoc/function/xref_gen.rb
-- lib/isodoc/function/xref_gen_seq.rb
-- lib/isodoc/function/xref_sect_gen.rb
+- lib/isodoc/gem_tasks.rb
 - lib/isodoc/headlesshtml_convert.rb
 - lib/isodoc/html_convert.rb
 - lib/isodoc/html_function.rb
@@ -348,6 +352,8 @@ files:
 - lib/isodoc/metadata.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
+- lib/isodoc/presentation_xml_convert.rb
+- lib/isodoc/sassc_importer.rb
 - lib/isodoc/version.rb
 - lib/isodoc/word_convert.rb
 - lib/isodoc/word_function.rb
@@ -358,9 +364,15 @@ files:
 - lib/isodoc/word_function/postprocess.rb
 - lib/isodoc/word_function/postprocess_cover.rb
 - lib/isodoc/word_function/table.rb
+- lib/isodoc/xref.rb
+- lib/isodoc/xref/xref_anchor.rb
+- lib/isodoc/xref/xref_counter.rb
+- lib/isodoc/xref/xref_gen.rb
+- lib/isodoc/xref/xref_gen_seq.rb
+- lib/isodoc/xref/xref_sect_gen.rb
 - lib/isodoc/xslfo_convert.rb
 - spec/assets/header.html
-- spec/assets/html.css
+- spec/assets/html.scss
 - spec/assets/htmlcover.html
 - spec/assets/htmlintro.html
 - spec/assets/i18n.yaml
@@ -383,6 +395,7 @@ files:
 - spec/isodoc/lists_spec.rb
 - spec/isodoc/metadata_spec.rb
 - spec/isodoc/postproc_spec.rb
+- spec/isodoc/presentation_xml_spec.rb
 - spec/isodoc/ref_spec.rb
 - spec/isodoc/section_spec.rb
 - spec/isodoc/table_spec.rb
@@ -393,7 +406,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -404,13 +417,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []

data/lib/isodoc/function/xref_counter.rb

@@ -1,84 +0,0 @@
-require "roman-numerals"
-
-module IsoDoc::Function
-  module XrefGen
-    def hiersep
-      "."
-    end
-
-    def hierfigsep
-      "-"
-    end
-
-    class Counter
-      def initialize
-        @num = 0
-        @letter = ""
-        @subseq = ""
-        @letter_override = nil
-        @number_override = nil
-      end
-
-      def new_subseq_increment(node)
-        @subseq = node["subsequence"]
-        @num += 1
-        @letter = node["subsequence"] ? "a" : ""
-        if node["number"]
-          /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
-          if n || a
-            @letter_override = @letter = a if a
-            @number_override = @num = n.to_i if n
-          else
-            @letter_override = node["number"]
-            @letter = @letter_override if /^[a-z]$/.match(@letter_override)
-          end
-        end
-      end
-
-      def sequence_increment(node)
-        if node["number"]
-          @number_override = node["number"]
-          @num = @number_override.to_i if /^\d+$/.match(@number_override)
-        else
-          @num += 1
-        end
-      end
-
-      def subsequence_increment(node)
-        if node["number"]
-          @letter_override = node["number"]
-          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
-        else
-          @letter = (@letter.ord + 1).chr.to_s
-        end
-      end
-
-      def increment(node)
-        return self if node["unnumbered"]
-        @letter_override = nil
-        @number_override = nil
-        if node["subsequence"] != @subseq
-          new_subseq_increment(node)
-        elsif @letter.empty?
-          sequence_increment(node)
-        else
-          subsequence_increment(node)
-        end
-        self
-      end
-
-      def print
-        "#{@number_override || @num}#{@letter_override || @letter}"
-      end
-
-      def listlabel(depth)
-        return @num.to_s if [2, 7].include? depth
-        return (96 + @num).chr.to_s if [1, 6].include? depth
-        return (64 + @num).chr.to_s if [4, 9].include? depth
-        return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
-        return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
-        return @num.to_s
-      end
-    end
-  end
-end