metanorma-iho 0.5.8 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fdf0696be05175e238e5926f6b67e87039e7b1bbb0446ff150b2460cc3a1f42
-  data.tar.gz: 4ae00994e31e579045e33a1da2f6308f1b6d405414ef6edce683059b92819390
+  metadata.gz: 7dc1b7ada828c3a0407939118556e3139cf716b2eed6a667efcd60ad04db7a26
+  data.tar.gz: c63a014a83f8ee957fe2289b6f6766872057dfce4114c921d81996470e6061e8
 SHA512:
-  metadata.gz: 4ed77af30eda911b772f889e4f05df483580a115ac4b9f31273aa20c3709f15536b71cee7f6fbe3e7280969cc507aa68f9311918d870a3ad91c7bc3129fccf45
-  data.tar.gz: ba7cf27357fd7562d69ec19356436cdbe8f7eb5f98360bf302abba414cfa476169c11b8fabab87ffefb60c7a5f1fa0f16e4eddf8ac30a27704efaaee8bf63b95
+  metadata.gz: 00a02daff0371d8c38b9a8c9d34a520ce0d9c38b98b991c112be43b0f780ce8492a66ca870ca4504fa1afc8951869ca8831d66a07a23b803224f63a0204682a6
+  data.tar.gz: 7d36bb8c4eca511eb7b94a38443068ff6e9ff2214be6bef15d5d2fa81e330997dd1aa1161f51a01253ac7eb3e9c2e17b8bc09567f543a184f1c59c7d54d8ede8

data/lib/isodoc/iho/base_convert.rb

@@ -18,119 +18,15 @@ module IsoDoc
       def std_bibitem_entry(list, bib, ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           prefix_bracketed_ref(ref, "[#{ordinal}]")
-          standard_citation(ref, bib)
+          reference_format(bib, ref)
         end
       end
 
-      def nodes_to_span(node)
-        noko do |xml|
-          xml.span do |s|
-            node&.children&.each { |x| parse(x, s) }
-          end
-        end.join
-      end
-
-      def multiplenames_and(names)
-        return "" if names.empty?
-        return names[0] if names.length == 1
-        return "#{names[0]} and #{names[1]}" if names.length == 2
-
-        names[0..-2].join(", ") + " and #{names[-1]}"
-      end
-
-      def extract_publisher(bib)
-        c = bib
-          .xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
-        abbrs = []
-        names = []
-        c&.each do |c1|
-          n = c1.at(ns("./organization/name")) or next
-          abbrs << (c1.at(ns("./organization/abbreviation")) || n)
-          names << nodes_to_span(n)
-        end
-        return [nil, nil] if names.empty?
-
-        [multiplenames_and(names), abbrs.map(&:text).join("/")]
-      end
-
-      def inline_bibitem_ref_code(bib)
-        id = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
-                       "@type = 'metanorma' or @type = 'ISSN' or "\
-                       "@type = 'ISBN' or @type = 'rfc-anchor' or "\
-                       "@type = 'metanorma-ordinal')]"))
-        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
-                         "@type = 'metanorma-ordinal')]"))
-        return [nil, id, nil, nil] if id
-
-        id = Nokogiri::XML::Node.new("docidentifier", bib.document)
-        id << "(NO ID)"
-        [nil, id, nil, nil]
-      end
-
-      def extract_edition(bib)
-        bib&.at(ns("./edition"))&.text
-      end
-
-      def extract_uri(bib)
-        bib.at(ns("./uri[@type = 'src']")) || bib.at(ns("./uri"))
-      end
-
       def omit_docid_prefix(prefix)
         return true if prefix == "IHO"
 
         super
       end
