metanorma-ogc 2.6.8 → 2.6.10

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -245,7 +245,7 @@
 
 					<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
 
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface' or local-name() = 'boilerplate']][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][parent::*[local-name() = 'preface' or local-name() = 'boilerplate']][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 
 							<!-- Copyright, Content, Foreword, etc. pages -->
 							<fo:page-sequence master-reference="document" force-page-count="no-force">
@@ -278,7 +278,7 @@
 							</fo:page-sequence>
 						</xsl:for-each>
 
-						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface' or local-name() = 'boilerplate'])][normalize-space() != '' or .//image or .//svg]">
+						<xsl:for-each select=".//*[local-name() = 'page_sequence'][not(parent::*[local-name() = 'preface' or local-name() = 'boilerplate'])][normalize-space() != '' or .//*[local-name() = 'image'] or .//*[local-name() = 'svg']]">
 
 							<!-- Document Pages -->
 							<fo:page-sequence master-reference="document" format="1" force-page-count="no-force">
@@ -776,8 +776,21 @@
 
 			<!-- <xsl:strip-space elements="ogc:xref"/> -->
 
-	<xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
-	<xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
+	<xsl:variable name="namespace_full_">
+		<xsl:choose>
+			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/iso -->
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
+
+	<xsl:variable name="root_element_">
+		<xsl:choose>
+			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: iso-standard -->
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="root_element" select="normalize-space($root_element_)"/>
 
 	<xsl:variable name="document_scheme" select="normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/>
 
@@ -4168,7 +4181,9 @@
 			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
 				</xsl:if>
 
 				<xsl:apply-templates/>
@@ -5198,7 +5213,17 @@
 			<xsl:call-template name="refine_dt-cell-style"/>
 
 			<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
-				<xsl:copy-of select="@id"/>
+
+				<xsl:choose>
+					<xsl:when test="$isGenerateTableIF = 'true'">
+
+							<xsl:copy-of select="@id"/>
+
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:copy-of select="@id"/>
+					</xsl:otherwise>
+				</xsl:choose>
 
 				<xsl:if test="normalize-space($key_iso) = 'true'">
 					<xsl:attribute name="margin-top">0</xsl:attribute>
@@ -5230,7 +5255,9 @@
 			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
-					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+
 				</xsl:if>
 
 				<xsl:choose>
@@ -5711,6 +5738,12 @@
     </xsl:if>
   </xsl:template>
 
+	<xsl:template match="*[local-name()='strike']">
+		<fo:inline text-decoration="line-through">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'pagebreak']">
 		<fo:block break-after="page"/>
 		<fo:block> </fo:block>
@@ -6473,6 +6506,14 @@
 					</xsl:for-each>
 				</xsl:variable>
 
+				<!-- <xsl:if test="$debug = 'true'">
+					<redirect:write file="{generate-id()}_words_with_width_sorted.xml">
+						<td_text><xsl:copy-of select="$td_text"/></td_text>
+						<words_with_width><xsl:copy-of select="$words_with_width"/></words_with_width>
+						<xsl:copy-of select="$words_with_width_sorted"/>
+					</redirect:write>
+				</xsl:if> -->
+
 				<xsl:variable name="words">
 					<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
 						<word>
@@ -6598,6 +6639,7 @@
 			<xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'font_en_vertical']"><tag>font_en_vertical</tag></xsl:if>
 		</tags>
 	</xsl:template>
 	<!-- =============================== -->
@@ -7138,7 +7180,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
@@ -7777,16 +7828,29 @@
 	<xsl:template name="getImageSrc">
 		<xsl:choose>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:call-template name="getImageSrcExternal"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="getImageSrcExternal">
+		<xsl:choose>
+			<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+				<xsl:value-of select="@src"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="src_with_basepath" select="concat($basepath, @src)"/>
+				<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($src_with_basepath)))"/>
 				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="@src"/>
+					<xsl:when test="$file_exists = 'true'">
+						<xsl:value-of select="$src_with_basepath"/>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:value-of select="concat($basepath, @src)"/>
+						<xsl:value-of select="@src"/>
 					</xsl:otherwise>
 				</xsl:choose>
