metanorma-ieee 1.0.15 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7baf9a088e45aeb06617388b08b5c2c6bb679e29b5e85254e9cbd8c1d487695
-  data.tar.gz: 38325ee923392c68bb35266dca81e66cb7a7ce8f46afa65c6039a688ce52f649
+  metadata.gz: 6d2fbf6c197a2071d6e49bae6e0b6823b05beb5115c7d01b6e58a1c02c2ce07a
+  data.tar.gz: 4d350e96e0519df1173631de9360794fe339a13a6045467fa7438748d624e1c2
 SHA512:
-  metadata.gz: 5669cb1f37a355962a317b5b9acb2d71b062a62ebd80b23a16b8ce580a70dd2c47c1310a6c36463d5ab4595222a0c5252db3e2faa98de640b5017fa44ccb2615
-  data.tar.gz: 589cf7c597e4dc249e4e2afeac1d5a9f41ba44588edb1af092fe5f6705655c005c7b78a5e5c705e1e0d92f502f4e032f41c14de307131d046d41d45b4aa99447
+  metadata.gz: b38d012b072d19846919c862a536a4c4e64449bb4c86d84d2f0c606a50425ab591690788cca61079cab673c64addc81605dfd5f704938833abf5206574f9711e
+  data.tar.gz: a0e2cd0841ab556a314b488bf2a85d52fa2738d5cac35ae13368640e2fd4702622cc211f2980080b6af4882a1ac76720fb1e424d8d913f9af58157419dfbb7fd

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>
@@ -7747,6 +7763,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 -->
 	<!-- ========================= -->
@@ -9831,25 +9850,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'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
+
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_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:value-of select="$width_effective"/>
+											<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>
+											<xsl:variable name="image_width_effective">
 
-									<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:value-of select="$width_effective"/>
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+											</xsl:variable>
 
-									</xsl:if>
+											<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 +13583,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"/>

data/lib/isodoc/ieee/ieee.standard.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>
@@ -7747,6 +7763,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 -->
 	<!-- ========================= -->
@@ -9831,25 +9850,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'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
+
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_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:value-of select="$width_effective"/>
+											<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>
+											<xsl:variable name="image_width_effective">
 
-									<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:value-of select="$width_effective"/>
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+											</xsl:variable>
 
-									</xsl:if>
+											<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 +13583,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"/>

data/lib/isodoc/ieee/presentation_bibdata.rb

@@ -0,0 +1,100 @@
+module IsoDoc
+  module IEEE
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def bibdata_i18n(bib)
+        super
+        bibdata_dates(bib)
+      end
+
+      def bibdata_dates(bib)
+        bib.xpath(ns("./date")).each do |d|
+          d.next = d.dup
+          d.next["format"] = "ddMMMyyyy"
+          d.next.xpath(ns("./from | ./to | ./on")).each do |x|
+            x.children = ddMMMyyyy(x.text)
+          end
+        end
+      end
+
+      def ddMMMyyyy(isodate)
+        return nil if isodate.nil?
+
+        arr = isodate.split("-")
+        if arr.size == 1 && (/^\d+$/.match isodate)
+          Date.new(*arr.map(&:to_i)).strftime("%Y")
+        elsif arr.size == 2
+          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
+        else
+          Date.parse(isodate).strftime("%d %b %Y")
+        end
+      end
+
+      def boilerplate(docxml)
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
+                        "clause/title")).each(&:remove)
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
+          .each do |clause|
+          participants(clause)
+        end
+      end
+
+      def participants(clause)
+        clause.xpath(ns(".//ul")).each_with_index do |ulist, idx|
+          ulist.xpath(ns("./li")).each { |list| participants1(list, idx) }
+          ulist.replace(ulist.children)
+        end
+        affiliation_header(clause)
+      end
+
+      def affiliation_header(clause)
+        clause.xpath(ns(".//p[@type = 'officeorgrepmember']")).each do |p|
+          prev = p.previous_element
+          prev && prev.name == "p" &&
+            prev["type"] == "officeorgrepmember" and next
+          p.previous = <<~HDR
+            <p type='officeorgrepmemberhdr'><em>Organization
+            Represented</em><tab/><em>Name of Representative</em></p>
+          HDR
+        end
+      end
+
+      def participants1(list, idx)
+        key = ""
+        map = list.xpath(ns(".//dt | .//dd")).each_with_object({}) do |dtd, m|
+          (dtd.name == "dt" and key = dtd.text) or
+            m[key] = @c.encode(dtd.text.strip, :hexadecimal)
+        end
+        list.replace(participant_para(map, idx))
+      end
+
+      def participant_para(map, idx)
+        name = participant_name(map)
+        if map["role"]&.casecmp("member")&.zero?
+          participant_member_para(map, name, idx)
+        else
+          participant_officeholder_para(map, name, idx)
+        end
+      end
+
+      def participant_member_para(map, name, _idx)
+        if map["company"] && (map["name"] || map["surname"])
+          pers = map["name"] || "#{map['given']} #{map['surname']}"
+          "<p type='officeorgrepmember'>#{name}<tab/>#{pers}</p>"
+        elsif map["company"] then "<p type='officeorgmember'>#{name}</p>"
+        else "<p type='officemember'>#{name}</p>"
+        end
+      end
+
+      def participant_officeholder_para(map, name, idx)
+        name = "<strong>#{name}</strong>" if idx.zero?
+        br = map["role"].size > 30 ? "<br/>" : ""
+        "<p type='officeholder' align='center'>#{name}, #{br}" \
+          "<em>#{map['role']}</em></p>"
+      end
+
+      def participant_name(map)
+        map["company"] || map["name"] || "#{map['given']} #{map['surname']}"
+      end
+    end
+  end
+end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "init"
+require_relative "presentation_bibdata"
 require_relative "presentation_terms"
 require_relative "presentation_ref"
 require "isodoc"
