metanorma-ieee 1.5.7 → 1.6.0

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -457,7 +457,7 @@
 							<xsl:with-param name="format" select="'ddMMyyyy'"/>
 						</xsl:call-template>
 					</xsl:variable> -->
-					<xsl:variable name="approved_date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'ieee-sasb-approved' and @format = 'ddMMMyyyy'])"/>
+					<xsl:variable name="approved_date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'ieee-sasb-approved' and (@format = 'ddMMMyyyy' or @format = 'text')])"/>
 
 					<!-- Example: Revision of IEEE Std 802.1X™-2010
 						Incorporating IEEE Std 802.1Xbx™-2014
@@ -640,7 +640,7 @@
 
 									<fo:block-container margin-left="47mm" margin-top="10mm"> <!-- margin-top="27mm" -->
 
-										<fo:block-container margin-left="0mm">
+										<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 
 											<xsl:apply-templates select="/*/mn:preface/mn:clause[@type = 'toc']">
 												<xsl:with-param name="num" select="$num"/>
@@ -2291,12 +2291,9 @@
 	<!-- <xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3"> -->
 	<xsl:template match="mn:fmt-title[../@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
 		<fo:block>
-			<xsl:attribute name="space-before">
-				<xsl:call-template name="getTitleMarginTop"/>
-			</xsl:attribute>
-			<xsl:attribute name="margin-bottom">
-				<xsl:call-template name="getTitleMarginBottom"/>
-			</xsl:attribute>
+			<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles></xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'space-before' or local-name() = 'margin-bottom']"/>
+
 			<xsl:call-template name="title"/>
 			<xsl:apply-templates select="following-sibling::*[1][self::mn:p]">
 				<xsl:with-param name="inline-header">true</xsl:with-param>
@@ -2345,90 +2342,8 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<xsl:template name="getTitleMarginBottom">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-				<xsl:choose>
-					<xsl:when test="ancestor::mn:abstract">6pt</xsl:when>
-					<xsl:otherwise>12pt</xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:choose>
-					<xsl:when test="$level = 1 and (ancestor::mn:preface or ancestor::mn:introduction or ancestor::mn:acknowledgements)">12pt</xsl:when>
-					<xsl:when test="$level = 1 and not(following-sibling::*[1][self::mn:clause])">12pt</xsl:when>
-					<xsl:when test="$level = 1">24pt</xsl:when>
-					<xsl:otherwise>12pt</xsl:otherwise>
-				</xsl:choose>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template match="mn:fmt-title" priority="2" name="title">
 
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-
-		<xsl:variable name="font-family">
-			<xsl:choose>
-				<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">Arial Black</xsl:when>
-				<xsl:otherwise>Arial</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:abstract">13pt</xsl:when>
-						<xsl:when test="$level = 1">20pt</xsl:when>
-						<xsl:when test="$level = 2">16pt</xsl:when>
-						<xsl:when test="$level = 3">13pt</xsl:when>
-						<xsl:otherwise>11pt</xsl:otherwise> <!-- 4th, ... levels -->
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:choose>
-						<xsl:when test="@type = 'section-title'">12pt</xsl:when>
-						<xsl:when test="$level = 1 and ancestor::mn:acknowledgements">11pt</xsl:when>
-						<xsl:when test="$level = 1">12pt</xsl:when>
-						<xsl:when test="$level = 2">11pt</xsl:when>
-						<xsl:otherwise>10pt</xsl:otherwise> <!-- 3rd, 4th, ... levels -->
-					</xsl:choose>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="font-weight">
-			<xsl:choose>
-				<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">normal</xsl:when>
-				<xsl:otherwise>
-					<xsl:choose>
-						<!-- <xsl:when test="@ancestor = 'annex' and $level = 1">normal</xsl:when> -->
-						<xsl:when test="ancestor::mn:annex and $level = 1">normal</xsl:when>
-						<xsl:otherwise>bold</xsl:otherwise>
-					</xsl:choose>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="margin-top">
-			<xsl:call-template name="getTitleMarginTop"/>
-		</xsl:variable>
-
-		<xsl:variable name="margin-bottom">
-			<xsl:call-template name="getTitleMarginBottom"/>
-		</xsl:variable>
-			<!-- <xsl:choose>
-				<xsl:when test="$level = 1">12pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable> -->
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -2436,26 +2351,7 @@
 			</xsl:choose>
 		</xsl:variable>
 
