metanorma-ogc 2.5.14 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a42aacc8919672ff6672fba3620817651a5e0e7b6d13dbac7d9d51a7a34bc0
-  data.tar.gz: a781bdab6a4550bc6d04f0a3cde51775d6755f680f2d9a22b4dfe65d9e8e5933
+  metadata.gz: a3c9e7230287337f9903c6e2628a5fb7b47ef3c8318e0a404d783564db1776c9
+  data.tar.gz: cb7741ebe5cf3875f498388f88cd52c20bb67ff0801ed9f91384a92ed7e2d445
 SHA512:
-  metadata.gz: e309309936b82e9e266346b7c630f845a9e77269724a31e20e1e29fc5b7ec2aa3a0d906664a67d34398ade90168276d1b66979aad8c46664b39a71a19b0bf868
-  data.tar.gz: 358c573ed7cd006c1fc6a25a1b94ea13b47f43a4ba78fb80f934c12c0dd45bab470e9c55d0c699e6d589a69f104b0944b04c17b85a723603d305f4c36014b814
+  metadata.gz: 4ea130e97e8ad1a5d7500c1f624ef62b89295921e4b112c0ca7e0ad46be1de1cd0e48e5270a2c9e3206d2b710b3396ab4f1a03eee009ce610e4ad004ec483f81
+  data.tar.gz: a3018511b9c1cca08f3c5d6c8ed8c6f500d1aebb839d352bef4724933bdfb74c36e34c1c18f0b6e421865a4cd78c68ab049e4ca3056dd0d010dab0d73c01bfdc

data/Gemfile.devel

@@ -0,0 +1,4 @@
+#gem "metanorma-plugin-glossarist", git: "https://github.com/metanorma/metanorma-plugin-glossarist"
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
+#gem "metanorma-cli"
+#gem "ruby-prof"

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

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #3D9970; }
 
@@ -1037,7 +1077,7 @@ p.AltTerms {
   font-size: 24px;
   margin-top: 1em; }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
   color: #00335b;
   background-color: #CFE2F3;
   font-size: 70%;

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

@@ -401,7 +401,7 @@ p.AltTerms {
   margin-top: 1em;
 }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
     color: #00335b;
     background-color: #CFE2F3;
     font-size: 70%;

data/lib/isodoc/ogc/html/ogc.css

@@ -856,6 +856,6 @@ div.warning p {
 span.hi {
   background-color: yellow; }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
   color: #00335b;
   background-color: #CFE2F3; }

data/lib/isodoc/ogc/html/ogc.scss

@@ -814,7 +814,7 @@ padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 span.hi {
   background-color: yellow;
 }
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
     color: #00335b;
     background-color: #CFE2F3;
 }

data/lib/isodoc/ogc/html_convert.rb

@@ -41,8 +41,13 @@ module IsoDoc
 
       def admonition_class(node)
         case node["type"]
-        when "important" then "Admonition.Important"
-        when "warning" then "Admonition.Warning"
+        when "important" then "Admonition Important"
+        when "warning" then "Admonition Warning"
+        when "caution" then "Admonition Caution"
+        when "todo" then "Admonition Todo"
+        when "editor" then "Admonition Editor"
+        when "tip" then "Admonition Tip"
+        when "safety-precaution" then "Admonition Safety-Precaution"
         else "Admonition"
         end
       end
@@ -135,6 +140,18 @@ module IsoDoc
         html
       end
 
+      # to pass on to imported _coverpage.scss
+      def scss_fontheader(is_html_css)
+        super + <<~SCSS
+          $color_text : #{@meta.get[:"presentation_metadata_color-text"].first};
+          $color_background_page : #{@meta.get[:"presentation_metadata_color-background-page"].first};
+          $color_background_definition_term : #{@meta.get[:"presentation_metadata_color-background-definition-term"].first};
+          $color_background_definition_description : #{@meta.get[:"presentation_metadata_color-background-definition-description"].first};
+          $color_secondary_shade_1 : #{@meta.get[:"presentation_metadata_color-secondary-shade-1"].first};
+          $color_background : #f6f8fa;
+        SCSS
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/ogc/metadata.rb

