metanorma-standoc 1.11.3 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7756f8b45a6897bf3a40e48df348a746bc75b30820597fa8ceadedcbbceb89d9
-  data.tar.gz: e62b62dd699df95d46bd13c18656bf3504c3a34936ff0a094d224d12a9f44987
+  metadata.gz: d9031c28646f9cd9a481ad67911f2f0f7e5bd058368f80888a788753e5f63fa3
+  data.tar.gz: 25b16459f351f266f19b2f00d70b5bf7f6f5c95325a0d61d43fbe5f3fa518802
 SHA512:
-  metadata.gz: 9776d2bfd161b5500e5ac9e8ea47a9597befe1642880a18fdc86839ceee0688e879d37de0bd9000420294f6a0094f455c840643e091a11da0b65489434a44bf9
-  data.tar.gz: 4f4d5f119ce92541ee1a89320fdc094352f3ca2ac885f1d52438279e4f70b995d0f87b4f7d034bafc63f05e2192b9ae8b7f4063dd1972525d773ec2f66e27dd1
+  metadata.gz: 885e62405f3198482ffd7e152b25bef8ab09fc227a8107984297e8fa15b64552b2e745f4ce5e1d60dd37df6dc5cf5c505fb9acfeedd1bdc4ef77954e01218893
+  data.tar.gz: 69cac251a0696b46dd25f37fb23828780e1945e57464e829c91ab5d88ac481311d130c4ff0e670ee89d56fd998eff4ea48e3c5a0c4b24c514021431fb785d852

data/.github/workflows/rake.yml

@@ -10,34 +10,6 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+    uses: metanorma/metanorma-build-scripts/.github/workflows/plantuml-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -12,3 +12,26 @@ spec/examples/rice_files/
 Gemfile.lock
 
 .rubocop-https--*
+
+/.err
+/action_schemaexpg1.svg
+/action_schemaexpg2.svg
+/address_class_profile.presentation.xml
+/address_component_profile.presentation.xml
+/blank_definition_profile.presentation.xml
+/common_models_diagram.presentation.xml
+/plantuml/
+/relaton/
+/spec/assets/lutaml/
+/spec/assets/plantuml*.png
+/spec/assets/xref_error.*
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test.xml
+/test.xml.abort
+/test/
+/top_down_diagram.presentation.xml
+/xref_error.*

data/Gemfile

@@ -10,4 +10,3 @@ if File.exist? 'Gemfile.devel'
   eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
 end
 
-gem "reline", "~> 0.2.8.pre.11"

data/lib/asciidoctor/standoc/base.rb

@@ -1,146 +1,3 @@
-require "date"
-require "nokogiri"
-require "htmlentities"
-require "json"
-require "pathname"
-require "isodoc"
-require "relaton"
-require "fileutils"
-require "metanorma-utils"
-require "isodoc/xslfo_convert"
-require_relative "render"
+require "asciidoctor/standoc/deprecated"
+require "metanorma/standoc/base"
 
