metanorma-iso 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100cc8d4acfdb9e4d94e485f58f09928173b43c096ce7c1fdce04633ee0082a7
-  data.tar.gz: 9c8870908553dd7103dc094e5b0f9ceebb9f43f31d417d4c8d01e5d3884c3e6e
+  metadata.gz: d83fb927cb8bc71790dd2b644f00ef5e55605fc0a4c12865b406f3107c29e365
+  data.tar.gz: 19ee55451fd8f24e839fd23a0aea32d0927fb20ebccaa75b045f82113eac3b57
 SHA512:
-  metadata.gz: 98580eb700d970913763622d7b5325c58a825a98bbe350b9cac0bdcb1f1d5891eac42d9e473deadbe289f90eb1f189c11684b53e1db48e79f94bc210d0c61171
-  data.tar.gz: 5c52e15664a2b8edb7590f85c73bc7b13d248c70f039970a7426f654be3f0ba8165bcfbed6ab71d46be075c34db8b9213a2508ae8a48f633ccf32eed409f2c5f
+  metadata.gz: 86e861221a56a29ab07d1d47516fb39d13626f2c6cb844783c2030b38a5be4f3f04a4a1ca6d55855eb9f1fc2dc4f772b10f089bd96ae91b741b85f865d4bdba9
+  data.tar.gz: b987964c53cee70a3fa4fffa4487fa9e89e3e1bc4d3358928f661c72dd59f462d0148a1a45ef401fa4bad29b8141b55fe38c1f0589685c0699e4f1eedcec9fc9

data/lib/isodoc/iso/base_convert.rb

@@ -187,6 +187,12 @@ module IsoDoc
       def ol_attrs(node)
         super.merge(start: node["start"]).compact
       end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = std_docid_semantic(ret[:sdo])
+        ret
+      end
     end
   end
 end

data/lib/isodoc/iso/html/isodoc-dis.css

@@ -220,9 +220,9 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -246,9 +246,9 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -272,9 +272,9 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -301,9 +301,9 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};

data/lib/isodoc/iso/html/isodoc-dis.scss

@@ -209,9 +209,9 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -234,9 +234,9 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -259,9 +259,9 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -287,9 +287,9 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;

data/lib/isodoc/iso/html/isodoc.css

@@ -217,9 +217,9 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -243,9 +243,9 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -269,9 +269,9 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -298,9 +298,9 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
   text-align: center;
   text-indent: 0cm;
   line-height: 12.0pt;
-  page-break-before: always;
+  /*page-break-before:always;*/
   mso-pagination: widow-orphan;
-  /*page-break-after:avoid;*/
+  page-break-after: avoid;
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};

data/lib/isodoc/iso/html/isodoc.scss

@@ -207,9 +207,9 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -232,9 +232,9 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -257,9 +257,9 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -285,9 +285,9 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
 	text-align:center;
 	text-indent:0cm;
 	line-height:12.0pt;
-	page-break-before:always;
+	/*page-break-before:always;*/
 	mso-pagination:widow-orphan;
-	/*page-break-after:avoid;*/
+	page-break-after:avoid;
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;

data/lib/isodoc/iso/init.rb

@@ -34,9 +34,20 @@ module IsoDoc
       end
 
       def std_docid_semantic(id)
-        return nil if id.nil?
+        id.nil? and return nil
+        ret = Nokogiri::XML.fragment(id)
+        ret.traverse do |x|
+          x.text? or next
+          x.replace(std_docid_semantic1(x.text))
+        end
+        to_xml(ret)
+      end
 
+      def std_docid_semantic1(id)
         ids = id.split(/ /)
+        %w(ISO IEC ITU IETF NIST OGC IEEE BIPM BSI IANA UN W3C IEV)
+          .include?(ids[0].sub(/\/.*$/, "")) or
+          return id
         ids.map! do |i|
           if %w(GUIDE TR TS DIR).include?(i)
             "<span class='stddocNumber'>#{i}</span>"