metanorma-ogc 2.7.5 → 2.7.7

data/lib/isodoc/ogc/ogc.policy.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/ogc/ogc.reference-model.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/ogc/ogc.release-notes.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/ogc/ogc.test-suite.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -2252,6 +2252,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -10422,11 +10423,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -13960,6 +13961,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -14242,6 +14246,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -15601,6 +15619,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

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

@@ -1052,6 +1052,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -9177,11 +9178,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -12719,6 +12720,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -13001,6 +13005,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -14360,6 +14378,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/metanorma/ogc/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/ogc/cleanup.rb

@@ -18,7 +18,7 @@ module Metanorma
         insert_submitters(xml, sect)
       end
 
-      def add_id
+      def add_id_txt
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
@@ -45,7 +45,7 @@ module Metanorma
         description = "standard" if %w(standard community-standard)
           .include?(doctype)
         <<~CLAUSE
-          <clause type='security' #{add_id}>
+          <clause type='security' #{add_id_txt}>
             <title>Security considerations</title>
             <p>#{@i18n.security_empty.sub('%', description)}</p></clause>
         CLAUSE

data/lib/metanorma/ogc/converter.rb

@@ -7,9 +7,6 @@ require_relative "cleanup"
 
 module Metanorma
   module Ogc
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       register_for "ogc"
 
@@ -83,8 +80,7 @@ module Metanorma
         when "foreword", "introduction" then "donotrecognise-foreword"
         when "references" then "normative references"
         when "glossary" then "terms and definitions"
-        else
-          super
+        else super
         end
       end
 
@@ -154,6 +150,7 @@ module Metanorma
         attrs1 = attrs.merge(id: "_#{UUIDTools::UUID.random_create}")
         xml.annex **attr_code(attrs1) do |xml_section|
           xml_section.title { |name| name << node.title }
+          attrs.delete(:anchor)
           xml_section.terms **attr_code(attrs) do |terms|
             (s = node.attr("source")) && s.split(",").each do |s1|
               terms.termdocsource(nil, **attr_code(bibitemid: s1))
@@ -163,11 +160,6 @@ module Metanorma
         end
       end
 
-      # KILL 
-      def highlight_parsex(text, xml)
-        xml.hi { |s| s << text }
-      end
-
       def set_obligation(attrs, node)
         if node.attr("style") == "appendix" && node.level == 1
           attrs[:obligation] = if node.attributes.has_key?("obligation")