metanorma-ogc 2.2.2.1 → 2.2.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -7392,6 +7392,18 @@
7392
7392
  </xsl:copy>
7393
7393
  </xsl:template>
7394
7394
 
7395
+ <xsl:template match="*[local-name() = 'sub']" mode="contents_item">
7396
+ <xsl:copy>
7397
+ <xsl:apply-templates mode="contents_item"/>
7398
+ </xsl:copy>
7399
+ </xsl:template>
7400
+
7401
+ <xsl:template match="*[local-name() = 'sup']" mode="contents_item">
7402
+ <xsl:copy>
7403
+ <xsl:apply-templates mode="contents_item"/>
7404
+ </xsl:copy>
7405
+ </xsl:template>
7406
+
7395
7407
  <xsl:template match="*[local-name() = 'stem']" mode="contents_item">
7396
7408
  <xsl:copy-of select="."/>
7397
7409
  </xsl:template>
@@ -8372,7 +8384,7 @@
8372
8384
  <!-- ====== -->
8373
8385
  <!-- eref -->
8374
8386
  <!-- ====== -->
8375
- <xsl:template match="*[local-name() = 'eref']">
8387
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
8376
8388
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
8377
8389
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
8378
8390
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -8874,21 +8886,29 @@
8874
8886
  </xsl:variable>
8875
8887
 
8876
8888
  <xsl:template match="@*|node()" mode="index_add_id">
8889
+ <xsl:param name="docid"/>
8877
8890
  <xsl:copy>
8878
- <xsl:apply-templates select="@*|node()" mode="index_add_id"/>
8891
+ <xsl:apply-templates select="@*|node()" mode="index_add_id">
8892
+ <xsl:with-param name="docid" select="$docid"/>
8893
+ </xsl:apply-templates>
8879
8894
  </xsl:copy>
8880
8895
  </xsl:template>
8881
8896
 
8882
8897
  <xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
8898
+ <xsl:param name="docid"/>
8883
8899
  <xsl:variable name="id">
8884
- <xsl:call-template name="generateIndexXrefId"/>
8900
+ <xsl:call-template name="generateIndexXrefId">
8901
+ <xsl:with-param name="docid" select="$docid"/>
8902
+ </xsl:call-template>
8885
8903
  </xsl:variable>
8886
8904
  <xsl:copy> <!-- add id to xref -->
8887
8905
  <xsl:apply-templates select="@*" mode="index_add_id"/>
8888
8906
  <xsl:attribute name="id">
8889
8907
  <xsl:value-of select="$id"/>
8890
8908
  </xsl:attribute>
8891
- <xsl:apply-templates mode="index_add_id"/>
8909
+ <xsl:apply-templates mode="index_add_id">
8910
+ <xsl:with-param name="docid" select="$docid"/>
8911
+ </xsl:apply-templates>
8892
8912
  </xsl:copy>
8893
8913
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
8894
8914
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -8900,7 +8920,9 @@
8900
8920
  <xsl:attribute name="id">
8901
8921
  <xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
8902
8922
  </xsl:attribute>
8903
- <xsl:apply-templates mode="index_add_id"/>
8923
+ <xsl:apply-templates mode="index_add_id">
8924
+ <xsl:with-param name="docid" select="$docid"/>
8925
+ </xsl:apply-templates>
8904
8926
  </xsl:copy>
8905
8927
  </xsl:if>
8906
8928
  </xsl:template>
@@ -8937,12 +8959,33 @@
8937
8959
  </xsl:when>
8938
8960
  <xsl:when test="self::* and local-name(.) = 'xref'">
8939
8961
  <xsl:variable name="id" select="@id"/>
8940
- <xsl:variable name="page" select="$index//item[@id = $id]"/>
8941
- <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8942
- <xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
8943
8962
 
8963
+ <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8944
8964
  <xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
