metanorma-ogc 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfcf839845ca523b4dbcba32c4bd689498e6e0a2c7c5ecb2a171dd3c7bce4934
-  data.tar.gz: 60dd01126c0591afd6d82b1aaa23d7a1e15e46081e04c1bf68be10c85ad73358
+  metadata.gz: 74e1a3d766e10152fd9b43ea442aab695736b16eab77e921c29c194db08761b3
+  data.tar.gz: ac7fa37c540c5270870222e7361858e3a609c299ee252e03c54dce0d18a956f9
 SHA512:
-  metadata.gz: 9c7334090d5271c9e01570baa42b6bf9f91934599989e491739ee27c8289385c62584f1527ea1184f87119a3bc08340c5ea00a4c1f2e726ac0b944fb16a10004
-  data.tar.gz: 35281f49a9263c900c1ea614b3b0aca5ba9fe00b0cfa528f11e3641cdf36f03c17caa9b06995a9ef4f07dde9d1b14f206066afe1523666bb0a4a45227349ad7b
+  metadata.gz: 169037e8a8f06c1749ca3ef1cec1c127213e2b592e8f6e8c03cb4f0028c6296c5a6fbf5c73e40bfd3b21ba6aa94f6a9fc4faef4016a36c5ecf42a5001927ab3c
+  data.tar.gz: 9ef4fe458fecb874acdf04acc91dfca78be408d99d876ebda1cee4ccce4e91874c0fc930a71438255e74174520950c00290a0b3824bb09c0797afe8e62d546d7

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

