metanorma-ogc 1.2.17 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d9b2a4f6759733416b83c67147a76fb26454cdb88b2db0878276307bfc47814e
4
- data.tar.gz: c4eee012c45e1ab5bda542e1a53ea39acbc75889f2b9a2535a7338cbc4740197
3
+ metadata.gz: f9fa70d6fdbc72921c0981d6afaadbdfd358a37c74f84f7bae86e75bbca1d089
4
+ data.tar.gz: ef441a2182e40e3605395584d4afee319a1a9e725f092f4db9661e1be2641e08
5
5
  SHA512:
6
- metadata.gz: 8edb09f7b9250c90d53cfb5e046819d0f4b8bd25314f8b91f31f6b2d4e065e39ed867f9f68449f2561fcd17f53e4f64944b4e5123c8418e877e766917cda29af
7
- data.tar.gz: 49477bcbb1cba63879167fb1228fc30994b9cc60ea82fc52289073c63d2c67c56cb42dadce15588d728a2603b119d1b8bb193994f282316d61c1efa20728ad51
6
+ metadata.gz: a5e6a4a9bd68c5b4d45950c68ca316c9460dff1e8f874ebfba9c43d27eb19920cf16384fb687f55c6f5c78d8329902eba231ebdeda988462d67f6d910e127529
7
+ data.tar.gz: de1fc5ecc2a852c251857cb852c0195f0ce396ca0c8fc7c3e0db701678d5d5d7b9a049666e453f5a7e3bf586f4a7e750187cb24d6885a19578fada4bf0effc3c
@@ -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
- <ref name="concept"/>
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">
@@ -108,6 +108,13 @@ a.FootnoteRef + a.FootnoteRef:before {
108
108
  content: ", ";
109
109
  vertical-align: super; }
110
110
 
111
+ .addition {
112
+ color: blue; }
113
+
114
+ .deletion {
115
+ color: red;
116
+ text-decoration: line-through; }
117
+
111
118
  #standard-band {
112
119
  background-color: #3D9970; }
113
120
 
@@ -32,7 +32,6 @@ module IsoDoc
32
32
  htmlstylesheet: html_doc_path("htmlstyle.scss"),
33
33
  htmlcoverpage: html_doc_path("html_ogc_titlepage.html"),
34
34
  htmlintropage: html_doc_path("html_ogc_intro.html"),
35
- scripts: html_doc_path("scripts.html"),
36
35
  }
37
36
  end
38
37
 
@@ -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
  <xsl:variable name="pageWidth" select="'215.9mm'"/>
10
11
  <xsl:variable name="pageHeight" select="'279.4mm'"/>
@@ -1993,7 +1994,7 @@
1993
1994
 
1994
1995
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1995
1996
 
1996
-
1997
+
1997
1998
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1998
1999
 
1999
2000
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
@@ -2001,6 +2002,12 @@
2001
2002
  <xsl:attribute name="space-after">6pt</xsl:attribute>
2002
2003
 
2003
2004
 
2005
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
2006
+ <xsl:attribute name="color">red</xsl:attribute>
2007
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2008
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
2009
+ <xsl:attribute name="color">red</xsl:attribute>
2010
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
2004
2011
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
2005
2012
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2006
2013
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3390,8 +3397,12 @@
3390
3397
  <fo:inline text-decoration="underline">
3391
3398
  <xsl:apply-templates/>
3392
3399
  </fo:inline>
3400
+ </xsl:template><xsl:template match="*[local-name()='add']">
3401
+ <fo:inline xsl:use-attribute-sets="add-style">
3402
+ <xsl:apply-templates/>
3403
+ </fo:inline>
3393
3404
  </xsl:template><xsl:template match="*[local-name()='del']">
3394
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
3405
+ <fo:inline xsl:use-attribute-sets="del-style">
3395
3406
  <xsl:apply-templates/>
3396
3407
  </fo:inline>
3397
3408
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -4011,22 +4022,37 @@
4011
4022
  <xsl:apply-templates/>
4012
4023
  </fo:block>
4013
4024
  </xsl:template><xsl:template match="*[local-name() = 'image']">
4014
- <fo:block xsl:use-attribute-sets="image-style">
4015
-
4016
-
4017
- <xsl:variable name="src">
4018
- <xsl:choose>
4019
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4020
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4021
- </xsl:when>
4022
- <xsl:otherwise>
4023
- <xsl:value-of select="@src"/>
4024
- </xsl:otherwise>
4025
- </xsl:choose>
4026
- </xsl:variable>
4027
-
4028
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4029
- </fo:block>
4025
+ <xsl:choose>
4026
+ <xsl:when test="ancestor::*[local-name() = 'title']">
4027
+ <fo:inline padding-left="1mm" padding-right="1mm">
4028
+ <xsl:variable name="src">
4029
+ <xsl:call-template name="image_src"/>
4030
+ </xsl:variable>
4031
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
4032
+ </fo:inline>
4033
+ </xsl:when>
4034
+ <xsl:otherwise>
4035
+ <fo:block xsl:use-attribute-sets="image-style">
4036
+
4037
+ <xsl:variable name="src">
4038
+ <xsl:call-template name="image_src"/>
4039
+ </xsl:variable>
4040
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4041
+ </fo:block>
4042
+ </xsl:otherwise>
4043
+ </xsl:choose>
4044
+ </xsl:template><xsl:template name="image_src">
4045
+ <xsl:choose>
4046
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4047
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4048
+ </xsl:when>
4049
+ <xsl:when test="not(starts-with(@src, 'data:'))">
4050
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
4051
+ </xsl:when>
4052
+ <xsl:otherwise>
4053
+ <xsl:value-of select="@src"/>
4054
+ </xsl:otherwise>
4055
+ </xsl:choose>
4030
4056
  </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">
4031
4057
  <xsl:apply-templates mode="contents"/>
4032
4058
  <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
  <xsl:variable name="pageWidth" select="'215.9mm'"/>
10
11
  <xsl:variable name="pageHeight" select="'279.4mm'"/>
@@ -1993,7 +1994,7 @@
1993
1994
 
1994
1995
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1995
1996
 
1996
-
1997
+
1997
1998
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1998
1999
 
1999
2000
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
@@ -2001,6 +2002,12 @@
2001
2002
  <xsl:attribute name="space-after">6pt</xsl:attribute>
2002
2003
 
2003
2004
 
2005
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
2006
+ <xsl:attribute name="color">red</xsl:attribute>
2007
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2008
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
2009
+ <xsl:attribute name="color">red</xsl:attribute>
2010
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
2004
2011
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
2005
2012
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2006
2013
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3390,8 +3397,12 @@
3390
3397
  <fo:inline text-decoration="underline">
3391
3398
  <xsl:apply-templates/>
3392
3399
  </fo:inline>
3400
+ </xsl:template><xsl:template match="*[local-name()='add']">
3401
+ <fo:inline xsl:use-attribute-sets="add-style">
3402
+ <xsl:apply-templates/>
3403
+ </fo:inline>
3393
3404
  </xsl:template><xsl:template match="*[local-name()='del']">
3394
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
3405
+ <fo:inline xsl:use-attribute-sets="del-style">
3395
3406
  <xsl:apply-templates/>
3396
3407
  </fo:inline>
3397
3408
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -4011,22 +4022,37 @@
4011
4022
  <xsl:apply-templates/>
4012
4023
  </fo:block>
4013
4024
  </xsl:template><xsl:template match="*[local-name() = 'image']">
4014
- <fo:block xsl:use-attribute-sets="image-style">
4015
-
4016
-
4017
- <xsl:variable name="src">
4018
- <xsl:choose>
4019
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4020
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4021
- </xsl:when>
4022
- <xsl:otherwise>
4023
- <xsl:value-of select="@src"/>
4024
- </xsl:otherwise>
4025
- </xsl:choose>
4026
- </xsl:variable>
4027
-
4028
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4029
- </fo:block>
4025
+ <xsl:choose>
4026
+ <xsl:when test="ancestor::*[local-name() = 'title']">
4027
+ <fo:inline padding-left="1mm" padding-right="1mm">
4028
+ <xsl:variable name="src">
4029
+ <xsl:call-template name="image_src"/>
4030
+ </xsl:variable>
4031
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
4032
+ </fo:inline>
4033
+ </xsl:when>
4034
+ <xsl:otherwise>
4035
+ <fo:block xsl:use-attribute-sets="image-style">
4036
+
4037
+ <xsl:variable name="src">
4038
+ <xsl:call-template name="image_src"/>
4039
+ </xsl:variable>
4040
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4041
+ </fo:block>
4042
+ </xsl:otherwise>
4043
+ </xsl:choose>
4044
+ </xsl:template><xsl:template name="image_src">
4045
+ <xsl:choose>
4046
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4047
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4048
+ </xsl:when>
4049
+ <xsl:when test="not(starts-with(@src, 'data:'))">
4050
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
4051
+ </xsl:when>
4052
+ <xsl:otherwise>
4053
+ <xsl:value-of select="@src"/>
4054
+ </xsl:otherwise>
4055
+ </xsl:choose>
4030
4056
  </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">