8945
- <xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
8965
+
8966
+ <xsl:variable name="pages_">
8967
+ <xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
8968
+ <xsl:choose>
8969
+ <xsl:when test="@id = $id">
8970
+ <page><xsl:value-of select="."/></page>
8971
+ </xsl:when>
8972
+ <xsl:when test="@id = $id_next">
8973
+ <page_next><xsl:value-of select="."/></page_next>
8974
+ </xsl:when>
8975
+ <xsl:when test="@id = $id_prev">
8976
+ <page_prev><xsl:value-of select="."/></page_prev>
8977
+ </xsl:when>
8978
+ </xsl:choose>
8979
+ </xsl:for-each>
8980
+ </xsl:variable>
8981
+ <xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
8982
+
8983
+ <!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
8984
+ <xsl:variable name="page" select="$pages/page"/>
8985
+ <!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
8986
+ <xsl:variable name="page_next" select="$pages/page_next"/>
8987
+ <!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
8988
+ <xsl:variable name="page_prev" select="$pages/page_prev"/>
8946
8989
 
8947
8990
  <xsl:choose>
8948
8991
  <!-- 2nd pass -->
@@ -9002,16 +9045,20 @@
9002
9045
  </xsl:template>
9003
9046
 
9004
9047
  <xsl:template name="generateIndexXrefId">
9048
+ <xsl:param name="docid"/>
9049
+
9005
9050
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
9006
9051
 
9007
- <xsl:variable name="docid">
9008
- <xsl:call-template name="getDocumentId"/>
9052
+ <xsl:variable name="docid_curr">
9053
+ <xsl:value-of select="$docid"/>
9054
+ <xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
9009
9055
  </xsl:variable>
9056
+
9010
9057
  <xsl:variable name="item_number">
9011
9058
  <xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
9012
9059
  </xsl:variable>
9013
9060
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
9014
- <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
9061
+ <xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
9015
9062
  </xsl:template>
9016
9063
 
9017
9064
  <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
@@ -7392,6 +7392,18 @@
7392
7392
  </xsl:copy>
7393
7393
  </xsl:template>
7394
7394
 
7395
+ <xsl:template match="*[local-name() = 'sub']" mode="contents_item">
7396
+ <xsl:copy>
7397
+ <xsl:apply-templates mode="contents_item"/>
7398
+ </xsl:copy>
7399
+ </xsl:template>
7400
+
7401
+ <xsl:template match="*[local-name() = 'sup']" mode="contents_item">
7402
+ <xsl:copy>
7403
+ <xsl:apply-templates mode="contents_item"/>
7404
+ </xsl:copy>
7405
+ </xsl:template>
7406
+
7395
7407
  <xsl:template match="*[local-name() = 'stem']" mode="contents_item">
7396
7408
  <xsl:copy-of select="."/>
7397
7409
  </xsl:template>
@@ -8372,7 +8384,7 @@
8372
8384
  <!-- ====== -->
8373
8385
  <!-- eref -->
8374
8386
  <!-- ====== -->
8375
- <xsl:template match="*[local-name() = 'eref']">
8387
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
8376
8388
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
8377
8389
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
8378
8390
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -8874,21 +8886,29 @@
8874
8886
  </xsl:variable>
8875
8887
 
8876
8888
  <xsl:template match="@*|node()" mode="index_add_id">
8889
+ <xsl:param name="docid"/>
8877
8890
  <xsl:copy>
8878
- <xsl:apply-templates select="@*|node()" mode="index_add_id"/>
8891
+ <xsl:apply-templates select="@*|node()" mode="index_add_id">
8892
+ <xsl:with-param name="docid" select="$docid"/>
8893
+ </xsl:apply-templates>
8879
8894
  </xsl:copy>
8880
8895
  </xsl:template>
8881
8896
 
8882
8897
  <xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
8898
+ <xsl:param name="docid"/>
8883
8899
  <xsl:variable name="id">