@@ -337,6 +337,18 @@ table.rouge-line-table pre {
 #retired {
   border-bottom: solid 3px #7e0d13; }
 
+#legacy-band {
+  background-color: #7e0d13; }
+
+#legacy {
+  border-bottom: solid 3px #7e0d13; }
+
+#rescinded-band {
+  background-color: #7e0d13; }
+
+#rescinded {
+  border-bottom: solid 3px #7e0d13; }
+
 .coverpage-maturity, .coverpage-stage {
   font-family: {{headerfont}};
   font-weight: 400;

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

@@ -41,6 +41,8 @@ $docstage-colors-list: (
 
   deprecated: #7e0d13,
   retired: #7e0d13,
+  legacy: #7e0d13,
+  rescinded: #7e0d13,
 );
 
 

data/lib/isodoc/ogc/html_convert.rb

@@ -69,14 +69,61 @@ module IsoDoc
 
       def html_head
         ret = super
-        k = @meta.get[:keywords].join(", ") and k = @c.encode(k).gsub("'", "'")
-        k.empty? or ret += "<meta name='keywords' content='#{k}'/>"
-        k = @meta.get[:abstract] and k = @c.encode(k)&.gsub("'", "&#x27;")
-        (k.nil? || k.empty?) or
-          ret += "<meta name='description' content='#{k}'/>"
+        ret += html_head_kw
+        ret += html_head_abstract
+        ret += html_head_creator
+        ret += html_head_date
+        ret += html_head_title
+        ret += html_head_dc
         ret
       end
 
+      def html_head_abstract
+        k = @meta.get[:abstract] and k = @c.encode(k)&.gsub("'", "&#x27;")
+        (k.nil? || k.empty?) and return ""
+        "<meta name='description' content='#{k}'/>\n" \
+          "<meta name='DC.description' lang='#{@lang}' content='#{k}' />"
+      end
+
+      def html_head_kw
+        k = @meta.get[:keywords].join(", ") and
+          k = @c.encode(k).gsub("'", "&#x27;")
+        k.empty? and return ""
+        "<meta name='keywords' content='#{k}'/>" \
+          "<meta name='DC.subject' lang='#{@lang}' content='#{k}' />"
+      end
+
+      def html_head_dc
+        <<~HTML
+          <link rel="profile" href="http://dublincore.org/documents/2008/08/04/dc-html/" />
+          <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
+          <meta name="DC.language" content="#{@lang}" />
+          <meta name="DC.rights" lang="#{@lang}" content="CC-BY-4.0"/>
+          <link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" />
+          <link rel="DCTERMS.license" href="https://www.ogc.org/license" />
+        HTML
+      end
+
+      def html_head_creator
+        k = @meta.get[:authors] and
+          k = @c.encode(k.join(", ")).gsub("'", "&#x27;")
+        (k.nil? || k.empty?) and return ""
+        "<meta name='DC.creator' lang='#{@lang}' content='#{k}' />"
+      end
+
+      def html_head_date
+        k = @meta.get[:revdate] || @meta.get[:ipublisheddate] and
+          k = @c.encode(k)&.gsub("'", "&#x27;")
+        (k.nil? || k.empty?) and return ""
+        "<meta name='DC.date' content='#{k}' />"
+      end
+
+      def html_head_title
+        k = @meta.get[:doctitle] and k = @c.encode(k)&.gsub("'", "&#x27;")
+        (k.nil? || k.empty?) and return ""
+        "<meta name='DC.title' lang='#{@lang}' content='#{k}' />"
+      end
+
       include BaseConvert
       include Init
     end

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

@@ -49,6 +49,7 @@
 	<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="toc_recommendations_">
 		<xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
@@ -192,6 +193,10 @@
 
 					<fo:flow flow-name="xsl-region-body" color="white">
 
+						<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>
+						<xsl:variable name="stage" select="/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang] | /ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[not(@language)]"/>
+						<xsl:variable name="isLegacy" select="normalize-space($stage = 'deprecated' or $stage = 'legacy' or $stage = 'retired' or $stage = 'rescinded')"/>
+
 						<!-- background image -->
 						<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
 							<fo:block>
@@ -267,7 +272,7 @@
 									<fo:block margin-top="4pt"> </fo:block>
 								</fo:block-container>
 								<fo:block color="{$color_design}">
-									<fo:block font-size="17pt" margin-bottom="14pt">
+									<fo:block font-size="17pt">
 										<xsl:call-template name="addLetterSpacing">
 											<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($doctype))"/>
 										</xsl:call-template>
@@ -291,13 +296,31 @@
 											<xsl:with-param name="letter-spacing" select="0.25"/>
 										</xsl:call-template>
 									</fo:block>
-									<fo:block font-size="12pt" font-weight="bold">
-										<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>
-										<xsl:variable name="stage" select="java:toUpperCase(java:java.lang.String.new(/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang]))"/>
-										<xsl:call-template name="addLetterSpacing">
-											<xsl:with-param name="text" select="$stage"/>
-										</xsl:call-template>
-									</fo:block>
+									<xsl:variable name="stage_uc" select="java:toUpperCase(java:java.lang.String.new($stage))"/>
+
+									<xsl:choose>
+										<xsl:when test="$isLegacy = 'true'">
+											<fo:block-container font-size="17pt" background-color="{$color_background_blue}" margin-left="-2.5mm" height="11.5mm" width="56mm" display-align="center" margin-top="0.5mm">
+												<fo:block-container margin-left="2.5mm">
+													<fo:block-container margin-left="0mm">
+														<fo:block margin-top="1mm">
+															<xsl:call-template name="addLetterSpacing">
+																<xsl:with-param name="text" select="$stage_uc"/>
+															</xsl:call-template>
+														</fo:block>
+													</fo:block-container>
+												</fo:block-container>
+											</fo:block-container>
+										</xsl:when>
+										<xsl:otherwise>
+											<fo:block font-size="12pt" font-weight="bold" margin-top="14pt">
+												<xsl:call-template name="addLetterSpacing">
+													<xsl:with-param name="text" select="$stage_uc"/>
+												</xsl:call-template>
+											</fo:block>
+										</xsl:otherwise>
+									</xsl:choose>
+
 								</fo:block>
 							</fo:block-container>
 						</fo:block-container>
@@ -389,7 +412,24 @@
 								</fo:block>
 							</fo:block>
 
-							<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement"/>
+							<xsl:choose>
+								<xsl:when test="$isLegacy = 'true'">
+									<fo:block-container margin-left="-7mm" color="{$color_design}" background-color="{$color_background_blue}" width="202mm">
+										<fo:block-container margin-left="2.5mm" margin-right="1mm" padding-top="0.5mm" padding-bottom="0.5mm">
+											<fo:block-container margin-left="0mm" margin-right="0mm">
+												<fo:block>
+													<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement">
+														<xsl:with-param name="isLegacy" select="$isLegacy"/>
+													</xsl:apply-templates>
+												</fo:block>
+											</fo:block-container>
+										</fo:block-container>
+									</fo:block-container>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement"/>
+								</xsl:otherwise>
+							</xsl:choose>
 
 						</fo:block-container>
 
@@ -3429,7 +3469,13 @@
 	</xsl:template> <!-- license-statement/p -->
 
 	<xsl:template match="*[local-name()='legal-statement']">
+		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+
+				<xsl:if test="$isLegacy = 'true'">
+					<xsl:attribute name="font-size">9pt</xsl:attribute>
+				</xsl:if>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -5718,13 +5764,14 @@
 	<!-- ================= -->
 	<!-- Added,deleted text -->
 	<!-- ================= -->
-	<xsl:template match="*[local-name()='add']" name="tag_add">
+	<xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add">
 		<xsl:param name="skip">true</xsl:param>
 		<xsl:param name="block">false</xsl:param>
 		<xsl:param name="type"/>
 		<xsl:param name="text-align"/>
 		<xsl:choose>
-			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+			<xsl:when test="starts-with(., $ace_tag) or local-name() = 'change-open-tag' or local-name() = 'change-close-tag'"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
+							<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
 				<xsl:choose>
 					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or      local-name(..) = 'formattedref' and not(preceding-sibling::node()))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
 					<xsl:otherwise>
