metanorma-iso 3.1.0 → 3.1.1

data/lib/isodoc/iso/iso.amendment.xsl

@@ -257,16 +257,11 @@
 		</xsl:choose>
 	</xsl:variable>
 
-	<xsl:variable name="document-master-reference">
-		<xsl:choose>
-			<xsl:when test="$stage-abbreviation != ''">-publishedISO</xsl:when>
-			<xsl:otherwise/>
-		</xsl:choose>
-	</xsl:variable>
+	<xsl:variable name="document-master-reference_addon"><xsl:if test="$stage-abbreviation = ''">-nonpublished</xsl:if></xsl:variable>
 
 	<xsl:variable name="force-page-count-preface">
 		<xsl:choose>
-			<xsl:when test="$document-master-reference != ''">end-on-even</xsl:when>
+			<xsl:when test="$document-master-reference_addon = ''">end-on-even</xsl:when>
 			<xsl:otherwise>no-force</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -443,7 +438,7 @@
 			<xsl:variable name="marginTopBottom_cover_page_2024">9.9</xsl:variable>
 
 			<!-- cover page -->
-			<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="cover-page-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="31.7mm" margin-right="31.7mm"/>
 				<fo:region-before region-name="cover-page-header" extent="25.4mm"/>
 				<fo:region-after/>
@@ -459,24 +454,24 @@
 				<fo:region-end region-name="cover-right-region" extent="18.5mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="cover-page-publishedISO-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="cover-page-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="12.7mm" margin-bottom="75mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
 				<fo:region-before region-name="cover-page-header" extent="12.7mm"/>
 				<fo:region-after region-name="cover-page-footer" extent="75mm" display-align="after"/>
 				<fo:region-start region-name="cover-left-region" extent="{$marginLeftRight1}mm"/>
 				<fo:region-end region-name="cover-right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
-			<fo:simple-page-master master-name="cover-page-publishedISO-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="cover-page-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="12.7mm" margin-bottom="75mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
 				<fo:region-before region-name="cover-page-header" extent="12.7mm"/>
 				<fo:region-after region-name="cover-page-footer" extent="75mm" display-align="after"/>
 				<fo:region-start region-name="cover-left-region" extent="{$marginLeftRight2}mm"/>
 				<fo:region-end region-name="cover-right-region" extent="{$marginLeftRight1}mm"/>
 			</fo:simple-page-master>
-			<fo:page-sequence-master master-name="cover-page-publishedISO">
+			<fo:page-sequence-master master-name="cover-page">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="cover-page-publishedISO-even"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="cover-page-publishedISO-odd"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="cover-page-even"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="cover-page-odd"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
@@ -514,14 +509,14 @@
 
 			<!-- contents pages -->
 			<!-- odd pages -->
-			<fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="odd-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
 				<fo:region-before region-name="header-odd" extent="27.4mm"/> <!--   display-align="center" -->
 				<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
 				<fo:region-start region-name="left-region" extent="19mm"/>
 				<fo:region-end region-name="right-region" extent="19mm"/>
 			</fo:simple-page-master>
-			<fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="odd-nonpublished-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
 				<fo:region-before region-name="header-odd" extent="27.4mm"/>
 				<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
@@ -529,42 +524,42 @@
 				<fo:region-end region-name="right-region" extent="19mm"/>
 			</fo:simple-page-master>
 			<!-- even pages -->
-			<fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="even-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
 				<fo:region-before region-name="header-even" extent="27.4mm"/> <!--   display-align="center" -->
 				<fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
 				<fo:region-start region-name="left-region" extent="19mm"/>
 				<fo:region-end region-name="right-region" extent="19mm"/>
 			</fo:simple-page-master>
-			<fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="even-nonpublished-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
 				<fo:region-before region-name="header-even" extent="27.4mm"/> <!--   display-align="center" -->
 				<fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
 				<fo:region-start region-name="left-region" extent="19mm"/>
 				<fo:region-end region-name="right-region" extent="19mm"/>
 			</fo:simple-page-master>
