metanorma-ogc 1.0.8 → 1.1.3

data/lib/isodoc/ogc/pdf_convert.rb

@@ -19,19 +19,6 @@ module IsoDoc
         standard user-guide test-suite white-paper).include? doctype
         "ogc.#{doctype}.xsl"
       end
-
-      def convert(filename, file = nil, debug = false)
-        file = File.read(filename, encoding: "utf-8") if file.nil?
-        docxml, outname_html, dir = convert_init(file, filename, debug)
-        /\.xml$/.match(filename) or
-          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
-        end
-        FileUtils.rm_rf dir
-        ::Metanorma::Output::XslfoPdf.new.convert(
-          filename, outname_html + ".pdf", File.join(@libdir, pdf_stylesheet(docxml)))
-      end
     end
   end
 end

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Ogc
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/ogc/reqt.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "reqt_xref"
 
 module IsoDoc
   module Ogc
@@ -14,7 +13,8 @@ module IsoDoc
 
       def recommend_table_attr(node)
         attr_code(id: node["id"], class: recommend_class(node),
-                  style: "border-collapse:collapse;border-spacing:0;")
+                  style: "border-collapse:collapse;border-spacing:0;"\
+                 "#{keep_style(node)}")
       end
 
       REQ_TBL_ATTR =
@@ -29,7 +29,7 @@ module IsoDoc
         label, title, lbl = recommendation_labels(node)
         out.p **{ class: recommendation_class(node) } do |b|
           if inject_crossreference_reqt?(node, label)
-            lbl = anchor(@reqtlabels[label.text], :xref, false)
+            lbl = @xrefs.anchor(@xrefs.reqtlabels[label.text], :xref, false)
             b << (lbl.nil? ? l10n("#{type}:") : l10n("#{lbl}:"))
           else
             b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
@@ -58,7 +58,7 @@ module IsoDoc
       # embedded reqts xref to top level reqts via label lookup
       def inject_crossreference_reqt?(node, label)
         !node.ancestors("requirement, recommendation, permission").empty? &&
-          @reqtlabels[label&.text]
+          @xrefs.reqtlabels[label&.text]
       end
 
       def recommendation_attributes1(node)
@@ -105,12 +105,17 @@ module IsoDoc
         end
       end
 
+      def reqt_component_attrs(node)
+        attr_code(style: keep_style(node))
+      end
+
       def requirement_component_parse(node, out)
         return if node["exclude"] == "true"
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
         out.tr do |tr|
-          tr.td **REQ_TBL_ATTR.merge(colspan: 2) do |td|
+          tr.td **REQ_TBL_ATTR.merge(colspan: 2).
+            merge(reqt_component_attrs(node)) do |td|
             node.children.each { |n| parse(n, td) }
           end
         end

data/lib/isodoc/ogc/sections.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module BaseConvert
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
-          t << "#{anchor(annex['id'], :label)} "
+          t << "#{@xrefs.anchor(annex['id'], :label)} "
           t.br
           t.b do |b|
             name&.children&.each { |c2| parse(c2, b) }
@@ -24,12 +24,13 @@ module IsoDoc
         end
       end
 
-      SUBMITTINGORGS =
-        "//bibdata/contributor[role/@type = 'author']/organization/name".freeze
+      def submittingorgs_path
+        "//bibdata/contributor[role/@type = 'author']/organization/name"
+      end
 
       def submittingorgs(docxml, out)
         orgs = []
-        docxml.xpath(ns(SUBMITTINGORGS)).each { |org| orgs << org.text }
+        docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
         return if orgs.empty?
         @prefacenum += 1
         out.div **{ class: "Section3" } do |div|
@@ -47,7 +48,7 @@ module IsoDoc
         f = docxml.at(ns("//submitters")) || return
         @prefacenum += 1
         out.div **{ class: "Section3" } do |div|
