metanorma-ogc 2.0.5 → 2.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +81 -21
  3. data/lib/isodoc/ogc/ogc.best-practice.xsl +81 -21
  4. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +81 -21
  5. data/lib/isodoc/ogc/ogc.community-practice.xsl +81 -21
  6. data/lib/isodoc/ogc/ogc.community-standard.xsl +81 -21
  7. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +81 -21
  8. data/lib/isodoc/ogc/ogc.engineering-report.xsl +81 -21
  9. data/lib/isodoc/ogc/ogc.other.xsl +81 -21
  10. data/lib/isodoc/ogc/ogc.policy.xsl +81 -21
  11. data/lib/isodoc/ogc/ogc.reference-model.xsl +81 -21
  12. data/lib/isodoc/ogc/ogc.release-notes.xsl +81 -21
  13. data/lib/isodoc/ogc/ogc.standard.xsl +81 -21
  14. data/lib/isodoc/ogc/ogc.test-suite.xsl +81 -21
  15. data/lib/isodoc/ogc/ogc.user-guide.xsl +81 -21
  16. data/lib/isodoc/ogc/ogc.white-paper.xsl +81 -21
  17. data/lib/metanorma/ogc/version.rb +1 -1
  18. metadata +3 -3
data/lib/isodoc/ogc/ogc.test-suite.xsl CHANGED
@@ -1451,7 +1451,7 @@
1451
1451
  </fo:static-content>
1452
1452
  </xsl:template>
1453
1453
 
1454
- <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
1454
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
1455
1455
  <xsl:call-template name="getLang"/>
1456
1456
  </xsl:variable><xsl:variable name="pageWidth_">
1457
1457
  215.9
@@ -6113,7 +6113,51 @@
6113
6113
  <xsl:with-param name="text" select="$text_step1"/>
6114
6114
  </xsl:call-template>
6115
6115
  </xsl:variable>
6116
- <xsl:value-of select="$text_step2"/>
6116
+
6117
+ <!-- <xsl:value-of select="$text_step2"/> -->
6118
+
6119
+ <!-- add zero-width space after space -->
6120
+ <xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
6121
+
6122
+ <!-- split text by zero-width space -->
6123
+ <xsl:variable name="text_step4">
6124
+ <xsl:call-template name="split">
6125
+ <xsl:with-param name="pText" select="$text_step3"/>
6126
+ <xsl:with-param name="sep" select="$zero_width_space"/>
6127
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
6128
+ <xsl:with-param name="keep_sep">true</xsl:with-param>
6129
+ </xsl:call-template>
6130
+ </xsl:variable>
6131
+
6132
+ <xsl:for-each select="xalan:nodeset($text_step4)/item">
6133
+ <xsl:choose>
6134
+ <xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
6135
+ <xsl:call-template name="interspers">
6136
+ <xsl:with-param name="str" select="."/>
6137
+ </xsl:call-template>
6138
+ </xsl:when>
6139
+ <xsl:otherwise>
6140
+ <xsl:value-of select="."/>
6141
+ </xsl:otherwise>
6142
+ </xsl:choose>
6143
+ </xsl:for-each>
6144
+
6145
+ </xsl:template><xsl:template name="interspers">
6146
+ <xsl:param name="str"/>
6147
+ <xsl:param name="char" select="$zero_width_space"/>
6148
+ <xsl:if test="$str != ''">
6149
+ <xsl:value-of select="substring($str, 1, 1)"/>
6150
+
6151
+ <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
6152
+ <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
6153
+ <xsl:value-of select="$char"/>
6154
+ </xsl:if>
6155
+
6156
+ <xsl:call-template name="interspers">
6157
+ <xsl:with-param name="str" select="substring($str, 2)"/>
6158
+ <xsl:with-param name="char" select="$char"/>
6159
+ </xsl:call-template>
6160
+ </xsl:if>
6117
6161
  </xsl:template><xsl:template match="*" mode="syntax_highlight">