-module Asciidoctor
-  module Standoc
-    module Base
-      XML_ROOT_TAG = "standard-document".freeze
-      XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
-      FONTS_MANIFEST = "fonts-manifest".freeze
-
-      def xml_root_tag
-        self.class::XML_ROOT_TAG
-      end
-
-      def xml_namespace
-        self.class::XML_NAMESPACE
-      end
-
-      def init(node)
-        @fn_number ||= 0
-        @draft = false
-        @refids = Set.new
-        @anchors = {}
-        @internal_eref_namespaces = []
-        @draft = node.attributes.has_key?("draft")
-        @novalid = node.attr("novalid")
-        @smartquotes = node.attr("smartquotes") != "false"
-        @keepasciimath = node.attr("mn-keep-asciimath") &&
-          node.attr("mn-keep-asciimath") != "false"
-        @fontheader = default_fonts(node)
-        @files_to_delete = []
-        @filename = if node.attr("docfile")
-                      File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
-                    else ""
-                    end
-        @localdir = Metanorma::Utils::localdir(node)
-        @output_dir = outputdir node
-        @no_isobib_cache = node.attr("no-isobib-cache")
-        @no_isobib = node.attr("no-isobib")
-        @index_terms = node.attr("index-terms")
-        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
-        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @bibdb = nil
-        @seen_headers = []
-        @datauriimage = node.attr("data-uri-image") != "false"
-        @boilerplateauthority = node.attr("boilerplate-authority")
-        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
-        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @log = Metanorma::Utils::Log.new
-        init_bib_caches(node)
-        init_iev_caches(node)
-        @lang = (node.attr("language") || "en")
-        @script = (node.attr("script") ||
-                   Metanorma::Utils.default_script(node.attr("language")))
-        @isodoc = isodoc(@lang, @script, node.attr("i18nyaml"))
-        @i18n = @isodoc.i18n
-      end
-
-      def document(node)
-        init(node)
-        ret = makexml(node).to_xml(encoding: "US-ASCII", indent: 2)
-        outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
-        clean_exit
-        ret
-      rescue StandardError => e
-        @log.add("Fatal Error", nil, e.message)
-        clean_exit
-        raise e
-      end
-
-      def version
-        flavour = self.class.name.sub(/::Converter$/, "").sub(/^.+::/, "")
-        Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
-      end
-
-      def clean_exit
-        @log.write("#{@output_dir}#{@filename}.err") unless @novalid
-
-        @files_to_delete.each { |f| FileUtils.rm f }
-      end
-
-      def clean_abort(msg, file = nil)
-        file and
-          File.open("#{@filename}.xml.abort", "w:UTF-8") { |f| f.write(file) }
-        clean_exit
-        abort(msg)
-      end
-
-      def makexml1(node)
-        result = ["<?xml version='1.0' encoding='UTF-8'?>",
-                  "<#{xml_root_tag} type='semantic' version='#{version}'>"]
-        result << noko { |ixml| front node, ixml }
-        result << noko { |ixml| middle node, ixml }
-        result << "</#{xml_root_tag}>"
-        textcleanup(result)
-      end
-
-      def makexml(node)
-        result = makexml1(node)
-        ret1 = cleanup(Nokogiri::XML(result))
-        ret1.root.add_namespace(nil, xml_namespace)
-        validate(ret1) unless @novalid
-        ret1
-      end
-
-      def draft?
-        @draft
-      end
-
-      def doctype(node)
-        node.attr("doctype")&.gsub(/\s+/, "-")&.downcase
-      end
-
-      def front(node, xml)
-        xml.bibdata **attr_code(type: "standard") do |b|
-          metadata node, b
-        end
-      end
-
-      def middle(node, xml)
-        xml.sections do |s|
-          s << node.content if node.blocks?
-        end
-      end
-
-      private
-
-      def outputdir(node)
-        if node.attr("output_dir").nil_or_empty?
-          Metanorma::Utils::localdir(node)
-        else
-          File.join(node.attr("output_dir"), "")
-        end
-      end
-    end
-  end
-end

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,239 +1,3 @@
-require "htmlentities"
-require "uri" if /^2\./.match?(RUBY_VERSION)
-require_relative "./blocks_notes"
+require "asciidoctor/standoc/deprecated"
+require "metanorma/standoc/blocks"
 