@@ -157,6 +157,17 @@ module IsoDoc
         end
         set(:logo_word, old ? get[:logo_old] : get[:logo_new])
       end
+
+      def presentation(xml, _out)
+        super
+        @metadata.each do |k, v|
+          /^presentation_metadata_color_/.match?(k) or next
+          v.is_a?(Array) or next
+          m = /^rgb\((\d+),\s*(\d+),\s*(\d+)\s*\)/.match(Array(v).first)
+          @metadata[k] =
+            sprintf("#%02x%02x%02x", m[1].to_i, m[2].to_i, m[3].to_i)
+        end
+      end
     end
   end
 end

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -41,23 +41,119 @@
 
 	<xsl:variable name="copyright-owner" select="java:toUpperCase(java:java.lang.String.new(/ogc:ogc-standard/ogc:bibdata/ogc:copyright/ogc:owner/ogc:organization/ogc:name))"/>
 
-	<xsl:variable name="color_main">rgb(88, 89, 91)</xsl:variable>
+	<xsl:variable name="presentation_metadata_color_text" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-text']/ogc:value)"/>
+	<xsl:variable name="color_main">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_text != ''"><xsl:value-of select="$presentation_metadata_color_text"/></xsl:when>
+			<xsl:otherwise>rgb(88, 89, 91)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_secondary_shade_1" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-secondary-shade-1']/ogc:value)"/>
 	<xsl:variable name="color_design">
 		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_secondary_shade_1 != ''"><xsl:value-of select="$presentation_metadata_color_secondary_shade_1"/></xsl:when>
 			<xsl:when test="$layoutVersion = '2022'">rgb(0, 177, 255)</xsl:when>
 			<xsl:otherwise>rgb(237, 193, 35)</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_secondary_shade_2" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-secondary-shade-2']/ogc:value)"/>
 	<xsl:variable name="color_design_light">
 		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_secondary_shade_2 != ''"><xsl:value-of select="$presentation_metadata_color_secondary_shade_2"/></xsl:when>
 			<xsl:when test="$layoutVersion = '2022'">rgb(0, 177, 255)</xsl:when>
 			<xsl:otherwise>rgb(246, 223, 140)</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
