metanorma-standoc 2.2.6 → 2.2.7

data/lib/metanorma/standoc/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/standoc/ref_utility.rb

@@ -139,6 +139,7 @@ module Metanorma
 
       def ref_normalise_no_format(ref)
         ref.gsub(/&/, "&")
+          .gsub(/>\n/, "> \n")
       end
     end
   end

data/lib/metanorma/standoc/render.rb

@@ -31,6 +31,7 @@ module Metanorma
           fonts: node.attr("fonts"),
           fontlicenseagreement: node.attr("font-license-agreement"),
           localizenumber: node.attr("localize-number"),
+          modspecidentifierbase: node.attr("modspec-identifier-base"),
         }
       end
 
@@ -82,7 +83,7 @@ module Metanorma
       end
 
       def pdf_extract_attributes(node)
-        %w(pdf-encrypt pdf-encryption-length pdf-user-password
+        pdf_options = %w(pdf-encrypt pdf-encryption-length pdf-user-password
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
@@ -91,6 +92,8 @@ module Metanorma
           .each_with_object({}) do |x, m|
           m[x.gsub(/-/, "").to_i] = node.attr(x)
         end
+
+        pdf_options.merge(fonts_manifest_option(node) || {})
       end
 
       def doc_converter(node)
@@ -120,6 +123,12 @@ module Metanorma
         pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
+
+      def fonts_manifest_option(node)
+        if node.attr(FONTS_MANIFEST)
+          { mn2pdf: { font_manifest: node.attr(FONTS_MANIFEST) } }
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/section.rb

@@ -52,8 +52,8 @@ module Metanorma
         end
       end
 
-      PREFACE_CLAUSE_NAMES = %w(abstract foreword introduction
-                                acknowledgements).freeze
+      PREFACE_CLAUSE_NAMES =
+        %w(abstract foreword introduction misc-container acknowledgements).freeze
 
       MAIN_CLAUSE_NAMES =
         ["normative references", "terms and definitions", "scope",
@@ -62,7 +62,7 @@ module Metanorma
       def start_main_section(ret, node)
         @preface = false if self.class::MAIN_CLAUSE_NAMES.include?(ret) &&
           node.role != "preface" && node.attr("style") != "preface"
-        @preface = false if (self.class::PREFACE_CLAUSE_NAMES)
+        @preface = false if self.class::PREFACE_CLAUSE_NAMES
           .intersection(@seen_headers_canonical + [ret]).empty?
       end
 
@@ -106,6 +106,7 @@ module Metanorma
         a = section_attributes(node)
         noko do |xml|
           case sectiontype(node)
+          when "misc-container" then misccontainer_parse(a, xml, node)
           when "introduction" then introduction_parse(a, xml, node)
           when "foreword" then foreword_parse(a, xml, node)
           when "scope" then scope_parse(a, xml, node)
@@ -164,6 +165,12 @@ module Metanorma
         end.join("\n")
       end
 
+      def misccontainer_parse(_attrs, xml, node)
+        xml.send :"misc-container-clause" do |xml_section|
+          xml_section << node.content
+        end
+      end
+
       def indexsect_parse(attrs, xml, node)
         xml.indexsect **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }

data/lib/metanorma/standoc/utils.rb

@@ -33,7 +33,12 @@ module Metanorma
         Metanorma::Utils::wrap_in_para(node, out)
       end
 
-      SUBCLAUSE_XPATH = "//clause[not(parent::sections)]"\
+      def to_xml(node)
+        node.to_xml(encoding: "UTF-8", indent: 2,
+                    save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+      end
+
+      SUBCLAUSE_XPATH = "//clause[not(parent::sections)]" \
                         "[not(ancestor::boilerplate)]".freeze
 
       def isodoc(lang, script, locale, i18nyaml = nil)

data/lib/metanorma/standoc/validate.rb

@@ -124,7 +124,7 @@ module Metanorma
       end
 
       def schema_validate1(file, doc, schema)
-        file.write(doc.to_xml)
+        file.write(to_xml(doc))
         file.close
         errors = Jing.new(schema, encoding: "UTF-8").validate(file.path)
         warn "Syntax Valid!" if errors.none?

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.2.6".freeze
+    VERSION = "2.2.7".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -22,8 +22,11 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
+  end
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -399,9 +399,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -412,8 +409,6 @@ files:
 - LICENSE
 - Makefile
 - README.adoc
-- Rakefile
-- bin/rspec
 - lib/asciidoctor/standoc/base.rb
 - lib/asciidoctor/standoc/blocks.rb
 - lib/asciidoctor/standoc/blocks_notes.rb
@@ -534,125 +529,6 @@ files:
 - lib/metanorma/standoc/views/datamodel/model_representation.adoc.erb
 - lib/metanorma/standoc/views/datamodel/plantuml_representation.adoc.erb
 - metanorma-standoc.gemspec
-- spec/assets/a1.adoc
-- spec/assets/a2.adoc
-- spec/assets/a3.adoc
-- spec/assets/a3a.adoc
-- spec/assets/a4.adoc
-- spec/assets/boilerplate.xml
-- spec/assets/codes.yml
-- spec/assets/correct.png
-- spec/assets/corrupt.png
-- spec/assets/header.html
-- spec/assets/html-override.css
-- spec/assets/html.scss
-- spec/assets/htmlcover.html
-- spec/assets/htmlintro.html
-- spec/assets/i18n.yaml
-- spec/assets/iso.adoc
-- spec/assets/iso.headless.html
-- spec/assets/iso.xml
-- spec/assets/iso123.rxl
-- spec/assets/rice_image1.png
-- spec/assets/scripts.html
-- spec/assets/std.css
-- spec/assets/word-override.css
-- spec/assets/word.scss
-- spec/assets/wordcover.html
-- spec/assets/wordintro.html
-- spec/assets/xref_error.adoc
-- spec/examples/103_01_02.html
-- spec/examples/codes_table.html
-- spec/examples/datamodel/address_class_profile.adoc
-- spec/examples/datamodel/address_class_profile.presentation.xml
-- spec/examples/datamodel/address_component_profile.adoc
-- spec/examples/datamodel/blank_definition_profile.adoc
-- spec/examples/datamodel/common_models_diagram.adoc
-- spec/examples/datamodel/models/models/AddressClassProfile.yml
-- spec/examples/datamodel/models/models/AddressComponentProfile.yml
-- spec/examples/datamodel/models/models/AddressComponentSpecification.yml
-- spec/examples/datamodel/models/models/AddressProfile.yml
-- spec/examples/datamodel/models/models/AttributeProfile.yml
-- spec/examples/datamodel/models/models/InterchangeAddressClassProfile.yml
-- spec/examples/datamodel/models/models/Localization copy.yml
-- spec/examples/datamodel/models/models/Localization.yml
-- spec/examples/datamodel/models/models/ProfileCompliantAddress.yml
-- spec/examples/datamodel/models/models/ProfileCompliantAddressComponent.yml
-- spec/examples/datamodel/models/models/Signature.yml
-- spec/examples/datamodel/models/models/SignatureBlankDefinition.yml
-- spec/examples/datamodel/models/models/TextDirectionCode copy.yml
-- spec/examples/datamodel/models/models/TextDirectionCode.yml
-- spec/examples/datamodel/models/models/Validity.yml
-- spec/examples/datamodel/models/models/iso19160-1/Address.yml
-- spec/examples/datamodel/models/models/iso19160-1/AddressComponent.yml
-- spec/examples/datamodel/models/style.uml.inc
-- spec/examples/datamodel/models/views/CommonModels.yml
-- spec/examples/datamodel/models/views/TopDown.yml
-- spec/examples/datamodel/top_down_diagram.adoc
-- spec/examples/english.yaml
-- spec/examples/iso_123_.xml
-- spec/examples/iso_123_all_parts.xml
-- spec/examples/iso_123_no_year_note.xml
-- spec/examples/iso_124_.xml
-- spec/examples/iso_216_.xml
-- spec/examples/iso_iec_12382_.xml
-- spec/examples/rice.adoc
-- spec/examples/rice.preview.html
-- spec/examples/rice.sh
-- spec/examples/rice_images/rice_image1.png
-- spec/examples/rice_images/rice_image2.png
-- spec/examples/rice_images/rice_image3_1.png
-- spec/examples/rice_images/rice_image3_2.png
-- spec/examples/rice_images/rice_image3_3.png
-- spec/fixtures/action_schemaexpg1.svg
-- spec/fixtures/datamodel_description_sections_tree.xml
-- spec/fixtures/diagram_definitions.lutaml
-- spec/fixtures/macros_datamodel/address_class_profile.xml
-- spec/fixtures/macros_datamodel/address_component_profile.xml
-- spec/fixtures/macros_datamodel/blank_definition_profile.xml
-- spec/fixtures/macros_datamodel/common_models_diagram.xml
-- spec/fixtures/macros_datamodel/top_down_diagram.xml
-- spec/fixtures/test.exp
-- spec/fixtures/test.xmi
-- spec/metanorma/base_spec.rb
-- spec/metanorma/biblio_spec.rb
-- spec/metanorma/blank_spec.rb
-- spec/metanorma/blocks_spec.rb
-- spec/metanorma/cleanup_blocks_spec.rb
-- spec/metanorma/cleanup_sections_spec.rb
-- spec/metanorma/cleanup_spec.rb
-- spec/metanorma/cleanup_terms_spec.rb
-- spec/metanorma/datamodel/attributes_table_preprocessor_spec.rb
-- spec/metanorma/datamodel/diagram_preprocessor_spec.rb
-- spec/metanorma/inline_spec.rb
-- spec/metanorma/isobib_cache_spec.rb
-- spec/metanorma/lists_spec.rb
-- spec/metanorma/macros_concept_spec.rb
-- spec/metanorma/macros_json2text_spec.rb
-- spec/metanorma/macros_plantuml_spec.rb
-- spec/metanorma/macros_spec.rb
-- spec/metanorma/macros_yaml2text_spec.rb
-- spec/metanorma/processor_spec.rb
-- spec/metanorma/refs_spec.rb
-- spec/metanorma/reqt_spec.rb
-- spec/metanorma/section_spec.rb
-- spec/metanorma/table_spec.rb
-- spec/metanorma/validate_spec.rb
-- spec/spec_helper.rb
-- spec/support/shared_examples/structured_data_2_text_preprocessor.rb
-- spec/vcr_cassettes/bsi16341.yml
-- spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml
-- spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml
-- spec/vcr_cassettes/hide_refs.yml
-- spec/vcr_cassettes/isobib_get_123.yml
-- spec/vcr_cassettes/isobib_get_123_1.yml
-- spec/vcr_cassettes/isobib_get_123_1_fr.yml
-- spec/vcr_cassettes/isobib_get_123_2.yml
-- spec/vcr_cassettes/isobib_get_123_2001.yml
-- spec/vcr_cassettes/isobib_get_124.yml
-- spec/vcr_cassettes/rfcbib_get_rfc8341.yml
-- spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml
-- spec/vcr_cassettes/std-link.yml
 homepage: https://github.com/metanorma/metanorma-standoc
 licenses:
 - BSD-2-Clause
@@ -665,14 +541,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model

data/.github/workflows/automerge.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-# source: https://github.com/marketplace/actions/merge-pull-requests#usage
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/ci/.github/workflows/plantuml-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "isodoc/gem_tasks"
-
-IsoDoc::GemTasks.install
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/rspec

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-  
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")
-

data/spec/assets/a1.adoc

@@ -1,8 +0,0 @@
-= X
-A
-
-== Clause 1
-
-X
-
-embed::spec/assets/a2.adoc[]

data/spec/assets/a2.adoc

@@ -1,10 +0,0 @@
-= A2
-A2
-
-== Clause 2
-
-X
-
-embed::spec/assets/a3.adoc[]
-
-embed::spec/assets/a3a.adoc[]

data/spec/assets/a3.adoc

@@ -1,9 +0,0 @@
-= A3
-A3
-
-== Clause 3
-
-X
-
-include::spec/assets/a4.adoc[]
-

data/spec/assets/a3a.adoc

@@ -1,7 +0,0 @@
-= A3a
-A3a
-
-== Clause 3a
-
-X
-

data/spec/assets/a4.adoc

@@ -1,4 +0,0 @@
-== Clause 4
-
-X
-

data/spec/assets/boilerplate.xml

@@ -1,4 +0,0 @@
-<boilerplate>
-  <text>{{ stage }}</text>
-</boilerplate>
-