-module Asciidoctor
-  module Standoc
-    module Blocks
-      def id_attr(node = nil)
-        { id: Metanorma::Utils::anchor_or_uuid(node),
-          tag: node&.attr("tag"),
-          "multilingual-rendering": node&.attr("multilingual-rendering") }
-      end
-
-      def id_unnum_attrs(node)
-        attr_code(id_attr(node).merge(
-                    unnumbered: node.option?("unnumbered") ? "true" : nil,
-                    number: node.attr("number"),
-                    subsequence: node.attr("subsequence"),
-                  ))
-      end
-
-      def formula_attrs(node)
-        attr_code(id_unnum_attrs(node)
-          .merge(keep_attrs(node).merge(
-                   inequality: node.option?("inequality") ? "true" : nil,
-                 )))
-      end
-
-      def keep_attrs(node)
-        { "keep-with-next": node.attr("keep-with-next"),
-          "keep-lines-together": node.attr("keep-lines-together") }
-      end
-
-      # We append each contained block to its parent
-      def open(node)
-        role = node.role || node.attr("style")
-        reqt_subpart(role) and return requirement_subpart(node)
-        role == "form" and return form(node)
-        role == "definition" and return termdefinition(node)
-        result = []
-        node.blocks.each do |b|
-          result << send(b.context, b)
-        end
-        result
-      end
-
-      def form(node)
-        noko do |xml|
-          xml.form **attr_code(id_attr(node)
-            .merge(class: node.attr("class"),
-                   name: node.attr("name"), action: node.attr("action"))) do |f|
-            f << node.content
-          end
-        end
-      end
-
-      def literal_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node)))
-      end
-
-      def literal(node)
-        noko do |xml|
-          xml.figure **literal_attrs(node) do |f|
-            figure_title(node, f)
-            f.pre node.lines.join("\n"),
-                  **attr_code(id: Metanorma::Utils::anchor_or_uuid,
-                              alt: node.attr("alt"))
-          end
-        end
-      end
-
-      # NOTE: html escaping is performed by Nokogiri
-      def stem(node)
-        noko do |xml|
-          xml.formula **formula_attrs(node) do |s|
-            stem_parse(node.lines.join("\n"), s, node.style.to_sym)
-          end
-        end
-      end
-
-      def term_example(node)
-        noko do |xml|
-          xml.termexample **attr_code(id_attr(node)) do |ex|
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def example(node)
-        return term_example(node) if in_terms?
-
-        role = node.role || node.attr("style")
-        %w(recommendation requirement permission).include?(role) and
-          return requirement(node, role)
-        return pseudocode_example(node) if role == "pseudocode"
-        return svgmap_example(node) if role == "svgmap"
-        return form(node) if role == "form"
-        return termdefinition(node) if role == "definition"
-
-        reqt_subpart(role) and return requirement_subpart(node)
-        example_proper(node)
-      end
-
-      def svgmap_attrs(node)
-        attr_code(id_attr(node)
-          .merge(id: node.id,
-                 unnumbered: node.option?("unnumbered") ? "true" : nil,
-                 number: node.attr("number"),
-                 subsequence: node.attr("subsequence"))
-        .merge(keep_attrs(node)))
-      end
-
-      def svgmap_example(node)
-        noko do |xml|
-          xml.svgmap **attr_code(svgmap_attrs(node).merge(
-                                   src: node.attr("src"), alt: node.attr("alt"),
-                                 )) do |ex|
-            figure_title(node, ex)
-            ex << node.content
-          end
-        end.join("\n")
-      end
-
-      # prevent A's and other subs inappropriate for pseudocode
-      def pseudocode_example(node)
-        node.blocks.each { |b| b.remove_sub(:replacements) }
-        noko do |xml|
-          xml.figure **example_attrs(node).merge(class: "pseudocode") do |ex|
-            figure_title(node, ex)
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def example_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
-      end
-
-      def example_proper(node)
-        noko do |xml|
-          xml.example **example_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def figure_title(node, out)
-        return if node.title.nil?
-
-        out.name { |name| name << node.title }
-      end
-
-      def figure_attrs(node)
-        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
-      end
-
-      def image(node)
-        noko do |xml|
-          xml.figure **figure_attrs(node) do |f|
-            figure_title(node, f)
-            f.image **image_attributes(node)
-          end
-        end
-      end
-
-      def para_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node)
-          .merge(align: node.attr("align"),
-                 variant_title: node.role == "variant-title" ? true : nil,
-                 type: node.attr("type"))))
-      end
-
-      def paragraph(node)
-        return termsource(node) if node.role == "source"
-
-        noko do |xml|
-          xml.p **para_attrs(node) do |xml_t|
-            xml_t << node.content
-          end
-        end.join("\n")
-      end
-
-      def quote_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node))
-          .merge(align: node.attr("align")))
-      end
-
-      def quote_attribution(node, out)
-        if node.attr("citetitle")
-          m = /^(?<cite>[^,]+)(,(?<text>.*$))?$/m.match node.attr("citetitle")
-          out.source **attr_code(target: m[:cite], type: "inline") do |s|
-            s <<  m[:text]
-          end
-        end
-        node.attr("attribution") and
-          out.author { |a| a << node.attr("attribution") }
-      end
-
-      def quote(node)
-        noko do |xml|
-          xml.quote **quote_attrs(node) do |q|
-            quote_attribution(node, q)
-            wrap_in_para(node, q)
-          end
-        end.join("\n")
-      end
-
-      def listing_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node)
-                  .merge(lang: node.attr("language"),
-                         unnumbered: node.option?("unnumbered") ? "true" : nil,
-                         number: node.attr("number"),
-                         filename: node.attr("filename"))))
-      end
-
-      # NOTE: html escaping is performed by Nokogiri
-      def listing(node)
-        fragment = ::Nokogiri::XML::Builder.new do |xml|
-          xml.sourcecode **listing_attrs(node) do |s|
-            figure_title(node, s)
-            s << node.content
-          end
-        end
-        fragment.to_xml(encoding: "US-ASCII", save_with:
-                        Nokogiri::XML::Node::SaveOptions::NO_DECLARATION)
-      end
-
-      def pass(node)
-        noko do |xml|
-          xml.passthrough **attr_code(formats:
-                                      node.attr("format") || "metanorma") do |p|
-            p << HTMLEntities.new.encode(node.content, :basic, :hexadecimal)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -1,101 +1,3 @@
-module Asciidoctor
-  module Standoc
-    module Blocks
-      def termnote_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node)
-          .merge(
-            unnumbered: node.attr("unnumbered"),
-            number: node.attr("number"),
-            subsequence: node.attr("subsequence"),
-            "keep-separate": node.attr("keep-separate"),
-          )))
-      end
+require "asciidoctor/standoc/deprecated"
+require "metanorma/standoc/blocks_notes"
 