4031
4057
  <xsl:apply-templates mode="contents"/>
4032
4058
  <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
  <xsl:variable name="pageWidth" select="'215.9mm'"/>
10
11
  <xsl:variable name="pageHeight" select="'279.4mm'"/>
@@ -1993,7 +1994,7 @@
1993
1994
 
1994
1995
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1995
1996
 
1996
-
1997
+
1997
1998
  </xsl:attribute-set><xsl:attribute-set name="deprecates-style">
1998
1999
 
1999
2000
  </xsl:attribute-set><xsl:attribute-set name="definition-style">
@@ -2001,6 +2002,12 @@
2001
2002
  <xsl:attribute name="space-after">6pt</xsl:attribute>
2002
2003
 
2003
2004
 
2005
+ </xsl:attribute-set><xsl:attribute-set name="add-style">
2006
+ <xsl:attribute name="color">red</xsl:attribute>
2007
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2008
+ </xsl:attribute-set><xsl:attribute-set name="del-style">
2009
+ <xsl:attribute name="color">red</xsl:attribute>
2010
+ <xsl:attribute name="text-decoration">line-through</xsl:attribute>
2004
2011
  </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
2005
2012
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
2006
2013
  <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -3390,8 +3397,12 @@
3390
3397
  <fo:inline text-decoration="underline">
3391
3398
  <xsl:apply-templates/>
3392
3399
  </fo:inline>
3400
+ </xsl:template><xsl:template match="*[local-name()='add']">
3401
+ <fo:inline xsl:use-attribute-sets="add-style">
3402
+ <xsl:apply-templates/>
3403
+ </fo:inline>
3393
3404
  </xsl:template><xsl:template match="*[local-name()='del']">
3394
- <fo:inline font-size="10pt" color="red" text-decoration="line-through">
3405
+ <fo:inline xsl:use-attribute-sets="del-style">
3395
3406
  <xsl:apply-templates/>
3396
3407
  </fo:inline>
3397
3408
  </xsl:template><xsl:template match="*[local-name()='hi']">
@@ -4011,22 +4022,37 @@
4011
4022
  <xsl:apply-templates/>
4012
4023
  </fo:block>
4013
4024
  </xsl:template><xsl:template match="*[local-name() = 'image']">
4014
- <fo:block xsl:use-attribute-sets="image-style">
4015
-
4016
-
4017
- <xsl:variable name="src">
4018
- <xsl:choose>
4019
- <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4020
- <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4021
- </xsl:when>
4022
- <xsl:otherwise>
4023
- <xsl:value-of select="@src"/>
4024
- </xsl:otherwise>
4025
- </xsl:choose>
4026
- </xsl:variable>
4027
-
4028
- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4029
- </fo:block>
4025
+ <xsl:choose>
4026
+ <xsl:when test="ancestor::*[local-name() = 'title']">
4027
+ <fo:inline padding-left="1mm" padding-right="1mm">
4028
+ <xsl:variable name="src">
4029
+ <xsl:call-template name="image_src"/>
4030
+ </xsl:variable>
4031
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/>
4032
+ </fo:inline>
4033
+ </xsl:when>
4034
+ <xsl:otherwise>
4035
+ <fo:block xsl:use-attribute-sets="image-style">
4036
+
4037
+ <xsl:variable name="src">
4038
+ <xsl:call-template name="image_src"/>
4039
+ </xsl:variable>
4040
+ <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
4041
+ </fo:block>
4042
+ </xsl:otherwise>
4043
+ </xsl:choose>
4044
+ </xsl:template><xsl:template name="image_src">
4045
+ <xsl:choose>
4046
+ <xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
4047
+ <xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
4048
+ </xsl:when>
4049
+ <xsl:when test="not(starts-with(@src, 'data:'))">
4050
+ <xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
4051
+ </xsl:when>
4052
+ <xsl:otherwise>
4053
+ <xsl:value-of select="@src"/>
4054
+ </xsl:otherwise>
4055
+ </xsl:choose>
4030
4056
  </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">
4031
4057
  <xsl:apply-templates mode="contents"/>
4032
4058
  <xsl:text> </xsl:text>