@@ -25,7 +26,6 @@ module IsoDoc
 
       def prefix_clause(target, loc)
         loc["type"] == "clause" or return loc["type"]
-
         if subclause?(target, loc["type"],
                       loc&.at(ns("./referenceFrom"))&.text)
           ""
@@ -101,34 +101,6 @@ module IsoDoc
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
-      def bibdata_i18n(bib)
-        super
-        bibdata_dates(bib)
-      end
-
-      def bibdata_dates(bib)
-        bib.xpath(ns("./date")).each do |d|
-          d.next = d.dup
-          d.next["format"] = "ddMMMyyyy"
-          d.next.xpath(ns("./from | ./to | ./on")).each do |x|
-            x.children = ddMMMyyyy(x.text)
-          end
-        end
-      end
-
-      def ddMMMyyyy(isodate)
-        return nil if isodate.nil?
-
-        arr = isodate.split("-")
-        if arr.size == 1 && (/^\d+$/.match isodate)
-          Date.new(*arr.map(&:to_i)).strftime("%Y")
-        elsif arr.size == 2
-          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
-        else
-          Date.parse(isodate).strftime("%d %b %Y")
-        end
-      end
-
       def amend1(elem)
         elem.xpath(ns("./description/p")).each do |p|
           p.children = to_xml(p.children).strip
@@ -151,73 +123,6 @@ module IsoDoc
         super
       end
 
-      def boilerplate(docxml)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
-                        "clause/title")).each(&:remove)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
-          .each do |clause|
-          participants(clause)
-        end
-      end
-
-      def participants(clause)
-        clause.xpath(ns(".//ul")).each_with_index do |ulist, idx|
-          ulist.xpath(ns("./li")).each { |list| participants1(list, idx) }
-          ulist.replace(ulist.children)
-        end
-        affiliation_header(clause)
-      end
-
-      def affiliation_header(clause)
-        clause.xpath(ns(".//p[@type = 'officeorgrepmember']")).each do |p|
-          prev = p.previous_element
-          prev && prev.name == "p" &&
-            prev["type"] == "officeorgrepmember" and next
-          p.previous = <<~HDR
-            <p type='officeorgrepmemberhdr'><em>Organization
-            Represented</em><tab/><em>Name of Representative</em></p>
-          HDR
-        end
-      end
-
-      def participants1(list, idx)
-        key = ""
-        map = list.xpath(ns(".//dt | .//dd")).each_with_object({}) do |dtd, m|
-          (dtd.name == "dt" and key = dtd.text) or
-            m[key] = @c.encode(dtd.text.strip, :hexadecimal)
-        end
-        list.replace(participant_para(map, idx))
-      end
-
-      def participant_para(map, idx)
-        name = participant_name(map)
-        if map["role"]&.casecmp("member")&.zero?
-          participant_member_para(map, name, idx)
-        else
-          participant_officeholder_para(map, name, idx)
-        end
-      end
-
-      def participant_member_para(map, name, _idx)
-        if map["company"] && (map["name"] || map["surname"])
-          pers = map["name"] || "#{map['given']} #{map['surname']}"
-          "<p type='officeorgrepmember'>#{name}<tab/>#{pers}</p>"
-        elsif map["company"] then "<p type='officeorgmember'>#{name}</p>"
-        else "<p type='officemember'>#{name}</p>"
-        end
-      end
-
-      def participant_officeholder_para(map, name, idx)
-        name = "<strong>#{name}</strong>" if idx.zero?
-        br = map["role"].size > 30 ? "<br/>" : ""
-        "<p type='officeholder' align='center'>#{name}, #{br}" \
-          "<em>#{map['role']}</em></p>"
-      end
-
-      def participant_name(map)
-        map["company"] || map["name"] || "#{map['given']} #{map['surname']}"
-      end
-
       def asciimath_dup(node)
         @suppressasciimathdup and return
         super