-			</xsl:when>
-			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
@@ -7834,14 +7898,8 @@
 				<xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -7862,16 +7920,8 @@
 				</svg>
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
-				<xsl:variable name="src">
-					<xsl:choose>
-						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-							<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:variable name="src" select="concat('url(file:///', $src_external, ')')"/>
 				<xsl:variable name="file" select="java:java.io.File.new(@src)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
 				<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
@@ -11993,7 +12043,9 @@
 	<xsl:template name="add_id">
 		<xsl:if test="not(@id)">
 			<!-- add @id - first element with @id plus '_element_name' -->
-			<xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+			<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
+			<xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
@@ -13298,6 +13350,7 @@
 		<xsl:param name="formatted">false</xsl:param>
 		<xsl:param name="lang"/>
 		<xsl:param name="returnEmptyIfNotFound">false</xsl:param>
+		<xsl:param name="bibdata_updated"/>
 
 		<xsl:variable name="curr_lang">
 			<xsl:choose>
@@ -13311,6 +13364,9 @@
 
 		<xsl:variable name="data_value">
 			<xsl:choose>
+				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
+					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
 				<xsl:when test="$formatted = 'true'">
 					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
@@ -13482,14 +13538,8 @@
 				<xsl:value-of select="$src"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:choose>
-					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-						<xsl:value-of select="concat('url(file:///', @src, ')')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
+				<xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -13511,15 +13561,23 @@
 	<!-- END: insert cover page image -->
 
 	<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
+	<xsl:variable name="regex_ja_spec_half_width_">
+		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
+		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
+		\u007D <!-- U+007D RIGHT CURLY BRACKET (}) -->
+		\uFF62 <!-- U+FF62 HALFWIDTH LEFT CORNER BRACKET (｢) -->
+		\uFF63 <!-- U+FF63 HALFWIDTH RIGHT CORNER BRACKET (｣) -->
+		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
+		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
+	</xsl:variable>
+	<xsl:variable name="regex_ja_spec_half_width" select="translate(normalize-space($regex_ja_spec_half_width_), ' ', '')"/>
 	<xsl:variable name="regex_ja_spec_">[
 		<!-- Rotate 90° clockwise -->
-		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		<xsl:value-of select="$regex_ja_spec_half_width"/>
 		\uFF08 <!-- U+FF08 FULLWIDTH LEFT PARENTHESIS (（) -->
-		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
 		\uFF09 <!-- U+FF09 FULLWIDTH RIGHT PARENTHESIS (）) -->
-		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
 		\uFF5B <!-- U+FF5B FULLWIDTH LEFT CURLY BRACKET (｛) -->
-		\u007D <!-- U+007D RIGHT CURLY BRACKET (}) -->
 		\uFF5D <!-- U+FF5D FULLWIDTH RIGHT CURLY BRACKET (｝) -->
 		\u3014 <!-- U+3014 LEFT TORTOISE SHELL BRACKET (〔) -->
 		\u3015 <!-- U+3015 RIGHT TORTOISE SHELL BRACKET (〕) -->
@@ -13527,21 +13585,16 @@
 		\u3011 <!-- U+3011 RIGHT BLACK LENTICULAR BRACKET (】) -->
 		\u300A <!-- U+300A LEFT DOUBLE ANGLE BRACKET (《) -->
 		\u300B <!-- U+300B RIGHT DOUBLE ANGLE BRACKET (》) -->
-		\uFF62 <!-- U+FF62 HALFWIDTH LEFT CORNER BRACKET (｢) -->
 		\u300C <!-- U+300C LEFT CORNER BRACKET (「) -->
-		\uFF63 <!-- U+FF63 HALFWIDTH RIGHT CORNER BRACKET (｣) -->
 		\u300D <!-- U+300D RIGHT CORNER BRACKET (」) -->
 		\u300E <!-- U+300E LEFT WHITE CORNER BRACKET (『) -->
 		\u300F <!-- U+300F RIGHT WHITE CORNER BRACKET (』) -->
