metanorma-iso 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 496766841b7e48e3e2f8f879f5e9c485b0874212ea6316a926558ba434f1636a
-  data.tar.gz: 24bc39c4fdf29b8dfeaba19a972d8a2d2610d940b6b9afb93da58975c8bd6ac3
+  metadata.gz: abbf367b7ec988ab0de353fe50309648657bc86b3d7a1495c4ac6722b4653b5b
+  data.tar.gz: 365546239553eb27bb0dcdc1e4920234922b93dcb235027f42f7f1a682f3fd18
 SHA512:
-  metadata.gz: 2a780fb001362017bf69e8b64ca78eb9c877d20c7bed50670d69fbf9f7a71c40756725e272e3baa0cc9d026c4809cbb222a466f0f9b77b30fe35afbdc9038d60
-  data.tar.gz: 9db3e3c657f3d5525e2407cc27c498bffbda194dcf06199e49def7a540af8a70755e1f6ff2b4465af09ea9440ffae9a106a965ba2e6696363774faf3bbab7004
+  metadata.gz: bbbdb1ad0d1b86c34f437af1ad664c2c6d19d706a28fa01a25cb5b677d1fddaec5d2eec0fdc4eb5846e5254777b3ea0d868ae31ee5c9e59c58f40f67bd17b339
+  data.tar.gz: eb62b3b9ab796aba24059a9c45c8432a7fc5a7ee0a3b30c6893fda63bbce62452270ee13f93c66d3f16b054dd9cf92887cca868a849f42c248b5f8c37efbfdfa

data/Gemfile

@@ -4,7 +4,7 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# gem "asciimath", git: "https://github.com/asciidoctor/asciimath"
+gem "relaton", git: "https://github.com/relaton/relaton"
 
 gemspec
 

data/lib/asciidoctor/iso/base.rb

@@ -28,7 +28,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Iso::PdfConvert.new(doc_extract_attributes(node))
+        IsoDoc::Iso::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def sts_converter(node)

data/lib/asciidoctor/iso/isodoc.rng

@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>

data/lib/asciidoctor/iso/isostandard.rng

@@ -159,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>

data/lib/isodoc/iso/html/style-human.css