-			<fo:page-sequence-master master-name="preface">
+			<fo:page-sequence-master master-name="preface-nonpublished">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
-			<fo:page-sequence-master master-name="preface-landscape">
+			<fo:page-sequence-master master-name="preface-nonpublished-landscape">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished-landscape"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
-			<fo:page-sequence-master master-name="document">
+			<fo:page-sequence-master master-name="document-nonpublished">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
-			<fo:page-sequence-master master-name="document-landscape">
+			<fo:page-sequence-master master-name="document-nonpublished-landscape">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished-landscape"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
@@ -599,7 +594,7 @@
 			</fo:page-sequence-master>
 
 			<!-- first page -->
-			<fo:simple-page-master master-name="first-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="firstpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-first" extent="{$marginTop}mm">
 					<xsl:if test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum'))">
@@ -611,7 +606,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 			<!-- odd pages -->
-			<fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-odd" extent="{$marginTop}mm">
 					<xsl:if test="$layoutVersion = '1951'">
@@ -623,7 +618,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="odd-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!--   display-align="center" -->
 				<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
@@ -631,7 +626,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 			<!-- even pages -->
-			<fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-even" extent="{$marginTop}mm">
 					<xsl:if test="$layoutVersion = '1951'">
@@ -644,7 +639,7 @@
 			</fo:simple-page-master>
 
 			<!-- for 1951 layout only -->
-			<fo:simple-page-master master-name="even-last-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="even-last" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-even" extent="{$marginTop}mm" precedence="true"/>
 				<fo:region-after region-name="footer-even-last" extent="{$marginBottom - 2}mm"/>
@@ -652,7 +647,7 @@
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="even-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+			<fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
 				<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
 				<fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
@@ -666,18 +661,18 @@
 				<fo:region-start region-name="left" extent="{$marginLeftRight2}mm"/>
 				<fo:region-end region-name="right" extent="{$marginLeftRight1}mm"/>
 			</fo:simple-page-master>
-			<fo:page-sequence-master master-name="preface-publishedISO">
+			<fo:page-sequence-master master-name="preface">
 				<fo:repeatable-page-master-alternatives>
 					<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
-			<fo:page-sequence-master master-name="preface-publishedISO-landscape">
+			<fo:page-sequence-master master-name="preface-landscape">
 				<fo:repeatable-page-master-alternatives>
 					<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
@@ -692,59 +687,59 @@
 			<fo:page-sequence-master master-name="preface-1987_TR">
 				<fo:repeatable-page-master-alternatives>
 					<fo:conditional-page-master-reference master-reference="first-preface_1987_TR" page-position="first"/>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:page-sequence-master master-name="document-publishedISO_first_sequence">
+			<fo:page-sequence-master master-name="document_first_sequence">
 				<fo:repeatable-page-master-alternatives>
 					<xsl:if test="not($layoutVersion = '1951')">
-						<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+						<fo:conditional-page-master-reference master-reference="firstpage" page-position="first"/>
 					</xsl:if>
 					<xsl:if test="$layoutVersion = '1951'">
-						<fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
+						<fo:conditional-page-master-reference page-position="last" master-reference="even-last"/> <!-- odd-or-even="even" -->
 					</xsl:if>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:page-sequence-master master-name="document-publishedISO">
+			<fo:page-sequence-master master-name="document">
 				<fo:repeatable-page-master-alternatives>
 					<xsl:if test="$layoutVersion = '1951'">
-						<fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
+						<fo:conditional-page-master-reference page-position="last" master-reference="even-last"/> <!-- odd-or-even="even" -->
 					</xsl:if>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:page-sequence-master master-name="document-publishedISO-landscape_first_sequence">
+			<fo:page-sequence-master master-name="document-landscape_first_sequence">
 				<fo:repeatable-page-master-alternatives>
 					<xsl:if test="not($layoutVersion = '1951')">
-						<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
+						<fo:conditional-page-master-reference master-reference="firstpage" page-position="first"/>
 					</xsl:if>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
-			<fo:page-sequence-master master-name="document-publishedISO-landscape">
+			<fo:page-sequence-master master-name="document-landscape">
 				<fo:repeatable-page-master-alternatives>
-					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
-					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
+					<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
 				</fo:repeatable-page-master-alternatives>
 			</fo:page-sequence-master>
 