-		<xsl:variable name="attributes_">
-			<attributes>
-				<xsl:attribute name="font-family"><xsl:value-of select="$font-family"/></xsl:attribute>
-				<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-				<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
-				<xsl:attribute name="space-before"><xsl:value-of select="$margin-top"/></xsl:attribute>
-				<!-- <xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute> -->
-				<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute></xsl:if>
-				<xsl:attribute name="margin-bottom"><xsl:value-of select="$margin-bottom"/></xsl:attribute>
-				<xsl:attribute name="keep-with-next">always</xsl:attribute>
-				<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-
-				<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
-
-				<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
-					<xsl:copy-of select="@id"/>
-				</xsl:if>
-			</attributes>
-		</xsl:variable>
-		<xsl:variable name="attributes" select="xalan:nodeset($attributes_)"/>
+		<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template></styles></xsl:variable>
 
 		<xsl:variable name="section">
 			<xsl:call-template name="extractSection"/>
@@ -2463,26 +2359,15 @@
 
 		<xsl:choose>
 			<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
-
-				<xsl:variable name="provisional-distance-between-starts">
-					<xsl:choose>
-						<xsl:when test="$level = 1 and string-length($section) = 2">8.5mm</xsl:when>
-						<xsl:when test="$level = 1 and string-length($section) = 3">13mm</xsl:when>
-						<xsl:when test="$level &gt;= 2">17.8mm</xsl:when>
-						<xsl:otherwise>10mm</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-				<fo:list-block provisional-distance-between-starts="{$provisional-distance-between-starts}">
-
-					<xsl:copy-of select="$attributes/attributes/@*"/>
-
-					<xsl:if test="$level = 1">
-						<xsl:attribute name="line-height">20pt</xsl:attribute>
-					</xsl:if>
+				<fo:list-block>
+					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
 							<fo:block id="__internal_layout__toc_section_{generate-id()}">
+								<xsl:variable name="level">
+									<xsl:call-template name="getLevel"/>
+								</xsl:variable>
 								<xsl:if test="$level = 1">
 									<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 								</xsl:if>
@@ -2510,8 +2395,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:element name="{$element-name}">
-
-					<xsl:copy-of select="$attributes/attributes/@*"/>
+					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
 					<!-- if first and last childs are `add` ace-tag, then move start ace-tag before title -->
 					<xsl:if test="mn:tab[1]/following-sibling::node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
@@ -2658,50 +2542,15 @@
 					<!-- 	<xsl:otherwise>fo:block</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable> -->
-				<xsl:element name="{$element-name}">
-					<xsl:call-template name="setBlockAttributes">
-						<xsl:with-param name="text_align_default">justify</xsl:with-param>
-					</xsl:call-template>
-
-					<xsl:attribute name="margin-bottom">6pt</xsl:attribute><!-- 8pt -->
-					<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and (ancestor::mn:sections or ancestor::mn:annex)">
-						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="../following-sibling::*[1][self::mn:note or self::mn:termnote or self::mn:ul or self::mn:ol] or following-sibling::*[1][self::mn:ul or self::mn:ol]">
-						<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="parent::mn:li">
-						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-						<xsl:if test="ancestor::mn:feedback-statement">
-							<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-						</xsl:if>
-					</xsl:if>
-					<xsl:if test="parent::mn:li and (ancestor::mn:note or ancestor::mn:termnote)">
-						<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="(following-sibling::*[1][self::mn:clause or self::mn:terms or self::mn:references])">
-						<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="@id">
-						<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-					</xsl:if>
-					<xsl:attribute name="line-height">1.2</xsl:attribute>
-					<!-- bookmarks only in paragraph -->
-					<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
-						<xsl:attribute name="font-size">0</xsl:attribute>
-						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-						<xsl:attribute name="line-height">0</xsl:attribute>
-					</xsl:if>
 
-					<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and not(parent::mn:li)">
-						<xsl:attribute name="line-height"><xsl:value-of select="$line-height"/></xsl:attribute>
-						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					</xsl:if>
+				<xsl:variable name="p_styles">
+					<styles xsl:use-attribute-sets="p-style">
+						<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
+					</styles>
+				</xsl:variable>
 
