metanorma-bipm 2.7.4 → 2.7.5
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.
- checksums.yaml +4 -4
- data/lib/isodoc/bipm/bipm.brochure.xsl +40 -3
- data/lib/isodoc/bipm/bipm.guide.xsl +40 -3
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +40 -3
- data/lib/isodoc/bipm/bipm.rapport.xsl +40 -3
- data/lib/isodoc/bipm/html/htmlstyle.css +27 -31
- data/lib/isodoc/bipm/jcgm.standard.xsl +42 -5
- data/lib/isodoc/bipm/presentation_footnotes.rb +2 -5
- data/lib/metanorma/bipm/front.rb +2 -8
- data/lib/metanorma/bipm/isodoc.rng +26 -19
- data/lib/metanorma/bipm/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: efc4e1f60334ce17359cae16254bcc70af7cab4b4d4cb7851c04ff8e1c7d82d1
|
4
|
+
data.tar.gz: f0fe8ed85a3a4c00a93c61cb4c13e0759f991e51c389a0421080e991d3e158e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3f78ec9f000852f061674ba012148cd31f94f282daaf2803b8d6ad17126819c2b4f7b0e59c50504b2d997f622dfe3b4fe3399d459d99a535dcccbfb2c44e4f56
|
7
|
+
data.tar.gz: 754d3a22bb6ef6fc22c08e36b207a2cfc7c2d09e9d521effdc3d87c8e926dc7df3a20c6b7767f435bed8e73ec118dcaa7c1c3bcdc80c2c1c8ccdb89155083e6b
|
@@ -4290,6 +4290,7 @@
|
|
4290
4290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4291
4291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4292
4292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
4293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
4293
4294
|
<xsl:variable name="cr"> </xsl:variable>
|
4294
4295
|
<xsl:variable name="lf">
|
4295
4296
|
</xsl:variable>
|
@@ -4832,6 +4833,7 @@
|
|
4832
4833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
4833
4834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
4834
4835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4835
4837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
4836
4838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
4837
4839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -4846,10 +4848,10 @@
|
|
4846
4848
|
|
4847
4849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
4848
4850
|
|
4849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
4851
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
4850
4852
|
<xsl:copy>
|
4851
4853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
4852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
4854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
4853
4855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
4854
4856
|
</xsl:copy>
|
4855
4857
|
</xsl:template>
|
@@ -5960,6 +5962,12 @@
|
|
5960
5962
|
<xsl:template name="refine_sourcecode-style">
|
5961
5963
|
</xsl:template> <!-- refine_sourcecode-style -->
|
5962
5964
|
|
5965
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
5966
|
+
</xsl:attribute-set>
|
5967
|
+
|
5968
|
+
<xsl:template name="refine_sourcecode-number-style">
|
5969
|
+
</xsl:template>
|
5970
|
+
|
5963
5971
|
<xsl:attribute-set name="sourcecode-name-style">
|
5964
5972
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
5965
5973
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -7344,6 +7352,12 @@
|
|
7344
7352
|
<xsl:template name="refine_term-name-style">
|
7345
7353
|
</xsl:template>
|
7346
7354
|
|
7355
|
+
<xsl:attribute-set name="preferred-style">
|
7356
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
7357
|
+
|
7358
|
+
<xsl:template name="refine_preferred-style">
|
7359
|
+
</xsl:template>
|
7360
|
+
|
7347
7361
|
<xsl:attribute-set name="preferred-block-style">
|
7348
7362
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
7349
7363
|
|
@@ -7978,6 +7992,12 @@
|
|
7978
7992
|
<xsl:call-template name="setBordersTableArray"/>
|
7979
7993
|
</xsl:template> <!-- refine_table-style -->
|
7980
7994
|
|
7995
|
+
<xsl:attribute-set name="table-number-style">
|
7996
|
+
</xsl:attribute-set>
|
7997
|
+
|
7998
|
+
<xsl:template name="refine_table-number-style">
|
7999
|
+
</xsl:template>
|
8000
|
+
|
7981
8001
|
<xsl:attribute-set name="table-name-style">
|
7982
8002
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
7983
8003
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -11643,6 +11663,12 @@
|
|
11643
11663
|
<xsl:template name="refine_figure-style">
|
11644
11664
|
</xsl:template>
|
11645
11665
|
|
11666
|
+
<xsl:attribute-set name="figure-number-style">
|
11667
|
+
</xsl:attribute-set>
|
11668
|
+
|
11669
|
+
<xsl:template name="refine_figure-number-style">
|
11670
|
+
</xsl:template>
|
11671
|
+
|
11646
11672
|
<xsl:attribute-set name="figure-name-style">
|
11647
11673
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
11648
11674
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
@@ -16565,10 +16591,17 @@
|
|
16565
16591
|
</xsl:choose>
|
16566
16592
|
</xsl:template>
|
16567
16593
|
|
16594
|
+
<xsl:attribute-set name="clause-style">
|
16595
|
+
|
16596
|
+
</xsl:attribute-set>
|
16597
|
+
|
16598
|
+
<xsl:template name="refine_clause-style">
|
16599
|
+
</xsl:template>
|
16600
|
+
|
16568
16601
|
<!-- main sections -->
|
16569
16602
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
16570
16603
|
<xsl:call-template name="setNamedDestination"/>
|
16571
|
-
<fo:block>
|
16604
|
+
<fo:block role="Sect">
|
16572
16605
|
<xsl:call-template name="setId"/>
|
16573
16606
|
|
16574
16607
|
<xsl:call-template name="sections_element_style"/>
|
@@ -16693,6 +16726,10 @@
|
|
16693
16726
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
16694
16727
|
</xsl:template>
|
16695
16728
|
|
16729
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
16730
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
16731
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
16732
|
+
|
16696
16733
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
16697
16734
|
<xsl:template name="insert_basic_link">
|
16698
16735
|
<xsl:param name="element"/>
|
@@ -4290,6 +4290,7 @@
|
|
4290
4290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4291
4291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4292
4292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
4293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
4293
4294
|
<xsl:variable name="cr"> </xsl:variable>
|
4294
4295
|
<xsl:variable name="lf">
|
4295
4296
|
</xsl:variable>
|
@@ -4832,6 +4833,7 @@
|
|
4832
4833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
4833
4834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
4834
4835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4835
4837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
4836
4838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
4837
4839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -4846,10 +4848,10 @@
|
|
4846
4848
|
|
4847
4849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
4848
4850
|
|
4849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
4851
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
4850
4852
|
<xsl:copy>
|
4851
4853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
4852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
4854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
4853
4855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
4854
4856
|
</xsl:copy>
|
4855
4857
|
</xsl:template>
|
@@ -5960,6 +5962,12 @@
|
|
5960
5962
|
<xsl:template name="refine_sourcecode-style">
|
5961
5963
|
</xsl:template> <!-- refine_sourcecode-style -->
|
5962
5964
|
|
5965
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
5966
|
+
</xsl:attribute-set>
|
5967
|
+
|
5968
|
+
<xsl:template name="refine_sourcecode-number-style">
|
5969
|
+
</xsl:template>
|
5970
|
+
|
5963
5971
|
<xsl:attribute-set name="sourcecode-name-style">
|
5964
5972
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
5965
5973
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -7344,6 +7352,12 @@
|
|
7344
7352
|
<xsl:template name="refine_term-name-style">
|
7345
7353
|
</xsl:template>
|
7346
7354
|
|
7355
|
+
<xsl:attribute-set name="preferred-style">
|
7356
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
7357
|
+
|
7358
|
+
<xsl:template name="refine_preferred-style">
|
7359
|
+
</xsl:template>
|
7360
|
+
|
7347
7361
|
<xsl:attribute-set name="preferred-block-style">
|
7348
7362
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
7349
7363
|
|
@@ -7978,6 +7992,12 @@
|
|
7978
7992
|
<xsl:call-template name="setBordersTableArray"/>
|
7979
7993
|
</xsl:template> <!-- refine_table-style -->
|
7980
7994
|
|
7995
|
+
<xsl:attribute-set name="table-number-style">
|
7996
|
+
</xsl:attribute-set>
|
7997
|
+
|
7998
|
+
<xsl:template name="refine_table-number-style">
|
7999
|
+
</xsl:template>
|
8000
|
+
|
7981
8001
|
<xsl:attribute-set name="table-name-style">
|
7982
8002
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
7983
8003
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -11643,6 +11663,12 @@
|
|
11643
11663
|
<xsl:template name="refine_figure-style">
|
11644
11664
|
</xsl:template>
|
11645
11665
|
|
11666
|
+
<xsl:attribute-set name="figure-number-style">
|
11667
|
+
</xsl:attribute-set>
|
11668
|
+
|
11669
|
+
<xsl:template name="refine_figure-number-style">
|
11670
|
+
</xsl:template>
|
11671
|
+
|
11646
11672
|
<xsl:attribute-set name="figure-name-style">
|
11647
11673
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
11648
11674
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
@@ -16565,10 +16591,17 @@
|
|
16565
16591
|
</xsl:choose>
|
16566
16592
|
</xsl:template>
|
16567
16593
|
|
16594
|
+
<xsl:attribute-set name="clause-style">
|
16595
|
+
|
16596
|
+
</xsl:attribute-set>
|
16597
|
+
|
16598
|
+
<xsl:template name="refine_clause-style">
|
16599
|
+
</xsl:template>
|
16600
|
+
|
16568
16601
|
<!-- main sections -->
|
16569
16602
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
16570
16603
|
<xsl:call-template name="setNamedDestination"/>
|
16571
|
-
<fo:block>
|
16604
|
+
<fo:block role="Sect">
|
16572
16605
|
<xsl:call-template name="setId"/>
|
16573
16606
|
|
16574
16607
|
<xsl:call-template name="sections_element_style"/>
|
@@ -16693,6 +16726,10 @@
|
|
16693
16726
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
16694
16727
|
</xsl:template>
|
16695
16728
|
|
16729
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
16730
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
16731
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
16732
|
+
|
16696
16733
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
16697
16734
|
<xsl:template name="insert_basic_link">
|
16698
16735
|
<xsl:param name="element"/>
|
@@ -4290,6 +4290,7 @@
|
|
4290
4290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4291
4291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4292
4292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
4293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
4293
4294
|
<xsl:variable name="cr"> </xsl:variable>
|
4294
4295
|
<xsl:variable name="lf">
|
4295
4296
|
</xsl:variable>
|
@@ -4832,6 +4833,7 @@
|
|
4832
4833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
4833
4834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
4834
4835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4835
4837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
4836
4838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
4837
4839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -4846,10 +4848,10 @@
|
|
4846
4848
|
|
4847
4849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
4848
4850
|
|
4849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
4851
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
4850
4852
|
<xsl:copy>
|
4851
4853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
4852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
4854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
4853
4855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
4854
4856
|
</xsl:copy>
|
4855
4857
|
</xsl:template>
|
@@ -5960,6 +5962,12 @@
|
|
5960
5962
|
<xsl:template name="refine_sourcecode-style">
|
5961
5963
|
</xsl:template> <!-- refine_sourcecode-style -->
|
5962
5964
|
|
5965
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
5966
|
+
</xsl:attribute-set>
|
5967
|
+
|
5968
|
+
<xsl:template name="refine_sourcecode-number-style">
|
5969
|
+
</xsl:template>
|
5970
|
+
|
5963
5971
|
<xsl:attribute-set name="sourcecode-name-style">
|
5964
5972
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
5965
5973
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -7344,6 +7352,12 @@
|
|
7344
7352
|
<xsl:template name="refine_term-name-style">
|
7345
7353
|
</xsl:template>
|
7346
7354
|
|
7355
|
+
<xsl:attribute-set name="preferred-style">
|
7356
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
7357
|
+
|
7358
|
+
<xsl:template name="refine_preferred-style">
|
7359
|
+
</xsl:template>
|
7360
|
+
|
7347
7361
|
<xsl:attribute-set name="preferred-block-style">
|
7348
7362
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
7349
7363
|
|
@@ -7978,6 +7992,12 @@
|
|
7978
7992
|
<xsl:call-template name="setBordersTableArray"/>
|
7979
7993
|
</xsl:template> <!-- refine_table-style -->
|
7980
7994
|
|
7995
|
+
<xsl:attribute-set name="table-number-style">
|
7996
|
+
</xsl:attribute-set>
|
7997
|
+
|
7998
|
+
<xsl:template name="refine_table-number-style">
|
7999
|
+
</xsl:template>
|
8000
|
+
|
7981
8001
|
<xsl:attribute-set name="table-name-style">
|
7982
8002
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
7983
8003
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -11643,6 +11663,12 @@
|
|
11643
11663
|
<xsl:template name="refine_figure-style">
|
11644
11664
|
</xsl:template>
|
11645
11665
|
|
11666
|
+
<xsl:attribute-set name="figure-number-style">
|
11667
|
+
</xsl:attribute-set>
|
11668
|
+
|
11669
|
+
<xsl:template name="refine_figure-number-style">
|
11670
|
+
</xsl:template>
|
11671
|
+
|
11646
11672
|
<xsl:attribute-set name="figure-name-style">
|
11647
11673
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
11648
11674
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
@@ -16565,10 +16591,17 @@
|
|
16565
16591
|
</xsl:choose>
|
16566
16592
|
</xsl:template>
|
16567
16593
|
|
16594
|
+
<xsl:attribute-set name="clause-style">
|
16595
|
+
|
16596
|
+
</xsl:attribute-set>
|
16597
|
+
|
16598
|
+
<xsl:template name="refine_clause-style">
|
16599
|
+
</xsl:template>
|
16600
|
+
|
16568
16601
|
<!-- main sections -->
|
16569
16602
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
16570
16603
|
<xsl:call-template name="setNamedDestination"/>
|
16571
|
-
<fo:block>
|
16604
|
+
<fo:block role="Sect">
|
16572
16605
|
<xsl:call-template name="setId"/>
|
16573
16606
|
|
16574
16607
|
<xsl:call-template name="sections_element_style"/>
|
@@ -16693,6 +16726,10 @@
|
|
16693
16726
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
16694
16727
|
</xsl:template>
|
16695
16728
|
|
16729
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
16730
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
16731
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
16732
|
+
|
16696
16733
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
16697
16734
|
<xsl:template name="insert_basic_link">
|
16698
16735
|
<xsl:param name="element"/>
|
@@ -4290,6 +4290,7 @@
|
|
4290
4290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4291
4291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4292
4292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
4293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
4293
4294
|
<xsl:variable name="cr"> </xsl:variable>
|
4294
4295
|
<xsl:variable name="lf">
|
4295
4296
|
</xsl:variable>
|
@@ -4832,6 +4833,7 @@
|
|
4832
4833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
4833
4834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
4834
4835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
4835
4837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
4836
4838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
4837
4839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -4846,10 +4848,10 @@
|
|
4846
4848
|
|
4847
4849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
4848
4850
|
|
4849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
4851
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
4850
4852
|
<xsl:copy>
|
4851
4853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
4852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
4854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
4853
4855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
4854
4856
|
</xsl:copy>
|
4855
4857
|
</xsl:template>
|
@@ -5960,6 +5962,12 @@
|
|
5960
5962
|
<xsl:template name="refine_sourcecode-style">
|
5961
5963
|
</xsl:template> <!-- refine_sourcecode-style -->
|
5962
5964
|
|
5965
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
5966
|
+
</xsl:attribute-set>
|
5967
|
+
|
5968
|
+
<xsl:template name="refine_sourcecode-number-style">
|
5969
|
+
</xsl:template>
|
5970
|
+
|
5963
5971
|
<xsl:attribute-set name="sourcecode-name-style">
|
5964
5972
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
5965
5973
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -7344,6 +7352,12 @@
|
|
7344
7352
|
<xsl:template name="refine_term-name-style">
|
7345
7353
|
</xsl:template>
|
7346
7354
|
|
7355
|
+
<xsl:attribute-set name="preferred-style">
|
7356
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
7357
|
+
|
7358
|
+
<xsl:template name="refine_preferred-style">
|
7359
|
+
</xsl:template>
|
7360
|
+
|
7347
7361
|
<xsl:attribute-set name="preferred-block-style">
|
7348
7362
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
7349
7363
|
|
@@ -7978,6 +7992,12 @@
|
|
7978
7992
|
<xsl:call-template name="setBordersTableArray"/>
|
7979
7993
|
</xsl:template> <!-- refine_table-style -->
|
7980
7994
|
|
7995
|
+
<xsl:attribute-set name="table-number-style">
|
7996
|
+
</xsl:attribute-set>
|
7997
|
+
|
7998
|
+
<xsl:template name="refine_table-number-style">
|
7999
|
+
</xsl:template>
|
8000
|
+
|
7981
8001
|
<xsl:attribute-set name="table-name-style">
|
7982
8002
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
7983
8003
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -11643,6 +11663,12 @@
|
|
11643
11663
|
<xsl:template name="refine_figure-style">
|
11644
11664
|
</xsl:template>
|
11645
11665
|
|
11666
|
+
<xsl:attribute-set name="figure-number-style">
|
11667
|
+
</xsl:attribute-set>
|
11668
|
+
|
11669
|
+
<xsl:template name="refine_figure-number-style">
|
11670
|
+
</xsl:template>
|
11671
|
+
|
11646
11672
|
<xsl:attribute-set name="figure-name-style">
|
11647
11673
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
11648
11674
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
@@ -16565,10 +16591,17 @@
|
|
16565
16591
|
</xsl:choose>
|
16566
16592
|
</xsl:template>
|
16567
16593
|
|
16594
|
+
<xsl:attribute-set name="clause-style">
|
16595
|
+
|
16596
|
+
</xsl:attribute-set>
|
16597
|
+
|
16598
|
+
<xsl:template name="refine_clause-style">
|
16599
|
+
</xsl:template>
|
16600
|
+
|
16568
16601
|
<!-- main sections -->
|
16569
16602
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
16570
16603
|
<xsl:call-template name="setNamedDestination"/>
|
16571
|
-
<fo:block>
|
16604
|
+
<fo:block role="Sect">
|
16572
16605
|
<xsl:call-template name="setId"/>
|
16573
16606
|
|
16574
16607
|
<xsl:call-template name="sections_element_style"/>
|
@@ -16693,6 +16726,10 @@
|
|
16693
16726
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
16694
16727
|
</xsl:template>
|
16695
16728
|
|
16729
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
16730
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
16731
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
16732
|
+
|
16696
16733
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
16697
16734
|
<xsl:template name="insert_basic_link">
|
16698
16735
|
<xsl:param name="element"/>
|
@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
|
|
145
145
|
background-color: #333333;
|
146
146
|
}
|
147
147
|
|
148
|
-
a.FootnoteRef + a.FootnoteRef::before {
|
149
|
-
content: ", ";
|
150
|
-
vertical-align: super;
|
151
|
-
}
|
152
|
-
|
153
|
-
a.TableFootnoteRef + a.TableFootnoteRef::before {
|
154
|
-
content: ", ";
|
155
|
-
vertical-align: super;
|
156
|
-
}
|
157
|
-
|
158
148
|
a.TableFootnoteRef, span.TableFootnoteRef,
|
159
149
|
a.FootnoteRef, span.FootnoteRef {
|
160
150
|
vertical-align: super;
|
@@ -477,11 +467,13 @@ body {
|
|
477
467
|
line-height: 1.4em;
|
478
468
|
color: #1d1d1d;
|
479
469
|
background-color: #ffffff;
|
480
|
-
font-weight: 400;
|
481
470
|
}
|
482
471
|
body main {
|
483
472
|
margin: 0 3em 0 6em;
|
484
473
|
}
|
474
|
+
body {
|
475
|
+
font-weight: 400;
|
476
|
+
}
|
485
477
|
body pre * {
|
486
478
|
font-family: {{bodyfont}} !important;
|
487
479
|
}
|
@@ -493,10 +485,6 @@ main {
|
|
493
485
|
/*
|
494
486
|
2. Responsive navigation layout
|
495
487
|
*/
|
496
|
-
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
497
|
-
font-family: {{bodyfont}};
|
498
|
-
font-weight: 400;
|
499
|
-
}
|
500
488
|
#toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
|
501
489
|
margin: 0;
|
502
490
|
padding: 0;
|
@@ -548,6 +536,10 @@ main {
|
|
548
536
|
color: black;
|
549
537
|
}
|
550
538
|
}
|
539
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
540
|
+
font-family: {{bodyfont}};
|
541
|
+
font-weight: 400;
|
542
|
+
}
|
551
543
|
@media screen and (max-width: 768px) {
|
552
544
|
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
553
545
|
padding: 0 1.5em;
|
@@ -652,12 +644,6 @@ main {
|
|
652
644
|
margin: 0;
|
653
645
|
}
|
654
646
|
}
|
655
|
-
div.figure {
|
656
|
-
line-height: 1.6em;
|
657
|
-
padding: 1.5em;
|
658
|
-
margin: 2em 0 1em 0;
|
659
|
-
overflow: auto;
|
660
|
-
}
|
661
647
|
div.figure .FigureTitle, div.figure .figure-title {
|
662
648
|
font-weight: 700;
|
663
649
|
font-size: 1em;
|
@@ -670,6 +656,12 @@ div.figure > img, div.figure > svg {
|
|
670
656
|
max-width: 100%;
|
671
657
|
height: auto;
|
672
658
|
}
|
659
|
+
div.figure {
|
660
|
+
line-height: 1.6em;
|
661
|
+
padding: 1.5em;
|
662
|
+
margin: 2em 0 1em 0;
|
663
|
+
overflow: auto;
|
664
|
+
}
|
673
665
|
|
674
666
|
table div.figure {
|
675
667
|
padding: 0;
|
@@ -1005,6 +997,13 @@ p.Biblio, p.NormRef {
|
|
1005
997
|
/*
|
1006
998
|
3.6 Source Code + figures
|
1007
999
|
*/
|
1000
|
+
.figure .SourceTitle,
|
1001
|
+
pre .SourceTitle,
|
1002
|
+
.pseudocode .SourceTitle {
|
1003
|
+
font-weight: 700;
|
1004
|
+
font-size: 1em;
|
1005
|
+
text-align: center;
|
1006
|
+
}
|
1008
1007
|
.figure,
|
1009
1008
|
pre,
|
1010
1009
|
.pseudocode {
|
@@ -1015,13 +1014,6 @@ pre,
|
|
1015
1014
|
margin: 2em 0 1em 0;
|
1016
1015
|
overflow: auto;
|
1017
1016
|
}
|
1018
|
-
.figure .SourceTitle,
|
1019
|
-
pre .SourceTitle,
|
1020
|
-
.pseudocode .SourceTitle {
|
1021
|
-
font-weight: 700;
|
1022
|
-
font-size: 1em;
|
1023
|
-
text-align: center;
|
1024
|
-
}
|
1025
1017
|
|
1026
1018
|
pre {
|
1027
1019
|
font-family: {{monospacefont}};
|
@@ -1075,12 +1067,14 @@ pre {
|
|
1075
1067
|
padding: 1.2em;
|
1076
1068
|
margin: 2em 0 1em 0;
|
1077
1069
|
text-align: left;
|
1078
|
-
color: #424242;
|
1079
|
-
padding-left: 2.7em;
|
1080
1070
|
}
|
1081
1071
|
.example p {
|
1082
1072
|
margin: 0;
|
1083
1073
|
}
|
1074
|
+
.example {
|
1075
|
+
color: #424242;
|
1076
|
+
padding-left: 2.7em;
|
1077
|
+
}
|
1084
1078
|
.example .example-title {
|
1085
1079
|
font-weight: 700;
|
1086
1080
|
text-transform: uppercase;
|
@@ -1362,7 +1356,6 @@ To top button
|
|
1362
1356
|
cursor: pointer;
|
1363
1357
|
padding: 10px 15px 10px 15px;
|
1364
1358
|
border-radius: 4px;
|
1365
|
-
text-transform: uppercase;
|
1366
1359
|
}
|
1367
1360
|
#myBtn:hover {
|
1368
1361
|
opacity: 1;
|
@@ -1372,6 +1365,9 @@ To top button
|
|
1372
1365
|
display: none;
|
1373
1366
|
}
|
1374
1367
|
}
|
1368
|
+
#myBtn {
|
1369
|
+
text-transform: uppercase;
|
1370
|
+
}
|
1375
1371
|
#myBtn a.anchorjs-link:hover {
|
1376
1372
|
background: none;
|
1377
1373
|
color: #485094;
|
@@ -2184,6 +2184,7 @@
|
|
2184
2184
|
<xsl:variable name="en_dash">–</xsl:variable>
|
2185
2185
|
<xsl:variable name="em_dash">—</xsl:variable>
|
2186
2186
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
2187
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
2187
2188
|
<xsl:variable name="cr"> </xsl:variable>
|
2188
2189
|
<xsl:variable name="lf">
|
2189
2190
|
</xsl:variable>
|
@@ -2726,6 +2727,7 @@
|
|
2726
2727
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
2727
2728
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
2728
2729
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
2730
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
2729
2731
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
2730
2732
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
2731
2733
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
@@ -2740,10 +2742,10 @@
|
|
2740
2742
|
|
2741
2743
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
2742
2744
|
|
2743
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
2745
|
+
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
|
2744
2746
|
<xsl:copy>
|
2745
2747
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
2746
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
2748
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
2747
2749
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
2748
2750
|
</xsl:copy>
|
2749
2751
|
</xsl:template>
|
@@ -3839,6 +3841,12 @@
|
|
3839
3841
|
<xsl:template name="refine_sourcecode-style">
|
3840
3842
|
</xsl:template> <!-- refine_sourcecode-style -->
|
3841
3843
|
|
3844
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
3845
|
+
</xsl:attribute-set>
|
3846
|
+
|
3847
|
+
<xsl:template name="refine_sourcecode-number-style">
|
3848
|
+
</xsl:template>
|
3849
|
+
|
3842
3850
|
<xsl:attribute-set name="sourcecode-name-style">
|
3843
3851
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
3844
3852
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -5226,6 +5234,12 @@
|
|
5226
5234
|
<xsl:template name="refine_term-name-style">
|
5227
5235
|
</xsl:template>
|
5228
5236
|
|
5237
|
+
<xsl:attribute-set name="preferred-style">
|
5238
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
5239
|
+
|
5240
|
+
<xsl:template name="refine_preferred-style">
|
5241
|
+
</xsl:template>
|
5242
|
+
|
5229
5243
|
<xsl:attribute-set name="preferred-block-style">
|
5230
5244
|
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
5231
5245
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
@@ -5870,6 +5884,12 @@
|
|
5870
5884
|
</xsl:if>
|
5871
5885
|
</xsl:template> <!-- refine_table-style -->
|
5872
5886
|
|
5887
|
+
<xsl:attribute-set name="table-number-style">
|
5888
|
+
</xsl:attribute-set>
|
5889
|
+
|
5890
|
+
<xsl:template name="refine_table-number-style">
|
5891
|
+
</xsl:template>
|
5892
|
+
|
5873
5893
|
<xsl:attribute-set name="table-name-style">
|
5874
5894
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
5875
5895
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -6339,7 +6359,7 @@
|
|
6339
6359
|
|
6340
6360
|
</fo:block>
|
6341
6361
|
|
6342
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
6362
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
6343
6363
|
<xsl:if test="$continued = 'true'">
|
6344
6364
|
|
6345
6365
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
@@ -9545,6 +9565,12 @@
|
|
9545
9565
|
<xsl:template name="refine_figure-style">
|
9546
9566
|
</xsl:template>
|
9547
9567
|
|
9568
|
+
<xsl:attribute-set name="figure-number-style">
|
9569
|
+
</xsl:attribute-set>
|
9570
|
+
|
9571
|
+
<xsl:template name="refine_figure-number-style">
|
9572
|
+
</xsl:template>
|
9573
|
+
|
9548
9574
|
<xsl:attribute-set name="figure-name-style">
|
9549
9575
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
9550
9576
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
@@ -12116,7 +12142,7 @@
|
|
12116
12142
|
|
12117
12143
|
<fo:list-item>
|
12118
12144
|
<fo:list-item-label end-indent="label-end()">
|
12119
|
-
<fo:block role="SKIP">
|
12145
|
+
<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
|
12120
12146
|
<fo:inline role="SKIP">
|
12121
12147
|
<xsl:apply-templates select="mn:biblio-tag">
|
12122
12148
|
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
@@ -14392,10 +14418,17 @@
|
|
14392
14418
|
</xsl:choose>
|
14393
14419
|
</xsl:template>
|
14394
14420
|
|
14421
|
+
<xsl:attribute-set name="clause-style">
|
14422
|
+
|
14423
|
+
</xsl:attribute-set>
|
14424
|
+
|
14425
|
+
<xsl:template name="refine_clause-style">
|
14426
|
+
</xsl:template>
|
14427
|
+
|
14395
14428
|
<!-- main sections -->
|
14396
14429
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
14397
14430
|
<xsl:call-template name="setNamedDestination"/>
|
14398
|
-
<fo:block>
|
14431
|
+
<fo:block role="Sect">
|
14399
14432
|
<xsl:call-template name="setId"/>
|
14400
14433
|
|
14401
14434
|
<xsl:call-template name="sections_element_style"/>
|
@@ -14525,6 +14558,10 @@
|
|
14525
14558
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
14526
14559
|
</xsl:template>
|
14527
14560
|
|
14561
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
14562
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
14563
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
14564
|
+
|
14528
14565
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
14529
14566
|
<xsl:template name="insert_basic_link">
|
14530
14567
|
<xsl:param name="element"/>
|
@@ -99,15 +99,12 @@ module IsoDoc
|
|
99
99
|
super
|
100
100
|
end
|
101
101
|
|
102
|
-
def
|
102
|
+
def table_footnotes(docxml)
|
103
103
|
table_fns = docxml.xpath(ns("//table//fn")) -
|
104
104
|
docxml.xpath(ns("//table/name//fn")) -
|
105
105
|
docxml.xpath(ns("//table/fmt-name//fn"))
|
106
106
|
@jcgm or table_fns -= docxml.xpath(ns("//quote//table//fn"))
|
107
|
-
|
108
|
-
docxml.xpath(ns("//figure/name//fn")) -
|
109
|
-
docxml.xpath(ns("//figure/fmt-name//fn"))
|
110
|
-
table_fns + fig_fns
|
107
|
+
table_fns
|
111
108
|
end
|
112
109
|
end
|
113
110
|
end
|
data/lib/metanorma/bipm/front.rb
CHANGED
@@ -91,10 +91,7 @@ module Metanorma
|
|
91
91
|
|
92
92
|
def title(node, xml)
|
93
93
|
["en", "fr"].each do |lang|
|
94
|
-
|
95
|
-
xml.title **attr_code(at.merge(type: "title-main")) do |t1|
|
96
|
-
t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-#{lang}"))
|
97
|
-
end
|
94
|
+
add_title_xml(xml, node.attr("title-#{lang}"), lang, "title-main")
|
98
95
|
%w(cover appendix annex part subpart provenance).each do |w|
|
99
96
|
typed_title(node, xml, lang, w)
|
100
97
|
end
|
@@ -102,11 +99,8 @@ module Metanorma
|
|
102
99
|
end
|
103
100
|
|
104
101
|
def typed_title(node, xml, lang, type)
|
105
|
-
at = { language: lang, format: "text/plain" }
|
106
102
|
title = node.attr("title-#{type}-#{lang}") or return
|
107
|
-
xml
|
108
|
-
t1 << Metanorma::Utils::asciidoc_sub(title)
|
109
|
-
end
|
103
|
+
add_title_xml(xml, title, lang, "title-#{type}")
|
110
104
|
end
|
111
105
|
end
|
112
106
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
2
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
3
|
-
<!-- VERSION v2.1.
|
3
|
+
<!-- VERSION v2.1.3 -->
|
4
4
|
|
5
5
|
<!--
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
|
|
455
455
|
</ref>
|
456
456
|
</zeroOrMore>
|
457
457
|
<zeroOrMore>
|
458
|
-
<ref name="
|
459
|
-
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
460
|
-
</ref>
|
461
|
-
<zeroOrMore>
|
462
|
-
<ref name="note">
|
463
|
-
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
464
|
-
</ref>
|
465
|
-
</zeroOrMore>
|
458
|
+
<ref name="ReferenceEntry"/>
|
466
459
|
</zeroOrMore>
|
467
460
|
<zeroOrMore>
|
468
461
|
<ref name="references">
|
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
|
|
604
597
|
</element>
|
605
598
|
</optional>
|
606
599
|
</define>
|
607
|
-
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
612
|
-
<attribute name="hiddenref">
|
613
|
-
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
600
|
+
<define name="FnAttributes">
|
601
|
+
<ref name="RequiredId"/>
|
602
|
+
<optional>
|
603
|
+
<attribute name="hiddenref">
|
604
|
+
<a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
|
614
605
|
This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
|
615
|
-
|
606
|
+
<data type="boolean"/>
|
607
|
+
</attribute>
|
608
|
+
</optional>
|
609
|
+
<attribute name="reference">
|
610
|
+
<a:documentation>The number of the footnote, used to identify it visually</a:documentation>
|
616
611
|
</attribute>
|
617
|
-
</
|
618
|
-
</
|
612
|
+
</define>
|
613
|
+
</include>
|
614
|
+
<!-- end overrides -->
|
619
615
|
<define name="TdAttributes" combine="interleave">
|
620
616
|
<ref name="RequiredId"/>
|
621
617
|
<optional>
|
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
|
|
853
849
|
<value>informative</value>
|
854
850
|
</choice>
|
855
851
|
</define>
|
852
|
+
<define name="ReferenceEntry">
|
853
|
+
<a:documentation>Entry in bibliography</a:documentation>
|
854
|
+
<ref name="doc_bibitem">
|
855
|
+
<a:documentation>Bibliographic item cited in the document</a:documentation>
|
856
|
+
</ref>
|
857
|
+
<zeroOrMore>
|
858
|
+
<ref name="note">
|
859
|
+
<a:documentation>Annotation of the bibliographic item</a:documentation>
|
860
|
+
</ref>
|
861
|
+
</zeroOrMore>
|
862
|
+
</define>
|
856
863
|
<define name="doc_bibitem">
|
857
864
|
<a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
|
858
865
|
<element name="bibitem">
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-bipm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.7.
|
4
|
+
version: 2.7.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-09-
|
11
|
+
date: 2025-09-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|