isodoc 2.10.7 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dfe3b646b2b65d551ff524de95c5960c5dc0d9e607a40b59948deb10832f659
-  data.tar.gz: 5230ba55bdba86b34080a412366c26e347f5284151d6099cee23446da6eddfd3
+  metadata.gz: 0b983ef5d3072f012ede53a44cf7ac4fd8d14c4a554224e34b83024524a44d66
+  data.tar.gz: b0d51de25b3f14dc15a68aa9a2cc20f14ff63cd38075d725a4bddb41818a2249
 SHA512:
-  metadata.gz: 02e6090e1a7c726ff5024b62f42606aad5ec942e1d8ecd63d576b975d4103b6adfa0cb211d226902f4003e1ad4bec6a00a81ea92edb99c8f1626e6941db8b0fd
-  data.tar.gz: ffa9b8ee9be5501fd29cd638b1cde09287f2111a3d6d3a302484e92f2f0d5a035d3765f97d80207edd4119825ebd796f98bde1010eb072ecc16bada797bff310
+  metadata.gz: 6889f50e0c7a00076784e74e2ed8aea85f1eacda8b97acce91b949335d6eb42f432c005094d23fc96b99971d3316727737001fc59bdfc4d7370c1692ee01d619
+  data.tar.gz: 407ce914a5c8af0e4aded2a7fefd166b1f13b5673498585d6f5d8b29c378ede3d9d8d22613cc74447a649557dc0d9b24bf9709cafc4a5dee20cc2e4a5026185d

data/isodoc.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf"
-  spec.add_dependency "mn-requirements", "~> 0.3.4"
+  spec.add_dependency "mn-requirements", "~> 0.4.0"
 
   spec.add_dependency "relaton-render", "~> 0.7.1"
   spec.add_dependency "roman-numerals"

data/lib/isodoc/base_style/all.css

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/base_style/reset.css

@@ -221,3 +221,43 @@ h5:hover > a.anchor,
 h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
+
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }

data/lib/isodoc/base_style/reset.scss

@@ -223,3 +223,50 @@ h6:hover>a.anchor,
 .inline-header:hover>a.anchor{
 visibility:visible;
 }
+
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out;
+}
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px;
+}
+
+.active, .collapsible:hover {
+  background-color: #555;
+}
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px;
+}
+
+.active:after {
+  content: "\25b2";
+}
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0;
+}
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0;
+}

data/lib/isodoc/base_style/scripts.html

@@ -185,3 +185,21 @@ $('#toggle').on('click', function(){
 anchors.add('h1, h2, h3, h4');
 </script>
 
+<script>
+// use .collapsible element to toggle visibility of element following it
+var coll = document.getElementsByClassName("collapsible");
+var i;
+
+for (i = 0; i < coll.length; i++) {
+  coll[i].addEventListener("click", function() {
+    this.classList.toggle("active");
+    var content = this.nextElementSibling;
+    if (content.style.maxHeight){
+      content.style.maxHeight = null;
+    } else {
+      content.style.maxHeight = content.scrollHeight + "px";
+    }
+  });
+}
+</script>
+

data/lib/isodoc/presentation_function/block.rb

@@ -6,7 +6,7 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(text)
       /^[[:upper:]][[:upper:]]/.match?(text) and return text
-      text.capitalize
+      text&.capitalize
     end
 
     def block_delim

data/lib/isodoc/presentation_function/metadata.rb

@@ -24,7 +24,7 @@ module IsoDoc
     def save_attachment(attachment, dir)
       n = File.join(dir, File.basename(attachment["name"]))
       c = attachment.text.sub(%r{^data:[^;]+;(?:charset=[^;]+;)?base64,}, "")
-      File.open(n, "wb") { |f| f.write(Base64.strict_decode64(c)) }
+      File.open(n, "wb") { |f| f.write(Base64.decode64(c)) }
     end
 
     def extension_insert(xml, path = [])

data/lib/isodoc/presentation_function/reqt.rb

@@ -2,19 +2,22 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
-        recommendation1(f, lower2cap(@i18n.recommendation))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.recommendation))
       end
     end
 
     def requirement(docxml)
       docxml.xpath(ns("//requirement")).each do |f|