-					<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and parent::mn:li">
-						<xsl:attribute name="line-height">inherit</xsl:attribute>
-						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-					</xsl:if>
+				<xsl:element name="{$element-name}">
+					<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
 					<xsl:apply-templates>
 						<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -5985,6 +5834,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -6008,7 +5861,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -6030,7 +5888,16 @@
 						</fo:block>
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
 
 					</fo:block-container>
 				</fo:block-container>
@@ -11852,6 +11719,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -11864,6 +11735,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
+
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
 
@@ -11884,7 +11759,16 @@
 			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
-			<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
 
 		</fo:block-container>
 	</xsl:template>
@@ -14063,7 +13947,6 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_references-non-normative-title-style">
-
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -16144,7 +16027,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -16164,6 +16047,156 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute><!-- 8pt -->
+		<xsl:attribute name="line-height">1.2</xsl:attribute>
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setBlockAttributes">
+			<xsl:with-param name="text_align_default">justify</xsl:with-param>
+		</xsl:call-template>
+
+		<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and (ancestor::mn:sections or ancestor::mn:annex)">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="../following-sibling::*[1][self::mn:note or self::mn:termnote or self::mn:ul or self::mn:ol] or following-sibling::*[1][self::mn:ul or self::mn:ol]">
+			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="parent::mn:li">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:feedback-statement">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+		<xsl:if test="parent::mn:li and (ancestor::mn:note or ancestor::mn:termnote)">
+			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="(following-sibling::*[1][self::mn:clause or self::mn:terms or self::mn:references])">
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+		</xsl:if>
+		<xsl:copy-of select="@id"/>
+
+		<!-- bookmarks only in paragraph -->
+		<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
+			<xsl:attribute name="font-size">0</xsl:attribute>
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			<xsl:attribute name="line-height">0</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and not(parent::mn:li)">
+			<xsl:attribute name="line-height"><xsl:value-of select="$line-height"/></xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and parent::mn:li">
+			<xsl:attribute name="line-height">inherit</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'ieee' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-family">Arial</xsl:attribute>
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:variable name="space_before">
+			<xsl:call-template name="getTitleMarginTop"/>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
+				<xsl:attribute name="font-family">Arial Black</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+				<xsl:if test="ancestor::mn:abstract">
+					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+				</xsl:if>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+				<xsl:variable name="section">
+					<xsl:call-template name="extractSection"/>
+				</xsl:variable>
+				<xsl:if test="string-length($section) != 0 and $element-name = 'fo:block'">
+					<xsl:attribute name="provisional-distance-between-starts">
+						<xsl:choose>
+							<xsl:when test="$level = 1 and string-length($section) = 2">8.5mm</xsl:when>
+							<xsl:when test="$level = 1 and string-length($section) = 3">13mm</xsl:when>
+							<xsl:when test="$level &gt;= 2">17.8mm</xsl:when>
+							<xsl:otherwise>10mm</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:if test="$level = 1">
+						<xsl:attribute name="font-size">20pt</xsl:attribute>
+						<xsl:attribute name="line-height">20pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$level = 2">
+						<xsl:attribute name="font-size">16pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$level = 3">
+						<xsl:attribute name="font-size">13pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$level &gt;= 4">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="ancestor::mn:abstract">
+						<xsl:attribute name="font-size">13pt</xsl:attribute>
+					</xsl:if>
+				</xsl:if>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="$level = 1">
+					<xsl:if test="ancestor::mn:acknowledgements">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="ancestor::mn:annex">
+						<xsl:attribute name="font-weight">normal</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="not(following-sibling::*[1][self::mn:clause])">
+						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="ancestor::mn:preface or ancestor::mn:introduction or ancestor::mn:acknowledgements">
+						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+					</xsl:if>
+				</xsl:if>
+				<xsl:if test="$level &gt;= 2">
+					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="$level = 2">
+					<xsl:attribute name="font-size">11pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="$level &gt;= 3">
+					<xsl:attribute name="font-size">10pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="@type = 'section-title'">
+					<xsl:attribute name="font-size">12pt</xsl:attribute>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+
+		<xsl:attribute name="space-before"><xsl:value-of select="$space_before"/></xsl:attribute>
+		<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$space_before"/></xsl:attribute></xsl:if>
+
+		<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
+			<xsl:copy-of select="@id"/>
+		</xsl:if>
+		<!-- $namespace = 'ieee' -->
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+	</xsl:template> <!-- refine_title-style -->
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -16502,6 +16535,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -17521,8 +17560,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -17530,9 +17570,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -17540,8 +17584,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">