@@ -5732,12 +5779,32 @@
 							<xsl:call-template name="insertTag">
 								<xsl:with-param name="type">
 									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag'">start</xsl:when>
+										<xsl:when test="local-name() = 'change-close-tag'">end</xsl:when>
 										<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
 										<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
 									</xsl:choose>
 								</xsl:with-param>
-								<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
-								<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+								<xsl:with-param name="kind">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="text()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
+								<xsl:with-param name="value">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="*[local-name() = 'sub']"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
 							</xsl:call-template>
 						</xsl:variable>
 						<xsl:choose>
@@ -7949,11 +8016,17 @@
 			</xsl:when>
 			<xsl:otherwise>
 
+				<xsl:variable name="image_class" select="ancestor::*[local-name() = 'image']/@class"/>
+				<xsl:variable name="ancestor_table_cell" select="normalize-space(ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"/>
+
 				<xsl:variable name="element">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
 							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
 						</xsl:when>
+						<xsl:when test="not(ancestor::*[local-name() = 'figure'])">
+							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
+						</xsl:when>
 						<xsl:otherwise>
 							<fo:block xsl:use-attribute-sets="image-style">
 								<xsl:if test="ancestor::*[local-name() = 'dt']">
@@ -7969,10 +8042,24 @@
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
 						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-							<xsl:if test="$isGenerateTableIF = 'false'">
-								<xsl:attribute name="width">100%</xsl:attribute>
-							</xsl:if>
-							<xsl:attribute name="content-height">100%</xsl:attribute>
+
+							<xsl:choose>
+								<xsl:when test="$image_class = 'corrigenda-tag'">
+									<xsl:attribute name="fox:alt-text">CorrigendaTag</xsl:attribute>
+									<xsl:attribute name="baseline-shift">-10%</xsl:attribute>
+									<xsl:if test="$ancestor_table_cell = 'true'">
+										<xsl:attribute name="baseline-shift">-25%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="height">3.5mm</xsl:attribute>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:if test="$isGenerateTableIF = 'false'">
+										<xsl:attribute name="width">100%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="content-height">100%</xsl:attribute>
+								</xsl:otherwise>
+							</xsl:choose>
+
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
 							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