-
-      def render_identifier(id)
-        if !id[1].nil? && (id[1]["type"] == "IHO")
-          id[1].children = id[1].text.sub(/^IHO /, "")
-        end
-        super
-      end
-
-      def extract_author(bib)
-        c = bib.xpath(ns("./contributor[role/@type = 'author']"))
-        c = bib.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
-        return extract_publisher(bib)[0] if c.empty?
-
-        c.map do |c1|
-          c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
-        end.reject { |e| e.nil? || e.empty? }.join(", ")
-      end
-
-      def extract_person_name(bib)
-        p = bib.at(ns("./person/name")) or return
-        c = p.at(ns("./completename")) and return c.text
-        s = p&.at(ns("./surname"))&.text or return
-        i = p.xpath(ns("./initial")) and
-          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
-        i.empty? and f = p.xpath(ns("./forename")) and
-          front = f.map { |e| e.text[0].upcase }.join
-        front ? "#{s} #{front}" : s
-      end
-
-      def iho?(bib)
-        extract_publisher(bib)[1] == "IHO"
-      end
-
-      # [{number}] {docID} edition {edition}: {title}, {author/organization}
-      def standard_citation(out, bib)
-        if ftitle = bib.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, out) }
-        else
-          id = render_identifier(inline_bibitem_ref_code(bib))
-          out << id[:sdo] if id[:sdo]
-          ed = extract_edition(bib) if iho?(bib)
-          out << " edition #{ed}" if ed
-          out << ": " if id[:sdo] || ed
-          iso_title(bib)&.children&.each { |n| parse(n, out) }
-          out << ", "
-          author = extract_author(bib)
-          out << author
-          u = extract_uri(bib)
-          out << " (<a href='#{u.text}'>#{u.text}</a>)" if u
-        end
-      end
     end
   end
 end

data/lib/isodoc/iho/html/html_iho_titlepage.html

@@ -66,6 +66,8 @@
       </div>
       {% endif %}
 
+      <div class="coverpage-warning" id="coverpage-note-destination"/>
+
       <div class="info-section">
         <div class="copyright">
           <div class="year">

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

@@ -711,6 +711,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .FigureTitle,
 .SourceTitle {
   font-weight: 700;

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

@@ -362,6 +362,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .FigureTitle,
 .SourceTitle {

data/lib/isodoc/iho/html/iho.css

@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.TableTitle {
+p.TableTitle, p.ListTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -142,13 +142,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
   line-height: {{normalfontsize}};
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{smallerfontsize}};
   mso-bidi-font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
   mso-style-priority: 10;
@@ -493,12 +495,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: {{normalfontsize}};
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right;
   mso-style-priority: 99;
@@ -528,8 +532,6 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-border-themecolor: accent1;
   padding: 0cm;
   mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: {{bodyfont}};
@@ -540,7 +542,11 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-bidi-theme-font: minor-bidi;
   color: #4472C4;
   mso-themecolor: accent1;
-  mso-ansi-language: EN-AU;
+  mso-ansi-language: EN-AU; }
+
+p.Admonition, li.Admonition {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   font-style: italic; }
 
 p.Code, li.Code, div.Code {
@@ -765,7 +771,9 @@ aside {
 
 p.example, li.example, td.example {
   margin-right: 0pt;
-  margin-left: 0pt; }
+  margin-left: 0pt;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
 
 div.example {
   margin-right: 36.0pt;
@@ -774,9 +782,7 @@ div.example {
   margin-bottom: 0cm; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}}; }
+  mso-pagination: none; }
 
 td.example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }

data/lib/isodoc/iho/html/iho.scss

@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -135,12 +135,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:$normalfontsize;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$smallerfontsize;
 	mso-bidi-font-size:$smallerfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -470,11 +472,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:$normalfontsize;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -504,8 +508,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-border-themecolor:accent1;
 	padding:0cm;
 	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -517,7 +519,12 @@ p.Admonition, li.Admonition, div.Admonition
 	color:#4472C4;
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
-	font-style:italic;}
+      }
+p.Admonition, li.Admonition {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        font-style:italic;
+        }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -720,6 +727,8 @@ margin-left: -36.0pt;
 p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:$smallerfontsize;
+  font-family:$bodyfont;
 }
 
 div.example {
@@ -731,8 +740,7 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:$smallerfontsize;
-        font-family:$bodyfont;}
+      }
 
 td.example p.MsoListParagraph {
   font-size: $smallerfontsize;

data/lib/isodoc/iho/html/word_iho_titlepage.html

@@ -885,4 +885,5 @@ AAAPAAAAAAAAAAAAAAAAAAcCAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAMAAwC3AAAA/AIAAAAA
  </v:shape>
 <w:wrap type="square" anchorx="margin" anchory="margin"/>
  </v:group></p>
+ <div class="coverpage-warning" id="coverpage-note-destination"/>