metanorma-ieee 1.0.15 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7baf9a088e45aeb06617388b08b5c2c6bb679e29b5e85254e9cbd8c1d487695
-  data.tar.gz: 38325ee923392c68bb35266dca81e66cb7a7ce8f46afa65c6039a688ce52f649
+  metadata.gz: 1a6256a1c2f7a1bc9b09f325c6f0405efb2697524e23511ceafbae690a3eb98b
+  data.tar.gz: 5af212c12b8c7cdba8f222ee84f542196d92afd541df56fa4c368cc3f05710fd
 SHA512:
-  metadata.gz: 5669cb1f37a355962a317b5b9acb2d71b062a62ebd80b23a16b8ce580a70dd2c47c1310a6c36463d5ab4595222a0c5252db3e2faa98de640b5017fa44ccb2615
-  data.tar.gz: 589cf7c597e4dc249e4e2afeac1d5a9f41ba44588edb1af092fe5f6705655c005c7b78a5e5c705e1e0d92f502f4e032f41c14de307131d046d41d45b4aa99447
+  metadata.gz: e85a872ea89629b68849d43ecd9236b7470964893e4d2f7658436b0f61fb84eb9d9f186a3ca19bc4a5b6ee94b272bfeaada0fb48cbc27f12c2303be8827669c9
+  data.tar.gz: 2d8911d33ddb39b3ac6f748d78cb6712e98dc945e7175b6b0bf218b1fa667739c1be7c3beba7cafed9e870fc05f2c500ade54a7a7a383d1cc1b60e70f166473c

data/lib/isodoc/ieee/base_convert.rb

@@ -8,12 +8,17 @@ module IsoDoc
         { id: node["id"], type: node["type"] }
       end
 
-      def scope(isoxml, out, num)
-        f = isoxml.at(ns("//clause[@type = 'overview']")) or return num
-        out.div **attr_code(id: f["id"]) do |div|
+      def top_element_render(elem, out)
+        elem.name == "clause" && elem["type"] == "overview" and
+          return scope(elem, out, 0)
+        super
+      end
+
+      def scope(node, out, num)
+        out.div **attr_code(id: node["id"]) do |div|
           num = num + 1
-          clause_name(f, f&.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+          clause_name(node, node&.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
@@ -22,7 +27,7 @@ module IsoDoc
 
       def middle_clause(_docxml = nil)
         "//clause[parent::sections][not(@type = 'overview')]" \
-          "[not(descendant::terms)]"
+          "[not(descendant::terms)][not(descendant::references)]"
       end
 
       def para_attrs(node)

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

@@ -301,10 +301,10 @@ blockquote,
 q {
   quotes: none; }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
   content: '';
   content: none; }
 
@@ -455,7 +455,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -467,7 +467,7 @@ li p {
   margin-bottom: 0.6em;
   line-height: 1.2; }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none; }
 
@@ -519,7 +519,7 @@ p.Terms {
     #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
 
@@ -994,7 +994,7 @@ ol.footnotes-list p,
 aside.footnote {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

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

@@ -38,10 +38,10 @@ q {
     quotes: none;
 }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
     content: '';
     content: none;
 }
@@ -228,7 +228,7 @@ ul>li {
     list-style: none;
 }
 
-ul>li>p:first-child:before {
+ul>li>p:first-child::before {
     content: "\2014";
     display: inline-block;
     width: 1em;
@@ -242,7 +242,7 @@ li p {
     line-height: 1.2;
 }
 
-#toc li:before {
+#toc li::before {
     content: " ";
     display: none;
 }
@@ -268,7 +268,7 @@ p.Terms {
     //     box-shadow: inset -5px 0px 10px -5px #1d1d1d !important;
     // }
 
-    li:before {
+    li::before {
         content: " ";
         display: none;
     }
@@ -655,7 +655,7 @@ aside.footnote {
     display: inline;
 }
 
-ol>li>p:before {
+ol>li>p::before {
     content: "";
     display: none;
 }

data/lib/isodoc/ieee/html/wordstyle.css

@@ -5172,7 +5172,7 @@ span.SpellE {
 @list l21:level1 {
   mso-level-number-format: bullet;
   mso-level-style-link: "IEEEStds Unordered List Level 2";
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 46.1pt;
@@ -5181,25 +5181,25 @@ span.SpellE {
 
 @list l21:level2 {
   mso-level-number-format: bullet;
-  mso-level-text: o;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 82.1pt;
   text-indent: -18.0pt;
-  font-family: "Courier New"; }
+  font-family: Symbol; }
 
 @list l21:level3 {
   mso-level-number-format: bullet;
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 118.1pt;
   text-indent: -18.0pt;
-  font-family: Wingdings; }
+  font-family: Symbol; }
 
 @list l21:level4 {
   mso-level-number-format: bullet;
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 154.1pt;
@@ -5208,25 +5208,25 @@ span.SpellE {
 
 @list l21:level5 {
   mso-level-number-format: bullet;
-  mso-level-text: o;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 190.1pt;
   text-indent: -18.0pt;
-  font-family: "Courier New"; }
+  font-family: Symbol; }
 
 @list l21:level6 {
   mso-level-number-format: bullet;
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 226.1pt;
   text-indent: -18.0pt;
-  font-family: Wingdings; }
+  font-family: Symbol; }
 
 @list l21:level7 {
   mso-level-number-format: bullet;
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 262.1pt;
@@ -5235,21 +5235,21 @@ span.SpellE {
 
 @list l21:level8 {
   mso-level-number-format: bullet;
-  mso-level-text: o;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 298.1pt;
   text-indent: -18.0pt;
-  font-family: "Courier New"; }
+  font-family: Symbol; }
 
 @list l21:level9 {
   mso-level-number-format: bullet;
-  mso-level-text: ;
+  mso-level-text: ;
   mso-level-tab-stop: none;
   mso-level-number-position: left;
   margin-left: 334.1pt;
   text-indent: -18.0pt;
-  font-family: Wingdings; }
+  font-family: Symbol; }
 
 @list l20:level1 lfo31 {
   mso-level-start-at: 10; }

data/lib/isodoc/ieee/html/wordstyle.scss

@@ -4912,7 +4912,7 @@ span.SpellE
 @list l21:level1
 	{mso-level-number-format:bullet;
 	mso-level-style-link:"IEEEStds Unordered List Level 2";
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:46.1pt;
@@ -4920,23 +4920,23 @@ span.SpellE
 	font-family:Symbol;}
 @list l21:level2
 	{mso-level-number-format:bullet;
-	mso-level-text:o;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:82.1pt;
 	text-indent:-18.0pt;
-	font-family:"Courier New";}
+	font-family:Symbol;}
 @list l21:level3
 	{mso-level-number-format:bullet;
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:118.1pt;
 	text-indent:-18.0pt;
-	font-family:Wingdings;}
+	font-family:Symbol;}
 @list l21:level4
 	{mso-level-number-format:bullet;
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:154.1pt;
@@ -4944,23 +4944,23 @@ span.SpellE
 	font-family:Symbol;}
 @list l21:level5
 	{mso-level-number-format:bullet;
-	mso-level-text:o;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:190.1pt;
 	text-indent:-18.0pt;
-	font-family:"Courier New";}
+	font-family:Symbol;}
 @list l21:level6
 	{mso-level-number-format:bullet;
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:226.1pt;
 	text-indent:-18.0pt;
-	font-family:Wingdings;}
+	font-family:Symbol;}
 @list l21:level7
 	{mso-level-number-format:bullet;
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:262.1pt;
@@ -4968,20 +4968,20 @@ span.SpellE
 	font-family:Symbol;}
 @list l21:level8
 	{mso-level-number-format:bullet;
-	mso-level-text:o;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:298.1pt;
 	text-indent:-18.0pt;
-	font-family:"Courier New";}
+	font-family:Symbol;}
 @list l21:level9
 	{mso-level-number-format:bullet;
-	mso-level-text:;
+	mso-level-text:;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:334.1pt;
 	text-indent:-18.0pt;
-	font-family:Wingdings;}
+	font-family:Symbol;}
 @list l20:level1 lfo31
 	{mso-level-start-at:10;}
 

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -1061,23 +1061,22 @@
 							<fo:flow flow-name="xsl-region-body">
 								<!-- debugpage=<xsl:copy-of select="."/> -->
 
