metanorma-csa 1.6.0 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/csa/converter.rb +3 -26
  3. data/lib/isodoc/csa/csa.standard.xsl +189 -67
  4. data/lib/metanorma/csa/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5d40ac7d7960480cf04f0bc223679aeeda06119c46aaa4b752205ba5a6614bde
4
- data.tar.gz: ce53937b6d118d5efc1a8d862bbf57e5d487d5433f52ddfd48f7ad650932c023
3
+ metadata.gz: d90ee4c2b591b5ec73387e3f6e83e82498161cf8ecc08bc045dafa2b99fa9347
4
+ data.tar.gz: ce93ce6f3f8656c4e23ab1fe598d2023d6c7136778ec836b04296adc7d39383e
5
5
  SHA512:
6
- metadata.gz: 4631e7f00ba44d538964e85211deaeab9d83ad236bef782fc18a674f4a28364ce09c109f724d37a93f0a5ee62b949a67e536531578233cd5a59d678ea7331b4c
7
- data.tar.gz: 784bc3a5f21d4daf5b7cbcbfd416744f7b802258188981bbe9d3e4f6f7dc0ac12d6eda940e13a3e2d6ec127cb0db6e118e1b3d3b34fea1429ea596eed6985acd
6
+ metadata.gz: f6b8e0b818eb09fe1173cfda224988d025a0044a7c65c8533355f5432e4ee369363da30dfd413582c19d6492d59e4d82dec3d60427d858bce7546eb27bf8413b
7
+ data.tar.gz: '0905c8c9e0556e9373fa36b4f108945a72e004429b7031c67fd1938ce6403c15e7436a76014e0c255ef0c984b8cb2ca4f5e106fcf42ffb26069562091c777d86'
data/lib/asciidoctor/csa/converter.rb CHANGED
@@ -22,22 +22,11 @@ module Asciidoctor
22
22
 
23
23
  register_for CSA_TYPE
24
24
 
25
- def metadata_author(node, xml)
26
- xml.contributor do |c|
27
- c.role **{ type: "author" }
28
- c.organization do |a|
29
- a.name "Cloud Security Alliance"
30
- end
31
- end
25
+ def default_publisher
26
+ "Cloud Security Alliance"
32
27
  end
33
28
 
34
- def metadata_publisher(node, xml)
35
- xml.contributor do |c|
36
- c.role **{ type: "publisher" }
37
- c.organization do |a|
38
- a.name "Cloud Security Alliance"
39
- end
40
- end
29
+ def personal_author(node, xml)
41
30
  end
42
31
 
43
32
  def metadata_committee(node, xml)
@@ -67,18 +56,6 @@ module Asciidoctor
67
56
  xml.docnumber { |i| i << node.attr('docnumber') }
68
57
  end
69
58
 
70
- def metadata_copyright(node, xml)
71
- from = node.attr('copyright-year') || Date.today.year
72
- xml.copyright do |c|
73
- c.from from
74
- c.owner do |owner|
75
- owner.organization do |o|
76
- o.name 'Cloud Security Alliance'
77
- end
78
- end
79
- end
80
- end
81
-
82
59
  def title_validate(root)
83
60
  nil
84
61
  end
data/lib/isodoc/csa/csa.standard.xsl CHANGED
@@ -18,51 +18,12 @@
18
18
  <xsl:text>, Cloud Security Alliance. All rights reserved.</xsl:text>
19
19
  </xsl:variable>
20
20
 
21
- <xsl:variable name="color-header-cover">rgb(55, 243, 244)</xsl:variable>
22
21
  <xsl:variable name="color-header-document">rgb(79, 201, 204)</xsl:variable>