-		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
 		\uFF3B <!-- U+FF3B FULLWIDTH LEFT SQUARE BRACKET (［) -->
-		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
 		\uFF3D <!-- U+FF3D FULLWIDTH RIGHT SQUARE BRACKET (］) -->
 		\u3008 <!-- U+3008 LEFT ANGLE BRACKET (〈) -->
 		\u3009 <!-- U+3009 RIGHT ANGLE BRACKET (〉) -->
 		\u3016 <!-- U+3016 LEFT WHITE LENTICULAR BRACKET (〖) -->
 		\u3017 <!-- U+3017 RIGHT WHITE LENTICULAR BRACKET (〗) -->
-
 		\u301A <!-- U+301A LEFT WHITE SQUARE BRACKET (〚) -->
 		\u301B <!-- U+301B RIGHT WHITE SQUARE BRACKET (〛) -->
 		\u301C <!-- U+301C WAVE DASH (〜) -->
@@ -13573,6 +13626,7 @@
 	<xsl:variable name="regex_ja_spec"><xsl:value-of select="translate(normalize-space($regex_ja_spec_), ' ', '')"/></xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
+		<xsl:param name="char_prev"/>
 		<xsl:param name="writing-mode">lr-tb</xsl:param>
 		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:param name="add_zero_width_space">false</xsl:param>
@@ -13582,53 +13636,99 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:if test="string-length($str) &gt; 0">
-					<xsl:variable name="horizontal_mode" select="normalize-space(ancestor::*[local-name() = 'span'][@class = 'horizontal'] and 1 = 1)"/>
+
+					<!-- <xsl:variable name="horizontal_mode" select="normalize-space(ancestor::*[local-name() = 'span'][@class = 'horizontal'] and 1 = 1)"/> -->
 					<xsl:variable name="char" select="substring($str,1,1)"/>
-					<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
-						<xsl:if test="normalize-space($writing-mode) != ''">
-							<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
-							<xsl:attribute name="reference-orientation">90</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
-							<xsl:attribute name="reference-orientation">0</xsl:attribute>
-						</xsl:if>
-						<xsl:if test="$char = '゜' or $char = '。' or $char = '﹒' or $char = '．'">
-							<!-- Rotate 180°: 
-								U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜)
-								U+3002 IDEOGRAPHIC FULL STOP (。)
-								U+FE52 SMALL FULL STOP (﹒)
-								U+FF0E FULLWIDTH FULL STOP (．)
-							-->
-							<xsl:attribute name="reference-orientation">-90</xsl:attribute>
-						</xsl:if>
-						<fo:block-container width="1em">
-							<fo:block line-height="1em">
-								<xsl:choose>
-									<xsl:when test="$horizontal_mode = 'true'">
-										<xsl:value-of select="$str"/>
-									</xsl:when>
-									<xsl:otherwise>
+					<xsl:variable name="char_next" select="substring($str,2,1)"/>
+
+					<xsl:variable name="char_half_width" select="normalize-space(java:matches(java:java.lang.String.new($char), concat('([', $regex_ja_spec_half_width, ']{1,})')))"/>
+
+					<xsl:choose>
+						<xsl:when test="$char_half_width = 'true'">
+							<fo:inline>
+								<xsl:attribute name="baseline-shift">7%</xsl:attribute>
+								<xsl:value-of select="$char"/>
+							</fo:inline>
+						</xsl:when>
+						<xsl:otherwise>
+							<!--  namespace-uri(ancestor::*[local-name() = 'title']) != '' to skip title from $contents  -->
+							<xsl:if test="namespace-uri(ancestor::*[local-name() = 'title']) != '' and ($char_prev = '' and ../preceding-sibling::node())">
+								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
+							</xsl:if>
+							<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP" text-align-last="center">
+								<xsl:if test="normalize-space($writing-mode) != ''">
+									<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+									<xsl:attribute name="reference-orientation">90</xsl:attribute>
+								</xsl:if>
+								<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+									<xsl:attribute name="reference-orientation">0</xsl:attribute>
+								</xsl:if>
+								<xsl:if test="$char = '゜' or $char = '。' or $char = '﹒' or $char = '．'">
+									<!-- Rotate 180°: 
+										U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜)
+										U+3002 IDEOGRAPHIC FULL STOP (。)
+										U+FE52 SMALL FULL STOP (﹒)
+										U+FF0E FULLWIDTH FULL STOP (．)
+									-->
+									<xsl:attribute name="reference-orientation">-90</xsl:attribute>
+								</xsl:if>
+								<fo:block-container width="1em" role="SKIP"><!-- border="0.5pt solid blue" -->
+									<fo:block line-height="1em" role="SKIP">
+										<!-- <xsl:choose>
+											<xsl:when test="$horizontal_mode = 'true'">
+												<xsl:value-of select="$str"/>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:value-of select="$char"/>
+											</xsl:otherwise>
+										</xsl:choose> -->
 										<xsl:value-of select="$char"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</fo:block>