@@ -10226,13 +10313,19 @@
 				<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
-			<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
+			</xsl:when>
+			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
 
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
+	<xsl:template match="*[local-name() = 'review'][@type = 'other']"/>
+
 	<xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -11835,7 +11928,7 @@
 
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
-		<xsl:text> </xsl:text>
+
 		<xsl:choose>
 			<xsl:when test="$edition_i18n != ''">
 				<!-- Example: <edition language="fr">deuxième édition</edition> -->

data/lib/isodoc/ogc/ogc.best-practice.xsl

@@ -49,6 +49,7 @@
 	<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="toc_recommendations_">
 		<xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
@@ -192,6 +193,10 @@
 
 					<fo:flow flow-name="xsl-region-body" color="white">
 
+						<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>
+						<xsl:variable name="stage" select="/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang] | /ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[not(@language)]"/>
+						<xsl:variable name="isLegacy" select="normalize-space($stage = 'deprecated' or $stage = 'legacy' or $stage = 'retired' or $stage = 'rescinded')"/>
+
 						<!-- background image -->
 						<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
 							<fo:block>
@@ -267,7 +272,7 @@
 									<fo:block margin-top="4pt"> </fo:block>
 								</fo:block-container>
 								<fo:block color="{$color_design}">
-									<fo:block font-size="17pt" margin-bottom="14pt">
+									<fo:block font-size="17pt">
 										<xsl:call-template name="addLetterSpacing">
 											<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($doctype))"/>
 										</xsl:call-template>
@@ -291,13 +296,31 @@
 											<xsl:with-param name="letter-spacing" select="0.25"/>
 										</xsl:call-template>
 									</fo:block>
-									<fo:block font-size="12pt" font-weight="bold">
-										<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>
-										<xsl:variable name="stage" select="java:toUpperCase(java:java.lang.String.new(/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang]))"/>
-										<xsl:call-template name="addLetterSpacing">
-											<xsl:with-param name="text" select="$stage"/>
-										</xsl:call-template>
-									</fo:block>
+									<xsl:variable name="stage_uc" select="java:toUpperCase(java:java.lang.String.new($stage))"/>
+
+									<xsl:choose>
+										<xsl:when test="$isLegacy = 'true'">
+											<fo:block-container font-size="17pt" background-color="{$color_background_blue}" margin-left="-2.5mm" height="11.5mm" width="56mm" display-align="center" margin-top="0.5mm">
+												<fo:block-container margin-left="2.5mm">
+													<fo:block-container margin-left="0mm">
+														<fo:block margin-top="1mm">
+															<xsl:call-template name="addLetterSpacing">
+																<xsl:with-param name="text" select="$stage_uc"/>
+															</xsl:call-template>
+														</fo:block>
+													</fo:block-container>
+												</fo:block-container>
+											</fo:block-container>
+										</xsl:when>
+										<xsl:otherwise>
+											<fo:block font-size="12pt" font-weight="bold" margin-top="14pt">
+												<xsl:call-template name="addLetterSpacing">
+													<xsl:with-param name="text" select="$stage_uc"/>
+												</xsl:call-template>
+											</fo:block>
+										</xsl:otherwise>
+									</xsl:choose>
+
 								</fo:block>
 							</fo:block-container>
 						</fo:block-container>
@@ -389,7 +412,24 @@
 								</fo:block>
 							</fo:block>
 
-							<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement"/>
+							<xsl:choose>
+								<xsl:when test="$isLegacy = 'true'">
+									<fo:block-container margin-left="-7mm" color="{$color_design}" background-color="{$color_background_blue}" width="202mm">
+										<fo:block-container margin-left="2.5mm" margin-right="1mm" padding-top="0.5mm" padding-bottom="0.5mm">
+											<fo:block-container margin-left="0mm" margin-right="0mm">
+												<fo:block>
+													<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement">
+														<xsl:with-param name="isLegacy" select="$isLegacy"/>
+													</xsl:apply-templates>
+												</fo:block>
+											</fo:block-container>
+										</fo:block-container>
+									</fo:block-container>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:apply-templates select="/ogc:ogc-standard/ogc:boilerplate/ogc:legal-statement"/>
+								</xsl:otherwise>
+							</xsl:choose>
 
 						</fo:block-container>
 
