metanorma-itu 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/itu/html/_coverpage.css +0 -10
- data/lib/isodoc/itu/html/htmlstyle.css +16 -22
- data/lib/isodoc/itu/html_convert.rb +0 -1
- data/lib/isodoc/itu/itu.implementers-guide.xsl +41 -4
- data/lib/isodoc/itu/itu.in-force.xsl +41 -4
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +41 -4
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +41 -4
- data/lib/isodoc/itu/itu.recommendation.xsl +41 -4
- data/lib/isodoc/itu/itu.resolution.xsl +41 -4
- data/lib/isodoc/itu/itu.service-publication.xsl +41 -4
- data/lib/isodoc/itu/itu.technical-paper.xsl +41 -4
- data/lib/isodoc/itu/itu.technical-report.xsl +41 -4
- data/lib/isodoc/itu/metadata.rb +2 -0
- data/lib/isodoc/itu/presentation_section.rb +48 -3
- data/lib/metanorma/itu/front.rb +5 -12
- data/lib/metanorma/itu/isodoc.rng +26 -19
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
|
@@ -3290,6 +3290,7 @@
|
|
|
3290
3290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3291
3291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3292
3292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
3293
3294
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3294
3295
|
<xsl:variable name="lf">
|
|
3295
3296
|
</xsl:variable>
|
|
@@ -3832,6 +3833,7 @@
|
|
|
3832
3833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3833
3834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3834
3835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3835
3837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3836
3838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3837
3839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3846,10 +3848,10 @@
|
|
|
3846
3848
|
|
|
3847
3849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3848
3850
|
|
|
3849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3851
|
+
<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">
|
|
3850
3852
|
<xsl:copy>
|
|
3851
3853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3853
3855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3854
3856
|
</xsl:copy>
|
|
3855
3857
|
</xsl:template>
|
|
@@ -4965,6 +4967,12 @@
|
|
|
4965
4967
|
<xsl:template name="refine_sourcecode-style">
|
|
4966
4968
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4967
4969
|
|
|
4970
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4971
|
+
</xsl:attribute-set>
|
|
4972
|
+
|
|
4973
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4974
|
+
</xsl:template>
|
|
4975
|
+
|
|
4968
4976
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4969
4977
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4970
4978
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -6353,6 +6361,12 @@
|
|
|
6353
6361
|
<xsl:template name="refine_term-name-style">
|
|
6354
6362
|
</xsl:template>
|
|
6355
6363
|
|
|
6364
|
+
<xsl:attribute-set name="preferred-style">
|
|
6365
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
6366
|
+
|
|
6367
|
+
<xsl:template name="refine_preferred-style">
|
|
6368
|
+
</xsl:template>
|
|
6369
|
+
|
|
6356
6370
|
<xsl:attribute-set name="preferred-block-style">
|
|
6357
6371
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
6358
6372
|
|
|
@@ -6987,6 +7001,12 @@
|
|
|
6987
7001
|
</xsl:if>
|
|
6988
7002
|
</xsl:template> <!-- refine_table-style -->
|
|
6989
7003
|
|
|
7004
|
+
<xsl:attribute-set name="table-number-style">
|
|
7005
|
+
</xsl:attribute-set>
|
|
7006
|
+
|
|
7007
|
+
<xsl:template name="refine_table-number-style">
|
|
7008
|
+
</xsl:template>
|
|
7009
|
+
|
|
6990
7010
|
<xsl:attribute-set name="table-name-style">
|
|
6991
7011
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6992
7012
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -7470,7 +7490,7 @@
|
|
|
7470
7490
|
|
|
7471
7491
|
</fo:block>
|
|
7472
7492
|
|
|
7473
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7493
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7474
7494
|
<xsl:if test="$continued = 'true'">
|
|
7475
7495
|
|
|
7476
7496
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -10659,6 +10679,12 @@
|
|
|
10659
10679
|
<xsl:template name="refine_figure-style">
|
|
10660
10680
|
</xsl:template>
|
|
10661
10681
|
|
|
10682
|
+
<xsl:attribute-set name="figure-number-style">
|
|
10683
|
+
</xsl:attribute-set>
|
|
10684
|
+
|
|
10685
|
+
<xsl:template name="refine_figure-number-style">
|
|
10686
|
+
</xsl:template>
|
|
10687
|
+
|
|
10662
10688
|
<xsl:attribute-set name="figure-name-style">
|
|
10663
10689
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10664
10690
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -15555,10 +15581,17 @@
|
|
|
15555
15581
|
</xsl:choose>
|
|
15556
15582
|
</xsl:template>
|
|
15557
15583
|
|
|
15584
|
+
<xsl:attribute-set name="clause-style">
|
|
15585
|
+
|
|
15586
|
+
</xsl:attribute-set>
|
|
15587
|
+
|
|
15588
|
+
<xsl:template name="refine_clause-style">
|
|
15589
|
+
</xsl:template>
|
|
15590
|
+
|
|
15558
15591
|
<!-- main sections -->
|
|
15559
15592
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
15560
15593
|
<xsl:call-template name="setNamedDestination"/>
|
|
15561
|
-
<fo:block>
|
|
15594
|
+
<fo:block role="Sect">
|
|
15562
15595
|
<xsl:call-template name="setId"/>
|
|
15563
15596
|
|
|
15564
15597
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -15691,6 +15724,10 @@
|
|
|
15691
15724
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15692
15725
|
</xsl:template>
|
|
15693
15726
|
|
|
15727
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
15728
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
15729
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
15730
|
+
|
|
15694
15731
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
15695
15732
|
<xsl:template name="insert_basic_link">
|
|
15696
15733
|
<xsl:param name="element"/>
|
|
@@ -3290,6 +3290,7 @@
|
|
|
3290
3290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3291
3291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3292
3292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
3293
3294
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3294
3295
|
<xsl:variable name="lf">
|
|
3295
3296
|
</xsl:variable>
|
|
@@ -3832,6 +3833,7 @@
|
|
|
3832
3833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3833
3834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3834
3835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3835
3837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3836
3838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3837
3839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3846,10 +3848,10 @@
|
|
|
3846
3848
|
|
|
3847
3849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3848
3850
|
|
|
3849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3851
|
+
<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">
|
|
3850
3852
|
<xsl:copy>
|
|
3851
3853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3853
3855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3854
3856
|
</xsl:copy>
|
|
3855
3857
|
</xsl:template>
|
|
@@ -4965,6 +4967,12 @@
|
|
|
4965
4967
|
<xsl:template name="refine_sourcecode-style">
|
|
4966
4968
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4967
4969
|
|
|
4970
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4971
|
+
</xsl:attribute-set>
|
|
4972
|
+
|
|
4973
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4974
|
+
</xsl:template>
|
|
4975
|
+
|
|
4968
4976
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4969
4977
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4970
4978
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -6353,6 +6361,12 @@
|
|
|
6353
6361
|
<xsl:template name="refine_term-name-style">
|
|
6354
6362
|
</xsl:template>
|
|
6355
6363
|
|
|
6364
|
+
<xsl:attribute-set name="preferred-style">
|
|
6365
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
6366
|
+
|
|
6367
|
+
<xsl:template name="refine_preferred-style">
|
|
6368
|
+
</xsl:template>
|
|
6369
|
+
|
|
6356
6370
|
<xsl:attribute-set name="preferred-block-style">
|
|
6357
6371
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
6358
6372
|
|
|
@@ -6987,6 +7001,12 @@
|
|
|
6987
7001
|
</xsl:if>
|
|
6988
7002
|
</xsl:template> <!-- refine_table-style -->
|
|
6989
7003
|
|
|
7004
|
+
<xsl:attribute-set name="table-number-style">
|
|
7005
|
+
</xsl:attribute-set>
|
|
7006
|
+
|
|
7007
|
+
<xsl:template name="refine_table-number-style">
|
|
7008
|
+
</xsl:template>
|
|
7009
|
+
|
|
6990
7010
|
<xsl:attribute-set name="table-name-style">
|
|
6991
7011
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6992
7012
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -7470,7 +7490,7 @@
|
|
|
7470
7490
|
|
|
7471
7491
|
</fo:block>
|
|
7472
7492
|
|
|
7473
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7493
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7474
7494
|
<xsl:if test="$continued = 'true'">
|
|
7475
7495
|
|
|
7476
7496
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -10659,6 +10679,12 @@
|
|
|
10659
10679
|
<xsl:template name="refine_figure-style">
|
|
10660
10680
|
</xsl:template>
|
|
10661
10681
|
|
|
10682
|
+
<xsl:attribute-set name="figure-number-style">
|
|
10683
|
+
</xsl:attribute-set>
|
|
10684
|
+
|
|
10685
|
+
<xsl:template name="refine_figure-number-style">
|
|
10686
|
+
</xsl:template>
|
|
10687
|
+
|
|
10662
10688
|
<xsl:attribute-set name="figure-name-style">
|
|
10663
10689
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10664
10690
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -15555,10 +15581,17 @@
|
|
|
15555
15581
|
</xsl:choose>
|
|
15556
15582
|
</xsl:template>
|
|
15557
15583
|
|
|
15584
|
+
<xsl:attribute-set name="clause-style">
|
|
15585
|
+
|
|
15586
|
+
</xsl:attribute-set>
|
|
15587
|
+
|
|
15588
|
+
<xsl:template name="refine_clause-style">
|
|
15589
|
+
</xsl:template>
|
|
15590
|
+
|
|
15558
15591
|
<!-- main sections -->
|
|
15559
15592
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
15560
15593
|
<xsl:call-template name="setNamedDestination"/>
|
|
15561
|
-
<fo:block>
|
|
15594
|
+
<fo:block role="Sect">
|
|
15562
15595
|
<xsl:call-template name="setId"/>
|
|
15563
15596
|
|
|
15564
15597
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -15691,6 +15724,10 @@
|
|
|
15691
15724
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15692
15725
|
</xsl:template>
|
|
15693
15726
|
|
|
15727
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
15728
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
15729
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
15730
|
+
|
|
15694
15731
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
15695
15732
|
<xsl:template name="insert_basic_link">
|
|
15696
15733
|
<xsl:param name="element"/>
|
|
@@ -3290,6 +3290,7 @@
|
|
|
3290
3290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3291
3291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3292
3292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
3293
3294
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3294
3295
|
<xsl:variable name="lf">
|
|
3295
3296
|
</xsl:variable>
|
|
@@ -3832,6 +3833,7 @@
|
|
|
3832
3833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3833
3834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3834
3835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3835
3837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3836
3838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3837
3839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3846,10 +3848,10 @@
|
|
|
3846
3848
|
|
|
3847
3849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3848
3850
|
|
|
3849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3851
|
+
<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">
|
|
3850
3852
|
<xsl:copy>
|
|
3851
3853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3853
3855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3854
3856
|
</xsl:copy>
|
|
3855
3857
|
</xsl:template>
|
|
@@ -4965,6 +4967,12 @@
|
|
|
4965
4967
|
<xsl:template name="refine_sourcecode-style">
|
|
4966
4968
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4967
4969
|
|
|
4970
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4971
|
+
</xsl:attribute-set>
|
|
4972
|
+
|
|
4973
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4974
|
+
</xsl:template>
|
|
4975
|
+
|
|
4968
4976
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4969
4977
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4970
4978
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -6353,6 +6361,12 @@
|
|
|
6353
6361
|
<xsl:template name="refine_term-name-style">
|
|
6354
6362
|
</xsl:template>
|
|
6355
6363
|
|
|
6364
|
+
<xsl:attribute-set name="preferred-style">
|
|
6365
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
6366
|
+
|
|
6367
|
+
<xsl:template name="refine_preferred-style">
|
|
6368
|
+
</xsl:template>
|
|
6369
|
+
|
|
6356
6370
|
<xsl:attribute-set name="preferred-block-style">
|
|
6357
6371
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
6358
6372
|
|
|
@@ -6987,6 +7001,12 @@
|
|
|
6987
7001
|
</xsl:if>
|
|
6988
7002
|
</xsl:template> <!-- refine_table-style -->
|
|
6989
7003
|
|
|
7004
|
+
<xsl:attribute-set name="table-number-style">
|
|
7005
|
+
</xsl:attribute-set>
|
|
7006
|
+
|
|
7007
|
+
<xsl:template name="refine_table-number-style">
|
|
7008
|
+
</xsl:template>
|
|
7009
|
+
|
|
6990
7010
|
<xsl:attribute-set name="table-name-style">
|
|
6991
7011
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6992
7012
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -7470,7 +7490,7 @@
|
|
|
7470
7490
|
|
|
7471
7491
|
</fo:block>
|
|
7472
7492
|
|
|
7473
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7493
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7474
7494
|
<xsl:if test="$continued = 'true'">
|
|
7475
7495
|
|
|
7476
7496
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -10659,6 +10679,12 @@
|
|
|
10659
10679
|
<xsl:template name="refine_figure-style">
|
|
10660
10680
|
</xsl:template>
|
|
10661
10681
|
|
|
10682
|
+
<xsl:attribute-set name="figure-number-style">
|
|
10683
|
+
</xsl:attribute-set>
|
|
10684
|
+
|
|
10685
|
+
<xsl:template name="refine_figure-number-style">
|
|
10686
|
+
</xsl:template>
|
|
10687
|
+
|
|
10662
10688
|
<xsl:attribute-set name="figure-name-style">
|
|
10663
10689
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10664
10690
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -15555,10 +15581,17 @@
|
|
|
15555
15581
|
</xsl:choose>
|
|
15556
15582
|
</xsl:template>
|
|
15557
15583
|
|
|
15584
|
+
<xsl:attribute-set name="clause-style">
|
|
15585
|
+
|
|
15586
|
+
</xsl:attribute-set>
|
|
15587
|
+
|
|
15588
|
+
<xsl:template name="refine_clause-style">
|
|
15589
|
+
</xsl:template>
|
|
15590
|
+
|
|
15558
15591
|
<!-- main sections -->
|
|
15559
15592
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
15560
15593
|
<xsl:call-template name="setNamedDestination"/>
|
|
15561
|
-
<fo:block>
|
|
15594
|
+
<fo:block role="Sect">
|
|
15562
15595
|
<xsl:call-template name="setId"/>
|
|
15563
15596
|
|
|
15564
15597
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -15691,6 +15724,10 @@
|
|
|
15691
15724
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15692
15725
|
</xsl:template>
|
|
15693
15726
|
|
|
15727
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
15728
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
15729
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
15730
|
+
|
|
15694
15731
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
15695
15732
|
<xsl:template name="insert_basic_link">
|
|
15696
15733
|
<xsl:param name="element"/>
|
|
@@ -3290,6 +3290,7 @@
|
|
|
3290
3290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3291
3291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3292
3292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
3293
3294
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3294
3295
|
<xsl:variable name="lf">
|
|
3295
3296
|
</xsl:variable>
|
|
@@ -3832,6 +3833,7 @@
|
|
|
3832
3833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3833
3834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3834
3835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3835
3837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3836
3838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3837
3839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3846,10 +3848,10 @@
|
|
|
3846
3848
|
|
|
3847
3849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3848
3850
|
|
|
3849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3851
|
+
<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">
|
|
3850
3852
|
<xsl:copy>
|
|
3851
3853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3853
3855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3854
3856
|
</xsl:copy>
|
|
3855
3857
|
</xsl:template>
|
|
@@ -4965,6 +4967,12 @@
|
|
|
4965
4967
|
<xsl:template name="refine_sourcecode-style">
|
|
4966
4968
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4967
4969
|
|
|
4970
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4971
|
+
</xsl:attribute-set>
|
|
4972
|
+
|
|
4973
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4974
|
+
</xsl:template>
|
|
4975
|
+
|
|
4968
4976
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4969
4977
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4970
4978
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -6353,6 +6361,12 @@
|
|
|
6353
6361
|
<xsl:template name="refine_term-name-style">
|
|
6354
6362
|
</xsl:template>
|
|
6355
6363
|
|
|
6364
|
+
<xsl:attribute-set name="preferred-style">
|
|
6365
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
6366
|
+
|
|
6367
|
+
<xsl:template name="refine_preferred-style">
|
|
6368
|
+
</xsl:template>
|
|
6369
|
+
|
|
6356
6370
|
<xsl:attribute-set name="preferred-block-style">
|
|
6357
6371
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
6358
6372
|
|
|
@@ -6987,6 +7001,12 @@
|
|
|
6987
7001
|
</xsl:if>
|
|
6988
7002
|
</xsl:template> <!-- refine_table-style -->
|
|
6989
7003
|
|
|
7004
|
+
<xsl:attribute-set name="table-number-style">
|
|
7005
|
+
</xsl:attribute-set>
|
|
7006
|
+
|
|
7007
|
+
<xsl:template name="refine_table-number-style">
|
|
7008
|
+
</xsl:template>
|
|
7009
|
+
|
|
6990
7010
|
<xsl:attribute-set name="table-name-style">
|
|
6991
7011
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6992
7012
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -7470,7 +7490,7 @@
|
|
|
7470
7490
|
|
|
7471
7491
|
</fo:block>
|
|
7472
7492
|
|
|
7473
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7493
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7474
7494
|
<xsl:if test="$continued = 'true'">
|
|
7475
7495
|
|
|
7476
7496
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -10659,6 +10679,12 @@
|
|
|
10659
10679
|
<xsl:template name="refine_figure-style">
|
|
10660
10680
|
</xsl:template>
|
|
10661
10681
|
|
|
10682
|
+
<xsl:attribute-set name="figure-number-style">
|
|
10683
|
+
</xsl:attribute-set>
|
|
10684
|
+
|
|
10685
|
+
<xsl:template name="refine_figure-number-style">
|
|
10686
|
+
</xsl:template>
|
|
10687
|
+
|
|
10662
10688
|
<xsl:attribute-set name="figure-name-style">
|
|
10663
10689
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10664
10690
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -15555,10 +15581,17 @@
|
|
|
15555
15581
|
</xsl:choose>
|
|
15556
15582
|
</xsl:template>
|
|
15557
15583
|
|
|
15584
|
+
<xsl:attribute-set name="clause-style">
|
|
15585
|
+
|
|
15586
|
+
</xsl:attribute-set>
|
|
15587
|
+
|
|
15588
|
+
<xsl:template name="refine_clause-style">
|
|
15589
|
+
</xsl:template>
|
|
15590
|
+
|
|
15558
15591
|
<!-- main sections -->
|
|
15559
15592
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
15560
15593
|
<xsl:call-template name="setNamedDestination"/>
|
|
15561
|
-
<fo:block>
|
|
15594
|
+
<fo:block role="Sect">
|
|
15562
15595
|
<xsl:call-template name="setId"/>
|
|
15563
15596
|
|
|
15564
15597
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -15691,6 +15724,10 @@
|
|
|
15691
15724
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15692
15725
|
</xsl:template>
|
|
15693
15726
|
|
|
15727
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
15728
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
15729
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
15730
|
+
|
|
15694
15731
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
15695
15732
|
<xsl:template name="insert_basic_link">
|
|
15696
15733
|
<xsl:param name="element"/>
|
|
@@ -3290,6 +3290,7 @@
|
|
|
3290
3290
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3291
3291
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3292
3292
|
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3293
|
+
<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
|
|
3293
3294
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3294
3295
|
<xsl:variable name="lf">
|
|
3295
3296
|
</xsl:variable>
|
|
@@ -3832,6 +3833,7 @@
|
|
|
3832
3833
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
|
|
3833
3834
|
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
|
|
3834
3835
|
<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3836
|
+
<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
|
3835
3837
|
<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
|
3836
3838
|
<xsl:template match="mn:preferred" mode="update_xml_step1"/>
|
|
3837
3839
|
<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
|
@@ -3846,10 +3848,10 @@
|
|
|
3846
3848
|
|
|
3847
3849
|
<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
|
3848
3850
|
|
|
3849
|
-
<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
|
|
3851
|
+
<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">
|
|
3850
3852
|
<xsl:copy>
|
|
3851
3853
|
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
3852
|
-
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
|
|
3854
|
+
<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
|
|
3853
3855
|
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
3854
3856
|
</xsl:copy>
|
|
3855
3857
|
</xsl:template>
|
|
@@ -4965,6 +4967,12 @@
|
|
|
4965
4967
|
<xsl:template name="refine_sourcecode-style">
|
|
4966
4968
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4967
4969
|
|
|
4970
|
+
<xsl:attribute-set name="sourcecode-number-style">
|
|
4971
|
+
</xsl:attribute-set>
|
|
4972
|
+
|
|
4973
|
+
<xsl:template name="refine_sourcecode-number-style">
|
|
4974
|
+
</xsl:template>
|
|
4975
|
+
|
|
4968
4976
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
4969
4977
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
4970
4978
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -6353,6 +6361,12 @@
|
|
|
6353
6361
|
<xsl:template name="refine_term-name-style">
|
|
6354
6362
|
</xsl:template>
|
|
6355
6363
|
|
|
6364
|
+
<xsl:attribute-set name="preferred-style">
|
|
6365
|
+
</xsl:attribute-set> <!-- preferred-style -->
|
|
6366
|
+
|
|
6367
|
+
<xsl:template name="refine_preferred-style">
|
|
6368
|
+
</xsl:template>
|
|
6369
|
+
|
|
6356
6370
|
<xsl:attribute-set name="preferred-block-style">
|
|
6357
6371
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
6358
6372
|
|
|
@@ -6987,6 +7001,12 @@
|
|
|
6987
7001
|
</xsl:if>
|
|
6988
7002
|
</xsl:template> <!-- refine_table-style -->
|
|
6989
7003
|
|
|
7004
|
+
<xsl:attribute-set name="table-number-style">
|
|
7005
|
+
</xsl:attribute-set>
|
|
7006
|
+
|
|
7007
|
+
<xsl:template name="refine_table-number-style">
|
|
7008
|
+
</xsl:template>
|
|
7009
|
+
|
|
6990
7010
|
<xsl:attribute-set name="table-name-style">
|
|
6991
7011
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
6992
7012
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -7470,7 +7490,7 @@
|
|
|
7470
7490
|
|
|
7471
7491
|
</fo:block>
|
|
7472
7492
|
|
|
7473
|
-
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7493
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
7474
7494
|
<xsl:if test="$continued = 'true'">
|
|
7475
7495
|
|
|
7476
7496
|
<!-- to prevent the error 'THead element may contain only TR elements' -->
|
|
@@ -10659,6 +10679,12 @@
|
|
|
10659
10679
|
<xsl:template name="refine_figure-style">
|
|
10660
10680
|
</xsl:template>
|
|
10661
10681
|
|
|
10682
|
+
<xsl:attribute-set name="figure-number-style">
|
|
10683
|
+
</xsl:attribute-set>
|
|
10684
|
+
|
|
10685
|
+
<xsl:template name="refine_figure-number-style">
|
|
10686
|
+
</xsl:template>
|
|
10687
|
+
|
|
10662
10688
|
<xsl:attribute-set name="figure-name-style">
|
|
10663
10689
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10664
10690
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
@@ -15555,10 +15581,17 @@
|
|
|
15555
15581
|
</xsl:choose>
|
|
15556
15582
|
</xsl:template>
|
|
15557
15583
|
|
|
15584
|
+
<xsl:attribute-set name="clause-style">
|
|
15585
|
+
|
|
15586
|
+
</xsl:attribute-set>
|
|
15587
|
+
|
|
15588
|
+
<xsl:template name="refine_clause-style">
|
|
15589
|
+
</xsl:template>
|
|
15590
|
+
|
|
15558
15591
|
<!-- main sections -->
|
|
15559
15592
|
<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
|
|
15560
15593
|
<xsl:call-template name="setNamedDestination"/>
|
|
15561
|
-
<fo:block>
|
|
15594
|
+
<fo:block role="Sect">
|
|
15562
15595
|
<xsl:call-template name="setId"/>
|
|
15563
15596
|
|
|
15564
15597
|
<xsl:call-template name="sections_element_style"/>
|
|
@@ -15691,6 +15724,10 @@
|
|
|
15691
15724
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15692
15725
|
</xsl:template>
|
|
15693
15726
|
|
|
15727
|
+
<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
|
|
15728
|
+
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
|
|
15729
|
+
<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
|
|
15730
|
+
|
|
15694
15731
|
<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
|
|
15695
15732
|
<xsl:template name="insert_basic_link">
|
|
15696
15733
|
<xsl:param name="element"/>
|
data/lib/isodoc/itu/metadata.rb
CHANGED
|
@@ -28,6 +28,8 @@ module IsoDoc
|
|
|
28
28
|
"[@type = 'amendment']",
|
|
29
29
|
corrigendumtitle: "//bibdata/title[@language='@_lang']" \
|
|
30
30
|
"[@type = 'corrigendum']",
|
|
31
|
+
resolutiontitle: "//bibdata/title[@type = 'resolution']",
|
|
32
|
+
resolutionplacedate: "//bibdata/title[@type = 'resolution-placedate']",
|
|
31
33
|
series: "//bibdata/series[@type='main']/title",
|
|
32
34
|
series1: "//bibdata/series[@type='secondary']/title",
|
|
33
35
|
series2: "//bibdata/series[@type='tertiary']/title",
|