8884
- <xsl:call-template name="generateIndexXrefId"/>
8900
+ <xsl:call-template name="generateIndexXrefId">
8901
+ <xsl:with-param name="docid" select="$docid"/>
8902
+ </xsl:call-template>
8885
8903
  </xsl:variable>
8886
8904
  <xsl:copy> <!-- add id to xref -->
8887
8905
  <xsl:apply-templates select="@*" mode="index_add_id"/>
8888
8906
  <xsl:attribute name="id">
8889
8907
  <xsl:value-of select="$id"/>
8890
8908
  </xsl:attribute>
8891
- <xsl:apply-templates mode="index_add_id"/>
8909
+ <xsl:apply-templates mode="index_add_id">
8910
+ <xsl:with-param name="docid" select="$docid"/>
8911
+ </xsl:apply-templates>
8892
8912
  </xsl:copy>
8893
8913
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
8894
8914
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -8900,7 +8920,9 @@
8900
8920
  <xsl:attribute name="id">
8901
8921
  <xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
8902
8922
  </xsl:attribute>
8903
- <xsl:apply-templates mode="index_add_id"/>
8923
+ <xsl:apply-templates mode="index_add_id">
8924
+ <xsl:with-param name="docid" select="$docid"/>
8925
+ </xsl:apply-templates>
8904
8926
  </xsl:copy>
8905
8927
  </xsl:if>
8906
8928
  </xsl:template>
@@ -8937,12 +8959,33 @@
8937
8959
  </xsl:when>
8938
8960
  <xsl:when test="self::* and local-name(.) = 'xref'">
8939
8961
  <xsl:variable name="id" select="@id"/>
8940
- <xsl:variable name="page" select="$index//item[@id = $id]"/>
8941
- <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8942
- <xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
8943
8962
 
8963
+ <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8944
8964
  <xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
8945
- <xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
8965
+
8966
+ <xsl:variable name="pages_">
8967
+ <xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
8968
+ <xsl:choose>
8969
+ <xsl:when test="@id = $id">
8970
+ <page><xsl:value-of select="."/></page>
8971
+ </xsl:when>
8972
+ <xsl:when test="@id = $id_next">
8973
+ <page_next><xsl:value-of select="."/></page_next>
8974
+ </xsl:when>
8975
+ <xsl:when test="@id = $id_prev">
8976
+ <page_prev><xsl:value-of select="."/></page_prev>
8977
+ </xsl:when>
8978
+ </xsl:choose>
8979
+ </xsl:for-each>
8980
+ </xsl:variable>
8981
+ <xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
8982
+
8983
+ <!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
8984
+ <xsl:variable name="page" select="$pages/page"/>
8985
+ <!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
8986
+ <xsl:variable name="page_next" select="$pages/page_next"/>
8987
+ <!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
8988
+ <xsl:variable name="page_prev" select="$pages/page_prev"/>
8946
8989
 
8947
8990
  <xsl:choose>
8948
8991
  <!-- 2nd pass -->
@@ -9002,16 +9045,20 @@
9002
9045
  </xsl:template>
9003
9046
 
9004
9047
  <xsl:template name="generateIndexXrefId">
9048
+ <xsl:param name="docid"/>
9049
+
9005
9050
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
9006
9051
 
9007
- <xsl:variable name="docid">
9008
- <xsl:call-template name="getDocumentId"/>
9052
+ <xsl:variable name="docid_curr">
9053
+ <xsl:value-of select="$docid"/>
9054
+ <xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
9009
9055
  </xsl:variable>
9056
+
9010
9057
  <xsl:variable name="item_number">
9011
9058
  <xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
9012
9059
  </xsl:variable>
9013
9060
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
9014
- <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
9061
+ <xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
9015
9062
  </xsl:template>
9016
9063
 
9017
9064
  <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
@@ -6563,6 +6563,18 @@
6563
6563
  </xsl:copy>