-						</fo:block-container>
-					</fo:inline-container>
-					<xsl:if test="$add_zero_width_space = 'true' and ($char = ',' or $char = '.' or $char = ' ' or $char = '·' or $char = ')' or $char = ']' or $char = '}')"><xsl:value-of select="$zero_width_space"/></xsl:if>
-
-					<xsl:if test="$horizontal_mode = 'false'">
-						<xsl:call-template name="insertVerticalChar">
-							<xsl:with-param name="str" select="substring($str, 2)"/>
-							<xsl:with-param name="writing-mode" select="$writing-mode"/>
-							<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
-							<xsl:with-param name="add_zero_width_space" select="$add_zero_width_space"/>
-						</xsl:call-template>
-					</xsl:if>
+									</fo:block>
+								</fo:block-container>
+							</fo:inline-container>
+							<xsl:if test="namespace-uri(ancestor::*[local-name() = 'title']) != '' and ($char_next != '' or ../following-sibling::node())">
+								<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
+							</xsl:if>
+						</xsl:otherwise>
+					</xsl:choose>
+
+					<xsl:if test="$add_zero_width_space = 'true' and ($char = ',' or $char = '.' or $char = ' ' or $char = '·' or $char = ')' or $char = ']' or $char = '}' or $char = '/')"><xsl:value-of select="$zero_width_space"/></xsl:if>
+						<!-- <xsl:if test="$horizontal_mode = 'false'"> -->
+							<xsl:call-template name="insertVerticalChar">
+								<xsl:with-param name="str" select="substring($str, 2)"/>
+								<xsl:with-param name="char_prev" select="$char"/>
+								<xsl:with-param name="writing-mode" select="$writing-mode"/>
+								<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
+								<xsl:with-param name="add_zero_width_space" select="$add_zero_width_space"/>
+							</xsl:call-template>
+						<!-- </xsl:if> -->
 				</xsl:if>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="insertHorizontalChars">
+		<xsl:param name="str"/>
+		<xsl:param name="writing-mode">lr-tb</xsl:param>
+		<xsl:param name="reference-orientation">90</xsl:param>
+		<xsl:param name="add_zero_width_space">false</xsl:param>
+		<xsl:choose>
+			<xsl:otherwise>
+				<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP">
+					<xsl:if test="normalize-space($writing-mode) != ''">
+						<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+						<xsl:attribute name="reference-orientation">90</xsl:attribute>
+					</xsl:if>
+					<fo:block-container width="1em" role="SKIP"> <!-- border="0.5pt solid green" -->
+						<fo:block line-height="1em" role="SKIP">
+							<xsl:value-of select="$str"/>
+						</fo:block>
+					</fo:block-container>
+				</fo:inline-container>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>

data/lib/metanorma/ogc/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.6.8".freeze
+    VERSION = "2.6.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.10
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -315,7 +315,7 @@ homepage: https://github.com/metanorma/metanorma-ogc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.
 test_files: []