@@ -243,9 +148,15 @@ module IsoDoc
       end
 
       def ol_numbering(docxml)
-        docxml.xpath(ns("//clause | //annex | //foreword | //acknowledgements | //introduction | //preface/abstract | //appendix | //terms | //term | //definitions | //references | //colophon")).each do |_c|
-          (docxml.xpath(ns(".//ol")) -
-          docxml.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | ./terms//ol | ./definitions//ol | /references//ol | ./colophon//ol"))).each_with_index do |o, i|
+        p = "//clause | //annex | //foreword | //acknowledgements | " \
+            "//introduction | //preface/abstract | //appendix | //terms | " \
+            "//term | //definitions | //references | //colophon"
+        docxml.xpath(ns(p)).each do |c|
+          (c.xpath(ns(".//ol")) -
+          c.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | " \
+                     "./terms//ol | ./definitions//ol | " \
+                     "/references//ol | ./colophon//ol")))
+            .each_with_index do |o, i|
             ol_numbering1(o, i)
           end
         end
@@ -266,6 +177,17 @@ module IsoDoc
         type
       end
 
+      def middle_title(docxml)
+        s = docxml.at(ns("//sections")) or return
+        ret = "<p class='zzSTDTitle1'>#{@meta.get[:full_doctitle]}"
+        @meta.get[:amd] || @meta.get[:corr] and ret += "<br/>"
+        @meta.get[:amd] and ret += "Amendment #{@meta.get[:amd]}"
+        @meta.get[:amd] && @meta.get[:corr] and ret += " "
+        @meta.get[:corr] and ret += "Corrigenda #{@meta.get[:corr]}"
+        ret += "</p>"
+        s.children.first.previous = ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/ieee/word_convert.rb

@@ -50,32 +50,34 @@ module IsoDoc
       def abstract(clause, out)
         page_break(out)
         out.div **attr_code(id: clause["id"], class: "abstract") do |s|
-          clause_name(clause, clause.at(ns("./title")), s, { class: "AbstractTitle" })
+          clause_name(clause, clause.at(ns("./title")), s,
+                      { class: "AbstractTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder][not(@class = 'zzSTDTitle1')] | " \
+        "//annex[@displayorder] | " \
+        "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
+        "//indexsect[@displayorder]".freeze
+
       def make_body3(body, docxml)
-        body.div class: "WordSectionMiddleTitle" do |_div3|
-          middle_title_ieee(docxml, body)
+        body.div class: "WordSectionMiddleTitle" do |div3|
+          middle_title_ieee(docxml, div3)
         end
         section_break(body, continuous: true)
         body.div class: "WordSectionMain" do |div3|
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
-      def middle_title(isoxml, out); end
-
-      def middle_title_ieee(_docxml, out)
+      def middle_title_ieee(docxml, out)
+        title = docxml.at(ns("//p[@class = 'zzSTDTitle1']")) or return
         out.p(class: "IEEEStdsTitle", style: "margin-top:70.0pt") do |p|
-          p << @meta.get[:full_doctitle]
-          @meta.get[:amd] || @meta.get[:corr] and p << "<br/>"
-          @meta.get[:amd] and p << "Amendment #{@meta.get[:amd]}"
-          @meta.get[:amd] && @meta.get[:corr] and p << " "
-          @meta.get[:corr] and p << "Corrigenda #{@meta.get[:corr]}"
+          title.children.each { |n| parse(n, p) }
         end
       end
 
@@ -137,7 +139,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering

data/lib/metanorma/ieee/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.0.15".freeze
+    VERSION = "1.1.0".freeze
   end
 end

data/metanorma-ieee.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
   spec.add_dependency "mnconvert", "~> 1.20"
   #spec.add_dependency "pubid-ieee", "~> 0.1.1"
   #spec.add_dependency "pubid-iso", "~> 0.5.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
 - lib/isodoc/ieee/init.rb
 - lib/isodoc/ieee/metadata.rb
 - lib/isodoc/ieee/pdf_convert.rb
+- lib/isodoc/ieee/presentation_bibdata.rb
 - lib/isodoc/ieee/presentation_ref.rb
 - lib/isodoc/ieee/presentation_terms.rb
 - lib/isodoc/ieee/presentation_xml_convert.rb