-      def note_attrs(node)
-        attr_code(
-          termnote_attrs(node).merge(
-            type: node.attr("type"),
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
-          ),
-        )
-      end
-
-      def sidebar_attrs(node)
-        todo_attrs(node).merge(
-          attr_code(
-            from: node.attr("from"),
-            to: node.attr("to") || node.attr("from"),
-          ),
-        )
-      end
-
-      def sidebar(node)
-        return unless draft?
-
-        noko do |xml|
-          xml.review **sidebar_attrs(node) do |r|
-            wrap_in_para(node, r)
-          end
-        end
-      end
-
-      def todo_attrs(node)
-        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
-        date += "T00:00:00Z" unless /T/.match? date
-        attr_code(id_attr(node)
-          .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
-                 "(Unknown)",
-                 date: date))
-      end
-
-      def todo(node)
-        noko do |xml|
-          xml.review **todo_attrs(node) do |r|
-            wrap_in_para(node, r)
-          end
-        end
-      end
-
-      def termnote(node)
-        noko do |xml|
-          xml.termnote **termnote_attrs(node) do |ex|
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
-      def note(node)
-        noko do |xml|
-          xml.note **note_attrs(node) do |c|
-            wrap_in_para(node, c)
-          end
-        end.join("\n")
-      end
-
-      def admonition_attrs(node)
-        name = node.attr("name")
-        a = node.attr("type") and ["danger", "safety precautions"].each do |t|
-          name = t if a.casecmp(t).zero?
-        end
-        attr_code(keep_attrs(node).merge(id_attr(node)
-          .merge(
-            type: name,
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
-          )))
-      end
-
-      def admonition(node)
-        return termnote(node) if in_terms?
-        return note(node) if node.attr("name") == "note"
-        return todo(node) if node.attr("name") == "todo"
-
-        noko do |xml|
-          xml.admonition **admonition_attrs(node) do |a|
-            node.title.nil? or a.name { |name| name << node.title }
-            wrap_in_para(node, a)
-          end
-        end.join("\n")
-      end
-    end
-  end
-end