6564
6564
  </xsl:template>
6565
6565
 
6566
+ <xsl:template match="*[local-name() = 'sub']" mode="contents_item">
6567
+ <xsl:copy>
6568
+ <xsl:apply-templates mode="contents_item"/>
6569
+ </xsl:copy>
6570
+ </xsl:template>
6571
+
6572
+ <xsl:template match="*[local-name() = 'sup']" mode="contents_item">
6573
+ <xsl:copy>
6574
+ <xsl:apply-templates mode="contents_item"/>
6575
+ </xsl:copy>
6576
+ </xsl:template>
6577
+
6566
6578
  <xsl:template match="*[local-name() = 'stem']" mode="contents_item">
6567
6579
  <xsl:copy-of select="."/>
6568
6580
  </xsl:template>
@@ -7531,7 +7543,7 @@
7531
7543
  <!-- ====== -->
7532
7544
  <!-- eref -->
7533
7545
  <!-- ====== -->
7534
- <xsl:template match="*[local-name() = 'eref']">
7546
+ <xsl:template match="*[local-name() = 'eref']" name="eref">
7535
7547
  <xsl:variable name="current_bibitemid" select="@bibitemid"/>
7536
7548
  <!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
7537
7549
  <xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -8037,21 +8049,29 @@
8037
8049
  </xsl:variable>
8038
8050
 
8039
8051
  <xsl:template match="@*|node()" mode="index_add_id">
8052
+ <xsl:param name="docid"/>
8040
8053
  <xsl:copy>
8041
- <xsl:apply-templates select="@*|node()" mode="index_add_id"/>
8054
+ <xsl:apply-templates select="@*|node()" mode="index_add_id">
8055
+ <xsl:with-param name="docid" select="$docid"/>
8056
+ </xsl:apply-templates>
8042
8057
  </xsl:copy>
8043
8058
  </xsl:template>
8044
8059
 
8045
8060
  <xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
8061
+ <xsl:param name="docid"/>
8046
8062
  <xsl:variable name="id">
8047
- <xsl:call-template name="generateIndexXrefId"/>
8063
+ <xsl:call-template name="generateIndexXrefId">
8064
+ <xsl:with-param name="docid" select="$docid"/>
8065
+ </xsl:call-template>
8048
8066
  </xsl:variable>
8049
8067
  <xsl:copy> <!-- add id to xref -->
8050
8068
  <xsl:apply-templates select="@*" mode="index_add_id"/>
8051
8069
  <xsl:attribute name="id">
8052
8070
  <xsl:value-of select="$id"/>
8053
8071
  </xsl:attribute>
8054
- <xsl:apply-templates mode="index_add_id"/>
8072
+ <xsl:apply-templates mode="index_add_id">
8073
+ <xsl:with-param name="docid" select="$docid"/>
8074
+ </xsl:apply-templates>
8055
8075
  </xsl:copy>
8056
8076
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
8057
8077
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -8063,7 +8083,9 @@
8063
8083
  <xsl:attribute name="id">
8064
8084
  <xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
8065
8085
  </xsl:attribute>
8066
- <xsl:apply-templates mode="index_add_id"/>
8086
+ <xsl:apply-templates mode="index_add_id">
8087
+ <xsl:with-param name="docid" select="$docid"/>
8088
+ </xsl:apply-templates>
8067
8089
  </xsl:copy>
8068
8090
  </xsl:if>
8069
8091
  </xsl:template>
@@ -8100,12 +8122,33 @@
8100
8122
  </xsl:when>
8101
8123
  <xsl:when test="self::* and local-name(.) = 'xref'">
8102
8124
  <xsl:variable name="id" select="@id"/>
8103
- <xsl:variable name="page" select="$index//item[@id = $id]"/>
8104
- <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8105
- <xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
8106
8125
 
8126
+ <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
8107
8127
  <xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
