metanorma-generic 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f20c2ff6ac5b4bd0c8225e2c2e90eccc45535e37ed0aa1a2d5d644aa66edab
-  data.tar.gz: b8334113bb3b81424dded4d127fdabf2767441201c5a4509d9282b280304d004
+  metadata.gz: 25641110b45e76829391dc1a8d7558ed8a57b1c205ed3edd68b7691e13efffa4
+  data.tar.gz: 7370721bedccaca54ee3277d9d03a96af28582c3a787b75900971e812992b4f0
 SHA512:
-  metadata.gz: 45cb75656b843384c91ce95588e490515cb8aeec3c3288359cd755c89a988d6d4821a0990a83c9c94776822a3d9df09ccc518934d8a8180364e9a3c0465e8435
-  data.tar.gz: c539dee549b527bb65f52272caaed23924139b06cc822272589a49a14dff01c826f4d2cb33a931e8d571b9b7466395935eff8d4893b4fd2b47a047b78d85acc7
+  metadata.gz: 783da8466b07f8e9afc0bb8553e1363b8587a4b5883371b0db5611f53fce39a2ae2dd990c556e65424511bf4241f451d9efc3cddbf75644f9d93760416477aad
+  data.tar.gz: 4dac2a50657d08b05e23e4c3e2ad59c200d9a3413e1ec37077b233a4a6c4b9e3ec31deb25d40f278dfe2e77460fbc21237b1461995da82fed95eae7aa4f02521

data/lib/asciidoctor/generic/isodoc.rng

@@ -32,6 +32,18 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="section-title">
+      <element name="title">
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+      <zeroOrMore>
+        <element name="variant-title">
+          <ref name="TypedTitleString"/>
+        </element>
+      </zeroOrMore>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -204,6 +216,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -899,7 +923,7 @@
   </include>
   <!-- end overrides -->
   <define name="docsubtype">
-    <element name="docsubtype">
+    <element name="subdoctype">
       <ref name="DocumentSubtype"/>
     </element>
   </define>
@@ -954,6 +978,16 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -989,8 +1023,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -998,6 +1038,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1229,6 +1272,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1490,26 +1539,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/asciidoctor/generic/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/isodoc/generic.rb

@@ -1,6 +1,5 @@
 require "isodoc/generic/metadata"
 require "isodoc/generic/html_convert"
-require "isodoc/generic/pdf_convert"
 require "isodoc/generic/word_convert"
 require "isodoc/generic/presentation_xml_convert"
 

data/lib/metanorma/generic/processor.rb

@@ -17,7 +17,6 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
         )
       end
 
@@ -44,8 +43,6 @@ module Metanorma
           IsoDoc::Generic::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
           IsoDoc::Generic::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :pdf
-          IsoDoc::Generic::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::Generic::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.10.2".freeze
+    VERSION = "1.10.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -251,7 +251,6 @@ files:
 - lib/isodoc/generic/i18n.rb
 - lib/isodoc/generic/init.rb
 - lib/isodoc/generic/metadata.rb
-- lib/isodoc/generic/pdf_convert.rb
 - lib/isodoc/generic/presentation_xml_convert.rb
 - lib/isodoc/generic/utils.rb
 - lib/isodoc/generic/word_convert.rb

data/lib/isodoc/generic/pdf_convert.rb

@@ -1,66 +0,0 @@
-require_relative "base_convert"
-require_relative "init"
-require "isodoc"
-
-module IsoDoc
-  module Generic
-    # A {Converter} implementation that generates PDF HTML output, and a
-    # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      class << self
-        attr_accessor :_file
-      end
-
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
-      end
-
-       def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif'
-                     : configuration.html_bodyfont || '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                       configuration.html_headerfont || '"Overpass",sans-serif'),
-          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }.transform_values { |v| v&.empty? ? nil : v }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
-            html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
-            html_doc_path("html_generic_titlepage.html"),
-          htmlintropage: baselocation(configuration.htmlintropage) ||
-            html_doc_path("html_generic_intro.html"),
-          scripts_pdf: baselocation(configuration.scripts_pdf) ||
-            html_doc_path("scripts.pdf.html")
-        }.transform_values { |v| v&.empty? ? nil : v }
-      end
-
-      def googlefonts
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-        HEAD
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
-      end
-
-      include BaseConvert
-      include Init
-    end
-  end
-end
-