-        recommendation1(f, lower2cap(@i18n.requirement))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.requirement))
       end
     end
 
     def permission(docxml)
       docxml.xpath(ns("//permission")).each do |f|
-        recommendation1(f, lower2cap(@i18n.permission))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.permission))
       end
     end
 

data/lib/isodoc/presentation_function/section.rb

@@ -21,12 +21,17 @@ module IsoDoc
       end
     end
 
+    def unnumbered_clause?(elem)
+      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
+        @suppressheadingnumbers || elem["unnumbered"] ||
+        elem.at("./ancestor::*[@unnumbered = 'true']")
+    end
+
     def clause1(elem)
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
       t = elem.at(ns("./title")) and t["depth"] = level
-      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
-        @suppressheadingnumbers || elem["unnumbered"] and return
+      unnumbered_clause?(elem) and return
       lbl = @xrefs.anchor(elem["id"], :label,
                           elem.parent.name != "sections") or return
       prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
@@ -65,6 +70,7 @@ module IsoDoc
       if t = elem.at(ns("./title"))
         t.children = "<strong>#{to_xml(t.children)}</strong>"
       end
+      unnumbered_clause?(elem) and return
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.7".freeze
+  VERSION = "2.11.1".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -132,6 +132,7 @@ container: false)
       end
 
       def reqt2class_label(elem, model)
+        elem["class"] and return [elem["class"], elem["class"]]
         model.req_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
           elem.at("./self::#{v1}") and return [n[:klass], n[:label]]

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -17,6 +17,7 @@ module IsoDoc
         i = Counter.new("@")
         clause_order_annex(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
+            unnumbered_section_name?(c) and next
             annex_names(c, i.increment(c).print)
             a[:multi] or break
           end
@@ -125,7 +126,7 @@ module IsoDoc
 
       def preface_name_anchors(clause, level, title)
         @anchors[clause["id"]] =
-          { label: nil, level: level,
+          { label: nil, level:,
             xref: title, title: nil,
             type: "clause", elem: @labels["clause"] }
       end
@@ -170,7 +171,7 @@ module IsoDoc
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{@labels['clause']} #{num}"),
-            title: clause_title(clause), level: level, type: "clause",
+            title: clause_title(clause), level:, type: "clause",
             elem: @labels["clause"] }
       end
 
@@ -188,9 +189,9 @@ module IsoDoc
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, num)
         @anchors[clause["id"]] =
-          { label: label,
+          { label:,
             elem: @labels["annex"], type: "clause",
-            subtype: "annex", value: num.to_s, level: level,
+            subtype: "annex", value: num.to_s, level:,
             title: clause_title(clause),
             xref: "#{@labels['annex']} #{num}" }
       end

data/lib/isodoc/xref.rb

@@ -29,7 +29,7 @@ module IsoDoc
       @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({
-               default: "default", lang: lang, script: script,
+               default: "default", lang:, script:,
                labels: @i18n.get
              })
       @i18n

data/lib/isodoc/xslfo_convert.rb

@@ -45,7 +45,7 @@ module IsoDoc
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =
-          @aligncrosselements.gsub(/,/, " ")
+          @aligncrosselements.tr(",", " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
       ret.merge(@pdf_cmd_options)
@@ -54,15 +54,14 @@ module IsoDoc
     # input_file: keep-alive tempfile
     def convert(input_fname, file = nil, debug = false,
                 output_fname = nil)
-      file = File.read(input_fname, encoding: "utf-8") if file.nil?
-      input_file, docxml, filename =
-        input_xml_path(input_fname, file, debug)
+      file ||= File.read(input_fname, encoding: "utf-8")
+      _, docxml, filename = input_xml_path(input_fname, file, debug)
+      xsl = pdf_stylesheet(docxml) or return
+      Pathname.new(xsl).absolute? or xsl = File.join(@libdir, xsl)
       @doctype = Nokogiri::XML(file).at(ns("//bibdata/ext/doctype"))&.text
       ::Metanorma::Output::XslfoPdf.new.convert(
-        filename,
-        output_fname || output_filename(input_fname),
-        File.join(@libdir, pdf_stylesheet(docxml)),
-        pdf_options(docxml),
+        filename, output_fname || output_filename(input_fname),
+        xsl, pdf_options(docxml)
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.7
+  version: 2.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement