metanorma-iso 1.5.14 → 1.6.0
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/asciidoctor/iso/basicdoc.rng +18 -3
- data/lib/asciidoctor/iso/isodoc.rng +7 -0
- data/lib/isodoc/iso/iso.amendment.xsl +103 -10
- data/lib/isodoc/iso/iso.international-standard.xsl +103 -10
- data/lib/metanorma/iso/processor.rb +11 -0
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +2 -2
- data/spec/asciidoctor-iso/base_spec.rb +2 -2
- data/spec/asciidoctor-iso/cleanup_spec.rb +7 -1
- data/spec/asciidoctor-iso/validate_spec.rb +1 -1
- metadata +6 -7
- data/lib/metanorma/iso/fonts_manifest.yaml +0 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c9ff94c61e35de46dc7952d37bfff144de3138445e1deac3634627a2fa6f7a6a
|
|
4
|
+
data.tar.gz: 053100705b2af0c4d3d26359948fa8ba23f811010b2096475664ee5b44c0d3dc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a093a518a812e1fea3f5053f287b589010fc896954ff6da4a9674c72c4d0db566095ba0702ac85b6ba519f23e2d0a09d8697d984c998dbda6759698c6075726c
|
|
7
|
+
data.tar.gz: 45b6dcdb5783272457a495e8c4f2ea2a3c4fab3114d48a8c7d6917782db82f3ee573af34c903fd07cda28447373721dd7cdb83c519bca9ae74208f4f9a77bd8c
|
|
@@ -729,12 +729,27 @@
|
|
|
729
729
|
</define>
|
|
730
730
|
<define name="index">
|
|
731
731
|
<element name="index">
|
|
732
|
-
<attribute name="
|
|
732
|
+
<attribute name="to">
|
|
733
|
+
<data type="IDREF"/>
|
|
734
|
+
</attribute>
|
|
735
|
+
<element name="primary">
|
|
736
|
+
<oneOrMore>
|
|
737
|
+
<ref name="PureTextElement"/>
|
|
738
|
+
</oneOrMore>
|
|
739
|
+
</element>
|
|
733
740
|
<optional>
|
|
734
|
-
<
|
|
741
|
+
<element name="secondary">
|
|
742
|
+
<oneOrMore>
|
|
743
|
+
<ref name="PureTextElement"/>
|
|
744
|
+
</oneOrMore>
|
|
745
|
+
</element>
|
|
735
746
|
</optional>
|
|
736
747
|
<optional>
|
|
737
|
-
<
|
|
748
|
+
<element name="tertiary">
|
|
749
|
+
<oneOrMore>
|
|
750
|
+
<ref name="PureTextElement"/>
|
|
751
|
+
</oneOrMore>
|
|
752
|
+
</element>
|
|
738
753
|
</optional>
|
|
739
754
|
</element>
|
|
740
755
|
</define>
|
|
@@ -55,6 +55,13 @@
|
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
56
56
|
</data>
|
|
57
57
|
</attribute>
|
|
58
|
+
<optional>
|
|
59
|
+
<attribute name="to">
|
|
60
|
+
<data type="string">
|
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
62
|
+
</data>
|
|
63
|
+
</attribute>
|
|
64
|
+
</optional>
|
|
58
65
|
<optional>
|
|
59
66
|
<attribute name="type">
|
|
60
67
|
<ref name="ReferenceFormat"/>
|
|
@@ -1363,13 +1363,22 @@
|
|
|
1363
1363
|
<xsl:otherwise> <!-- for ordered lists -->
|
|
1364
1364
|
<xsl:choose>
|
|
1365
1365
|
<xsl:when test="../@type = 'arabic'">
|
|
1366
|
-
<xsl:number format="
|
|
1366
|
+
<xsl:number format="1." lang="en"/>
|
|
1367
1367
|
</xsl:when>
|
|
1368
1368
|
<xsl:when test="../@type = 'alphabet'">
|
|
1369
1369
|
<xsl:number format="a)" lang="en"/>
|
|
1370
1370
|
</xsl:when>
|
|
1371
|
+
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1372
|
+
<xsl:number format="A." lang="en"/>
|
|
1373
|
+
</xsl:when>
|
|
1374
|
+
<xsl:when test="../@type = 'roman'">
|
|
1375
|
+
<xsl:number format="i)"/>
|
|
1376
|
+
</xsl:when>
|
|
1377
|
+
<xsl:when test="../@type = 'roman_upper'">
|
|
1378
|
+
<xsl:number format="I."/>
|
|
1379
|
+
</xsl:when>
|
|
1371
1380
|
<xsl:otherwise>
|
|
1372
|
-
<xsl:number format="
|
|
1381
|
+
<xsl:number format="a)"/>
|
|
1373
1382
|
</xsl:otherwise>
|
|
1374
1383
|
</xsl:choose>
|
|
1375
1384
|
</xsl:otherwise>
|
|
@@ -2513,6 +2522,7 @@
|
|
|
2513
2522
|
|
|
2514
2523
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
|
2515
2524
|
|
|
2525
|
+
|
|
2516
2526
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
|
2517
2527
|
|
|
2518
2528
|
|
|
@@ -3613,7 +3623,9 @@
|
|
|
3613
3623
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
|
3614
3624
|
<fo:block-container>
|
|
3615
3625
|
|
|
3616
|
-
<xsl:
|
|
3626
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
|
3627
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3628
|
+
</xsl:if>
|
|
3617
3629
|
|
|
3618
3630
|
|
|
3619
3631
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
@@ -3628,6 +3640,7 @@
|
|
|
3628
3640
|
<fo:block-container>
|
|
3629
3641
|
|
|
3630
3642
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3643
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
3631
3644
|
|
|
3632
3645
|
|
|
3633
3646
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
@@ -3825,12 +3838,32 @@
|
|
|
3825
3838
|
</xsl:otherwise>
|
|
3826
3839
|
</xsl:choose>
|
|
3827
3840
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
|
3828
|
-
<xsl:
|
|
3829
|
-
<xsl:
|
|
3830
|
-
|
|
3831
|
-
<xsl:
|
|
3832
|
-
|
|
3833
|
-
|
|
3841
|
+
<xsl:variable name="lengths">
|
|
3842
|
+
<xsl:for-each select="*[local-name()='dt']">
|
|
3843
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
|
3844
|
+
<xsl:variable name="attributes">
|
|
3845
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
|
3846
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
|
3847
|
+
</xsl:variable>
|
|
3848
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
|
3849
|
+
</xsl:for-each>
|
|
3850
|
+
</xsl:variable>
|
|
3851
|
+
<xsl:variable name="maxLength">
|
|
3852
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
|
3853
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
|
3854
|
+
<xsl:if test="position() = 1">
|
|
3855
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
|
3856
|
+
</xsl:if>
|
|
3857
|
+
</xsl:for-each> -->
|
|
3858
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
|
3859
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
|
3860
|
+
<xsl:if test="position() = 1">
|
|
3861
|
+
<xsl:value-of select="."/>
|
|
3862
|
+
</xsl:if>
|
|
3863
|
+
</xsl:for-each>
|
|
3864
|
+
</xsl:variable>
|
|
3865
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
|
3866
|
+
<xsl:value-of select="$maxLength"/>
|
|
3834
3867
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
|
3835
3868
|
<xsl:param name="key_iso"/>
|
|
3836
3869
|
|
|
@@ -4631,6 +4664,8 @@
|
|
|
4631
4664
|
<xsl:variable name="bookmark-title_">
|
|
4632
4665
|
<xsl:call-template name="getLangVersion">
|
|
4633
4666
|
<xsl:with-param name="lang" select="@lang"/>
|
|
4667
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
|
4668
|
+
<xsl:with-param name="title" select="@title-part"/>
|
|
4634
4669
|
</xsl:call-template>
|
|
4635
4670
|
</xsl:variable>
|
|
4636
4671
|
<xsl:choose>
|
|
@@ -4648,13 +4683,34 @@
|
|
|
4648
4683
|
</xsl:choose>
|
|
4649
4684
|
</fo:bookmark-title>
|
|
4650
4685
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4686
|
+
|
|
4687
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4688
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4689
|
+
</xsl:call-template>
|
|
4690
|
+
|
|
4691
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4692
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4693
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4694
|
+
</xsl:call-template>
|
|
4695
|
+
|
|
4651
4696
|
</fo:bookmark>
|
|
4652
4697
|
|
|
4653
4698
|
</xsl:for-each>
|
|
4654
4699
|
</xsl:when>
|
|
4655
4700
|
<xsl:otherwise>
|
|
4656
4701
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
|
4702
|
+
|
|
4657
4703
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4704
|
+
|
|
4705
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4706
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4707
|
+
</xsl:call-template>
|
|
4708
|
+
|
|
4709
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4710
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4711
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4712
|
+
</xsl:call-template>
|
|
4713
|
+
|
|
4658
4714
|
</xsl:for-each>
|
|
4659
4715
|
</xsl:otherwise>
|
|
4660
4716
|
</xsl:choose>
|
|
@@ -4673,8 +4729,44 @@
|
|
|
4673
4729
|
|
|
4674
4730
|
</fo:bookmark-tree>
|
|
4675
4731
|
</xsl:if>
|
|
4732
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
4733
|
+
<xsl:param name="contents"/>
|
|
4734
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
|
4735
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
|
4736
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
|
4737
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
|
4738
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4739
|
+
<fo:bookmark-title>
|
|
4740
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4741
|
+
</fo:bookmark-title>
|
|
4742
|
+
</fo:bookmark>
|
|
4743
|
+
</xsl:for-each>
|
|
4744
|
+
</fo:bookmark>
|
|
4745
|
+
</xsl:if>
|
|
4746
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
|
4747
|
+
<xsl:param name="contents"/>
|
|
4748
|
+
<xsl:param name="lang"/>
|
|
4749
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
|
4750
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
|
4751
|
+
<fo:bookmark-title>
|
|
4752
|
+
<xsl:choose>
|
|
4753
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
|
4754
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
|
4755
|
+
</xsl:choose>
|
|
4756
|
+
</fo:bookmark-title>
|
|
4757
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
|
4758
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4759
|
+
<fo:bookmark-title>
|
|
4760
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4761
|
+
</fo:bookmark-title>
|
|
4762
|
+
</fo:bookmark>
|
|
4763
|
+
</xsl:for-each>
|
|
4764
|
+
</fo:bookmark>
|
|
4765
|
+
</xsl:if>
|
|
4676
4766
|
</xsl:template><xsl:template name="getLangVersion">
|
|
4677
4767
|
<xsl:param name="lang"/>
|
|
4768
|
+
<xsl:param name="doctype" select="''"/>
|
|
4769
|
+
<xsl:param name="title" select="''"/>
|
|
4678
4770
|
<xsl:choose>
|
|
4679
4771
|
<xsl:when test="$lang = 'en'">
|
|
4680
4772
|
|
|
@@ -5170,7 +5262,8 @@
|
|
|
5170
5262
|
<fo:block-container margin-left="0mm">
|
|
5171
5263
|
|
|
5172
5264
|
<fo:block xsl:use-attribute-sets="quote-style">
|
|
5173
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
|
5265
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
|
5266
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
5174
5267
|
</fo:block>
|
|
5175
5268
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
|
5176
5269
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
@@ -1363,13 +1363,22 @@
|
|
|
1363
1363
|
<xsl:otherwise> <!-- for ordered lists -->
|
|
1364
1364
|
<xsl:choose>
|
|
1365
1365
|
<xsl:when test="../@type = 'arabic'">
|
|
1366
|
-
<xsl:number format="
|
|
1366
|
+
<xsl:number format="1." lang="en"/>
|
|
1367
1367
|
</xsl:when>
|
|
1368
1368
|
<xsl:when test="../@type = 'alphabet'">
|
|
1369
1369
|
<xsl:number format="a)" lang="en"/>
|
|
1370
1370
|
</xsl:when>
|
|
1371
|
+
<xsl:when test="../@type = 'alphabet_upper'">
|
|
1372
|
+
<xsl:number format="A." lang="en"/>
|
|
1373
|
+
</xsl:when>
|
|
1374
|
+
<xsl:when test="../@type = 'roman'">
|
|
1375
|
+
<xsl:number format="i)"/>
|
|
1376
|
+
</xsl:when>
|
|
1377
|
+
<xsl:when test="../@type = 'roman_upper'">
|
|
1378
|
+
<xsl:number format="I."/>
|
|
1379
|
+
</xsl:when>
|
|
1371
1380
|
<xsl:otherwise>
|
|
1372
|
-
<xsl:number format="
|
|
1381
|
+
<xsl:number format="a)"/>
|
|
1373
1382
|
</xsl:otherwise>
|
|
1374
1383
|
</xsl:choose>
|
|
1375
1384
|
</xsl:otherwise>
|
|
@@ -2513,6 +2522,7 @@
|
|
|
2513
2522
|
|
|
2514
2523
|
</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
|
|
2515
2524
|
|
|
2525
|
+
|
|
2516
2526
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
|
2517
2527
|
|
|
2518
2528
|
|
|
@@ -3613,7 +3623,9 @@
|
|
|
3613
3623
|
</xsl:template><xsl:template match="*[local-name()='dl']">
|
|
3614
3624
|
<fo:block-container>
|
|
3615
3625
|
|
|
3616
|
-
<xsl:
|
|
3626
|
+
<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
|
|
3627
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3628
|
+
</xsl:if>
|
|
3617
3629
|
|
|
3618
3630
|
|
|
3619
3631
|
<xsl:if test="parent::*[local-name() = 'note']">
|
|
@@ -3628,6 +3640,7 @@
|
|
|
3628
3640
|
<fo:block-container>
|
|
3629
3641
|
|
|
3630
3642
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3643
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
3631
3644
|
|
|
3632
3645
|
|
|
3633
3646
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
@@ -3825,12 +3838,32 @@
|
|
|
3825
3838
|
</xsl:otherwise>
|
|
3826
3839
|
</xsl:choose>
|
|
3827
3840
|
</xsl:template><xsl:template name="getMaxLength_dt">
|
|
3828
|
-
<xsl:
|
|
3829
|
-
<xsl:
|
|
3830
|
-
|
|
3831
|
-
<xsl:
|
|
3832
|
-
|
|
3833
|
-
|
|
3841
|
+
<xsl:variable name="lengths">
|
|
3842
|
+
<xsl:for-each select="*[local-name()='dt']">
|
|
3843
|
+
<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
|
|
3844
|
+
<xsl:variable name="attributes">
|
|
3845
|
+
<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
|
|
3846
|
+
<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
|
|
3847
|
+
</xsl:variable>
|
|
3848
|
+
<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
|
|
3849
|
+
</xsl:for-each>
|
|
3850
|
+
</xsl:variable>
|
|
3851
|
+
<xsl:variable name="maxLength">
|
|
3852
|
+
<!-- <xsl:for-each select="*[local-name()='dt']">
|
|
3853
|
+
<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
|
|
3854
|
+
<xsl:if test="position() = 1">
|
|
3855
|
+
<xsl:value-of select="string-length(normalize-space(.))"/>
|
|
3856
|
+
</xsl:if>
|
|
3857
|
+
</xsl:for-each> -->
|
|
3858
|
+
<xsl:for-each select="xalan:nodeset($lengths)/length">
|
|
3859
|
+
<xsl:sort select="." data-type="number" order="descending"/>
|
|
3860
|
+
<xsl:if test="position() = 1">
|
|
3861
|
+
<xsl:value-of select="."/>
|
|
3862
|
+
</xsl:if>
|
|
3863
|
+
</xsl:for-each>
|
|
3864
|
+
</xsl:variable>
|
|
3865
|
+
<!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
|
|
3866
|
+
<xsl:value-of select="$maxLength"/>
|
|
3834
3867
|
</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
|
|
3835
3868
|
<xsl:param name="key_iso"/>
|
|
3836
3869
|
|
|
@@ -4631,6 +4664,8 @@
|
|
|
4631
4664
|
<xsl:variable name="bookmark-title_">
|
|
4632
4665
|
<xsl:call-template name="getLangVersion">
|
|
4633
4666
|
<xsl:with-param name="lang" select="@lang"/>
|
|
4667
|
+
<xsl:with-param name="doctype" select="@doctype"/>
|
|
4668
|
+
<xsl:with-param name="title" select="@title-part"/>
|
|
4634
4669
|
</xsl:call-template>
|
|
4635
4670
|
</xsl:variable>
|
|
4636
4671
|
<xsl:choose>
|
|
@@ -4648,13 +4683,34 @@
|
|
|
4648
4683
|
</xsl:choose>
|
|
4649
4684
|
</fo:bookmark-title>
|
|
4650
4685
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4686
|
+
|
|
4687
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4688
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4689
|
+
</xsl:call-template>
|
|
4690
|
+
|
|
4691
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4692
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4693
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4694
|
+
</xsl:call-template>
|
|
4695
|
+
|
|
4651
4696
|
</fo:bookmark>
|
|
4652
4697
|
|
|
4653
4698
|
</xsl:for-each>
|
|
4654
4699
|
</xsl:when>
|
|
4655
4700
|
<xsl:otherwise>
|
|
4656
4701
|
<xsl:for-each select="xalan:nodeset($contents)/doc">
|
|
4702
|
+
|
|
4657
4703
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
4704
|
+
|
|
4705
|
+
<xsl:call-template name="insertFigureBookmarks">
|
|
4706
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4707
|
+
</xsl:call-template>
|
|
4708
|
+
|
|
4709
|
+
<xsl:call-template name="insertTableBookmarks">
|
|
4710
|
+
<xsl:with-param name="contents" select="contents"/>
|
|
4711
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
4712
|
+
</xsl:call-template>
|
|
4713
|
+
|
|
4658
4714
|
</xsl:for-each>
|
|
4659
4715
|
</xsl:otherwise>
|
|
4660
4716
|
</xsl:choose>
|
|
@@ -4673,8 +4729,44 @@
|
|
|
4673
4729
|
|
|
4674
4730
|
</fo:bookmark-tree>
|
|
4675
4731
|
</xsl:if>
|
|
4732
|
+
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
4733
|
+
<xsl:param name="contents"/>
|
|
4734
|
+
<xsl:if test="xalan:nodeset($contents)/figure">
|
|
4735
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
|
|
4736
|
+
<fo:bookmark-title>Figures</fo:bookmark-title>
|
|
4737
|
+
<xsl:for-each select="xalan:nodeset($contents)/figure">
|
|
4738
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4739
|
+
<fo:bookmark-title>
|
|
4740
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4741
|
+
</fo:bookmark-title>
|
|
4742
|
+
</fo:bookmark>
|
|
4743
|
+
</xsl:for-each>
|
|
4744
|
+
</fo:bookmark>
|
|
4745
|
+
</xsl:if>
|
|
4746
|
+
</xsl:template><xsl:template name="insertTableBookmarks">
|
|
4747
|
+
<xsl:param name="contents"/>
|
|
4748
|
+
<xsl:param name="lang"/>
|
|
4749
|
+
<xsl:if test="xalan:nodeset($contents)/table">
|
|
4750
|
+
<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
|
|
4751
|
+
<fo:bookmark-title>
|
|
4752
|
+
<xsl:choose>
|
|
4753
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
|
4754
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
|
4755
|
+
</xsl:choose>
|
|
4756
|
+
</fo:bookmark-title>
|
|
4757
|
+
<xsl:for-each select="xalan:nodeset($contents)/table">
|
|
4758
|
+
<fo:bookmark internal-destination="{@id}">
|
|
4759
|
+
<fo:bookmark-title>
|
|
4760
|
+
<xsl:value-of select="normalize-space(title)"/>
|
|
4761
|
+
</fo:bookmark-title>
|
|
4762
|
+
</fo:bookmark>
|
|
4763
|
+
</xsl:for-each>
|
|
4764
|
+
</fo:bookmark>
|
|
4765
|
+
</xsl:if>
|
|
4676
4766
|
</xsl:template><xsl:template name="getLangVersion">
|
|
4677
4767
|
<xsl:param name="lang"/>
|
|
4768
|
+
<xsl:param name="doctype" select="''"/>
|
|
4769
|
+
<xsl:param name="title" select="''"/>
|
|
4678
4770
|
<xsl:choose>
|
|
4679
4771
|
<xsl:when test="$lang = 'en'">
|
|
4680
4772
|
|
|
@@ -5170,7 +5262,8 @@
|
|
|
5170
5262
|
<fo:block-container margin-left="0mm">
|
|
5171
5263
|
|
|
5172
5264
|
<fo:block xsl:use-attribute-sets="quote-style">
|
|
5173
|
-
<xsl:apply-templates select=".//*[local-name() = 'p']"/>
|
|
5265
|
+
<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
|
|
5266
|
+
<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
|
|
5174
5267
|
</fo:block>
|
|
5175
5268
|
<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
|
|
5176
5269
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
@@ -25,6 +25,17 @@ module Metanorma
|
|
|
25
25
|
"Metanorma::ISO #{Metanorma::ISO::VERSION}"
|
|
26
26
|
end
|
|
27
27
|
|
|
28
|
+
def fonts_manifest
|
|
29
|
+
{
|
|
30
|
+
"Cambria" => nil,
|
|
31
|
+
"Cambria Math" => nil,
|
|
32
|
+
"Times New Roman" => nil,
|
|
33
|
+
"Source Han Sans" => nil,
|
|
34
|
+
"Courier" => nil,
|
|
35
|
+
"Courier New" => nil,
|
|
36
|
+
}
|
|
37
|
+
end
|
|
38
|
+
|
|
28
39
|
def use_presentation_xml(ext)
|
|
29
40
|
return true if ext == :html_alt
|
|
30
41
|
super
|
data/metanorma-iso.gemspec
CHANGED
|
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
|
|
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
|
31
31
|
|
|
32
32
|
spec.add_dependency "ruby-jing"
|
|
33
|
-
spec.add_dependency "isodoc", "~> 1.
|
|
34
|
-
spec.add_dependency "metanorma-standoc", "~> 1.
|
|
33
|
+
spec.add_dependency "isodoc", "~> 1.4.0"
|
|
34
|
+
spec.add_dependency "metanorma-standoc", "~> 1.7.0"
|
|
35
35
|
spec.add_dependency "tokenizer", "~> 0.3.0"
|
|
36
36
|
spec.add_dependency "twitter_cldr"
|
|
37
37
|
spec.add_dependency "mn2sts", "~> 1.5.0"
|
|
@@ -197,8 +197,8 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
197
197
|
:tc-docnumber: 2000, 2003
|
|
198
198
|
:language: el
|
|
199
199
|
:script: Grek
|
|
200
|
-
:publisher: IEC
|
|
201
|
-
:copyright-holder: ISO
|
|
200
|
+
:publisher: IEC;IETF;ISO
|
|
201
|
+
:copyright-holder: ISO;IETF
|
|
202
202
|
:copyright-year: 2001
|
|
203
203
|
:doctype: technical-report
|
|
204
204
|
:pub-address: 1 Infinity Loop + \
|
|
@@ -124,7 +124,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
124
124
|
OUTPUT
|
|
125
125
|
end
|
|
126
126
|
|
|
127
|
-
it "
|
|
127
|
+
it "keeps any initial boilerplate from terms and definitions" do
|
|
128
128
|
expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
129
129
|
#{ASCIIDOC_BLANK_HDR}
|
|
130
130
|
== Terms and Definitions
|
|
@@ -142,6 +142,12 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
142
142
|
<terms id="_" obligation="normative"><title>Terms and definitions</title>
|
|
143
143
|
|
|
144
144
|
#{TERM_BOILERPLATE}
|
|
145
|
+
<p id='_'>I am boilerplate</p>
|
|
146
|
+
<ul id='_'>
|
|
147
|
+
<li>
|
|
148
|
+
<p id='_'>So am I</p>
|
|
149
|
+
</li>
|
|
150
|
+
</ul>
|
|
145
151
|
<term id="term-time">
|
|
146
152
|
<preferred>Time</preferred>
|
|
147
153
|
<definition><p id="_">This paragraph is extraneous</p></definition>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iso
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.6.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-12-
|
|
11
|
+
date: 2020-12-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: ruby-jing
|
|
@@ -30,28 +30,28 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 1.
|
|
33
|
+
version: 1.4.0
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 1.
|
|
40
|
+
version: 1.4.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: metanorma-standoc
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 1.
|
|
47
|
+
version: 1.7.0
|
|
48
48
|
type: :runtime
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - "~>"
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: 1.
|
|
54
|
+
version: 1.7.0
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: tokenizer
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -334,7 +334,6 @@ files:
|
|
|
334
334
|
- lib/isodoc/iso/xref.rb
|
|
335
335
|
- lib/metanorma-iso.rb
|
|
336
336
|
- lib/metanorma/iso.rb
|
|
337
|
-
- lib/metanorma/iso/fonts_manifest.yaml
|
|
338
337
|
- lib/metanorma/iso/processor.rb
|
|
339
338
|
- lib/metanorma/iso/version.rb
|
|
340
339
|
- metanorma-iso.gemspec
|