data/lib/isodoc/ieee/presentation_bibdata.rb

@@ -7,6 +7,11 @@ module IsoDoc
       end
 
       def bibdata_dates(bib)
+        bibdata_date_format(bib)
+        bibdata_date_defaults(bib)
+      end
+
+      def bibdata_date_format(bib)
         bib.xpath(ns("./date")).each do |d|
           d.next = d.dup
           d.next["format"] = "ddMMMyyyy"
@@ -16,6 +21,18 @@ module IsoDoc
         end
       end
 
+      def bibdata_date_defaults(bib)
+        bib.at(ns("./date[@type = 'ieee-sasb-approved']")) and return
+        ins = bib.at(ns("./docnumber")) ||
+          bib.at(ns("./docidentifier[last()]")) ||
+          bib.at(ns("./title[last()]")) or return
+        ins.next = <<~XML
+          <date type="ieee-sasb-approved" format="text">
+             <on>&lt;Date Approved&gt;</on>
+          </date>
+        XML
+      end
+
       def ddMMMyyyy(isodate)
         isodate.nil? and return nil
         arr = isodate.split("-")

data/lib/isodoc/ieee/presentation_bibitem.rb

@@ -29,7 +29,7 @@ module IsoDoc
 
       def author_date(xml, renderings)
         author_date?(xml) or return
-        cit = renderings[xml["id"]][:citation]
+        cit = renderings[xml["id"]][:citation][:author_date]
         xml << "<docidentifier type='metanorma'>#{cit}</docidentifier>"
         xml.at(ns("./biblio-tag"))&.remove
         xml << "<biblio-tag>#{cit}, </biblio-tag>"
@@ -53,7 +53,7 @@ module IsoDoc
                template: "{{ creatornames }}",
                extenttemplate: { (bib["type"] || "misc").to_sym => "{{page}}" },
                sizetemplate: { (bib["type"] || "misc").to_sym => "{{data}}" })
-          .render1(RelatonBib::XMLParser.from_xml(bib.to_xml))
+          .render1(RelatonBib::XMLParser.from_xml(bib.to_xml), false)
       end
 
       def bibliography_bibitem_number1(bibitem, idx, normative)

data/lib/isodoc/ieee/presentation_ref.rb

@@ -17,24 +17,16 @@ module IsoDoc
 
       # Style manual 19
       def anchor_linkend(node, linkend)
-        if node["citeas"] && i = @bibanchors[node["bibitemid"]]
-          biblio_anchor_linkend(node, i, linkend)
-        elsif node["citeas"] && (i = @normrefanchors[node["bibitemid"]])
-          cit = normref_anchor_linkend(node, i)
-          cit || super
-        else super
+        if node["citeas"] && bib = @bibanchors[node["bibitemid"]]
+          biblio_anchor_linkend(node, bib, linkend)
+        else
+        node["citeas"] && (bib = @normrefanchors[node["bibitemid"]]) &&
+          !%w(standard).include?(bib[:type]) and
+          node["style"] ||= "author_date"
+        super
         end
       end
 
-      # force Author-Date referencing on non-standards in norm ref
-      def normref_anchor_linkend(node, bib)
-        @ref_renderings or return nil
-        %w(standard).include?(bib[:type]) and return nil
-        cit = @ref_renderings[node["bibitemid"]][:citation]&.strip
-        cit.empty? and cit = nil
-        cit
-      end
-
       def biblio_anchor_linkend(node, bib, linkend)
         if %w(standard).include?(bib[:type])
           biblio_anchor_linkend_std(node, bib, linkend)

data/lib/isodoc/ieee/presentation_terms.rb

@@ -191,6 +191,11 @@ module IsoDoc
 
       def term(docxml); end
 
+      #def term1(elem)
+        #super
+        #elem.at(ns("./fmt-name"))&.remove # keep fmt-xref-label
+      #end
+
       def license_termnote(elem, idx)
         elem.name = "fn"
         elem["reference"] = "_termnote_license_#{idx}"

data/lib/metanorma/ieee/converter.rb

@@ -106,3 +106,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"