-			<fo:simple-page-master master-name="last-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
 				<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
-				<fo:region-after region-name="last-page-footer" extent="{$marginBottom - 2}mm"/>
+				<fo:region-after region-name="back-page-footer" extent="{$marginBottom - 2}mm"/>
 				<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
 				<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="last-page_2024" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="back-page_2024" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="{$marginTopBottom_cover_page_2024}mm" margin-bottom="{$marginTopBottom_cover_page_2024}mm" margin-left="{$marginLeftRight_cover_page_2024}mm" margin-right="{$marginLeftRight_cover_page_2024}mm"/>
 				<fo:region-before region-name="header" extent="{$marginTopBottom_cover_page_2024}mm"/>
 				<fo:region-after region-name="footer" extent="{$marginTopBottom_cover_page_2024}mm"/>
@@ -818,7 +813,7 @@
 				<xsl:with-param name="root-style" select="$root-style"/>
 			</xsl:call-template>
 
-			<xsl:if test="$layoutVersion = '2024'">
+			<xsl:if test="$layoutVersion = '2024' and /mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type = 'author']/mn:organization/mn:abbreviation = 'ISO'">
 				<xsl:attribute name="color">rgb(35,31,32)</xsl:attribute>
 			</xsl:if>
 
@@ -886,7 +881,7 @@
 
 				<xsl:choose>
 					<xsl:when test="$layoutVersion = '1951'">
-						<fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="auto" force-page-count="no-force">
+						<fo:page-sequence master-reference="document{$document-master-reference_addon}" initial-page-number="auto" force-page-count="no-force">
 							<fo:static-content flow-name="xsl-footnote-separator">
 								<fo:block>
 									<fo:leader leader-pattern="rule" leader-length="30%"/>
@@ -1069,7 +1064,7 @@
 								<fo:page-sequence format="i" force-page-count="no-force">
 
 									<xsl:attribute name="master-reference">
-										<xsl:value-of select="concat('preface',$document-master-reference)"/>
+										<xsl:value-of select="concat('preface',$document-master-reference_addon)"/>
 										<xsl:call-template name="getPageSequenceOrientation"/>
 									</xsl:attribute>
 
@@ -1218,14 +1213,14 @@
 						<!-- BODY -->
 						<fo:page-sequence force-page-count="no-force">
 
-							<!-- Example: msster-reference document-publishedISO-landscape_first_sequence -->
+							<!-- Example: msster-reference document-landscape_first_sequence -->
 							<xsl:attribute name="master-reference">
-								<xsl:value-of select="concat('document',$document-master-reference)"/>
+								<xsl:value-of select="concat('document',$document-master-reference_addon)"/>
 								<!-- <xsl:variable name="previous_orientation" select="preceding-sibling::page_sequence[@orientation][1]/@orientation"/>
 								<xsl:if test="(@orientation = 'landscape' or $previous_orientation = 'landscape') and not(@orientation = 'portrait')">-<xsl:value-of select="@orientation"/></xsl:if> -->
 								<xsl:call-template name="getPageSequenceOrientation"/>
 								<xsl:if test="position() = 1">
-									<xsl:if test="normalize-space($document-master-reference) != ''">_first_sequence</xsl:if>
+									<xsl:if test="normalize-space($document-master-reference_addon) = ''">_first_sequence</xsl:if>
 								</xsl:if>
 							</xsl:attribute>
 							<xsl:if test="position() = 1">
@@ -2189,7 +2184,7 @@
 				</xsl:when> <!-- END: $layoutVersion = '2024' -->
 
 				<xsl:when test="$stage-abbreviation != ''">
-					<fo:page-sequence master-reference="cover-page-publishedISO" force-page-count="no-force">
+					<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
 						<fo:static-content flow-name="cover-page-footer" font-size="10pt">
 							<xsl:if test="$layoutVersion = '1989'">
 								<xsl:attribute name="font-size">9pt</xsl:attribute>
@@ -2821,7 +2816,7 @@
 					</fo:page-sequence>
 				</xsl:when> <!-- $isPublished = 'true' -->
 				<xsl:otherwise>
-					<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
+					<fo:page-sequence master-reference="cover-page-nonpublished" force-page-count="no-force">
 						<fo:static-content flow-name="cover-page-header" font-size="10pt">
 							<fo:block-container height="24mm" display-align="before">
 								<fo:block padding-top="12.5mm">
@@ -3251,7 +3246,7 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="3">
+	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="3">
 		<xsl:choose>
 			<xsl:when test="$isGenerateTableIF = 'true'"/>
 			<xsl:when test="$toc_level = 0"/>
@@ -3259,16 +3254,9 @@
 			<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
 			<xsl:otherwise>
 
-				<fo:block-container font-weight="bold">
+				<fo:block-container xsl:use-attribute-sets="toc-style">
 
-					<xsl:if test="$layoutVersion = '1987'">
-						<xsl:attribute name="font-size">9pt</xsl:attribute>
-						<xsl:attribute name="font-weight">normal</xsl:attribute>
-					</xsl:if>
-
-					<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)">
-						<xsl:attribute name="margin-top">62mm</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_toc-style"/>
 
 					<!-- render 'Contents' outside if role="TOC" -->
 					<xsl:apply-templates select="mn:fmt-title"/>
@@ -3299,20 +3287,9 @@
 									</xsl:if>
 								</xsl:if>
 
-								<fo:block role="TOCI">
-									<xsl:if test="@level = 1">
-										<xsl:attribute name="margin-top">5pt</xsl:attribute>
-									</xsl:if>
-									<xsl:if test="@level = 3">
-										<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
-									</xsl:if>
+								<fo:block role="TOCI" xsl:use-attribute-sets="toc-item-style">
 
-									<xsl:if test="$layoutVersion = '1987'">
-										<xsl:if test="@type = 'section'">
-											<xsl:attribute name="margin-top">12pt</xsl:attribute>
-										</xsl:if>
-										<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-									</xsl:if>
+									<xsl:call-template name="refine_toc-item-style"/>
 
 									<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mnx:title}"> <!-- link at this level needs for PDF structure tags -->
 
@@ -3385,7 +3362,7 @@
 															<xsl:apply-templates select="mnx:title"/>
 
 															<fo:inline keep-together.within-line="always" role="SKIP">
-																<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+																<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 																<fo:inline role="SKIP">
 																	<xsl:if test="@level = 1 and @type = 'annex'">
 																		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -3409,24 +3386,24 @@
 							</xsl:for-each>
 
 							<!-- List of Tables -->
-							<xsl:if test="$contents//mnx:tables/mnx:table">
-								<xsl:call-template name="insertListOf_Title">
-									<xsl:with-param name="title" select="$title-list-tables"/>
-								</xsl:call-template>
-								<xsl:for-each select="$contents//mnx:tables/mnx:table">
-									<xsl:call-template name="insertListOf_Item"/>
-								</xsl:for-each>
-							</xsl:if>
+							<xsl:for-each select="$contents//mnx:tables/mnx:table">
+								<xsl:if test="position() = 1">
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-tables"/>
+									</xsl:call-template>
+								</xsl:if>
+								<xsl:call-template name="insertListOf_Item"/>
+							</xsl:for-each>
 
 							<!-- List of Figures -->
-							<xsl:if test="$contents//mnx:figures/mnx:figure">
-								<xsl:call-template name="insertListOf_Title">
-									<xsl:with-param name="title" select="$title-list-figures"/>
-								</xsl:call-template>
-								<xsl:for-each select="$contents//mnx:figures/mnx:figure">
-									<xsl:call-template name="insertListOf_Item"/>
-								</xsl:for-each>
-							</xsl:if>
+							<xsl:for-each select="$contents//mnx:figures/mnx:figure">
+								<xsl:if test="position() = 1">
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-figures"/>
+									</xsl:call-template>
+								</xsl:if>
+								<xsl:call-template name="insertListOf_Item"/>
+							</xsl:for-each>
 
 						</xsl:if>
 					</fo:block>
@@ -3436,11 +3413,11 @@
 	</xsl:template>
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
-		<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
+		<fo:block xsl:use-attribute-sets="toc-title-style">
 			<xsl:if test="$layoutVersion = '2024'">
 				<xsl:attribute name="margin-top">0</xsl:attribute>
 			</xsl:if>
-			<fo:inline font-size="16pt" font-weight="bold" role="SKIP">
+			<fo:inline role="SKIP">
 				<xsl:if test="$layoutVersion = '1987'">
 					<xsl:attribute name="font-size">14pt</xsl:attribute>
 				</xsl:if>
@@ -3453,9 +3430,9 @@
 				</xsl:call-template> -->
 				<xsl:apply-templates/>
 			</fo:inline>
-			<fo:inline keep-together.within-line="always" role="SKIP">
+			<fo:inline font-weight="normal" keep-together.within-line="always" role="SKIP">
 				<fo:leader leader-pattern="space"/>
-				<fo:inline font-weight="normal" font-size="10pt" role="SKIP">
+				<fo:inline xsl:use-attribute-sets="toc-title-page-style">
 					<xsl:if test="$layoutVersion = '1987'">
 						<xsl:attribute name="font-size">8pt</xsl:attribute>
 					</xsl:if>
@@ -3488,20 +3465,20 @@
 
 	<xsl:template name="insertListOf_Title">
 		<xsl:param name="title"/>
-		<fo:block role="TOCI" margin-top="5pt" keep-with-next="always">
+		<fo:block xsl:use-attribute-sets="toc-listof-title-style">
 			<xsl:value-of select="$title"/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="insertListOf_Item">
-		<fo:block role="TOCI" font-weight="normal" text-align-last="justify" margin-left="12mm">
+		<fo:block xsl:use-attribute-sets="toc-listof-item-style">
 			<fo:basic-link internal-destination="{@id}">
 				<xsl:call-template name="setAltText">
 					<xsl:with-param name="value" select="@alt-text"/>
 				</xsl:call-template>
 				<xsl:apply-templates select="." mode="contents"/>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 					<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 				</fo:inline>
 			</fo:basic-link>
@@ -5398,9 +5375,9 @@
 	</xsl:template>
 
 	<xsl:template name="insertLastPage">
-		<fo:page-sequence master-reference="last-page" force-page-count="no-force">
+		<fo:page-sequence master-reference="back-page" force-page-count="no-force">
 			<xsl:call-template name="insertHeaderEven"/>
-			<fo:static-content flow-name="last-page-footer" font-size="10pt">
+			<fo:static-content flow-name="back-page-footer" font-size="10pt">
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column column-width="33%"/>
 					<fo:table-column column-width="33%"/>
@@ -5512,7 +5489,7 @@
 	</xsl:template> <!-- END: insertLastPage -->
 
 	<xsl:template name="insertLastPage_2024">
-		<fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
+		<fo:page-sequence master-reference="back-page_2024" force-page-count="no-force">
 			<fo:flow flow-name="xsl-region-body">
 				<xsl:variable name="fo_last_page">
 				<fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
@@ -11162,6 +11139,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -13221,7 +13208,10 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -16034,8 +16024,8 @@
 </xsl:template>
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		<xsl:choose>
 			<xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
 			<xsl:otherwise>
@@ -16073,7 +16063,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -16090,8 +16080,26 @@
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
 		<!-- end bibitem processing -->
+
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -16643,6 +16651,87 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+		<xsl:if test="$layoutVersion = '1987'">
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)">
+			<xsl:attribute name="margin-top">62mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="font-size">16pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-top">10pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-title-page-style">
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="font-size">10pt</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set> <!-- toc-title-page-style -->
+
+	<xsl:attribute-set name="toc-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+		<xsl:if test="@level = 1">
+			<xsl:attribute name="margin-top">5pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@level = 3">
+			<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$layoutVersion = '1987'">
+			<xsl:if test="@type = 'section'">
+				<xsl:attribute name="margin-top">12pt</xsl:attribute>
+			</xsl:if>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- END: refine_toc-item-style -->
+
+	<xsl:attribute-set name="toc-leader-style">
+		<xsl:attribute name="font-size">9pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="leader-pattern">dots</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-leader-style -->
+
+	<xsl:attribute-set name="toc-pagenumber-style">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<xsl:attribute-set name="toc-listof-title-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="margin-top">5pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="margin-left">12mm</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">