metanorma-bipm 0.0.3 → 1.0.2

data/lib/isodoc/bipm/html/html_bipm_titlepage.html

@@ -28,11 +28,17 @@
     </div>
 
     <div class="coverpage-title">
-      {% if appendixtitle %}
+      {% if appendixtitle or parttitle or subparttitle %}
       <span class="title-third">{{ doctitle }}</span>
       <span class="title-third">{{ docsubtitle }}</span><br/>
-      <span class="title-first">{% if appendixid %}{{ appendixid}}: {% endif %}{{ appendixtitle }}</span><br/>
-      <span class="title-second">{% if appendixid_alt %}{{ appendixid_alt}}: {% endif %}{{ appendixsubtitle }}</span>
+      {% if partid %}<span class="title-first">{{ partid}}: {{ parttitle }}</span><br/>{% endif %}
+      {% if partid_alt %}<span class="title-second">{{ partid_alt}}: {{ partsubtitle }}</span>{% endif %}       
+      {% if subparttitle %}<span class="title-first">{{ subparttitle }}</span><br/>{% endif %}
+      {% if subpartsubtitle %}<span class="title-second">{{ subpartsubtitle }}</span><br/>{% endif %}
+      {% if appendixid %}<span class="title-first">{{ appendixid}}: {{ appendixtitle }}</span><br/>{% endif %} 
+      {% if appendixid_alt %}<span class="title-second">{{ appendixid_alt}}: {{ appendixsubtitle }}</span>{% endif %}
+      {% if annexid %}<span class="title-first">{{ annexid}}: {{ annextitle }}</span><br/>{% endif %} 
+      {% if annexid_alt %}<span class="title-second">{{ annexid_alt}}: {{ annexsubtitle }}</span>{% endif %}
       {% else %}
       <span class="title-first">{{ doctitle }}</span><br/>
       <span class="title-second">{{ docsubtitle }}</span>
@@ -61,6 +67,15 @@
   <div class="coverpage-tc-name">
     <span>{{ metadata_extensions["editorialgroup"]["committee_acronym"] }}{% if metadata_extensions["editorialgroup"]["committee_acronym"] and committee %}: {% endif %}{{ committee }}</span>
   </div>
+ 
+  {% if authors %}
+  <div class="coverpage-tc-name">
+    {% for item in authors %}
+    <span>{{item}} {% if authors_affiliations[forloop.index0] %}({{ authors_affiliations[forloop.index0] }}){% endif %}{% if forloop.last == false %}, {% endif %}{% endfor %}.
+  </div>
+  {% endif %}
+
+
   </div>
 
     <div class="wrapper-top-bottom"></div>

data/lib/isodoc/bipm/html/htmlstyle.css