8108
- <xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
8128
+
8129
+ <xsl:variable name="pages_">
8130
+ <xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
8131
+ <xsl:choose>
8132
+ <xsl:when test="@id = $id">
8133
+ <page><xsl:value-of select="."/></page>
8134
+ </xsl:when>
8135
+ <xsl:when test="@id = $id_next">
8136
+ <page_next><xsl:value-of select="."/></page_next>
8137
+ </xsl:when>
8138
+ <xsl:when test="@id = $id_prev">
8139
+ <page_prev><xsl:value-of select="."/></page_prev>
8140
+ </xsl:when>
8141
+ </xsl:choose>
8142
+ </xsl:for-each>
8143
+ </xsl:variable>
8144
+ <xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
8145
+
8146
+ <!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
8147
+ <xsl:variable name="page" select="$pages/page"/>
8148
+ <!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
8149
+ <xsl:variable name="page_next" select="$pages/page_next"/>
8150
+ <!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
8151
+ <xsl:variable name="page_prev" select="$pages/page_prev"/>
8109
8152
 
8110
8153
  <xsl:choose>
8111
8154
  <!-- 2nd pass -->
@@ -8165,16 +8208,20 @@
8165
8208
  </xsl:template>
8166
8209
 
8167
8210
  <xsl:template name="generateIndexXrefId">
8211
+ <xsl:param name="docid"/>
8212
+
8168
8213
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
8169
8214
 
8170
- <xsl:variable name="docid">
8171
- <xsl:call-template name="getDocumentId"/>
8215
+ <xsl:variable name="docid_curr">
8216
+ <xsl:value-of select="$docid"/>
8217
+ <xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
8172
8218
  </xsl:variable>
8219
+
8173
8220
  <xsl:variable name="item_number">
8174
8221
  <xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
8175
8222
  </xsl:variable>
8176
8223
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
8177
- <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
8224
+ <xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
8178
8225
  </xsl:template>
8179
8226
 
8180
8227
  <xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
@@ -170,6 +170,11 @@ module IsoDoc
170
170
  @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
171
171
  end
172
172
 
173
+ def table_attrs(node)
174
+ node["class"] == "modspec" and node["width"] = "100%"
175
+ super
176
+ end
177
+
173
178
  include BaseConvert
174
179
  include Init
175
180
  end
@@ -18,11 +18,6 @@ module IsoDoc
18
18
  n = section_names(doc.at(ns("//sections/definitions")), n, 1)
19
19
  clause_names(doc, n)
20
20
  end
21
- if @parse_settings.empty?
22
- middle_section_asset_names(doc)
23
- termnote_anchor_names(doc)
24
- termexample_anchor_names(doc)
25
- end
26
21
  end
27
22
 
28
23
  def preface_anchor_names(doc)
@@ -73,8 +73,14 @@
73
73
  <text/>
74
74
  </element>
75
75
  </define>
76
- <define name="script">
76
+ <define name="locale">
77
77
  <a:documentation>ISO-639</a:documentation>
78
+ <element name="locale">
79
+ <text/>
80
+ </element>
81
+ </define>
82
+ <define name="script">
83
+ <a:documentation>ISO-3166</a:documentation>
78
84
  <element name="script">
79
85
  <text/>
80
86
  </element>
@@ -93,6 +99,9 @@
93
99
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
100
  <attribute name="language"/>
95
101
  </optional>
102
+ <optional>
103
+ <attribute name="locale"/>
104
+ </optional>
96
105
  <optional>
97
106
  <attribute name="script"/>
98
107
  </optional>
@@ -136,6 +145,9 @@
136
145
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
146
  <attribute name="language"/>
138
147
  </optional>
148
+ <optional>
149
+ <attribute name="locale"/>
150
+ </optional>
139
151
  <optional>
140
152
  <attribute name="script"/>
141
153
  </optional>
@@ -650,6 +662,9 @@
650
662
  <zeroOrMore>