@@ -976,3 +976,24 @@ span.keyword {
 .Admonition p,
 .admonition p {
   margin: 0; }
+
+/* Collapse TOC */
+.collapse-group {
+  display: flex;
+  align-items: center;
+  position: relative; }
+
+.collapse-button {
+  position: absolute;
+  right: 0;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>'); }
+
+.collapse {
+  display: none; }
+
+.expand {
+  transform: rotateZ(-180deg); }

data/lib/isodoc/iso/html/style-human.scss

@@ -692,3 +692,29 @@ span.keyword {
 .admonition p {
     margin: 0;
 }
+
+/* Collapse TOC */
+
+                .collapse-group {
+                        display: flex;
+                        align-items: center;
+                        position: relative;
+                }
+
+                .collapse-button {
+                        position: absolute;
+                        right: 0;
+                        display: inline-block;
+                        height: 20px;
+                        width: 20px;
+                        cursor: pointer;
+                        background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>');
+                }
+
+                .collapse {
+                        display: none;
+                }
+
+                .expand {
+                        transform: rotateZ(-180deg);
+                }

data/lib/isodoc/iso/html/style-iso.css

@@ -1004,3 +1004,24 @@ span.keyword {
 
 .Admonition p, .admonition p {
   margin: 0; }
+
+/* Collapse TOC */
+.collapse-group {
+  display: flex;
+  align-items: center;
+  position: relative; }
+
+.collapse-button {
+  position: absolute;
+  right: 0;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>'); }
+
+.collapse {
+  display: none; }
+
+.expand {
+  transform: rotateZ(-180deg); }

data/lib/isodoc/iso/html/style-iso.scss

@@ -709,3 +709,29 @@ font-weight: 600;
 .Admonition p, .admonition p {
     margin: 0;
 }
+
+/* Collapse TOC */
+
+                .collapse-group {
+                        display: flex;
+                        align-items: center;
+                        position: relative;
+                }
+
+                .collapse-button {
+                        position: absolute;
+                        right: 0;
+                        display: inline-block;
+                        height: 20px;
+                        width: 20px;
+                        cursor: pointer;
+                        background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>');
+                }
+
+                .collapse {
+                        display: none;
+                }
+
+                .expand {
+                        transform: rotateZ(-180deg);
+                }

data/lib/isodoc/iso/html_convert.rb

@@ -10,39 +10,98 @@ module IsoDoc
         super
       end
 
-      def googlefonts()
-      <<~HEAD.freeze
-      <link href="https://fonts.googleapis.com/css?family=Space+Mono:400,400i,700,700i&display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
-      HEAD
-    end
+      def googlefonts
+        <<~HEAD.freeze
+          <link href="https://fonts.googleapis.com/css?family=Space+Mono:400,400i,700,700i&display=swap" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+        HEAD
+      end
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
-                     options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
-        headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                     options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
-        monospacefont: (options[:alt] ?  '"Space Mono",monospace' :
-                        '"Courier New",monospace'),
-                        normalfontsize: "1.0em",
-                        smallerfontsize: "0.9em",
-                        footnotefontsize: "0.9em",
-                        monospacefontsize: "0.8em",
+          bodyfont: (if options[:script] == "Hans"
+                       '"Source Han Sans",serif'
+                     else
+                       options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'
+                     end),
+          headerfont: (if options[:script] == "Hans"
+                         '"Source Han Sans",sans-serif'
+                       else
+                         options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'
+                       end),
+          monospacefont: (if options[:alt]
+                            '"Space Mono",monospace'
+                          else
+                            '"Courier New",monospace'
+                          end),
+          normalfontsize: "1.0em",
+          smallerfontsize: "0.9em",
+          footnotefontsize: "0.9em",
+          monospacefontsize: "0.8em",
         }
       end
 
       def default_file_locations(options)
         {
-          htmlstylesheet: (options[:alt] ? html_doc_path("style-human.scss") :
-                           html_doc_path("style-iso.scss")),
-        htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
-        htmlintropage: html_doc_path("html_iso_intro.html"),
+          htmlstylesheet: (if options[:alt]
+                             html_doc_path("style-human.scss")
+                           else
+                             html_doc_path("style-iso.scss")
+                           end),
+          htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
+          htmlintropage: html_doc_path("html_iso_intro.html"),
         }
       end
 
-      def footnote_reference_format(a)
-        a.content = a.content + ")"
+      def footnote_reference_format(link)
+        link.content += ")"
+      end
+
+      def html_toc_entry(level, header)
+        if level == "h1" && header.parent.at(".//h2[not(@class = 'TermNum')]"\
+                                             "[not(@class = 'noTOC')][text()]")
+          <<~HDR
+            <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(header)}</a></li>
+            <div class="collapse-button"></div></div>
+          HDR
+        else
+          %(<li class="#{level}"><a href="##{header['id']}">\
+      #{header_strip(header)}</a></li>)
+        end
+      end
+
+      def html_toc(docxml)
+        super
+        docxml.xpath("//div[@id = 'toc']/ul[li[@class = 'h2']]").each do |u|
+          html_toc1(u)
+        end
+        docxml
+      end
+
+      def html_toc1(ulist)
+        u2 = nil
+        ulist.xpath("./li").each do |l|
+          if l["class"] != "h2"
+            u2 = nil
+          elsif u2 then u2.add_child(l.remove)
+          else
+            u2 = l.replace("<ul class='content collapse'>#{l}</ul>").first
+            p = u2.previous_element and p << u2
+          end
+        end
+      end
+
+      def inject_script(doc)
+        scr = <<~HEAD.freeze
+          <script>
+          $(".collapse-button").click(function () {
+          $(this).toggleClass('expand'); // expand: the class to change the collapse button shape
+          // collapse: the class to collapse/expand the li elements with the h2 class
+          $(this).closest('li').children(".content").toggleClass('collapse');})
+          </script>
+        HEAD
+        a = super.split(%r{</body>})
+        "#{a[0]}#{scr}</body>#{a[1]}"
       end
 
       def table_th_center(docxml)