@@ -213,7 +213,7 @@ body {
   margin-left: auto;
   margin-right: auto;
   max-width: 100%;
-  font-size: 15px;
+  font-size: {{normalfontsize}};
   font-weight: 300;
   line-height: 1.4em;
   color: #1d1d1d;
@@ -450,31 +450,6 @@ p.document-stage {
   font-weight: 300;
   height: 160px; }
 
-#proposal-band p {
-  height: 150px; }
-
-#standard-band,
-#published-band {
-  background-color: #007864; }
-
-#standard,
-#published {
-  border-bottom: solid 3px #007864; }
-
-#governance,
-#policy-and-procedures {
-  border-bottom: solid 3px #750697; }
-
-#governance-band,
-#policy-and-procedures-band {
-  background-color: #750697; }
-
-#guide {
-  border-bottom: solid 3px #48a0e7; }
-
-#guide-band {
-  background-color: #48a0e7; }
-
 .coverpage-maturity {
   font-family: {{bodyfont}};
   font-weight: 400;
@@ -482,38 +457,6 @@ p.document-stage {
   margin: 0 0 2em 0;
   text-transform: uppercase; }
 
-#working-draft,
-#proposal {
-  border-bottom: solid 3px #F7803C; }
-
-#working-draft-band,
-#proposal-band {
-  background-color: #F7803C; }
-
-#committee-draft {
-  border-bottom: solid 3px #fd06fd; }
-
-#committee-draft-band {
-  background-color: #fd06fd; }
-
-#draft-standard {
-  border-bottom: solid 3px #fdf906; }
-
-#draft-standard-band {
-  background-color: #fdf906; }
-
-#standard {
-  border-bottom: solid 3px #007864; }
-
-#standard-band {
-  background-color: #007864; }
-
-#obsolete {
-  border-bottom: solid 3px #7e0d13; }
-
-#obsolete-band {
-  background-color: #7e0d13; }
-
 /*
     3. TYPOGRAPHY
 */
@@ -612,6 +555,53 @@ ul li:first-child {
   content: " ";
   display: none; }
 
+/* https://github.com/metanorma/metanorma-bipm/issues/47 */
+ol[class="alphabet"] {
+  counter-reset: alphabet; }
+
+ol[class="roman"] {
+  counter-reset: roman; }
+
+ol[class="alphabet"] ol[class="alphabet"] {
+  counter-reset: none; }
+
+ol[class="alphabet"] > li {
+  list-style: none;
+  position: relative; }
+
+ol[class="alphabet"] ol[class="alphabet"] > li {
+  list-style: inherit; }
+
+ol[class="alphabet"] > li:before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha) ") ";
+  position: absolute;
+  left: -1.4em; }
+
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
+  counter-increment: none;
+  content: initial; }
+
+ol[class="roman"] ol[class="roman"] {
+  counter-reset: none; }
+
+ol[class="roman"] > li {
+  list-style: none;
+  position: relative; }
+
+ol[class="roman"] ol[class="roman"] > li {
+  list-style: inherit; }
+
+ol[class="roman"] > li:before {
+  counter-increment: roman;
+  content: "(" counter(roman, lower-roman) ") ";
+  position: absolute;
+  left: -2.0em; }
+
+ol[class="roman"] ol[class="roman"] > li:before {
+  counter-increment: none;
+  content: initial; }
+
 /*
     3.4 Rules
 */
@@ -635,7 +625,7 @@ p.Biblio, p.NormRef {
 pre,
 .pseudocode {
   background-color: #f7f7f7;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -731,7 +721,7 @@ a.footnote-number {
   font-size: 0.8em; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }
 
 /*
     3.11 Blockquotes

data/lib/isodoc/bipm/html/htmlstyle.scss

@@ -36,7 +36,7 @@ $docstage-colors-list: (
 */
 
 body {
-  @include bodyStyle1(15px, 1.4em, #1d1d1d, #ffffff, 300);
+  @include bodyStyle1($normalfontsize, 1.4em, #1d1d1d, #ffffff, 300);
   font-weight: 400;
 
   pre * {
@@ -147,84 +147,10 @@ p.document-stage {
   height: 160px;
 }
 
-#proposal-band p {
-  height: 150px;
-}
-
-#standard-band,
-#published-band {
-  background-color: #007864;
-}
-
-#standard,
-#published {
-  border-bottom: solid 3px #007864;
-}
-
-#governance,
-#policy-and-procedures {
-  border-bottom: solid 3px #750697;
-}
-
-#governance-band,
-#policy-and-procedures-band {
-  background-color: #750697;
-}
-
-#guide {
-  border-bottom: solid 3px #48a0e7;
-}
-
-#guide-band {
-  background-color: #48a0e7;
-}
-
 .coverpage-maturity {
   @include coverpageStageBlock();
 }
 
-#working-draft,
-#proposal {
-  border-bottom: solid 3px #F7803C;
-}
-
-#working-draft-band,
-#proposal-band {
-  background-color: #F7803C;
-}
-
-#committee-draft {
-  border-bottom: solid 3px #fd06fd;
-}
-
-#committee-draft-band {
-  background-color: #fd06fd;
-}
-
-#draft-standard {
-  border-bottom: solid 3px #fdf906;
-}
-
-#draft-standard-band {
-  background-color: #fdf906;
-}
-
-#standard {
-  border-bottom: solid 3px #007864;
-}
-
-#standard-band {
-  background-color: #007864;
-}
-
-#obsolete {
-  border-bottom: solid 3px #7e0d13;
-}
-
-#obsolete-band {
-  background-color: #7e0d13;
-}
-
 /*
     3. TYPOGRAPHY
 */
@@ -330,6 +256,56 @@ ul li:first-child {
   display: none;
 }
 
+/* https://github.com/metanorma/metanorma-bipm/issues/47 */
+
+ol[class="alphabet"] {
+  counter-reset: alphabet;
+}
+ol[class="roman"] {
+  counter-reset: roman;
+}
+ol[class="alphabet"] ol[class="alphabet"]  {
+  counter-reset: none;
+}
+ol[class="alphabet"] > li {
+  list-style: none;
+  position: relative;
+}
+ol[class="alphabet"] ol[class="alphabet"] > li {
+  list-style: inherit;
+}
+ol[class="alphabet"] > li:before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha)") ";
+  position: absolute;
+  left: -1.4em;
+}
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
+  counter-increment: none;
+  content: initial;
+}
+ol[class="roman"] ol[class="roman"]  {
+  counter-reset: none;
+}
+ol[class="roman"] > li {
+  list-style: none;
+  position: relative;
+}
+ol[class="roman"] ol[class="roman"] > li {
+  list-style: inherit;
+}
+ol[class="roman"] > li:before {
+  counter-increment: roman;
+  content: "("counter(roman, lower-roman)") ";
+  position: absolute;
+  left: -2.0em;
+}
+ol[class="roman"] ol[class="roman"] > li:before {
+  counter-increment: none;
+  content: initial;
+}
+
+
 
 /*
     3.4 Rules
@@ -425,7 +401,7 @@ a.footnote-number {
 }
 
 .footnote {
-    font-size: 0.9em;
+    font-size: $footnotefontsize;
 }
 
 

data/lib/isodoc/bipm/html_convert.rb

@@ -22,6 +22,23 @@ module IsoDoc
         end
       end
 
+      def counter_reset(node)
+        s = node["start"]
+        return nil unless s && !s.empty? && !s.to_i.zero?
+        "counter-reset: #{node['type']} #{s.to_i - 1};"
+      end
+
+      def ol_attrs(node)
+        klass, style = if node["type"] == "roman" &&
+            !node.at("./ancestor::xmlns:ol[@type = 'roman']") || 
+            node["type"] == "alphabet" &&
+            !node.at("./ancestor::xmlns:ol[@type = 'alphabet']")
+          [node["type"], counter_reset(node)]
+                       end
+        super.merge(attr_code(type: ol_style((node["type"] || "arabic").to_sym),
+                              start: node["start"]), style: style, class: klass)
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/bipm/i18n-en.yaml

@@ -1,2 +1,10 @@
 annex: Appendix
+appendix: Annex
 see: see
+see_also: see also
+clause: Chapter
+subclause: Section
+formula: Equation
+inequality: Inequality
+bibliography: References
+index: Index

data/lib/isodoc/bipm/i18n-fr.yaml

@@ -1,5 +1,22 @@
 annex: Annexe
+appendix: Appendice
 see: voir
+see_also: voir aussi
+clause: chapître
+subclause: section
+formula: équation
+inequality: inégalité
+bibliography: Références
+note_xref: note
+termnote: note % à l’article
+list: liste
+figure: figure
+table: tableau
+requirement: exigence
+recommendation: recommandation
+permission: autorisation
+example_xref: exemple
+index: Index
 doctype_dict: 
   brochure: brochure
   mise-en-pratique: mise-en-pratique
@@ -13,7 +30,7 @@ doctype_dict:
   cipm-mra: cipm-mra
   resolution: résolution
 stage_dict: 
-    draft-proposal: projet-de-proposition
-    draft-development: projet-de-développement
-    in-force: en-vigeur
-    retired: retiré
+  draft-proposal: projet-de-proposition
+  draft-development: projet-de-développement
+  in-force: en-vigeur
+  retired: retiré

data/lib/isodoc/bipm/index.rb

@@ -0,0 +1,136 @@
+require "twitter_cldr"
+require "sterile"
+
+module IsoDoc
+  module BIPM
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
+       def add_id
+        %(id="_#{UUIDTools::UUID.random_create}")
+      end
+
+      def index(docxml)
+        return unless docxml.at(ns("//index"))
+        i = docxml.root.add_child "<clause type='index' #{add_id}><title>#{@i18n.index}</title></clause>"
+        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)
+        index.keys.sort.each do |k|
+          c = i.first.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+          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)
+          end
+        end
+        @xrefs.bookmark_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
+      end
+
+      def sortable(s)
+        HTMLEntities.new.decode(Nokogiri::XML.fragment(s).text)
+      end
+
+      def index_entries_opt
+        { xref_lbl: ", ", see_lbl: ", #{see_lbl}", also_lbl: ", #{also_lbl}" }
+      end
+
+      def index_entries(words, index, primary)
+        ret = index_entries_head(words[primary], index.dig(words[primary], nil, nil), index_entries_opt)
+        words2 = index[words[primary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        unless words2.empty?
+          ret += "<ul>"
+          words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+            ret += index_entries2(words2, index[words[primary]], w)
+          end
+          ret += "</ul>"
+        end
+        ret + "</li>"
+      end
+
+      def index_entries2(words, index, secondary)
+        ret = index_entries_head(words[secondary], index.dig(words[secondary], nil), index_entries_opt)
+        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        unless words3.empty?
+          ret += "<ul>"
+          words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+            ret += (index_entries_head(words3[w], index[words[secondary]][words3[w]], index_entries_opt) + "</li>")
+          end
+          ret += "</ul>"
+        end
+        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({}) { |w, v| v[sortable(w).downcase] = w }
+        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| see_sort[k] }&.join(", ")
+        also_sort = entries&.dig(:also)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| also_sort[k] }&.join(", ")
+        ret += "#{opt[:xref_lbl]} #{xref}" if xref
+        ret += "#{opt[:see_lbl]} #{see}" if see
+        ret += "#{opt[:also_lbl]} #{also}" if also
+        ret
+      end
+
+      def see_lbl
+        @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
+      end
+
+      def also_lbl
+        @lang == "en" ? @i18n.see_also : "<em>#{@i18n.see_also}</em>"
+      end
+
+      def sort_indexterms(terms, see, also)
+        index = extract_indexterms(terms)
+        index = extract_indexsee(index, see, :see)
+        index = extract_indexsee(index, also, :also)
+        index.keys.sort.each_with_object({}) do |k, v|
+          v[sortable(k)[0].upcase.transliterate] ||= {}
+          v[sortable(k)[0].upcase.transliterate][k] = index[k]
+        end
+      end
+
+      def extract_indexsee(v, terms, label)
+        terms.each_with_object(v) 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] ||= []
+          v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
+          t.remove
+        end
+      end
+
+      def xml_encode_attr(s)
+        HTMLEntities.new.encode(s, :basic, :hexadecimal).gsub(/\&#x([^;]+);/) { |x| "&#x#{$1.upcase};" }
+      end
+
+      # 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
+          index2bookmark(t)
+          v[term] ||= {}
+          v[term][term2] ||= {}
+          v[term][term2][term3] ||= {}
+          v[term][term2][term3][:xref] ||= []
+          to = t["to"] ? "to='#{t['to']}' " : ""
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' #{to}pagenumber='true'/>"
+        end
+      end
+
+      def index2bookmark(t)
+        t.name = "bookmark"
+        t.children.each { |x| x.remove }
+        t["id"] = "_#{UUIDTools::UUID.random_create}"
+      end
+    end
+  end
+end