metanorma-un 0.5.16 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/un/isodoc.rng +130 -1
- data/lib/isodoc/un/html/htmlstyle.css +7 -0
- data/lib/isodoc/un/html_convert.rb +0 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +44 -18
- data/lib/isodoc/un/un.plenary.xsl +44 -18
- data/lib/isodoc/un/un.recommendation.xsl +49 -23
- data/lib/metanorma/un/version.rb +1 -1
- data/metanorma-unece.gemspec +5 -5
- metadata +25 -25
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5f3831d18128aeb1bb04f33c590fbd82d17220f113968d0898d08ae690e35733
|
|
4
|
+
data.tar.gz: 3bfee434e83b02a2c270fbd0f1afe8ae9c20a33cbe39978581c1381a2d1f52d9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 95f97d91ad56176d3120bfcf1c0e5737a1ca9d329ab24b7c4ad9a8b24c1652cd656b1abc3cb728a836f3584a66f1eef3e984addf2bbd4afa9cc17de86b56f03a
|
|
7
|
+
data.tar.gz: 6cdb99cbcd16e773d52327bf2719646dcfbe7d077006e008e155e53e019a18662fd52e6397790288df365471bf32b8bb587bc3ec84d83e92b562a2a091446d64
|
|
@@ -86,6 +86,35 @@
|
|
|
86
86
|
<text/>
|
|
87
87
|
</element>
|
|
88
88
|
</define>
|
|
89
|
+
<define name="erefType">
|
|
90
|
+
<optional>
|
|
91
|
+
<attribute name="normative">
|
|
92
|
+
<data type="boolean"/>
|
|
93
|
+
</attribute>
|
|
94
|
+
</optional>
|
|
95
|
+
<attribute name="citeas"/>
|
|
96
|
+
<attribute name="type">
|
|
97
|
+
<ref name="ReferenceFormat"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
<optional>
|
|
100
|
+
<attribute name="alt"/>
|
|
101
|
+
</optional>
|
|
102
|
+
<optional>
|
|
103
|
+
<attribute name="case">
|
|
104
|
+
<choice>
|
|
105
|
+
<value>capital</value>
|
|
106
|
+
<value>lowercase</value>
|
|
107
|
+
</choice>
|
|
108
|
+
</attribute>
|
|
109
|
+
</optional>
|
|
110
|
+
<optional>
|
|
111
|
+
<attribute name="droploc">
|
|
112
|
+
<data type="boolean"/>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<ref name="CitationType"/>
|
|
116
|
+
<text/>
|
|
117
|
+
</define>
|
|
89
118
|
<define name="ul">
|
|
90
119
|
<element name="ul">
|
|
91
120
|
<attribute name="id">
|
|
@@ -775,6 +804,78 @@
|
|
|
775
804
|
<ref name="paragraph"/>
|
|
776
805
|
</element>
|
|
777
806
|
</define>
|
|
807
|
+
<define name="em">
|
|
808
|
+
<element name="em">
|
|
809
|
+
<zeroOrMore>
|
|
810
|
+
<choice>
|
|
811
|
+
<ref name="PureTextElement"/>
|
|
812
|
+
<ref name="stem"/>
|
|
813
|
+
<ref name="index"/>
|
|
814
|
+
</choice>
|
|
815
|
+
</zeroOrMore>
|
|
816
|
+
</element>
|
|
817
|
+
</define>
|
|
818
|
+
<define name="strong">
|
|
819
|
+
<element name="strong">
|
|
820
|
+
<zeroOrMore>
|
|
821
|
+
<choice>
|
|
822
|
+
<ref name="PureTextElement"/>
|
|
823
|
+
<ref name="stem"/>
|
|
824
|
+
<ref name="index"/>
|
|
825
|
+
</choice>
|
|
826
|
+
</zeroOrMore>
|
|
827
|
+
</element>
|
|
828
|
+
</define>
|
|
829
|
+
<define name="tt">
|
|
830
|
+
<element name="tt">
|
|
831
|
+
<zeroOrMore>
|
|
832
|
+
<choice>
|
|
833
|
+
<ref name="PureTextElement"/>
|
|
834
|
+
<ref name="index"/>
|
|
835
|
+
</choice>
|
|
836
|
+
</zeroOrMore>
|
|
837
|
+
</element>
|
|
838
|
+
</define>
|
|
839
|
+
<define name="keyword">
|
|
840
|
+
<element name="keyword">
|
|
841
|
+
<zeroOrMore>
|
|
842
|
+
<choice>
|
|
843
|
+
<ref name="PureTextElement"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="strike">
|
|
850
|
+
<element name="strike">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="underline">
|
|
860
|
+
<element name="underline">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="smallcap">
|
|
870
|
+
<element name="smallcap">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
778
879
|
</include>
|
|
779
880
|
<!-- end overrides -->
|
|
780
881
|
<define name="colgroup">
|
|
@@ -793,7 +894,35 @@
|
|
|
793
894
|
<value>internal</value>
|
|
794
895
|
</define>
|
|
795
896
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
897
|
+
<choice>
|
|
898
|
+
<ref name="concept"/>
|
|
899
|
+
<ref name="add"/>
|
|
900
|
+
<ref name="del"/>
|
|
901
|
+
</choice>
|
|
902
|
+
</define>
|
|
903
|
+
<define name="add">
|
|
904
|
+
<element name="add">
|
|
905
|
+
<choice>
|
|
906
|
+
<ref name="PureTextElement"/>
|
|
907
|
+
<ref name="eref"/>
|
|
908
|
+
<ref name="stem"/>
|
|
909
|
+
<ref name="keyword"/>
|
|
910
|
+
<ref name="xref"/>
|
|
911
|
+
<ref name="hyperlink"/>
|
|
912
|
+
</choice>
|
|
913
|
+
</element>
|
|
914
|
+
</define>
|
|
915
|
+
<define name="del">
|
|
916
|
+
<element name="del">
|
|
917
|
+
<choice>
|
|
918
|
+
<ref name="PureTextElement"/>
|
|
919
|
+
<ref name="eref"/>
|
|
920
|
+
<ref name="stem"/>
|
|
921
|
+
<ref name="keyword"/>
|
|
922
|
+
<ref name="xref"/>
|
|
923
|
+
<ref name="hyperlink"/>
|
|
924
|
+
</choice>
|
|
925
|
+
</element>
|
|
797
926
|
</define>
|
|
798
927
|
<define name="concept">
|
|
799
928
|
<element name="concept">
|
|
@@ -115,6 +115,13 @@ a.FootnoteRef + a.FootnoteRef:before {
|
|
|
115
115
|
content: ", ";
|
|
116
116
|
vertical-align: super; }
|
|
117
117
|
|
|
118
|
+
.addition {
|
|
119
|
+
color: blue; }
|
|
120
|
+
|
|
121
|
+
.deletion {
|
|
122
|
+
color: red;
|
|
123
|
+
text-decoration: line-through; }
|
|
124
|
+
|
|
118
125
|
#standard-band {
|
|
119
126
|
background-color: #0AC442; }
|
|
120
127
|
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
<xsl:param name="svg_images"/>
|
|
6
6
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
7
7
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
8
|
+
<xsl:param name="basepath"/>
|
|
8
9
|
|
|
9
10
|
|
|
10
11
|
|
|
@@ -1653,12 +1654,18 @@
|
|
|
1653
1654
|
|
|
1654
1655
|
</xsl:attribute-set><xsl:attribute-set name="admitted-style">
|
|
1655
1656
|
|
|
1656
|
-
|
|
1657
|
+
|
|
1657
1658
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
|
1658
1659
|
|
|
1659
1660
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
|
1660
1661
|
|
|
1661
1662
|
|
|
1663
|
+
</xsl:attribute-set><xsl:attribute-set name="add-style">
|
|
1664
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1665
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
1666
|
+
</xsl:attribute-set><xsl:attribute-set name="del-style">
|
|
1667
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1668
|
+
<xsl:attribute name="text-decoration">line-through</xsl:attribute>
|
|
1662
1669
|
</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
1663
1670
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
|
1664
1671
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
|
@@ -3034,8 +3041,12 @@
|
|
|
3034
3041
|
<fo:inline text-decoration="underline">
|
|
3035
3042
|
<xsl:apply-templates/>
|
|
3036
3043
|
</fo:inline>
|
|
3044
|
+
</xsl:template><xsl:template match="*[local-name()='add']">
|
|
3045
|
+
<fo:inline xsl:use-attribute-sets="add-style">
|
|
3046
|
+
<xsl:apply-templates/>
|
|
3047
|
+
</fo:inline>
|
|
3037
3048
|
</xsl:template><xsl:template match="*[local-name()='del']">
|
|
3038
|
-
<fo:inline
|
|
3049
|
+
<fo:inline xsl:use-attribute-sets="del-style">
|
|
3039
3050
|
<xsl:apply-templates/>
|
|
3040
3051
|
</fo:inline>
|
|
3041
3052
|
</xsl:template><xsl:template match="*[local-name()='hi']">
|
|
@@ -3660,22 +3671,37 @@
|
|
|
3660
3671
|
<xsl:apply-templates/>
|
|
3661
3672
|
</fo:block>
|
|
3662
3673
|
</xsl:template><xsl:template match="*[local-name() = 'image']">
|
|
3663
|
-
<
|
|
3664
|
-
|
|
3665
|
-
|
|
3666
|
-
|
|
3667
|
-
|
|
3668
|
-
|
|
3669
|
-
|
|
3670
|
-
|
|
3671
|
-
|
|
3672
|
-
|
|
3673
|
-
|
|
3674
|
-
|
|
3675
|
-
|
|
3676
|
-
|
|
3677
|
-
|
|
3678
|
-
|
|
3674
|
+
<xsl:choose>
|
|
3675
|
+
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
3676
|
+
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
3677
|
+
<xsl:variable name="src">
|
|
3678
|
+
<xsl:call-template name="image_src"/>
|
|
3679
|
+
</xsl:variable>
|
|
3680
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
|
|
3681
|
+
</fo:inline>
|
|
3682
|
+
</xsl:when>
|
|
3683
|
+
<xsl:otherwise>
|
|
3684
|
+
<fo:block xsl:use-attribute-sets="image-style">
|
|
3685
|
+
|
|
3686
|
+
<xsl:variable name="src">
|
|
3687
|
+
<xsl:call-template name="image_src"/>
|
|
3688
|
+
</xsl:variable>
|
|
3689
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
|
|
3690
|
+
</fo:block>
|
|
3691
|
+
</xsl:otherwise>
|
|
3692
|
+
</xsl:choose>
|
|
3693
|
+
</xsl:template><xsl:template name="image_src">
|
|
3694
|
+
<xsl:choose>
|
|
3695
|
+
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
3696
|
+
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
3697
|
+
</xsl:when>
|
|
3698
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
3699
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
3700
|
+
</xsl:when>
|
|
3701
|
+
<xsl:otherwise>
|
|
3702
|
+
<xsl:value-of select="@src"/>
|
|
3703
|
+
</xsl:otherwise>
|
|
3704
|
+
</xsl:choose>
|
|
3679
3705
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
3680
3706
|
<xsl:apply-templates mode="contents"/>
|
|
3681
3707
|
<xsl:text> </xsl:text>
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
<xsl:param name="svg_images"/>
|
|
6
6
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
7
7
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
8
|
+
<xsl:param name="basepath"/>
|
|
8
9
|
|
|
9
10
|
|
|
10
11
|
|
|
@@ -1653,12 +1654,18 @@
|
|
|
1653
1654
|
|
|
1654
1655
|
</xsl:attribute-set><xsl:attribute-set name="admitted-style">
|
|
1655
1656
|
|
|
1656
|
-
|
|
1657
|
+
|
|
1657
1658
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
|
1658
1659
|
|
|
1659
1660
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
|
1660
1661
|
|
|
1661
1662
|
|
|
1663
|
+
</xsl:attribute-set><xsl:attribute-set name="add-style">
|
|
1664
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1665
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
1666
|
+
</xsl:attribute-set><xsl:attribute-set name="del-style">
|
|
1667
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1668
|
+
<xsl:attribute name="text-decoration">line-through</xsl:attribute>
|
|
1662
1669
|
</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
1663
1670
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
|
1664
1671
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
|
@@ -3034,8 +3041,12 @@
|
|
|
3034
3041
|
<fo:inline text-decoration="underline">
|
|
3035
3042
|
<xsl:apply-templates/>
|
|
3036
3043
|
</fo:inline>
|
|
3044
|
+
</xsl:template><xsl:template match="*[local-name()='add']">
|
|
3045
|
+
<fo:inline xsl:use-attribute-sets="add-style">
|
|
3046
|
+
<xsl:apply-templates/>
|
|
3047
|
+
</fo:inline>
|
|
3037
3048
|
</xsl:template><xsl:template match="*[local-name()='del']">
|
|
3038
|
-
<fo:inline
|
|
3049
|
+
<fo:inline xsl:use-attribute-sets="del-style">
|
|
3039
3050
|
<xsl:apply-templates/>
|
|
3040
3051
|
</fo:inline>
|
|
3041
3052
|
</xsl:template><xsl:template match="*[local-name()='hi']">
|
|
@@ -3660,22 +3671,37 @@
|
|
|
3660
3671
|
<xsl:apply-templates/>
|
|
3661
3672
|
</fo:block>
|
|
3662
3673
|
</xsl:template><xsl:template match="*[local-name() = 'image']">
|
|
3663
|
-
<
|
|
3664
|
-
|
|
3665
|
-
|
|
3666
|
-
|
|
3667
|
-
|
|
3668
|
-
|
|
3669
|
-
|
|
3670
|
-
|
|
3671
|
-
|
|
3672
|
-
|
|
3673
|
-
|
|
3674
|
-
|
|
3675
|
-
|
|
3676
|
-
|
|
3677
|
-
|
|
3678
|
-
|
|
3674
|
+
<xsl:choose>
|
|
3675
|
+
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
3676
|
+
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
3677
|
+
<xsl:variable name="src">
|
|
3678
|
+
<xsl:call-template name="image_src"/>
|
|
3679
|
+
</xsl:variable>
|
|
3680
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
|
|
3681
|
+
</fo:inline>
|
|
3682
|
+
</xsl:when>
|
|
3683
|
+
<xsl:otherwise>
|
|
3684
|
+
<fo:block xsl:use-attribute-sets="image-style">
|
|
3685
|
+
|
|
3686
|
+
<xsl:variable name="src">
|
|
3687
|
+
<xsl:call-template name="image_src"/>
|
|
3688
|
+
</xsl:variable>
|
|
3689
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
|
|
3690
|
+
</fo:block>
|
|
3691
|
+
</xsl:otherwise>
|
|
3692
|
+
</xsl:choose>
|
|
3693
|
+
</xsl:template><xsl:template name="image_src">
|
|
3694
|
+
<xsl:choose>
|
|
3695
|
+
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
3696
|
+
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
3697
|
+
</xsl:when>
|
|
3698
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
3699
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
3700
|
+
</xsl:when>
|
|
3701
|
+
<xsl:otherwise>
|
|
3702
|
+
<xsl:value-of select="@src"/>
|
|
3703
|
+
</xsl:otherwise>
|
|
3704
|
+
</xsl:choose>
|
|
3679
3705
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
3680
3706
|
<xsl:apply-templates mode="contents"/>
|
|
3681
3707
|
<xsl:text> </xsl:text>
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
<xsl:param name="svg_images"/>
|
|
6
6
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
7
7
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
8
|
+
<xsl:param name="basepath"/>
|
|
8
9
|
|
|
9
10
|
|
|
10
11
|
|
|
@@ -1513,12 +1514,18 @@
|
|
|
1513
1514
|
|
|
1514
1515
|
</xsl:attribute-set><xsl:attribute-set name="admitted-style">
|
|
1515
1516
|
|
|
1516
|
-
|
|
1517
|
+
|
|
1517
1518
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
|
1518
1519
|
|
|
1519
1520
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
|
1520
1521
|
|
|
1521
1522
|
|
|
1523
|
+
</xsl:attribute-set><xsl:attribute-set name="add-style">
|
|
1524
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1525
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
1526
|
+
</xsl:attribute-set><xsl:attribute-set name="del-style">
|
|
1527
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
1528
|
+
<xsl:attribute name="text-decoration">line-through</xsl:attribute>
|
|
1522
1529
|
</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
1523
1530
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
|
|
1524
1531
|
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
|
|
@@ -2899,8 +2906,12 @@
|
|
|
2899
2906
|
<fo:inline text-decoration="underline">
|
|
2900
2907
|
<xsl:apply-templates/>
|
|
2901
2908
|
</fo:inline>
|
|
2909
|
+
</xsl:template><xsl:template match="*[local-name()='add']">
|
|
2910
|
+
<fo:inline xsl:use-attribute-sets="add-style">
|
|
2911
|
+
<xsl:apply-templates/>
|
|
2912
|
+
</fo:inline>
|
|
2902
2913
|
</xsl:template><xsl:template match="*[local-name()='del']">
|
|
2903
|
-
<fo:inline
|
|
2914
|
+
<fo:inline xsl:use-attribute-sets="del-style">
|
|
2904
2915
|
<xsl:apply-templates/>
|
|
2905
2916
|
</fo:inline>
|
|
2906
2917
|
</xsl:template><xsl:template match="*[local-name()='hi']">
|
|
@@ -3529,27 +3540,42 @@
|
|
|
3529
3540
|
<xsl:apply-templates/>
|
|
3530
3541
|
</fo:block>
|
|
3531
3542
|
</xsl:template><xsl:template match="*[local-name() = 'image']">
|
|
3532
|
-
<
|
|
3533
|
-
|
|
3534
|
-
<
|
|
3535
|
-
<xsl:
|
|
3536
|
-
|
|
3537
|
-
|
|
3538
|
-
|
|
3539
|
-
|
|
3540
|
-
|
|
3541
|
-
|
|
3542
|
-
|
|
3543
|
-
|
|
3544
|
-
|
|
3545
|
-
|
|
3546
|
-
|
|
3547
|
-
|
|
3548
|
-
|
|
3549
|
-
|
|
3550
|
-
|
|
3551
|
-
|
|
3552
|
-
|
|
3543
|
+
<xsl:choose>
|
|
3544
|
+
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
3545
|
+
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
3546
|
+
<xsl:variable name="src">
|
|
3547
|
+
<xsl:call-template name="image_src"/>
|
|
3548
|
+
</xsl:variable>
|
|
3549
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
|
|
3550
|
+
</fo:inline>
|
|
3551
|
+
</xsl:when>
|
|
3552
|
+
<xsl:otherwise>
|
|
3553
|
+
<fo:block xsl:use-attribute-sets="image-style">
|
|
3554
|
+
|
|
3555
|
+
<xsl:if test="ancestor::un:admonition">
|
|
3556
|
+
<xsl:attribute name="margin-top">-12mm</xsl:attribute>
|
|
3557
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
3558
|
+
</xsl:if>
|
|
3559
|
+
|
|
3560
|
+
<xsl:variable name="src">
|
|
3561
|
+
<xsl:call-template name="image_src"/>
|
|
3562
|
+
</xsl:variable>
|
|
3563
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
|
|
3564
|
+
</fo:block>
|
|
3565
|
+
</xsl:otherwise>
|
|
3566
|
+
</xsl:choose>
|
|
3567
|
+
</xsl:template><xsl:template name="image_src">
|
|
3568
|
+
<xsl:choose>
|
|
3569
|
+
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
3570
|
+
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
3571
|
+
</xsl:when>
|
|
3572
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
3573
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
3574
|
+
</xsl:when>
|
|
3575
|
+
<xsl:otherwise>
|
|
3576
|
+
<xsl:value-of select="@src"/>
|
|
3577
|
+
</xsl:otherwise>
|
|
3578
|
+
</xsl:choose>
|
|
3553
3579
|
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
3554
3580
|
<xsl:apply-templates mode="contents"/>
|
|
3555
3581
|
<xsl:text> </xsl:text>
|
data/lib/metanorma/un/version.rb
CHANGED
data/metanorma-unece.gemspec
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
lib = File.expand_path("
|
|
1
|
+
lib = File.expand_path("lib", __dir__)
|
|
2
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
3
3
|
require "metanorma/un/version"
|
|
4
4
|
|
|
@@ -26,21 +26,21 @@ Gem::Specification.new do |spec|
|
|
|
26
26
|
spec.require_paths = ["lib"]
|
|
27
27
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
|
28
28
|
|
|
29
|
+
spec.add_dependency "iso-639"
|
|
29
30
|
spec.add_dependency "roman-numerals"
|
|
30
31
|
spec.add_dependency "twitter_cldr"
|
|
31
|
-
spec.add_dependency "iso-639"
|
|
32
32
|
|
|
33
|
-
spec.add_dependency "
|
|
34
|
-
spec.add_dependency "
|
|
33
|
+
spec.add_dependency "isodoc", "~> 1.6.0"
|
|
34
|
+
spec.add_dependency "metanorma-standoc", "~> 1.9.0"
|
|
35
35
|
|
|
36
36
|
spec.add_development_dependency "byebug", "~> 9.1"
|
|
37
|
-
spec.add_development_dependency "sassc", "2.4.0"
|
|
38
37
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
39
38
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
40
39
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
|
41
40
|
spec.add_development_dependency "rake", "~> 13.0"
|
|
42
41
|
spec.add_development_dependency "rspec", "~> 3.6"
|
|
43
42
|
spec.add_development_dependency "rubocop", "~> 1.5.2"
|
|
43
|
+
spec.add_development_dependency "sassc", "2.4.0"
|
|
44
44
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
|
45
45
|
spec.add_development_dependency "timecop", "~> 0.9"
|
|
46
46
|
end
|
metadata
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-un
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.6.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: 2021-
|
|
11
|
+
date: 2021-04-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
|
-
name:
|
|
14
|
+
name: iso-639
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
@@ -25,7 +25,7 @@ dependencies:
|
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '0'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
|
-
name:
|
|
28
|
+
name: roman-numerals
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - ">="
|
|
@@ -39,7 +39,7 @@ dependencies:
|
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
40
|
version: '0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
|
-
name:
|
|
42
|
+
name: twitter_cldr
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - ">="
|
|
@@ -53,33 +53,33 @@ dependencies:
|
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
|
-
name:
|
|
56
|
+
name: isodoc
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
59
|
- - "~>"
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: 1.
|
|
61
|
+
version: 1.6.0
|
|
62
62
|
type: :runtime
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
66
|
- - "~>"
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version: 1.
|
|
68
|
+
version: 1.6.0
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
|
-
name:
|
|
70
|
+
name: metanorma-standoc
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
|
72
72
|
requirements:
|
|
73
73
|
- - "~>"
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
|
-
version: 1.
|
|
75
|
+
version: 1.9.0
|
|
76
76
|
type: :runtime
|
|
77
77
|
prerelease: false
|
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
79
|
requirements:
|
|
80
80
|
- - "~>"
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
|
-
version: 1.
|
|
82
|
+
version: 1.9.0
|
|
83
83
|
- !ruby/object:Gem::Dependency
|
|
84
84
|
name: byebug
|
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -94,20 +94,6 @@ dependencies:
|
|
|
94
94
|
- - "~>"
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
96
|
version: '9.1'
|
|
97
|
-
- !ruby/object:Gem::Dependency
|
|
98
|
-
name: sassc
|
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
|
100
|
-
requirements:
|
|
101
|
-
- - '='
|
|
102
|
-
- !ruby/object:Gem::Version
|
|
103
|
-
version: 2.4.0
|
|
104
|
-
type: :development
|
|
105
|
-
prerelease: false
|
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
107
|
-
requirements:
|
|
108
|
-
- - '='
|
|
109
|
-
- !ruby/object:Gem::Version
|
|
110
|
-
version: 2.4.0
|
|
111
97
|
- !ruby/object:Gem::Dependency
|
|
112
98
|
name: equivalent-xml
|
|
113
99
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -192,6 +178,20 @@ dependencies:
|
|
|
192
178
|
- - "~>"
|
|
193
179
|
- !ruby/object:Gem::Version
|
|
194
180
|
version: 1.5.2
|
|
181
|
+
- !ruby/object:Gem::Dependency
|
|
182
|
+
name: sassc
|
|
183
|
+
requirement: !ruby/object:Gem::Requirement
|
|
184
|
+
requirements:
|
|
185
|
+
- - '='
|
|
186
|
+
- !ruby/object:Gem::Version
|
|
187
|
+
version: 2.4.0
|
|
188
|
+
type: :development
|
|
189
|
+
prerelease: false
|
|
190
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
191
|
+
requirements:
|
|
192
|
+
- - '='
|
|
193
|
+
- !ruby/object:Gem::Version
|
|
194
|
+
version: 2.4.0
|
|
195
195
|
- !ruby/object:Gem::Dependency
|
|
196
196
|
name: simplecov
|
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|