@@ -3429,7 +3469,13 @@
 	</xsl:template> <!-- license-statement/p -->
 
 	<xsl:template match="*[local-name()='legal-statement']">
+		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+
+				<xsl:if test="$isLegacy = 'true'">
+					<xsl:attribute name="font-size">9pt</xsl:attribute>
+				</xsl:if>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -5718,13 +5764,14 @@
 	<!-- ================= -->
 	<!-- Added,deleted text -->
 	<!-- ================= -->
-	<xsl:template match="*[local-name()='add']" name="tag_add">
+	<xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add">
 		<xsl:param name="skip">true</xsl:param>
 		<xsl:param name="block">false</xsl:param>
 		<xsl:param name="type"/>
 		<xsl:param name="text-align"/>
 		<xsl:choose>
-			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+			<xsl:when test="starts-with(., $ace_tag) or local-name() = 'change-open-tag' or local-name() = 'change-close-tag'"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
+							<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
 				<xsl:choose>
 					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or      local-name(..) = 'formattedref' and not(preceding-sibling::node()))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
 					<xsl:otherwise>
@@ -5732,12 +5779,32 @@
 							<xsl:call-template name="insertTag">
 								<xsl:with-param name="type">
 									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag'">start</xsl:when>
+										<xsl:when test="local-name() = 'change-close-tag'">end</xsl:when>
 										<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
 										<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
 									</xsl:choose>
 								</xsl:with-param>
-								<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
-								<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+								<xsl:with-param name="kind">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="text()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
+								<xsl:with-param name="value">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="*[local-name() = 'sub']"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
 							</xsl:call-template>
 						</xsl:variable>
 						<xsl:choose>
@@ -7949,11 +8016,17 @@
 			</xsl:when>
 			<xsl:otherwise>
 
+				<xsl:variable name="image_class" select="ancestor::*[local-name() = 'image']/@class"/>
+				<xsl:variable name="ancestor_table_cell" select="normalize-space(ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"/>
+
 				<xsl:variable name="element">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
 							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
 						</xsl:when>
+						<xsl:when test="not(ancestor::*[local-name() = 'figure'])">
+							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
+						</xsl:when>
 						<xsl:otherwise>
 							<fo:block xsl:use-attribute-sets="image-style">
 								<xsl:if test="ancestor::*[local-name() = 'dt']">
@@ -7969,10 +8042,24 @@
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
 						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-							<xsl:if test="$isGenerateTableIF = 'false'">
-								<xsl:attribute name="width">100%</xsl:attribute>
-							</xsl:if>
-							<xsl:attribute name="content-height">100%</xsl:attribute>
+
+							<xsl:choose>
+								<xsl:when test="$image_class = 'corrigenda-tag'">
+									<xsl:attribute name="fox:alt-text">CorrigendaTag</xsl:attribute>
+									<xsl:attribute name="baseline-shift">-10%</xsl:attribute>
+									<xsl:if test="$ancestor_table_cell = 'true'">
+										<xsl:attribute name="baseline-shift">-25%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="height">3.5mm</xsl:attribute>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:if test="$isGenerateTableIF = 'false'">
+										<xsl:attribute name="width">100%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="content-height">100%</xsl:attribute>
+								</xsl:otherwise>
+							</xsl:choose>
+
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
 							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
@@ -10226,13 +10313,19 @@
 				<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
-			<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
+			</xsl:when>
+			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
 
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
+	<xsl:template match="*[local-name() = 'review'][@type = 'other']"/>
+
 	<xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -11835,7 +11928,7 @@
 
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
-		<xsl:text> </xsl:text>
+
 		<xsl:choose>
 			<xsl:when test="$edition_i18n != ''">
 				<!-- Example: <edition language="fr">deuxième édition</edition> -->