metanorma-iso 1.10.2 → 1.10.6

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

@@ -140,7 +140,7 @@ span.title {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-weight: 900;
 }
 
@@ -148,18 +148,19 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h2, .h3, .h4, .h5, .h6{
     font-weight: 700;
 }
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
@@ -171,7 +172,8 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
@@ -179,7 +181,7 @@ h6 {
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -190,7 +192,7 @@ h1, h2, h3, h4, h5, h6 {
 
 {% endif %}
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -218,7 +220,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -252,7 +254,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }
 
@@ -693,3 +694,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.scss

@@ -112,27 +112,27 @@ span.partlabel {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -164,7 +164,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -193,7 +193,6 @@ p.AltTerms {
 }
 
 p.Terms {
-    font-weight: bold;
     margin-top: 0em;
 }
 
@@ -710,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/wordstyle.scss

@@ -269,7 +269,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure
         {text-align: center;}
 
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -284,8 +284,6 @@ h1
 	line-height:13.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:1;
-	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -303,6 +301,10 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1 {
+	mso-outline-level:1;
+	mso-list:l1 level1 lfo6;
+}
 h1.ForewordTitle {
         font-size:13.0pt;
         font-style: normal ;
@@ -336,7 +338,7 @@ h1.Annex
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-.h2Annex, h2
+.h2Annex, h2, .h2
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -372,7 +374,7 @@ h2
 	{ mso-list:l1 level2 lfo6;
         mso-outline-level:2;
         }
-.h3Annex, h3
+.h3Annex, h3, .h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -407,7 +409,7 @@ h2
 h3      {mso-list:l1 level3 lfo6;
 	mso-outline-level:3;
         }
-.h4Annex, h4
+.h4Annex, h4, .h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -440,7 +442,7 @@ h3      {mso-list:l1 level3 lfo6;
 h4      {mso-list:l1 level4 lfo6;
 	mso-outline-level:4;
         }
-.h5Annex, h5
+.h5Annex, h5, .h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -473,7 +475,7 @@ h4      {mso-list:l1 level4 lfo6;
 h5      {mso-list:l1 level5 lfo6;
 	mso-outline-level:5;
         }
-h6
+h6, .h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;

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)

data/lib/isodoc/iso/index.rb

@@ -5,32 +5,36 @@ module IsoDoc
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
-      def index(docxml)
-        unless docxml.at(ns("//index"))
-          docxml.xpath(ns("//indexsect")).each(&:remove)
-          return
+      def index(xml)
+        if xml.at(ns("//index"))
+          i = xml.at(ns("//indexsect")) ||
+            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}"\
+                               "</title></indexsect>").first
+          index = sort_indexterms(xml.xpath(ns("//index")),
+                                  xml.xpath(ns("//index-xref[@also = 'false']")),
+                                  xml.xpath(ns("//index-xref[@also = 'true']")))
+          index1(xml, i, index)
+        else xml.xpath(ns("//indexsect")).each(&:remove)
         end
-        i = docxml.at(ns("//indexsect")) ||
-          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
-        index = sort_indexterms(docxml.xpath(ns("//index")),
-                                docxml.xpath(ns("//index-xref[@also = 'false']")),
-                                docxml.xpath(ns("//index-xref[@also = 'true']")))
-        index1(docxml, i, index)
       end
 
-      def index1(docxml, i, index)
-        c = i.add_child("<ul></ul>").first
+      def index1(docxml, indexsect, index)
+        c = indexsect.add_child("<ul></ul>").first
         index.keys.sort.each do |k|
-          # c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
           words = index[k].keys.each_with_object({}) do |w, v|
             v[sortable(w).downcase] = w
           end
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            # c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
             c.add_child index_entries(words, index[k], w)
           end
         end
-        docxml.xpath(ns("//indexsect//xref")).each { |x| x.children.remove }
+        index1_cleanup(docxml)
+      end
+
+      def index1_cleanup(docxml)
+        docxml.xpath(ns("//indexsect//xref")).each do |x|
+          x.children.remove
+        end
         @xrefs.bookmark_anchor_names(docxml)
       end
 
@@ -56,7 +60,7 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries2(words, index, secondary)
@@ -75,30 +79,29 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries_head(head, entries, opt)
         ret = "<li>#{head}"
         xref = entries&.dig(:xref)&.join(", ")
-        see_sort = entries&.dig(:see)&.each_with_object({}) do |w, v|
-          v[sortable(w).downcase] = w
-        end
-        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-                see_sort[k]
-              end&.join(", ")
-        also_sort = entries&.dig(:also)&.each_with_object({}) do |w, v|
-          v[sortable(w).downcase] = w
-        end
-        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-                 also_sort[k]
-               end&.join(", ")
+        see = index_entries_see(entries, :see)
+        also = index_entries_see(entries, :also)
         ret += "#{opt[:xref_lbl]} #{xref}" if xref
         ret += "#{opt[:see_lbl]} #{see}" if see
         ret += "#{opt[:also_lbl]} #{also}" if also
         ret
       end
 
+      def index_entries_see(entries, label)
+        see_sort = entries&.dig(label)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+          see_sort[k]
+        end&.join(", ")
+      end
+
       def see_lbl
         @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
       end
@@ -119,13 +122,8 @@ module IsoDoc
 
       def extract_indexsee(val, terms, label)
         terms.each_with_object(val) do |t, v|
-          term = t&.at(ns("./primary"))&.children&.to_xml
-          term2 = t&.at(ns("./secondary"))&.children&.to_xml
-          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
-          v[term] ||= {}
-          v[term][term2] ||= {}
-          v[term][term2][term3] ||= {}
-          v[term][term2][term3][label] ||= []
+          term, term2, term3 = extract_indexterms_init(t)
+          term_hash_init(v, term, term2, term3, label)
           v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
           t.remove
         end
@@ -138,22 +136,32 @@ module IsoDoc
         end
       end
 
-      # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
+      # attributes are decoded into UTF-8,
+      # elements in extract_indexsee are still in entities
       def extract_indexterms(terms)
         terms.each_with_object({}) do |t, v|
-          term = t&.at(ns("./primary"))&.children&.to_xml
-          term2 = t&.at(ns("./secondary"))&.children&.to_xml
-          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
+          term, term2, term3 = extract_indexterms_init(t)
           index2bookmark(t)
-          v[term] ||= {}
-          v[term][term2] ||= {}
-          v[term][term2][term3] ||= {}
-          v[term][term2][term3][:xref] ||= []
+          term_hash_init(v, term, term2, term3, :xref)
           to = t["to"] ? "to='#{t['to']}' " : ""
-          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' #{to}pagenumber='true'/>"
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' "\
+                                          "#{to}pagenumber='true'/>"
+        end
+      end
+
+      def extract_indexterms_init(term)
+        %w(primary secondary tertiary).each_with_object([]) do |x, m|
+          m << term&.at(ns("./#{x}"))&.children&.to_xml
         end
       end
 
+      def term_hash_init(hash, term, term2, term3, label)
+        hash[term] ||= {}
+        hash[term][term2] ||= {}
+        hash[term][term2][term3] ||= {}
+        hash[term][term2][term3][label] ||= []
+      end
+
       def index2bookmark(node)
         node.name = "bookmark"
         node.children.each(&:remove)