-	<xsl:variable name="color_dl_dt">rgb(215,243,255)</xsl:variable>
-	<xsl:variable name="color_dl_dd">rgb(242,251,255)</xsl:variable>
-	<xsl:variable name="color_blue">rgb(33, 55, 92)</xsl:variable>
-	<xsl:variable name="color_background_blue">rgb(33,60,107)</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_definition_term" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-definition-term']/ogc:value)"/>
+	<xsl:variable name="color_dl_dt">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_definition_term != ''"><xsl:value-of select="$presentation_metadata_color_background_definition_term"/></xsl:when>
+			<xsl:otherwise>rgb(215, 243, 255)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_definition_description" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-definition-description']/ogc:value)"/>
+	<xsl:variable name="color_dl_dd">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_definition_description != ''"><xsl:value-of select="$presentation_metadata_color_background_definition_description"/></xsl:when>
+			<xsl:otherwise>rgb(242, 251, 255)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_text_title" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-text-title']/ogc:value)"/>
+	<xsl:variable name="color_text_title">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_text_title != ''"><xsl:value-of select="$presentation_metadata_color_text_title"/></xsl:when>
+			<xsl:otherwise>rgb(33, 55, 92)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_page" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-page']/ogc:value)"/>
+	<xsl:variable name="color-background-page">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_page != ''"><xsl:value-of select="$presentation_metadata_color_background_page"/></xsl:when>
+			<xsl:otherwise>rgb(33, 55, 92)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_text_label_legacy" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-text-label-legacy']/ogc:value)"/>
+	<xsl:variable name="color_background_blue">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_text_label_legacy != ''"><xsl:value-of select="$presentation_metadata_color_background_text_label_legacy"/></xsl:when>
+			<xsl:otherwise>rgb(33, 60, 107)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_term_preferred_label" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-term-preferred-label']/ogc:value)"/>
+	<xsl:variable name="color_term_preferred">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_term_preferred_label != ''"><xsl:value-of select="$presentation_metadata_color_background_term_preferred_label"/></xsl:when>
+			<xsl:otherwise>rgb(249, 235, 187)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_term_deprecated_label" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-term-deprecated-label']/ogc:value)"/>
+	<xsl:variable name="color_term_deprecated">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_term_deprecated_label != ''"><xsl:value-of select="$presentation_metadata_color_background_term_deprecated_label"/></xsl:when>
+			<xsl:otherwise>rgb(237, 237, 238)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_term_admitted_label" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-term-admitted-label']/ogc:value)"/>
+	<xsl:variable name="color_term_admitted">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_term_admitted_label != ''"><xsl:value-of select="$presentation_metadata_color_background_term_admitted_label"/></xsl:when>
+			<xsl:otherwise>rgb(223, 236, 249)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_table_header" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-table-header']/ogc:value)"/>
+	<xsl:variable name="color_table_header_row">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_table_header != ''"><xsl:value-of select="$presentation_metadata_color_background_table_header"/></xsl:when>
+			<xsl:otherwise>rgb(33, 55, 92)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_table_row_even" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-table-row-even']/ogc:value)"/>
+	<xsl:variable name="color_table_row_even">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_table_row_even != ''"><xsl:value-of select="$presentation_metadata_color_background_table_row_even"/></xsl:when>
+			<xsl:otherwise>rgb(252, 246, 222)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:variable name="presentation_metadata_color_background_table_row_odd" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = 'color-background-table-row-odd']/ogc:value)"/>
+	<xsl:variable name="color_table_row_odd">
+		<xsl:choose>
+			<xsl:when test="$presentation_metadata_color_background_table_row_odd != ''"><xsl:value-of select="$presentation_metadata_color_background_table_row_odd"/></xsl:when>
+			<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 
 	<xsl:variable name="toc_recommendations_">
 		<xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
@@ -140,12 +236,6 @@
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
 
-		<xsl:variable name="updated_xml_step1">
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:variable>
-
-		<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
-
 			<fo:root xml:lang="{$lang}">
 				<xsl:variable name="root-style">
 					<root-style xsl:use-attribute-sets="root-style"/>
@@ -226,16 +316,9 @@
 							</fo:block>
 						</fo:block-container>
 
-						<!-- background color -->
-						<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
-							<fo:block>
-								<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
-									<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}mm" height="{$pageHeight}mm">
-										<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:rgb(33,55,92);stroke-width:0;fill-opacity:0.85"/>
-									</svg>
-								</fo:instream-foreign-object>
-							</fo:block>
-						</fo:block-container>
+						<xsl:call-template name="insertBackgroundColor">
+							<xsl:with-param name="opacity">0.85</xsl:with-param>
+						</xsl:call-template>
 
 						<xsl:call-template name="insertCrossingLines"/>
 
@@ -502,6 +585,12 @@
 				
 				<xsl:for-each select="xalan:nodeset($updated_xml)/*"> -->
 
+			<xsl:variable name="updated_xml_step1">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:variable>
+
+			<xsl:for-each select="xalan:nodeset($updated_xml_step1)">
+
 					<xsl:variable name="updated_xml_with_pages">
 						<xsl:call-template name="processPrefaceAndMainSectionsOGC_items"/>
 					</xsl:variable>
@@ -615,9 +704,10 @@
 
 				<xsl:apply-templates select="//ogc:indexsect" mode="sections"/>
 
-			</fo:root>
+			</xsl:for-each>
+
+		</fo:root>
 
-		</xsl:for-each>
 	</xsl:template>
 
 	<xsl:template name="processPrefaceAndMainSectionsOGC_items">
@@ -703,7 +793,7 @@
 	</xsl:template>
 
 	<xsl:template match="ogc:preface//ogc:clause[@type = 'toc']" priority="4">
-		<fo:block color="{$color_blue}">
+		<fo:block color="{$color_text_title}">
 
 			<xsl:apply-templates/>
 
@@ -957,16 +1047,8 @@
 					<xsl:with-param name="color">white</xsl:with-param>
 				</xsl:call-template>
 				<fo:flow flow-name="xsl-region-body">
-					<!-- background color -->
-					<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
-						<fo:block>
-							<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
-								<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}mm" height="{$pageHeight}mm">
-									<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:rgb(33,55,92);stroke-width:0;fill-opacity:1"/>
-								</svg>
-							</fo:instream-foreign-object>
-						</fo:block>
-					</fo:block-container>
+
+					<xsl:call-template name="insertBackgroundColor"/>
 
 					<xsl:call-template name="insertCrossingLines"/>
 
@@ -1268,7 +1350,7 @@
 					<xsl:attribute name="keep-with-next">always</xsl:attribute>
 					<xsl:attribute name="margin-top">30pt</xsl:attribute>
 					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+					<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 					<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 					<xsl:apply-templates/>
 					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
@@ -1399,7 +1481,7 @@
 			<xsl:call-template name="getLevelTermName"/>
 		</xsl:variable>
 		<fo:block space-before="36pt" margin-bottom="10pt" keep-with-next="always" role="H{$levelTerm}">
-			<fo:list-block color="{$color_blue}" keep-with-next="always" provisional-distance-between-starts="{string-length()*3.25}mm">
+			<fo:list-block color="{$color_text_title}" keep-with-next="always" provisional-distance-between-starts="{string-length()*3.25}mm">
 				<fo:list-item>
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block><fo:inline font-size="18pt"><xsl:apply-templates/></fo:inline></fo:block> <!-- padding-right="1mm" -->
@@ -1465,9 +1547,12 @@
 			<xsl:variable name="label" select="text()"/>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
-					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
+					<!-- <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
 					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
-					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when> -->
+					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'"><xsl:value-of select="$color_term_preferred"/></xsl:when>
+					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'"><xsl:value-of select="$color_term_deprecated"/></xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'"><xsl:value-of select="$color_term_admitted"/></xsl:when>
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:call-template name="addLetterSpacing">
@@ -1505,7 +1590,7 @@
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
-		<xsl:param name="color" select="$color_blue"/>
+		<xsl:param name="color" select="$color_text_title"/>
 		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container font-size="8pt" color="{$color}" padding-top="6mm">
 				<fo:table table-layout="fixed" width="100%">
@@ -1637,6 +1722,20 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template name="insertBackgroundColor">
+		<xsl:param name="opacity">1</xsl:param>
+		<!-- background color -->
+		<fo:block-container absolute-position="fixed" left="0" top="0" font-size="0">
+			<fo:block>
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
+					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$pageWidth}mm" height="{$pageHeight}mm">
+						<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:{$color-background-page};stroke-width:0;fill-opacity:{$opacity}"/>
+					</svg>
+				</fo:instream-foreign-object>
+			</fo:block>
+		</fo:block-container>
+	</xsl:template>
+
 	<xsl:template name="insertCrossingLines">
 		<fo:block-container absolute-position="fixed" width="{$pageWidth}mm" height="{$pageHeight}mm" font-size="0">
 			<fo:block>
@@ -1693,7 +1792,7 @@
 		<xsl:param name="title"/>
 		<xsl:param name="level">1</xsl:param>
 		<fo:block>
-			<fo:block font-size="18pt" color="{$color_blue}" keep-with-next="always" line-height="150%">
+			<fo:block font-size="18pt" color="{$color_text_title}" keep-with-next="always" line-height="150%">
 				<xsl:if test="$section != ''">
 					<fo:inline padding-right="2mm">
 						<xsl:call-template name="addLetterSpacing">
