metanorma-itu 2.3.6 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +2 -8
- data/lib/isodoc/itu/html/_coverpage.css +8 -0
- data/lib/isodoc/itu/html/htmlstyle.css +16 -0
- data/lib/isodoc/itu/itu.implementers-guide.xsl +6 -4
- data/lib/isodoc/itu/itu.in-force.xsl +6 -4
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +6 -4
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +6 -4
- data/lib/isodoc/itu/itu.recommendation.xsl +6 -4
- data/lib/isodoc/itu/itu.resolution.xsl +6 -4
- data/lib/isodoc/itu/itu.service-publication.xsl +6 -4
- data/lib/isodoc/itu/itu.technical-paper.xsl +6 -4
- data/lib/isodoc/itu/itu.technical-report.xsl +6 -4
- data/lib/metanorma/itu/basicdoc.rng +117 -25
- data/lib/metanorma/itu/biblio-standoc.rng +44 -1
- data/lib/metanorma/itu/biblio.rng +11 -0
- data/lib/metanorma/itu/cleanup.rb +5 -4
- data/lib/metanorma/itu/converter.rb +2 -1
- data/lib/metanorma/itu/isodoc.rng +10 -64
- data/lib/metanorma/itu/reqt.rng +0 -16
- data/lib/metanorma/itu/version.rb +1 -1
- data/metanorma-itu.gemspec +1 -2
- metadata +4 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1b6c121ab1fdf9a196e90ea5ab29d752a64fe68a92c14a3a4a2e6b8524b7feda
|
4
|
+
data.tar.gz: 173aa634916fe688a1f916c18211c2a990ae2e7e1db83c43c987767dbdb02b64
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8e3746262a7b1fd8b93d696d749ab06d72c9c478add3f72f60f6c31da28153077b98e8f112df943262f6572b07d38678e5e4ffd274bf8503ee44c6a8ef26e6d4
|
7
|
+
data.tar.gz: 21007537fa639e8dda93505d231b9a93f4cfa415ae6be12ffb1c5f0ba4a8454016a4eae6658f8ff30f055df2b8e0b3399a59162f9fffcdba5adbff63a9c9b1cb
|
data/Gemfile
CHANGED
@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
|
|
4
4
|
source "https://rubygems.org"
|
5
5
|
git_source(:github) { |repo| "https://github.com/#{repo}" }
|
6
6
|
|
7
|
-
group :development, :test do
|
8
|
-
gem "rspec"
|
9
|
-
end
|
10
|
-
|
11
|
-
if File.exist? "Gemfile.devel"
|
12
|
-
eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
|
13
|
-
end
|
14
|
-
|
15
7
|
gemspec
|
8
|
+
|
9
|
+
eval_gemfile("Gemfile.devel") rescue nil
|
@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
|
|
132
132
|
color: red;
|
133
133
|
text-decoration: line-through; }
|
134
134
|
|
135
|
+
ruby {
|
136
|
+
ruby-position: over;
|
137
|
+
-webkit-ruby-position: before; }
|
138
|
+
|
139
|
+
ruby ruby {
|
140
|
+
ruby-position: under;
|
141
|
+
-webkit-ruby-position: after; }
|
142
|
+
|
135
143
|
/* code highlighting with line numbers */
|
136
144
|
table.rouge-line-table td.rouge-gutter {
|
137
145
|
-moz-user-select: none;
|
@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
|
|
132
132
|
color: red;
|
133
133
|
text-decoration: line-through; }
|
134
134
|
|
135
|
+
ruby {
|
136
|
+
ruby-position: over;
|
137
|
+
-webkit-ruby-position: before; }
|
138
|
+
|
139
|
+
ruby ruby {
|
140
|
+
ruby-position: under;
|
141
|
+
-webkit-ruby-position: after; }
|
142
|
+
|
135
143
|
/* code highlighting with line numbers */
|
136
144
|
table.rouge-line-table td.rouge-gutter {
|
137
145
|
-moz-user-select: none;
|
@@ -415,6 +423,14 @@ a.FootnoteRef, span.FootnoteRef {
|
|
415
423
|
color: red;
|
416
424
|
text-decoration: line-through; }
|
417
425
|
|
426
|
+
ruby {
|
427
|
+
ruby-position: over;
|
428
|
+
-webkit-ruby-position: before; }
|
429
|
+
|
430
|
+
ruby ruby {
|
431
|
+
ruby-position: under;
|
432
|
+
-webkit-ruby-position: after; }
|
433
|
+
|
418
434
|
/* code highlighting with line numbers */
|
419
435
|
table.rouge-line-table td.rouge-gutter {
|
420
436
|
-moz-user-select: none;
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -10714,14 +10714,16 @@
|
|
10714
10714
|
|
10715
10715
|
<xsl:template match="*[local-name() = 'annex']">
|
10716
10716
|
<fo:block break-after="page"/>
|
10717
|
-
<fo:block
|
10717
|
+
<fo:block>
|
10718
10718
|
|
10719
10719
|
<xsl:call-template name="setBlockSpanAll"/>
|
10720
10720
|
|
10721
10721
|
<xsl:call-template name="refine_annex_style"/>
|
10722
10722
|
|
10723
10723
|
</fo:block>
|
10724
|
-
<
|
10724
|
+
<fo:block id="{@id}">
|
10725
|
+
<xsl:apply-templates/>
|
10726
|
+
</fo:block>
|
10725
10727
|
</xsl:template>
|
10726
10728
|
|
10727
10729
|
<xsl:template name="refine_annex_style">
|
@@ -11656,10 +11658,10 @@
|
|
11656
11658
|
|
11657
11659
|
<xsl:variable name="toc_level">
|
11658
11660
|
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
11659
|
-
<xsl:variable name="
|
11661
|
+
<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
|
11660
11662
|
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
11661
11663
|
<xsl:choose>
|
11662
|
-
<xsl:when test="$
|
11664
|
+
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11663
11665
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
11664
11666
|
<xsl:otherwise><!-- default value -->
|
11665
11667
|
2
|
@@ -95,8 +95,89 @@
|
|
95
95
|
<ref name="pagebreak"/>
|
96
96
|
<ref name="hr"/>
|
97
97
|
<ref name="bookmark"/>
|
98
|
+
<ref name="amend"/>
|
98
99
|
</choice>
|
99
100
|
</define>
|
101
|
+
<define name="amend">
|
102
|
+
<element name="amend">
|
103
|
+
<ref name="AmendType"/>
|
104
|
+
</element>
|
105
|
+
</define>
|
106
|
+
<define name="AmendType">
|
107
|
+
<optional>
|
108
|
+
<attribute name="id">
|
109
|
+
<data type="ID"/>
|
110
|
+
</attribute>
|
111
|
+
</optional>
|
112
|
+
<attribute name="change">
|
113
|
+
<choice>
|
114
|
+
<value>add</value>
|
115
|
+
<value>modify</value>
|
116
|
+
<value>delete</value>
|
117
|
+
<value>replace</value>
|
118
|
+
</choice>
|
119
|
+
</attribute>
|
120
|
+
<optional>
|
121
|
+
<attribute name="path"/>
|
122
|
+
</optional>
|
123
|
+
<optional>
|
124
|
+
<attribute name="path_end"/>
|
125
|
+
</optional>
|
126
|
+
<optional>
|
127
|
+
<attribute name="title"/>
|
128
|
+
</optional>
|
129
|
+
<optional>
|
130
|
+
<element name="location">
|
131
|
+
<zeroOrMore>
|
132
|
+
<choice>
|
133
|
+
<ref name="locality"/>
|
134
|
+
<ref name="localityStack"/>
|
135
|
+
</choice>
|
136
|
+
</zeroOrMore>
|
137
|
+
</element>
|
138
|
+
</optional>
|
139
|
+
<optional>
|
140
|
+
<element name="description">
|
141
|
+
<zeroOrMore>
|
142
|
+
<ref name="BasicBlock"/>
|
143
|
+
</zeroOrMore>
|
144
|
+
</element>
|
145
|
+
</optional>
|
146
|
+
<optional>
|
147
|
+
<element name="newcontent">
|
148
|
+
<optional>
|
149
|
+
<attribute name="id">
|
150
|
+
<data type="ID"/>
|
151
|
+
</attribute>
|
152
|
+
</optional>
|
153
|
+
<zeroOrMore>
|
154
|
+
<ref name="BasicBlock"/>
|
155
|
+
</zeroOrMore>
|
156
|
+
</element>
|
157
|
+
</optional>
|
158
|
+
<zeroOrMore>
|
159
|
+
<ref name="classification"/>
|
160
|
+
</zeroOrMore>
|
161
|
+
<zeroOrMore>
|
162
|
+
<ref name="contributor"/>
|
163
|
+
</zeroOrMore>
|
164
|
+
</define>
|
165
|
+
<define name="classification">
|
166
|
+
<element name="classification">
|
167
|
+
<ref name="classification_tag"/>
|
168
|
+
<ref name="classification_value"/>
|
169
|
+
</element>
|
170
|
+
</define>
|
171
|
+
<define name="classification_tag">
|
172
|
+
<element name="tag">
|
173
|
+
<text/>
|
174
|
+
</element>
|
175
|
+
</define>
|
176
|
+
<define name="classification_value">
|
177
|
+
<element name="value">
|
178
|
+
<text/>
|
179
|
+
</element>
|
180
|
+
</define>
|
100
181
|
<define name="paragraph">
|
101
182
|
<element name="p">
|
102
183
|
<ref name="ParagraphType"/>
|
@@ -715,27 +796,36 @@
|
|
715
796
|
</define>
|
716
797
|
<define name="ruby">
|
717
798
|
<element name="ruby">
|
718
|
-
<
|
719
|
-
<
|
720
|
-
|
721
|
-
|
722
|
-
|
723
|
-
|
724
|
-
|
799
|
+
<choice>
|
800
|
+
<ref name="ruby_pronunciation"/>
|
801
|
+
<ref name="ruby_annotation"/>
|
802
|
+
</choice>
|
803
|
+
<choice>
|
804
|
+
<text/>
|
805
|
+
<ref name="ruby"/>
|
806
|
+
</choice>
|
725
807
|
</element>
|
726
808
|
</define>
|
727
|
-
<define name="
|
728
|
-
<element name="
|
729
|
-
<
|
730
|
-
|
731
|
-
|
809
|
+
<define name="ruby_pronunciation">
|
810
|
+
<element name="pronunciation">
|
811
|
+
<attribute name="value"/>
|
812
|
+
<optional>
|
813
|
+
<attribute name="script"/>
|
814
|
+
</optional>
|
815
|
+
<optional>
|
816
|
+
<attribute name="lang"/>
|
817
|
+
</optional>
|
732
818
|
</element>
|
733
819
|
</define>
|
734
|
-
<define name="
|
735
|
-
<element name="
|
736
|
-
<
|
737
|
-
|
738
|
-
|
820
|
+
<define name="ruby_annotation">
|
821
|
+
<element name="annotation">
|
822
|
+
<attribute name="value"/>
|
823
|
+
<optional>
|
824
|
+
<attribute name="script"/>
|
825
|
+
</optional>
|
826
|
+
<optional>
|
827
|
+
<attribute name="lang"/>
|
828
|
+
</optional>
|
739
829
|
</element>
|
740
830
|
</define>
|
741
831
|
<define name="br">
|
@@ -930,18 +1020,12 @@
|
|
930
1020
|
</optional>
|
931
1021
|
<optional>
|
932
1022
|
<attribute name="width">
|
933
|
-
<
|
934
|
-
<data type="int"/>
|
935
|
-
<value>auto</value>
|
936
|
-
</choice>
|
1023
|
+
<ref name="ImageSize"/>
|
937
1024
|
</attribute>
|
938
1025
|
</optional>
|
939
1026
|
<optional>
|
940
1027
|
<attribute name="height">
|
941
|
-
<
|
942
|
-
<data type="int"/>
|
943
|
-
<value>auto</value>
|
944
|
-
</choice>
|
1028
|
+
<ref name="ImageSize"/>
|
945
1029
|
</attribute>
|
946
1030
|
</optional>
|
947
1031
|
<optional>
|
@@ -956,6 +1040,14 @@
|
|
956
1040
|
</attribute>
|
957
1041
|
</optional>
|
958
1042
|
</define>
|
1043
|
+
<define name="ImageSize">
|
1044
|
+
<choice>
|
1045
|
+
<data type="string">
|
1046
|
+
<param name="pattern">\d+([.]\d+)?(%?)</param>
|
1047
|
+
</data>
|
1048
|
+
<value>auto</value>
|
1049
|
+
</choice>
|
1050
|
+
</define>
|
959
1051
|
<define name="video">
|
960
1052
|
<element name="video">
|
961
1053
|
<attribute name="id">
|
@@ -9,11 +9,42 @@
|
|
9
9
|
-->
|
10
10
|
<include href="biblio.rng">
|
11
11
|
<define name="BibData">
|
12
|
-
<ref name="
|
12
|
+
<ref name="StandardBibliographicItem"/>
|
13
13
|
<optional>
|
14
14
|
<ref name="ext"/>
|
15
15
|
</optional>
|
16
16
|
</define>
|
17
|
+
<define name="docrelation">
|
18
|
+
<element name="relation">
|
19
|
+
<attribute name="type">
|
20
|
+
<ref name="DocRelationType"/>
|
21
|
+
</attribute>
|
22
|
+
<optional>
|
23
|
+
<element name="description">
|
24
|
+
<ref name="FormattedString"/>
|
25
|
+
</element>
|
26
|
+
</optional>
|
27
|
+
<element name="bibitem">
|
28
|
+
<ref name="StandardReducedBibliographicItem"/>
|
29
|
+
</element>
|
30
|
+
<choice>
|
31
|
+
<zeroOrMore>
|
32
|
+
<ref name="locality"/>
|
33
|
+
</zeroOrMore>
|
34
|
+
<zeroOrMore>
|
35
|
+
<ref name="localityStack"/>
|
36
|
+
</zeroOrMore>
|
37
|
+
</choice>
|
38
|
+
<choice>
|
39
|
+
<zeroOrMore>
|
40
|
+
<ref name="sourceLocality"/>
|
41
|
+
</zeroOrMore>
|
42
|
+
<zeroOrMore>
|
43
|
+
<ref name="sourceLocalityStack"/>
|
44
|
+
</zeroOrMore>
|
45
|
+
</choice>
|
46
|
+
</element>
|
47
|
+
</define>
|
17
48
|
</include>
|
18
49
|
<define name="ext">
|
19
50
|
<element name="ext">
|
@@ -161,4 +192,16 @@
|
|
161
192
|
</optional>
|
162
193
|
</element>
|
163
194
|
</define>
|
195
|
+
<define name="StandardBibliographicItem">
|
196
|
+
<ref name="BibliographicItem"/>
|
197
|
+
<zeroOrMore>
|
198
|
+
<ref name="amend"/>
|
199
|
+
</zeroOrMore>
|
200
|
+
</define>
|
201
|
+
<define name="StandardReducedBibliographicItem">
|
202
|
+
<ref name="ReducedBibliographicItem"/>
|
203
|
+
<zeroOrMore>
|
204
|
+
<ref name="amend"/>
|
205
|
+
</zeroOrMore>
|
206
|
+
</define>
|
164
207
|
</grammar>
|
@@ -241,6 +241,9 @@
|
|
241
241
|
</element>
|
242
242
|
</define>
|
243
243
|
<define name="FullNameType">
|
244
|
+
<optional>
|
245
|
+
<ref name="name_abbreviation"/>
|
246
|
+
</optional>
|
244
247
|
<choice>
|
245
248
|
<group>
|
246
249
|
<zeroOrMore>
|
@@ -266,6 +269,11 @@
|
|
266
269
|
<ref name="variantname"/>
|
267
270
|
</zeroOrMore>
|
268
271
|
</define>
|
272
|
+
<define name="name_abbreviation">
|
273
|
+
<element name="abbreviation">
|
274
|
+
<ref name="LocalizedString"/>
|
275
|
+
</element>
|
276
|
+
</define>
|
269
277
|
<define name="prefix">
|
270
278
|
<element name="prefix">
|
271
279
|
<ref name="LocalizedString"/>
|
@@ -870,6 +878,9 @@
|
|
870
878
|
<optional>
|
871
879
|
<ref name="validity"/>
|
872
880
|
</optional>
|
881
|
+
<optional>
|
882
|
+
<ref name="depiction"/>
|
883
|
+
</optional>
|
873
884
|
</define>
|
874
885
|
<define name="btitle">
|
875
886
|
<element name="title">
|
@@ -11,8 +11,7 @@ module Metanorma
|
|
11
11
|
def resolution_inline_header(xml)
|
12
12
|
@doctype == "resolution" or return
|
13
13
|
xml.xpath("//clause//clause").each do |c|
|
14
|
-
|
15
|
-
|
14
|
+
(title = c.at("./title")) && !title.text&.empty? and next
|
16
15
|
c["inline-header"] = true
|
17
16
|
end
|
18
17
|
end
|
@@ -26,6 +25,8 @@ module Metanorma
|
|
26
25
|
end
|
27
26
|
|
28
27
|
def insert_missing_sections(xml)
|
28
|
+
xml.at("//metanorma-extension/semantic-metadata/" \
|
29
|
+
"headless[text() = 'true']") and return nil
|
29
30
|
insert_scope(xml)
|
30
31
|
insert_norm_ref(xml)
|
31
32
|
insert_terms(xml)
|
@@ -47,7 +48,7 @@ module Metanorma
|
|
47
48
|
ins.previous =
|
48
49
|
"<clause type='scope' #{add_id}><title>#{@i18n.scope}</title><p>" \
|
49
50
|
"#{@i18n.clause_empty}</p></clause>"
|
50
|
-
xml
|
51
|
+
xml.at("//sentinel")&.remove
|
51
52
|
end
|
52
53
|
|
53
54
|
def insert_norm_ref(xml)
|
@@ -58,7 +59,7 @@ module Metanorma
|
|
58
59
|
xml.at("//bibliography/references[@normative = 'true']") or
|
59
60
|
ins.previous = "<references #{add_id} normative='true'>" \
|
60
61
|
"<title>#{@i18n.normref}</title></references>"
|
61
|
-
xml
|
62
|
+
xml.at("//sentinel")&.remove
|
62
63
|
end
|
63
64
|
|
64
65
|
def insert_terms(xml)
|
@@ -22,7 +22,8 @@ module Metanorma
|
|
22
22
|
super
|
23
23
|
@smartquotes = node.attr("smartquotes") == "true"
|
24
24
|
@no_insert_missing_sections = doctype(node) != "recommendation" ||
|
25
|
-
node.attr("legacy-do-not-insert-missing-sections")
|
25
|
+
node.attr("legacy-do-not-insert-missing-sections") ||
|
26
|
+
node.attr("document-schema") == "legacy"
|
26
27
|
end
|
27
28
|
|
28
29
|
def boilerplate_file(_xmldoc)
|
@@ -17,10 +17,19 @@
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
18
18
|
of this.
|
19
19
|
-->
|
20
|
-
<!-- VERSION v1.2.
|
20
|
+
<!-- VERSION v1.2.12 -->
|
21
21
|
<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">
|
22
22
|
<include href="reqt.rng"/>
|
23
23
|
<include href="basicdoc.rng">
|
24
|
+
<define name="amend">
|
25
|
+
<element name="amend">
|
26
|
+
<ref name="BlockAttributes"/>
|
27
|
+
<ref name="AmendType"/>
|
28
|
+
<zeroOrMore>
|
29
|
+
<ref name="autonumber"/>
|
30
|
+
</zeroOrMore>
|
31
|
+
</element>
|
32
|
+
</define>
|
24
33
|
<define name="admonition">
|
25
34
|
<element name="admonition">
|
26
35
|
<attribute name="type">
|
@@ -2319,69 +2328,6 @@
|
|
2319
2328
|
<ref name="CitationType"/>
|
2320
2329
|
</element>
|
2321
2330
|
</define>
|
2322
|
-
<define name="amend">
|
2323
|
-
<element name="amend">
|
2324
|
-
<optional>
|
2325
|
-
<attribute name="id">
|
2326
|
-
<data type="ID"/>
|
2327
|
-
</attribute>
|
2328
|
-
</optional>
|
2329
|
-
<attribute name="change">
|
2330
|
-
<choice>
|
2331
|
-
<value>add</value>
|
2332
|
-
<value>modify</value>
|
2333
|
-
<value>delete</value>
|
2334
|
-
<value>replace</value>
|
2335
|
-
</choice>
|
2336
|
-
</attribute>
|
2337
|
-
<optional>
|
2338
|
-
<attribute name="path"/>
|
2339
|
-
</optional>
|
2340
|
-
<optional>
|
2341
|
-
<attribute name="path_end"/>
|
2342
|
-
</optional>
|
2343
|
-
<optional>
|
2344
|
-
<attribute name="title"/>
|
2345
|
-
</optional>
|
2346
|
-
<ref name="BlockAttributes"/>
|
2347
|
-
<optional>
|
2348
|
-
<element name="location">
|
2349
|
-
<zeroOrMore>
|
2350
|
-
<ref name="locality"/>
|
2351
|
-
</zeroOrMore>
|
2352
|
-
</element>
|
2353
|
-
</optional>
|
2354
|
-
<zeroOrMore>
|
2355
|
-
<ref name="autonumber"/>
|
2356
|
-
</zeroOrMore>
|
2357
|
-
<optional>
|
2358
|
-
<element name="description">
|
2359
|
-
<zeroOrMore>
|
2360
|
-
<ref name="BasicBlock"/>
|
2361
|
-
</zeroOrMore>
|
2362
|
-
</element>
|
2363
|
-
</optional>
|
2364
|
-
<optional>
|
2365
|
-
<element name="newcontent">
|
2366
|
-
<optional>
|
2367
|
-
<attribute name="id">
|
2368
|
-
<data type="ID"/>
|
2369
|
-
</attribute>
|
2370
|
-
</optional>
|
2371
|
-
<zeroOrMore>
|
2372
|
-
<ref name="BasicBlock"/>
|
2373
|
-
</zeroOrMore>
|
2374
|
-
</element>
|
2375
|
-
</optional>
|
2376
|
-
<optional>
|
2377
|
-
<element name="description">
|
2378
|
-
<zeroOrMore>
|
2379
|
-
<ref name="BasicBlock"/>
|
2380
|
-
</zeroOrMore>
|
2381
|
-
</element>
|
2382
|
-
</optional>
|
2383
|
-
</element>
|
2384
|
-
</define>
|
2385
2331
|
<define name="autonumber">
|
2386
2332
|
<element name="autonumber">
|
2387
2333
|
<attribute name="type">
|
data/lib/metanorma/itu/reqt.rng
CHANGED
@@ -207,20 +207,4 @@
|
|
207
207
|
<value>permission</value>
|
208
208
|
</choice>
|
209
209
|
</define>
|
210
|
-
<define name="classification">
|
211
|
-
<element name="classification">
|
212
|
-
<ref name="classification_tag"/>
|
213
|
-
<ref name="classification_value"/>
|
214
|
-
</element>
|
215
|
-
</define>
|
216
|
-
<define name="classification_tag">
|
217
|
-
<element name="tag">
|
218
|
-
<text/>
|
219
|
-
</element>
|
220
|
-
</define>
|
221
|
-
<define name="classification_value">
|
222
|
-
<element name="value">
|
223
|
-
<text/>
|
224
|
-
</element>
|
225
|
-
</define>
|
226
210
|
</grammar>
|
data/metanorma-itu.gemspec
CHANGED
@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
|
|
25
25
|
spec.require_paths = ["lib"]
|
26
26
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
|
27
27
|
|
28
|
-
spec.add_dependency "metanorma-standoc", "~> 2.
|
29
|
-
spec.add_dependency "ruby-jing"
|
28
|
+
spec.add_dependency "metanorma-standoc", "~> 2.8.0"
|
30
29
|
spec.add_dependency "twitter_cldr", ">= 3.0.0"
|
31
30
|
spec.add_dependency "tzinfo-data" # we need this for windows only
|
32
31
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-itu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-standoc
|
@@ -16,28 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.
|
19
|
+
version: 2.8.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 2.
|
27
|
-
- !ruby/object:Gem::Dependency
|
28
|
-
name: ruby-jing
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - ">="
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: '0'
|
34
|
-
type: :runtime
|
35
|
-
prerelease: false
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
37
|
-
requirements:
|
38
|
-
- - ">="
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: '0'
|
26
|
+
version: 2.8.0
|
41
27
|
- !ruby/object:Gem::Dependency
|
42
28
|
name: twitter_cldr
|
43
29
|
requirement: !ruby/object:Gem::Requirement
|