-          clause_name(anchor(f['id'], :label), "Submitters", div,
+          clause_name(@xrefs.anchor(f['id'], :label), "Submitters", div,
                       class: "IntroTitle")
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
@@ -70,7 +71,7 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @abstract_lbl, s,
+          clause_name(@xrefs.anchor(f["id"], :label), @abstract_lbl, s,
                       class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -81,7 +82,7 @@ module IsoDoc
         @prefacenum += 1
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(anchor(f["id"], :label), @foreword_lbl, s,
+          clause_name(@xrefs.anchor(f["id"], :label), @foreword_lbl, s,
                       class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -91,7 +92,7 @@ module IsoDoc
         f = isoxml.at(ns("//acknowledgements")) || return
         @prefacenum += 1
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(anchor(f["id"], :label), f&.at(ns("./title")), div,
+          clause_name(@xrefs.anchor(f["id"], :label), f&.at(ns("./title")), div,
                       class: "IntroTitle")
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end

data/lib/isodoc/ogc/word_convert.rb

@@ -11,7 +11,6 @@ module IsoDoc
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
-        @reqtlabels = {}
         super
       end
 
@@ -37,10 +36,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|
@@ -72,15 +67,15 @@ module IsoDoc
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,1&quot; <span
-        style='mso-element:field-separator'></span></span>
+        \\h \\z \\t &quot;RecommendationTitle,recommendationtitle&quot; 
+        <span style='mso-element:field-separator'></span></span>
       TOC
 
       WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
                           <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,1&quot; <span
+        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -88,7 +83,7 @@ module IsoDoc
                                       <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,1&quot; <span
+        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
         style='mso-element:field-separator'></span></span>
       TOC
 

data/lib/isodoc/ogc/{reqt_xref.rb → xref.rb}

@@ -1,10 +1,19 @@
 module IsoDoc
   module Ogc
-    module BaseConvert
-      FIRST_LVL_REQ = IsoDoc::Function::XrefGen::FIRST_LVL_REQ
+    class Xref < IsoDoc::Xref
+      def initialize(lang, script, klass, labels, options)
+        @reqtlabels = {}
+        super
+      end
+
+      def reqtlabels
+        @reqtlabels
+      end
+
+      FIRST_LVL_REQ = IsoDoc::XrefGen::Blocks::FIRST_LVL_REQ
 
       def sequential_permission_names(clause, klass, label)
-        c = ::IsoDoc::Function::XrefGen::Counter.new
+        c = ::IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = c.increment(t).print
@@ -40,7 +49,7 @@ module IsoDoc
       end
 
       def sequential_permission_names1(block, lbl, klass, label)
-        c = ::IsoDoc::Function::XrefGen::Counter.new
+        c = ::IsoDoc::XrefGen::Counter.new
         block.xpath(ns("./#{klass}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
@@ -82,7 +91,7 @@ module IsoDoc
       end
 
       def hierarchical_permission_names(clause, num, klass, label)
-        c = ::IsoDoc::Function::XrefGen::Counter.new
+        c = ::IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           lbl = "#{num}#{hiersep}#{c.increment(t).print}"
@@ -91,6 +100,59 @@ module IsoDoc
           sequential_permission_children(t, lbl)
         end
       end
+
+      def initial_anchor_names(d)
+        @prefacenum = 0
+        preface_names_numbered(d.at(ns("//preface/abstract")))
+        @prefacenum += 1 if d.at(ns("//keyword"))
+        preface_names_numbered(d.at(ns("//foreword")))
+        preface_names_numbered(d.at(ns("//introduction")))
+        @prefacenum += 1 if d.at(ns(@klass.submittingorgs_path))
+        preface_names_numbered(d.at(ns("//submitters")))
+        d.xpath(ns("//preface/clause")).each do |c|
+          preface_names_numbered(c)
+        end
+        preface_names_numbered(d.at(ns("//acknowledgements")))
+        sequential_asset_names(d.xpath(ns(
+          "//preface/abstract | //foreword | //introduction | "\
+          "//submitters | //acknowledgements | //preface/clause")))
+        n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
+        n = section_names(d.at(ns("//clause[title = 'Conformance']")), n, 1)
+        n = section_names(d.at(ns(
+          "//references[title = 'Normative References' or "\
+          "title = 'Normative references']")), n, 1)
+        n = section_names(
+          d.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
+          n, 1)
+        n = section_names(d.at(ns("//sections/definitions")), n, 1)
+        middle_section_asset_names(d)
+        clause_names(d, n)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def middle_section_asset_names(d)
+        middle_sections = "//clause[title = 'Scope' or title = 'Conformance'] "\
+          "| //foreword | //introduction | //preface/abstract | "\
+          "//submitters | //acknowledgements | //preface/clause | "\
+          "//references[title = 'Normative References' or title = "\
+          "'Normative references'] | //sections/terms | "\
+          "//sections/definitions | //clause[parent::sections]"
+        sequential_asset_names(d.xpath(ns(middle_sections)))
+      end
+
+      def preface_names_numbered(clause)
+        return if clause.nil?
+        @prefacenum += 1
+        pref = RomanNumerals.to_roman(@prefacenum).downcase
+        @anchors[clause["id"]] =
+          { label: pref,
+            level: 1, xref: preface_clause_name(clause), type: "clause" }
+        clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
+                        "./references")).each_with_index do |c, i|
+          section_names1(c, "#{pref}.#{i + 1}", 2)
+        end
+      end
     end
   end
 end

data/lib/metanorma/ogc/processor.rb

@@ -30,18 +30,16 @@ module Metanorma
         "Metanorma::Ogc #{Metanorma::Ogc::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::Ogc::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Ogc::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Ogc::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Ogc::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Ogc::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Ogc::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::Ogc::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.8"
+    VERSION = "1.1.3"
   end
 end

data/metanorma-ogc.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.0.20"
+  spec.add_dependency "isodoc", "~> 1.1.0"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.20
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.20
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -243,15 +257,19 @@ files:
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
 - lib/isodoc/ogc/biblio.rb
+- lib/isodoc/ogc/html/_coverpage.css
 - lib/isodoc/ogc/html/_coverpage.scss
 - lib/isodoc/ogc/html/header.html
 - lib/isodoc/ogc/html/html_ogc_intro.html
 - lib/isodoc/ogc/html/html_ogc_titlepage.html
+- lib/isodoc/ogc/html/htmlstyle.css
 - lib/isodoc/ogc/html/htmlstyle.scss
+- lib/isodoc/ogc/html/ogc.css
 - lib/isodoc/ogc/html/ogc.scss
 - lib/isodoc/ogc/html/scripts.html
 - lib/isodoc/ogc/html/word_ogc_intro.html
 - lib/isodoc/ogc/html/word_ogc_titlepage.html
+- lib/isodoc/ogc/html/wordstyle.css
 - lib/isodoc/ogc/html/wordstyle.scss
 - lib/isodoc/ogc/html_convert.rb
 - lib/isodoc/ogc/i18n-en.yaml
@@ -272,10 +290,11 @@ files:
 - lib/isodoc/ogc/ogc.user-guide.xsl
 - lib/isodoc/ogc/ogc.white-paper.xsl
 - lib/isodoc/ogc/pdf_convert.rb
+- lib/isodoc/ogc/presentation_xml_convert.rb
 - lib/isodoc/ogc/reqt.rb
-- lib/isodoc/ogc/reqt_xref.rb
 - lib/isodoc/ogc/sections.rb
 - lib/isodoc/ogc/word_convert.rb
+- lib/isodoc/ogc/xref.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb
 - lib/metanorma/ogc/processor.rb
@@ -285,7 +304,7 @@ homepage: https://github.com/metanorma/metanorma-ogc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -300,9 +319,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.
 test_files: []