metanorma-rsd 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101eb1fc5a1a726cefc8e12dcd570733d0cb2b800c586c4628ba4674647e671f
-  data.tar.gz: 78064e1735d8fac74138360ae08438a82447b2974d6a38f3587ce8e9b2d5c47f
+  metadata.gz: 5ba559a92fb5dfdc07a3841c0f0fee4532efc6707667ed1e7d36b034d1869c02
+  data.tar.gz: 5b1155129af97fc10d19de0189355311ab5e212a4b81ebc0ae5357d197679d25
 SHA512:
-  metadata.gz: 1311e29995441ad9c98b18cf3a280a131e3870736706369610328fc34bf673a29461777048f48fd155b9c2dfb428c72a0bd8b22bd4664847f43ed5ee74bad15a
-  data.tar.gz: 5dd2bd74300087c571aaaa77377192e4f55943df03cbc87080903812d20894a4f49359d6ab79f77f7cce3a7267ca735c83a781d06572a702cf4570df132dccd4
+  metadata.gz: 7bbe7a4ac00c6222f13d572cd29edb7f069b5723a2fe43c94a1fbfaca4de2cc544f1f0887b9dcb34089c413dd8289e233719411dc4fbe5be7d343fe62d60648a
+  data.tar.gz: 8f8a7871dc1145a3e3c55822b02cdff99b794eaa67ac2c4732cdffef0fd44831c53cf4836bf9d3a195ce03cbb15f962bd4aaa01cbb5de1e209d9a4635a641d95

data/.github/workflows/macos.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           brew install plantuml

data/.github/workflows/ubuntu.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           sudo bash -c "curl -L https://github.com/riboseinc/plantuml-install/raw/master/ubuntu.sh | bash"

data/.github/workflows/windows.yml

@@ -27,15 +27,7 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Install PlantUML
         run: |
           cinst -y plantuml

data/lib/asciidoctor/rsd/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -737,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -989,38 +1021,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">
@@ -1028,12 +1085,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/rsd/converter.rb

@@ -7,23 +7,10 @@ module Asciidoctor
     # schema encapsulation of the document for validation
     #
     class Converter < Asciidoctor::Generic::Converter
-      register_for "rsd"
-
-      def metadata_recipient(node, xml)
-        recipient = node.attr("recipient") || return
-        xml.recipient recipient
-      end
-
-      def metadata_security(node, xml)
-        security = node.attr("security") || return
-        xml.security security
-      end
+      XML_ROOT_TAG = 'rsd-standard'.freeze
+      XML_NAMESPACE = 'https://www.metanorma.org/ns/rsd'.freeze
 
-      def metadata_ext(node, xml)
-        super
-        metadata_security(node, xml)
-        metadata_recipient(node, xml)
-      end
+      register_for "rsd"
 
       def sectiontype(node, level = true)
         ret = node&.attr("heading")&.downcase ||
@@ -73,6 +60,7 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
         IsoDoc::Rsd::PdfConvert.new(html_extract_attributes(node))
       end
 

data/lib/asciidoctor/rsd/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -911,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/isodoc/rsd/base_convert.rb

@@ -5,12 +5,6 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def info(isoxml, out)
-        @meta.security isoxml, out
-        @meta.recipient isoxml, out
-        super
-      end
-
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{anchor(annex['id'], :label)}<br/><br/>"

data/lib/isodoc/rsd/html/scripts.html

@@ -1,24 +1,8 @@
   <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': true, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
 <script>

data/lib/isodoc/rsd/metadata.rb

@@ -8,16 +8,6 @@ module IsoDoc
         Metanorma::Rsd.configuration
       end
 
-      def security(isoxml, _out)
-        security = isoxml.at(ns("//bibdata/ext/security")) || return
-        set(:security, security.text)
-      end
-
-      def recipient(isoxml, _out)
-        recipient = isoxml.at(ns("//bibdata/ext/recipient")) || return
-        set(:recipient, recipient.text)
-      end
-
       def version(isoxml, _out)
         super
         revdate = get[:revdate]

data/lib/isodoc/rsd/pdf_convert.rb

@@ -1,33 +1,30 @@
 require "isodoc"
-require "isodoc/generic/pdf_convert"
 require "isodoc/rsd/metadata"
 
 module IsoDoc
   module Rsd
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::Generic::PdfConvert
-      def configuration
-        Metanorma::Rsd.configuration
+    class PdfConvert <  IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
       end
 
-       def make_body3(body, docxml)
-      body.div **{ class: "main-section" } do |div3|
-        boilerplate docxml, div3
-        abstract docxml, div3
-        foreword docxml, div3
-        executivesummary docxml, div3
-        introduction docxml, div3
-        preface docxml, div3
-        acknowledgements docxml, div3
-        middle docxml, div3
-        footnotes div3
-        comments div3
+      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, "rsd.standard.xsl"))
       end
     end
-
-      include BaseConvert
-    end
   end
 end