metanorma-bipm 0.0.2 → 1.0.1

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

@@ -23,12 +23,20 @@
       <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
     </div>
 
+    <div class="coverpage-logo">
+      <img src="{{ logo }}"/>
+    </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">{{ appendixid}}: {{ appendixtitle }}</span><br/>
-      <span class="title-second">{{ appendixid_alt}}: {{ 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>
@@ -38,11 +46,34 @@
 
   <div class="coverpage-logo">
     <span>Bureau International de Poids et Mesures {{ docyear }}</span>
+    {% if metadata_extensions["si-aspect"] %}
+    <br/>
+{% for item in si_aspect_index %}
+  {% if item == metadata_extensions["si-aspect"]  %}
+  <img src="{{ si_aspect_paths[forloop.index0] }}" width="310px" height="310px"/>
+  {% endif %}
+{% endfor %}
+    {% endif %}
   </div>
 
+  {% for item in metadata_extensions["editorialgroup"]["committee"]["variant_language"] %}
+  {% if item == lang %}
+  {% assign committee = metadata_extensions["editorialgroup"]["committee"]["variant"][forloop.index0] %}
+  {% endif %}
+  {% endfor %}
+
   <div class="coverpage-tc-name">
-    <span>{{ tc }}</span>
+    <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

@@ -112,16 +112,20 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #brochure-band {
   background-color: #0AC442; }
 
 #brochure {
   border-bottom: solid 3px #0AC442; }
 
-#mis-en-pratique-band {
+#mise-en-pratique-band {
   background-color: #540D6E; }
 
-#mis-en-pratique {
+#mise-en-pratique {
   border-bottom: solid 3px #540D6E; }
 
 #rapport-band {
@@ -209,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;
@@ -446,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;
@@ -478,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
 */
@@ -608,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
 */
@@ -631,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;
@@ -727,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

@@ -9,7 +9,7 @@
 
 $doctype-colors-list: (
   brochure: #0AC442,
-  mis-en-pratique: #540D6E,
+  mise-en-pratique: #540D6E,
   rapport: #D183C9,
   monographie: #65AFFF,
   guide: #3A405A,
@@ -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

@@ -7,6 +7,38 @@ module IsoDoc
   module BIPM
     class HtmlConvert < IsoDoc::Generic::HtmlConvert
 
+      def middle(isoxml, out)
+        super
+        doccontrol isoxml, out
+      end
+
+      def doccontrol(isoxml, out)
+        c = isoxml.at(ns("//doccontrol")) or return
+        out.div **attr_code(class: "doccontrol") do |div|
+          clause_parse_title(c, div, c.at(ns("./title")), out)
+          c.children.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, div)
+          end
+        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