23
- <xsl:variable name="color-link">rgb(33, 94, 159)</xsl:variable>
24
-
25
- <xsl:variable name="copyright_short">
26
- <xsl:text>© </xsl:text>
27
- <xsl:value-of select="/csa:csa-standard/csa:bibdata/csa:copyright/csa:from"/>
28
- <xsl:text> </xsl:text>
29
- <xsl:value-of select="/csa:csa-standard/csa:bibdata/csa:contributor/csa:organization/csa:name"/>
30
- </xsl:variable>
31
-
32
- <xsl:variable name="doctitle" select="/csa:csa-standard/csa:bibdata/csa:title[@language = 'en']"/>
33
-
34
- <xsl:variable name="doctype">
35
- <xsl:call-template name="capitalizeWords">
36
- <xsl:with-param name="str" select="/csa:csa-standard/csa:bibdata/csa:ext/csa:doctype"/>
37
- </xsl:call-template>
38
- </xsl:variable>
39
-
40
- <xsl:variable name="header">
41
- <xsl:text>Open Geospatial Consortium </xsl:text>
42
- <xsl:value-of select="/csa:csa-standard/csa:bibdata/csa:docidentifier[@type = 'csa-internal']"/>
43
- <xsl:text>:</xsl:text>
44
- <xsl:value-of select="/csa:csa-standard/csa:bibdata/csa:copyright/csa:from"/>
45
- </xsl:variable>
46
22
 
47
23
  <xsl:variable name="contents">