-								<xsl:if test="position() = 1">
-
+								<!-- <xsl:if test="position() = 1">
+									
 									<xsl:choose>
 										<xsl:when test="$current_template = 'draft'">
 											<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
-
+											
 												<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
 													<xsl:attribute name="font-size">24pt</xsl:attribute>
 												</xsl:if>
-
+												
 												<xsl:copy-of select="$title_prefix"/>
 												<xsl:copy-of select="$title"/>
-
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
+												
 											</fo:block>
 										</xsl:when>
-
+										
 										<xsl:when test="$current_template = 'standard'">
 											<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
 												<fo:block font-weight="bold" space-before="13mm">
@@ -1085,30 +1084,21 @@
 												</fo:block>
 											</fo:block>
 										</xsl:when>
+										
+										<xsl:otherwise>  --><!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
 
-										<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
-
-											<xsl:attribute name="font-family">Calibri Light</xsl:attribute>
+											<!-- <xsl:attribute name="font-family">Calibri Light</xsl:attribute>
 											<xsl:attribute name="font-size">12pt</xsl:attribute>
-
+											
 											<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
 												<xsl:copy-of select="$title"/>
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
 											</fo:block>
 											<xsl:call-template name="addBlueBox"/>
-											<!-- <fo:block font-size="1" margin-top="3mm">
-												<fo:instream-foreign-object content-width="57mm" content-height="3mm" scaling="non-uniform" fox:alt-text="Image Box">
-													<xsl:call-template name="insertImageBoxSVG">
-														<xsl:with-param name="color"><xsl:value-of select="$color_blue"/></xsl:with-param>
-													</xsl:call-template>
-												</fo:instream-foreign-object>
-											</fo:block>
-											<fo:block margin-top="12pt" margin-bottom="12pt">&#xa0;</fo:block> -->
-											<fo:block margin-bottom="12pt"> </fo:block>
+											<fo:block margin-bottom="12pt">&#xa0;</fo:block>
 										</xsl:otherwise>
 									</xsl:choose>
-
-								</xsl:if>
+									
+								</xsl:if> -->
 
 								<xsl:apply-templates select="*" mode="page"/>
 								<xsl:if test="position() = last()"><fo:block id="lastBlockMain"/></xsl:if>
@@ -1736,6 +1726,32 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="ieee:p[@class = 'zzSTDTitle1']" priority="4">
+		<xsl:choose>
+			<xsl:when test="$current_template = 'draft'">
+				<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
+					<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
+						<xsl:attribute name="font-size">24pt</xsl:attribute>
+					</xsl:if>
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:when test="$current_template = 'standard'">
+				<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+
+				<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
+					<xsl:apply-templates/>
+				</fo:block>
+				<xsl:call-template name="addBlueBox"/>
+				<fo:block margin-bottom="12pt"> </fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -4056,11 +4072,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -6668,21 +6699,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -7747,6 +7778,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -9797,8 +9831,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -9831,25 +9869,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -13544,7 +13602,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>