6118
6162
  <xsl:apply-templates mode="syntax_highlight"/>
6119
6163
  </xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6631,11 +6675,24 @@
6631
6675
  </xsl:template><xsl:template match="*[local-name() = 'author']">
6632
6676
  <xsl:text>— </xsl:text>
6633
6677
  <xsl:apply-templates/>
6634
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
6678
+ </xsl:template><xsl:variable name="bibitems_">
6679
+ <xsl:for-each select="//*[local-name() = 'bibitem']">
6680
+ <xsl:copy-of select="."/>
6681
+ </xsl:for-each>
6682
+ </xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
6683
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
6684
+ <xsl:copy-of select="."/>
6685
+ </xsl:for-each>
6686
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
6687
+ <xsl:copy-of select="."/>
6688
+ </xsl:for-each>
6689
+ </xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
6635
6690
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
6636
- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
6691
+ <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
6692
+ <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
6637
6693
  <xsl:choose>
6638
- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6694
+ <!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6695
+ <xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6639
6696
  <fo:inline xsl:use-attribute-sets="eref-style">
6640
6697
  <xsl:if test="@type = 'footnote'">
6641
6698
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -7881,7 +7938,7 @@
7881
7938
  <xsl:copy>
7882
7939
  <xsl:copy-of select="@*"/>
7883
7940
  <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
7884
- <xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
7941
+ <xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
7885
7942
  <xsl:sort select="@displayorder" data-type="number"/>
7886
7943
  <xsl:apply-templates select="." mode="update_xml_step1"/>
7887
7944
  </xsl:for-each>
@@ -8130,22 +8187,25 @@
8130
8187
  <xsl:param name="pText" select="."/>
8131
8188
  <xsl:param name="sep" select="','"/>
8132
8189
  <xsl:param name="normalize-space" select="'true'"/>
8190
+ <xsl:param name="keep_sep" select="'false'"/>
8133
8191
  <xsl:if test="string-length($pText) &gt;0">
8134
- <item>
8135
- <xsl:choose>
8136
- <xsl:when test="$normalize-space = 'true'">
8137
- <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
8138
- </xsl:when>
8139
- <xsl:otherwise>
8140
- <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
8141
- </xsl:otherwise>
8142
- </xsl:choose>
8143
- </item>
8144
- <xsl:call-template name="split">
8145
- <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
8146
- <xsl:with-param name="sep" select="$sep"/>
8147
- <xsl:with-param name="normalize-space" select="$normalize-space"/>
8148
- </xsl:call-template>
8192
+ <item>
8193
+ <xsl:choose>
8194
+ <xsl:when test="$normalize-space = 'true'">
8195
+ <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
8196
+ </xsl:when>
8197
+ <xsl:otherwise>
8198
+ <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
8199
+ </xsl:otherwise>
8200
+ </xsl:choose>
8201
+ </item>
8202
+ <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
8203
+ <xsl:call-template name="split">
8204
+ <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
8205
+ <xsl:with-param name="sep" select="$sep"/>
8206
+ <xsl:with-param name="normalize-space" select="$normalize-space"/>
8207
+ <xsl:with-param name="keep_sep" select="$keep_sep"/>
8208
+ </xsl:call-template>
8149
8209
  </xsl:if>
8150
8210
  </xsl:template><xsl:template name="getDocumentId">
8151
8211
  <xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
data/lib/isodoc/ogc/ogc.user-guide.xsl CHANGED
@@ -1451,7 +1451,7 @@
1451
1451
  </fo:static-content>
1452
1452
  </xsl:template>
1453
1453
 
1454
- <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
1454
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
1455
1455
  <xsl:call-template name="getLang"/>
1456
1456
  </xsl:variable><xsl:variable name="pageWidth_">
1457
1457
  215.9
@@ -6113,7 +6113,51 @@
6113
6113
  <xsl:with-param name="text" select="$text_step1"/>
6114
6114
  </xsl:call-template>
6115
6115
  </xsl:variable>
6116
- <xsl:value-of select="$text_step2"/>
6116
+
6117
+ <!-- <xsl:value-of select="$text_step2"/> -->
6118
+
6119
+ <!-- add zero-width space after space -->
6120
+ <xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
6121
+
6122
+ <!-- split text by zero-width space -->
6123
+ <xsl:variable name="text_step4">
6124
+ <xsl:call-template name="split">
6125
+ <xsl:with-param name="pText" select="$text_step3"/>
6126
+ <xsl:with-param name="sep" select="$zero_width_space"/>
6127
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
6128
+ <xsl:with-param name="keep_sep">true</xsl:with-param>
6129
+ </xsl:call-template>
6130
+ </xsl:variable>
6131
+
6132
+ <xsl:for-each select="xalan:nodeset($text_step4)/item">
6133
+ <xsl:choose>
6134
+ <xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
6135
+ <xsl:call-template name="interspers">
6136
+ <xsl:with-param name="str" select="."/>
6137
+ </xsl:call-template>
6138
+ </xsl:when>
6139
+ <xsl:otherwise>
6140
+ <xsl:value-of select="."/>
6141
+ </xsl:otherwise>
6142
+ </xsl:choose>
6143
+ </xsl:for-each>
6144
+
6145
+ </xsl:template><xsl:template name="interspers">
6146
+ <xsl:param name="str"/>
6147
+ <xsl:param name="char" select="$zero_width_space"/>
6148
+ <xsl:if test="$str != ''">
6149
+ <xsl:value-of select="substring($str, 1, 1)"/>
6150
+
6151
+ <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
6152
+ <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
6153
+ <xsl:value-of select="$char"/>
6154
+ </xsl:if>
6155
+
6156
+ <xsl:call-template name="interspers">
6157
+ <xsl:with-param name="str" select="substring($str, 2)"/>
6158
+ <xsl:with-param name="char" select="$char"/>
6159
+ </xsl:call-template>
6160
+ </xsl:if>
6117
6161
  </xsl:template><xsl:template match="*" mode="syntax_highlight">
6118
6162
  <xsl:apply-templates mode="syntax_highlight"/>
6119
6163
  </xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6631,11 +6675,24 @@
6631
6675
  </xsl:template><xsl:template match="*[local-name() = 'author']">
6632
6676
  <xsl:text>— </xsl:text>
6633
6677
  <xsl:apply-templates/>
6634
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
6678
+ </xsl:template><xsl:variable name="bibitems_">
6679
+ <xsl:for-each select="//*[local-name() = 'bibitem']">
6680
+ <xsl:copy-of select="."/>
6681
+ </xsl:for-each>
6682
+ </xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
6683
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
6684
+ <xsl:copy-of select="."/>
6685
+ </xsl:for-each>
6686
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
6687
+ <xsl:copy-of select="."/>
6688
+ </xsl:for-each>
6689
+ </xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
6635
6690
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
6636
- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
6691
+ <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
6692
+ <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
6637
6693
  <xsl:choose>
6638
- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6694
+ <!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6695
+ <xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
6639
6696
  <fo:inline xsl:use-attribute-sets="eref-style">
6640
6697
  <xsl:if test="@type = 'footnote'">
6641
6698
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -7881,7 +7938,7 @@
7881
7938
  <xsl:copy>
7882
7939
  <xsl:copy-of select="@*"/>
7883
7940
  <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
7884
- <xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
7941
+ <xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
7885
7942
  <xsl:sort select="@displayorder" data-type="number"/>
7886
7943
  <xsl:apply-templates select="." mode="update_xml_step1"/>
7887
7944
  </xsl:for-each>
@@ -8130,22 +8187,25 @@
8130
8187
  <xsl:param name="pText" select="."/>
8131
8188
  <xsl:param name="sep" select="','"/>
8132
8189
  <xsl:param name="normalize-space" select="'true'"/>
8190
+ <xsl:param name="keep_sep" select="'false'"/>
8133
8191
  <xsl:if test="string-length($pText) &gt;0">
8134
- <item>
8135
- <xsl:choose>
8136
- <xsl:when test="$normalize-space = 'true'">
8137
- <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
8138
- </xsl:when>
8139
- <xsl:otherwise>
8140
- <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
8141
- </xsl:otherwise>
8142
- </xsl:choose>
8143
- </item>
8144
- <xsl:call-template name="split">
8145
- <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
8146
- <xsl:with-param name="sep" select="$sep"/>
8147
- <xsl:with-param name="normalize-space" select="$normalize-space"/>
8148
- </xsl:call-template>
8192
+ <item>
8193
+ <xsl:choose>
8194
+ <xsl:when test="$normalize-space = 'true'">
8195
+ <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
8196
+ </xsl:when>
8197
+ <xsl:otherwise>
8198
+ <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
8199
+ </xsl:otherwise>
8200
+ </xsl:choose>
8201
+ </item>
8202
+ <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
8203
+ <xsl:call-template name="split">
8204
+ <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
8205
+ <xsl:with-param name="sep" select="$sep"/>
8206
+ <xsl:with-param name="normalize-space" select="$normalize-space"/>
8207
+ <xsl:with-param name="keep_sep" select="$keep_sep"/>
8208
+ </xsl:call-template>
8149
8209
  </xsl:if>
8150
8210
  </xsl:template><xsl:template name="getDocumentId">
8151
8211
  <xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
data/lib/isodoc/ogc/ogc.white-paper.xsl CHANGED
@@ -632,7 +632,7 @@
632
632
  </xsl:choose>
633
633
  </xsl:template>
634
634
 
635
- <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
635
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
636
636
  <xsl:call-template name="getLang"/>
637
637
  </xsl:variable><xsl:variable name="pageWidth_">
638
638
  215.9
@@ -5274,7 +5274,51 @@
5274
5274
  <xsl:with-param name="text" select="$text_step1"/>
5275
5275
  </xsl:call-template>
5276
5276
  </xsl:variable>
5277
- <xsl:value-of select="$text_step2"/>
5277
+
5278
+ <!-- <xsl:value-of select="$text_step2"/> -->
5279
+
5280
+ <!-- add zero-width space after space -->
5281
+ <xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
5282
+
5283
+ <!-- split text by zero-width space -->
5284
+ <xsl:variable name="text_step4">
5285
+ <xsl:call-template name="split">
5286
+ <xsl:with-param name="pText" select="$text_step3"/>
5287
+ <xsl:with-param name="sep" select="$zero_width_space"/>
5288
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
5289
+ <xsl:with-param name="keep_sep">true</xsl:with-param>
5290
+ </xsl:call-template>
5291
+ </xsl:variable>
5292
+
5293
+ <xsl:for-each select="xalan:nodeset($text_step4)/item">
5294
+ <xsl:choose>
5295
+ <xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
5296
+ <xsl:call-template name="interspers">
5297
+ <xsl:with-param name="str" select="."/>
5298
+ </xsl:call-template>
5299
+ </xsl:when>
5300
+ <xsl:otherwise>
5301
+ <xsl:value-of select="."/>
5302
+ </xsl:otherwise>
5303
+ </xsl:choose>
5304
+ </xsl:for-each>
5305
+
5306
+ </xsl:template><xsl:template name="interspers">
5307
+ <xsl:param name="str"/>
5308
+ <xsl:param name="char" select="$zero_width_space"/>
5309
+ <xsl:if test="$str != ''">
5310
+ <xsl:value-of select="substring($str, 1, 1)"/>
5311
+
5312
+ <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
5313
+ <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
5314
+ <xsl:value-of select="$char"/>
5315
+ </xsl:if>
5316
+
5317
+ <xsl:call-template name="interspers">
5318
+ <xsl:with-param name="str" select="substring($str, 2)"/>
5319
+ <xsl:with-param name="char" select="$char"/>
5320
+ </xsl:call-template>
5321
+ </xsl:if>
5278
5322
  </xsl:template><xsl:template match="*" mode="syntax_highlight">
5279
5323
  <xsl:apply-templates mode="syntax_highlight"/>
5280
5324
  </xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -5792,11 +5836,24 @@
5792
5836
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5793
5837
  <xsl:text>— </xsl:text>
5794
5838
  <xsl:apply-templates/>
5795
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5839
+ </xsl:template><xsl:variable name="bibitems_">
5840
+ <xsl:for-each select="//*[local-name() = 'bibitem']">
5841
+ <xsl:copy-of select="."/>
5842
+ </xsl:for-each>
5843
+ </xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
5844
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5845
+ <xsl:copy-of select="."/>
5846
+ </xsl:for-each>
5847
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
5848
+ <xsl:copy-of select="."/>
5849
+ </xsl:for-each>
5850
+ </xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5796
5851
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
5797
- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
5852
+ <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
5853
+ <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
5798
5854
  <xsl:choose>
5799
- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
5855
+ <!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
5856
+ <xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
5800
5857
  <fo:inline xsl:use-attribute-sets="eref-style">
5801
5858
  <xsl:if test="@type = 'footnote'">
5802
5859
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -7047,7 +7104,7 @@
7047
7104
  <xsl:copy>
7048
7105
  <xsl:copy-of select="@*"/>
7049
7106
  <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
7050
- <xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
7107
+ <xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
7051
7108
  <xsl:sort select="@displayorder" data-type="number"/>
7052
7109
  <xsl:apply-templates select="." mode="update_xml_step1"/>
7053
7110
  </xsl:for-each>
@@ -7296,22 +7353,25 @@
7296
7353
  <xsl:param name="pText" select="."/>
7297
7354
  <xsl:param name="sep" select="','"/>
7298
7355
  <xsl:param name="normalize-space" select="'true'"/>
7356
+ <xsl:param name="keep_sep" select="'false'"/>
7299
7357
  <xsl:if test="string-length($pText) &gt;0">
7300
- <item>
7301
- <xsl:choose>
7302
- <xsl:when test="$normalize-space = 'true'">
7303
- <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
7304
- </xsl:when>
7305
- <xsl:otherwise>
7306
- <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
7307
- </xsl:otherwise>
7308
- </xsl:choose>
7309
- </item>
7310
- <xsl:call-template name="split">
7311
- <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
7312
- <xsl:with-param name="sep" select="$sep"/>
7313
- <xsl:with-param name="normalize-space" select="$normalize-space"/>
7314
- </xsl:call-template>
7358
+ <item>
7359
+ <xsl:choose>
7360
+ <xsl:when test="$normalize-space = 'true'">
7361
+ <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
7362
+ </xsl:when>
7363
+ <xsl:otherwise>
7364
+ <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
7365
+ </xsl:otherwise>
7366
+ </xsl:choose>
7367
+ </item>
7368
+ <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
7369
+ <xsl:call-template name="split">
7370
+ <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
7371
+ <xsl:with-param name="sep" select="$sep"/>
7372
+ <xsl:with-param name="normalize-space" select="$normalize-space"/>
7373
+ <xsl:with-param name="keep_sep" select="$keep_sep"/>
7374
+ </xsl:call-template>
7315
7375
  </xsl:if>
7316
7376
  </xsl:template><xsl:template name="getDocumentId">
7317
7377
  <xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
data/lib/metanorma/ogc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.0.5".freeze
3
+ VERSION = "2.0.6".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.5
4
+ version: 2.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-03-07 00:00:00.000000000 Z
11
+ date: 2022-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
285
285
  - !ruby/object:Gem::Version
286
286
  version: '0'
287
287
  requirements: []
288
- rubygems_version: 3.2.32
288
+ rubygems_version: 3.3.9
289
289
  signing_key:
290
290
  specification_version: 4
291
291
  summary: Metanorma for the Open Geospatial Consortium.