651
663
  <ref name="language"/>
652
664
  </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="locale"/>
667
+ </zeroOrMore>
653
668
  <zeroOrMore>
654
669
  <ref name="script"/>
655
670
  </zeroOrMore>
@@ -741,6 +756,9 @@
741
756
  <zeroOrMore>
742
757
  <ref name="language"/>
743
758
  </zeroOrMore>
759
+ <zeroOrMore>
760
+ <ref name="locale"/>
761
+ </zeroOrMore>
744
762
  <zeroOrMore>
745
763
  <ref name="script"/>
746
764
  </zeroOrMore>
@@ -854,6 +872,15 @@
854
872
  <optional>
855
873
  <attribute name="type"/>
856
874
  </optional>
875
+ <optional>
876
+ <attribute name="language"/>
877
+ </optional>
878
+ <optional>
879
+ <attribute name="locale"/>
880
+ </optional>
881
+ <optional>
882
+ <attribute name="script"/>
883
+ </optional>
857
884
  <data type="anyURI"/>
858
885
  </define>
859
886
  <define name="DateType">
@@ -882,6 +909,7 @@
882
909
  <value>vote-started</value>
883
910
  <value>vote-ended</value>
884
911
  <value>announced</value>
912
+ <value>stable-until</value>
885
913
  </choice>
886
914
  </define>
887
915
  <define name="bdate">
@@ -930,6 +958,9 @@
930
958
  <optional>
931
959
  <attribute name="language"/>
932
960
  </optional>
961
+ <optional>
962
+ <attribute name="locale"/>
963
+ </optional>
933
964
  <optional>
934
965
  <attribute name="script"/>
935
966
  </optional>
@@ -205,6 +205,15 @@
205
205
  <data type="boolean"/>
206
206
  </attribute>
207
207
  </optional>
208
+ <optional>
209
+ <attribute name="style">
210
+ <choice>
211
+ <value>basic</value>
212
+ <value>full</value>
213
+ <value>short</value>
214
+ </choice>
215
+ </attribute>
216
+ </optional>
208
217
  <ref name="XrefBody"/>
209
218
  </element>
210
219
  </define>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.2.2.1".freeze
3
+ VERSION = "2.2.4".freeze
4
4
  end
5
5
  end
@@ -1,6 +1,5 @@
1
1
  template:
2
- # skip standardidentifier, it is inserted in front of formattedref within metanorma
3
- standard: "{% if creatornames %}{{ creatornames }} ({{role}}){%else%}{{ publisher_abbrev}}{%endif%} : {{standardidentifier|first}} {{draft}} , <em>{{ title }}</em>. {{ publisher }}{%if place%},{%endif%} {{ place }} ({{date}}). {{uri}}."
2
+ standard: "{% if creatornames %}{{ creatornames }} ({{role}}){%else%}{{ publisher_abbrev}}{%endif%} : {{authoritative_identifier|first}} {{draft}} , <em>{{ title }}</em>. {{ publisher }}{%if place%},{%endif%} {{ place }} ({{date}}). {{uri}}."
4
3
  misc: standard
5
4
  techreport: standard
6
5
  book: "{{ creatornames }} ({{role}}) : <em>{{ title }}</em> . {{ publisher }}, {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%} ({{date}})."
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
26
26
 
27
27
  spec.add_dependency "iso-639"
28
- spec.add_dependency "metanorma-standoc", "~> 2.2.0"
28
+ spec.add_dependency "metanorma-standoc", "~> 2.2.4"
29
29
 
30
30
  spec.add_development_dependency "debug"
31
31
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.2.2.1
4
+ version: 2.2.4
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-09-07 00:00:00.000000000 Z
11
+ date: 2022-10-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.2.0
33
+ version: 2.2.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.2.0
40
+ version: 2.2.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: debug
43
43
  requirement: !ruby/object:Gem::Requirement