@@ -2221,7 +2320,7 @@
 	<xsl:attribute-set name="copyright-statement-title-style">
 
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 			<xsl:attribute name="margin-top">24pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- copyright-statement-title-style -->
@@ -2243,7 +2342,7 @@
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 
 	</xsl:attribute-set> <!-- license-statement-title-style -->
 
@@ -2535,7 +2634,7 @@
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-name-style -->
@@ -2555,7 +2654,7 @@
 	<xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 
-			<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
+			<xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
 			<xsl:attribute name="color">white</xsl:attribute>
 
 	</xsl:attribute-set>
@@ -2585,8 +2684,8 @@
 			<xsl:variable name="number"><xsl:number/></xsl:variable>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
-					<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
-					<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+					<xsl:when test="$number mod 2 = 0"><xsl:value-of select="$color_table_row_even"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$color_table_row_odd"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
 
@@ -2772,7 +2871,7 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 
 	</xsl:attribute-set> <!-- dl-name-style -->
 
@@ -2968,7 +3067,7 @@
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 			<!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="space-after">12pt</xsl:attribute>
@@ -3139,7 +3238,7 @@
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
 
 	</xsl:attribute-set> <!-- list-name-style -->
 
@@ -3749,13 +3848,35 @@
 			</xsl:for-each>
 		</xsl:element>
 
-		<xsl:call-template name="insertAnnexInSeparatePageSequences"/>
+		<xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
 
-		<xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
+		<!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
 
 		<!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
 	</xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
 
+	<xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
+		<xsl:for-each select="/*/*[local-name()='annex'] |           /*/*[local-name()='bibliography']/*[not(@normative='true')] |           /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] |          /*/*[local-name()='indexsect']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
+					<xsl:element name="page_sequence" namespace="{$namespace_full}">
+						<xsl:attribute name="main_page_sequence"/>
+						<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+					</xsl:element>
+				</xsl:when>
+				<xsl:otherwise> <!-- bibliography -->
+					<xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
+						<xsl:element name="page_sequence" namespace="{$namespace_full}">
+							<xsl:attribute name="main_page_sequence"/>
+							<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+						</xsl:element>
+					</xsl:element>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="insertAnnexInSeparatePageSequences">
 		<xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -10459,7 +10580,7 @@
 
 					<xsl:attribute name="font-weight">normal</xsl:attribute>
 					<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
-						<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
+						<xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
 					</xsl:if>
 					<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
 						<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
@@ -12379,6 +12500,12 @@
 
 					<xsl:call-template name="setBlockSpanAll"/>
 
+						<xsl:variable name="admonition_color" select="normalize-space(/ogc:ogc-standard/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = concat('color-admonition-', @type)]/ogc:value)"/>
+						<xsl:if test="$admonition_color != ''">
+							<xsl:attribute name="border">0.5pt solid <xsl:value-of select="$admonition_color"/></xsl:attribute>
+							<xsl:attribute name="color"><xsl:value-of select="$admonition_color"/></xsl:attribute>
+						</xsl:if>
+
 							<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
 
 										<fo:block xsl:use-attribute-sets="admonition-name-style">
@@ -12654,10 +12781,12 @@
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
-			<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
-			<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
-			<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
-				<xsl:value-of select="."/>
+			<xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
+				<xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
+				<xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
+					<xsl:value-of select="normalize-space(.)"/>
+				</xsl:if>
 			</xsl:if>
 		</xsl:copy>
 	</xsl:template>
@@ -13532,7 +13661,8 @@
 		<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
 			<xsl:choose>
 				<xsl:when test="normalize-space() != ''">
-					<pdf:embedded-file src="{.}" filename="{@name}"/>
+					<xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
+					<pdf:embedded-file src="{$src_attachment}" filename="{@name}"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- _{filename}_attachments -->