metanorma-bipm 0.0.3 → 0.0.4

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

@@ -28,11 +28,15 @@
     </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 %}
       {% else %}
       <span class="title-first">{{ doctitle }}</span><br/>
       <span class="title-second">{{ docsubtitle }}</span>
@@ -61,6 +65,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

@@ -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
 */

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

@@ -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

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,16 @@
 annex: Appendix
 see: see
+clause: chapter
+subclause: section
+formula: equation
+inequality: inequality
+bibliography: References
+note_xref: note
+termnote: note % to entry
+list: list
+figure: figure
+table: table
+requirement: requirement
+recommendation: recommendation
+permission: permission
+example_xref: example

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

@@ -1,5 +1,19 @@
 annex: Annexe
 see: voir
+clause: chapître
+clause: 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
 doctype_dict: 
   brochure: brochure
   mise-en-pratique: mise-en-pratique

data/lib/isodoc/bipm/metadata.rb

@@ -24,16 +24,17 @@ module IsoDoc
       TITLE = "//bibdata/title".freeze
 
       def title(isoxml, _out)
-        lang1 = @lang == "fr" ? "fr" : "en"
-        lang2 = @lang == "fr" ? "en" : "fr"
+        lang1, lang2  = @lang == "fr" ? %w(fr en) : %w(en fr)
         set(:doctitle, @c.encode(isoxml&.at(
           ns("#{TITLE}[@type='main'][@language='#{lang1}']"))&.text || ""))
         set(:docsubtitle, @c.encode(isoxml&.at(
           ns("#{TITLE}[@type='main'][@language='#{lang2}']"))&.text || ""))
-        set(:appendixtitle, @c.encode(isoxml&.at(
-          ns("#{TITLE}[@type='appendix'][@language='#{lang1}']"))&.text || ""))
-        set(:appendixsubtitle, @c.encode(isoxml&.at(
-          ns("#{TITLE}[@type='appendix'][@language='#{lang2}']"))&.text || ""))
+        %w(appendix part subtitle).each do |e|
+          set("#{e}title".to_sym, @c.encode(isoxml&.at(
+            ns("#{TITLE}[@type='#{e}'][@language='#{lang1}']"))&.text || ""))
+          set("#{e}subtitle".to_sym, @c.encode(isoxml&.at(
+            ns("#{TITLE}[@type='#{e}'][@language='#{lang2}']"))&.text || ""))
+        end
       end
 
       def status_print(status)
@@ -46,11 +47,18 @@ module IsoDoc
 
       def docid(isoxml, _out)
         super
-        label1 = @lang == "fr" ? "Annexe" : "Appendix"
-        label2 = @lang == "fr" ? "Appendix" : "Annexe"
+        label1, label2 = @lang == "fr" ? %w(Annexe Appendix) : %w(Appendix Annexe)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))
         dn and set(:appendixid, @i18n.l10n("#{label1} #{dn&.text}"))
         dn and set(:appendixid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+        label1, label2  = @lang == "fr" ? %w(Partie Part) : %w(Part Partie)
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/part"))
+        dn and set(:partid, @i18n.l10n("#{label1} #{dn&.text}"))
+        dn and set(:partid_alt, @i18n.l10n("#{label2} #{dn&.text}"))
+      end
+
+      def extract_person_names_affiliations(authors)
+        extract_person_affiliations(authors)
       end
     end
   end

data/lib/isodoc/bipm/pdf_convert.rb

@@ -11,7 +11,10 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        "bipm.brochure.xsl"
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        doctype = "brochure" unless %w(guide mise-en-pratique rapport).
+          include? doctype
+        "bipm.#{doctype}.xsl"
       end
 
       def pdf_options(docxml)

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -9,7 +9,7 @@ module IsoDoc
         return if labelled_ancestor(f)
         return if f["unnumbered"] && !f.at(ns("./name"))
         n = @xrefs.anchor(f['id'], :label, false)
-        prefix_name(f, ".<tab/>", l10n("#{@i18n.table} #{n}"), "name")
+        prefix_name(f, ".<tab/>", l10n("#{@i18n.table.capitalize} #{n}"), "name")
       end
 
       def annex1(f)
@@ -72,20 +72,25 @@ module IsoDoc
       end
 
       def list_authors(xml)
-        ret = list_people(xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person")
+        ret = list_people(
+          xml, "//bibdata/contributor[xmlns:role/@type = 'author']/person")
         @i18n.multiple_and(ret, @i18n.get["and"])
       end
 
+      COCHAIR = "xmlns:role[contains(text(),'co-chair')]".freeze
+      CHAIR = "[xmlns:role[contains(text(),'chair')]"\
+        "[not(contains(text(),'co-chair'))]]".freeze
+
       def list_cochairs(xml)
-        ret = list_people(xml, "//bibdata/contributor[xmlns:role[contains(text(),'co-chair')]]/person")
-        role = xml&.at(ns("//bibdata/contributor[xmlns:role[contains(text(),'co-chair')]]/role"))&.text
+        ret = list_people(xml, "//bibdata/contributor[#{COCHAIR}]/person")
+        role = xml&.at(ns("//bibdata/contributor[#{COCHAIR}]/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
         "#{label}: #{@i18n.multiple_and(ret, @i18n.get["and"])}"
       end
 
       def list_chairs(xml)
-        ret = list_people(xml, "//bibdata/contributor[xmlns:role[contains(text(),'chair')][not(contains(text(),'co-chair'))]]/person")
-        role = xml&.at(ns("//bibdata/contributor[xmlns:role[contains(text(),'chair')][not(contains(text(),'co-chair'))]]/role"))&.text
+        ret = list_people(xml, "//bibdata/contributor#{CHAIR}/person")
+        role = xml&.at(ns("//bibdata/contributor#{CHAIR}/role"))&.text
         label = ret.size > 1 && role ? "#{role}s" : role
         "#{label}: #{@i18n.multiple_and(ret, @i18n.get["and"])}"
       end
@@ -103,6 +108,12 @@ module IsoDoc
         ret
       end
 
+      def twitter_cldr_localiser()
+        locale = :fr
+        twitter_cldr_reader(locale)
+        locale
+      end
+
       include Init
     end
   end