48
- <contents>
49
-
50
- <xsl:apply-templates select="/csa:csa-standard/csa:preface/*" mode="contents"/>
51
-
52
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/csa:clause[@id='_scope']" mode="contents"/>
53
-
54
- <!-- Normative references -->
55
- <xsl:apply-templates select="/csa:csa-standard/csa:bibliography/csa:references[@id = '_normative_references' or @id = '_references']" mode="contents"/>
56
-
57
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/csa:terms" mode="contents"/> <!-- Terms and definitions -->
58
-
59
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/*[local-name() != 'terms' and not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]" mode="contents"/>
60
-
61
- <xsl:apply-templates select="/csa:csa-standard/csa:annex" mode="contents"/>
62
-
63
- <!-- Bibliography -->
64
- <xsl:apply-templates select="/csa:csa-standard/csa:bibliography/csa:references[@id != '_normative_references' and @id != '_references']" mode="contents"/>
65
-
24
+ <contents>
25
+ <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
26
+ <xsl:call-template name="processMainSectionsDefault_Contents"/>
66
27
  </contents>
67
28
  </xsl:variable>
68
29
 
@@ -101,7 +62,7 @@
101
62
  </fo:block>
102
63
  </fo:static-content>
103
64
  <fo:static-content flow-name="cover-page-header">
104
- <fo:block-container height="2.5mm" background-color="{$color-header-cover}">
65
+ <fo:block-container height="2.5mm" background-color="rgb(55, 243, 244)">
105
66
  <fo:block font-size="1pt"> </fo:block>
106
67
  </fo:block-container>
107
68
  <fo:block-container position="absolute" top="2.5mm" height="{279.4 - 2.5}mm" width="100%" background-color="rgb(80, 203, 205)">
@@ -113,7 +74,7 @@
113
74
 
114
75
  <fo:block-container width="136mm" margin-bottom="12pt">
115
76
  <fo:block font-size="36pt" font-weight="bold" color="rgb(54, 59, 74)">
116
- <xsl:value-of select="$doctitle"/>
77
+ <xsl:value-of select="/csa:csa-standard/csa:bibdata/csa:title[@language = 'en']"/>
117
78
  </fo:block>
118
79
  </fo:block-container>
119
80
 
@@ -229,20 +190,8 @@
229
190
  <fo:block break-after="page"/>
230
191
 
231
192
  <fo:block line-height="145%">
232
- <xsl:apply-templates select="/csa:csa-standard/csa:preface/*"/>
233
-
234
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/csa:clause[@id='_scope']"/>
235
-
236
- <!-- Normative references -->
237
- <xsl:apply-templates select="/csa:csa-standard/csa:bibliography/csa:references[@id = '_normative_references' or @id = '_references']"/>
238
-
239
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/csa:terms"/> <!-- Terms and definitions -->
240
-
241
- <xsl:apply-templates select="/csa:csa-standard/csa:sections/*[local-name() != 'terms' and not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]"/>
242
-
243
- <xsl:apply-templates select="/csa:csa-standard/csa:annex"/>
244
- <xsl:apply-templates select="/csa:csa-standard/csa:bibliography/csa:references[@id != '_normative_references' and @id != '_references']"/>
245
-
193
+ <xsl:call-template name="processPrefaceSectionsDefault"/>
194
+ <xsl:call-template name="processMainSectionsDefault"/>
246
195
  </fo:block>
247
196
 
248
197
 
@@ -712,7 +661,7 @@
712
661
 
713
662
 
714
663
  <!-- [position() &gt; 1] -->
715
- <xsl:template match="csa:references[@id != '_normative_references' and @id != '_references']">
664
+ <xsl:template match="csa:references[not(@normative='true')]">
716
665
  <fo:block break-after="page"/>
717
666
  <fo:block id="{@id}" line-height="145%">
718
667
  <xsl:apply-templates/>
@@ -722,7 +671,7 @@
722
671
 
723
672
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
724
673
  <!-- <xsl:template match="csa:references[@id = '_bibliography']/csa:bibitem"> [position() &gt; 1] -->
725
- <xsl:template match="csa:references[@id != '_normative_references' and @id != '_references']/csa:bibitem">
674
+ <xsl:template match="csa:references[not(@normative='true')]/csa:bibitem">
726
675
  <fo:block margin-bottom="12pt" line-height="145%">
727
676
  <fo:inline id="{@id}">
728
677
  <xsl:number format="[1]"/>
@@ -785,10 +734,10 @@
785
734
  </xsl:template>
786
735
 
787
736
  <!-- <xsl:template match="csa:references[@id = '_bibliography']/csa:bibitem" mode="contents"/> [position() &gt; 1] -->
788
- <xsl:template match="csa:references[@id != '_normative_references' and @id != '_references']/csa:bibitem" mode="contents"/>
737
+ <xsl:template match="csa:references[not(@normative='true')]/csa:bibitem" mode="contents"/>
789
738
 
790
739
  <!-- <xsl:template match="csa:references[@id = '_bibliography']/csa:bibitem/csa:title"> [position() &gt; 1]-->
791
- <xsl:template match="csa:references[@id != '_normative_references' and @id != '_references']/csa:bibitem/csa:title">
740
+ <xsl:template match="csa:references[not(@normative='true')]/csa:bibitem/csa:title">
792
741
  <fo:inline font-style="italic">
793
742
  <xsl:apply-templates/>
794
743
  </fo:inline>
@@ -1054,6 +1003,7 @@
1054
1003
  <xsl:attribute name="margin-right">12.5mm</xsl:attribute>
1055
1004
 
1056
1005
 
1006
+
1057
1007
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
1058
1008
 
1059
1009
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1073,6 +1023,8 @@
1073
1023
 
1074
1024
 
1075
1025
 
1026
+
1027
+
1076
1028
 
1077
1029
 
1078
1030
  </xsl:attribute-set><xsl:attribute-set name="example-p-style">
@@ -1089,6 +1041,8 @@
1089
1041
 
1090
1042
 
1091
1043
 
1044
+
1045
+
1092
1046
  </xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
1093
1047
 
1094
1048
  <xsl:attribute name="padding-right">10mm</xsl:attribute>
@@ -1108,6 +1062,7 @@
1108
1062
 
1109
1063
 
1110
1064
 
1065
+
1111
1066
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1112
1067
 
1113
1068
 
@@ -1246,7 +1201,7 @@
1246
1201
 
1247
1202
 
1248
1203
 
1249
-
1204
+
1250
1205
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1251
1206
 
1252
1207
  </xsl:attribute-set><xsl:attribute-set name="image-style">
@@ -1291,7 +1246,43 @@
1291
1246
  <xsl:attribute name="space-after">6pt</xsl:attribute>
1292
1247
 
1293
1248
 
1294
- </xsl:attribute-set><xsl:template match="text()">
1249
+ </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1250
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1251
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1252
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1253
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1254
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1255
+ </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1256
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1257
+
1258
+ <!-- Normative references -->
1259
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
1260
+ <!-- Terms and definitions -->
1261
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
1262
+ <!-- Another main sections -->
1263
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
1264
+ <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1265
+ <!-- Bibliography -->
1266
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
1267
+ </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1268
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1269
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1270
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1271
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1272
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1273
+ </xsl:template><xsl:template name="processMainSectionsDefault">
1274
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1275
+
1276
+ <!-- Normative references -->
1277
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1278
+ <!-- Terms and definitions -->
1279
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
1280
+ <!-- Another main sections -->
1281
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
1282
+ <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1283
+ <!-- Bibliography -->
1284
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1285
+ </xsl:template><xsl:template match="text()">
1295
1286
  <xsl:value-of select="."/>
1296
1287
  </xsl:template><xsl:template match="*[local-name()='br']">
1297
1288
  <xsl:value-of select="$linebreak"/>
@@ -1368,6 +1359,7 @@
1368
1359
 
1369
1360
 
1370
1361
 
1362
+
1371
1363
  <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
1372
1364
 
1373
1365
 
@@ -1380,6 +1372,7 @@
1380
1372
 
1381
1373
 
1382
1374
 
1375
+
1383
1376
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
1384
1377
  <xsl:choose>
1385
1378
  <xsl:when test=". = 1 or . = 0">
@@ -1630,6 +1623,15 @@
1630
1623
  </fo:table-row>
1631
1624
  </xsl:template><xsl:template match="*[local-name()='th']">
1632
1625
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
1626
+ <xsl:attribute name="text-align">
1627
+ <xsl:choose>
1628
+ <xsl:when test="@align">
1629
+ <xsl:value-of select="@align"/>
1630
+ </xsl:when>
1631
+ <xsl:otherwise>center</xsl:otherwise>
1632
+ </xsl:choose>
1633
+ </xsl:attribute>
1634
+
1633
1635
 
1634
1636
 
1635
1637
 
@@ -1654,6 +1656,14 @@
1654
1656
  </fo:table-cell>
1655
1657
  </xsl:template><xsl:template match="*[local-name()='td']">
1656
1658
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
1659
+ <xsl:attribute name="text-align">
1660
+ <xsl:choose>
1661
+ <xsl:when test="@align">
1662
+ <xsl:value-of select="@align"/>
1663
+ </xsl:when>
1664
+ <xsl:otherwise>left</xsl:otherwise>
1665
+ </xsl:choose>
1666
+ </xsl:attribute>
1657
1667
 
1658
1668
 
1659
1669
 
@@ -2829,6 +2839,117 @@
2829
2839
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
2830
2840
  <xsl:apply-templates/>
2831
2841
  </fo:block>
2842
+ </xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
2843
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
2844
+ <fo:block-container margin-left="0mm" margin-right="0mm">
2845
+ <fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">
2846
+ <xsl:variable name="simple-table">
2847
+ <xsl:call-template name="getSimpleTable"/>
2848
+ </xsl:variable>
2849
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
2850
+ <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
2851
+ <fo:table-column column-width="35mm"/>
2852
+ <fo:table-column column-width="115mm"/>
2853
+ </xsl:if>
2854
+ <xsl:apply-templates mode="requirement"/>
2855
+ </fo:table>
2856
+ <!-- fn processing -->
2857
+ <xsl:if test=".//*[local-name() = 'fn']">
2858
+ <xsl:for-each select="*[local-name() = 'tbody']">
2859
+ <fo:block font-size="90%" border-bottom="1.pt solid black">
2860
+ <xsl:call-template name="fn_display"/>
2861
+ </fo:block>
2862
+ </xsl:for-each>
2863
+ </xsl:if>
2864
+ </fo:block-container>
2865
+ </fo:block-container>
2866
+ </xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
2867
+ <fo:table-header>
2868
+ <xsl:apply-templates mode="requirement"/>
2869
+ </fo:table-header>
2870
+ </xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
2871
+ <fo:table-body>
2872
+ <xsl:apply-templates mode="requirement"/>
2873
+ </fo:table-body>
2874
+ </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
2875
+ <fo:table-row>
2876
+ <xsl:apply-templates mode="requirement"/>
2877
+ </fo:table-row>
2878
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
2879
+ <fo:table-cell text-align="{@align}">
2880
+ <xsl:attribute name="text-align">
2881
+ <xsl:choose>
2882
+ <xsl:when test="@align">
2883
+ <xsl:value-of select="@align"/>
2884
+ </xsl:when>
2885
+ <xsl:otherwise>center</xsl:otherwise>
2886
+ </xsl:choose>
2887
+ </xsl:attribute>
2888
+ <xsl:if test="@colspan">
2889
+ <xsl:attribute name="number-columns-spanned">
2890
+ <xsl:value-of select="@colspan"/>
2891
+ </xsl:attribute>
2892
+ </xsl:if>
2893
+ <xsl:if test="@rowspan">
2894
+ <xsl:attribute name="number-rows-spanned">
2895
+ <xsl:value-of select="@rowspan"/>
2896
+ </xsl:attribute>
2897
+ </xsl:if>
2898
+
2899
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
2900
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2901
+ <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
2902
+ </xsl:if>
2903
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
2904
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2905
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
2906
+ </xsl:if>
2907
+
2908
+ <fo:block>
2909
+ <xsl:apply-templates/>
2910
+ </fo:block>
2911
+ </fo:table-cell>
2912
+ </xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
2913
+ <fo:table-cell text-align="{@align}">
2914
+ <xsl:attribute name="text-align">
2915
+ <xsl:choose>
2916
+ <xsl:when test="@align">
2917
+ <xsl:value-of select="@align"/>
2918
+ </xsl:when>
2919
+ <xsl:otherwise>left</xsl:otherwise>
2920
+ </xsl:choose>
2921
+ </xsl:attribute>
2922
+ <xsl:if test="@colspan">
2923
+ <xsl:attribute name="number-columns-spanned">
2924
+ <xsl:value-of select="@colspan"/>
2925
+ </xsl:attribute>
2926
+ </xsl:if>
2927
+ <xsl:if test="@rowspan">
2928
+ <xsl:attribute name="number-rows-spanned">
2929
+ <xsl:value-of select="@rowspan"/>
2930
+ </xsl:attribute>
2931
+ </xsl:if>
2932
+
2933
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
2934
+ <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
2935
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2936
+ <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> <!-- 2nd line and below -->
2937
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
2938
+ </xsl:if>
2939
+ </xsl:if>
2940
+
2941
+ <fo:block>
2942
+ <xsl:apply-templates/>
2943
+ </fo:block>
2944
+ </fo:table-cell>
2945
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
2946
+ <fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
2947
+ <xsl:apply-templates/>
2948
+ </fo:block>
2949
+ </xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
2950
+ <fo:block margin-bottom="10pt">
2951
+ <xsl:apply-templates/>
2952
+ </fo:block>
2832
2953
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
2833
2954
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
2834
2955
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3072,7 +3193,7 @@
3072
3193
  <fo:block>
3073
3194
  <xsl:call-template name="setId"/>
3074
3195
 
3075
- <xsl:variable name="pos"><xsl:number count="csa:sections/csa:clause[not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]"/></xsl:variable>
3196
+ <xsl:variable name="pos"><xsl:number count="csa:sections/csa:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable>
3076
3197
  <xsl:if test="$pos &gt;= 2">
3077
3198
  <xsl:attribute name="space-before">18pt</xsl:attribute>
3078
3199
  </xsl:if>
@@ -3106,7 +3227,7 @@
3106
3227
  <fo:block id="{@id}">
3107
3228
  <xsl:apply-templates/>
3108
3229
  </fo:block>
3109
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@id = '_normative_references' or @id = '_references']">
3230
+ </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3110
3231
 
3111
3232
  <fo:block id="{@id}">
3112
3233
  <xsl:apply-templates/>
@@ -3358,7 +3479,8 @@
3358
3479
 
3359
3480
 
3360
3481
 
3361
-
3482
+
3483
+
3362
3484
  </xsl:variable>
3363
3485
  <xsl:if test="$documentNS != $XSLNS">
3364
3486
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
data/lib/metanorma/csa/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Metanorma
4
4
  module Csa
5
- VERSION = '1.6.0'
5
+ VERSION = '1.6.1'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-07-29 00:00:00.000000000 Z
11
+ date: 2020-08-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities