metanorma-ribose 1.6.0 → 1.6.1

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ubuntu.yml +1 -1
  3. data/lib/isodoc/ribose/rsd.standard.xsl +195 -55
  4. data/lib/metanorma/ribose/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9ce5853df8daa9d2d0663467fbb52f8d9aa124d85978e40614ca7db02bf4b443
4
- data.tar.gz: c97dd624276bacd15828fcc6b7f0167ec23eab046212313f2f4a5cf0be1889c6
3
+ metadata.gz: 566efa000e9a2eb1e621a328d5e69e5d569617182362ac4031a102a5a6c59098
4
+ data.tar.gz: ff40565a7e4f8f2bc82ab7375feae8575c293f158db22d616215dca89c3be3b8
5
5
  SHA512:
6
- metadata.gz: 64d52d28120af657e24fc8fe323312087a70de9a03451a577dc1acbbee9001cd5d068e36cca29217c14eb16e3d762cfa6a14a69933db235b863a458caf72ea5c
7
- data.tar.gz: 18a54900b465640bcfcaf4c9991f657211fb86d3e370d7f6705682b98806eb3943e67bdb186505c9d78787920b37250e3bd2f16c73de6bff968f5495f37bcd97
6
+ metadata.gz: 770d8094bd43b178446544ed1da08e984b0fc758a83cd6a902dbcc55bdc58b2a219faa7f68f25a5aa9559bf37c7ca87b3b272840ff81b259f8f7d13a9bad5f30
7
+ data.tar.gz: ae257de831e084d599743d16b16d11024de37ef2cf0d803075d458752368e6d514d87a8cddec27a2d1faf1d909a864b51cb57abac42df958665b187202ad33d1
data/.github/workflows/ubuntu.yml CHANGED
@@ -39,7 +39,7 @@ jobs:
39
39
  polling_interval_seconds: 5
40
40
  timeout_minutes: 5
41
41
  max_attempts: 3
42
- command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
42
+ command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
43
43
  - name: Run specs
44
44
  run: |
45
45
  bundle exec rake
data/lib/isodoc/ribose/rsd.standard.xsl CHANGED
@@ -37,21 +37,14 @@
37
37
  <xsl:variable name="contents">
38
38
  <contents>
39
39
 
40
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:abstract" mode="contents"/>
41
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:foreword" mode="contents"/>
42
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:executivesummary" mode="contents"/>
40
43
  <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:introduction" mode="contents"/>
44
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:clause" mode="contents"/>
45
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:acknowledgements" mode="contents"/>
41
46
 
42
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/rsd:clause[@id='_scope']" mode="contents"/>
43
-
44
- <!-- Normative references -->
45
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:bibliography/rsd:references[@id = '_normative_references' or @id = '_references']" mode="contents"/>
46
-
47
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/rsd:terms" mode="contents"/> <!-- Terms and definitions -->
48
-
49
-
50
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/*[local-name() != 'terms' and not(@id='_scope') ]" mode="contents"/>
51
-
52
-
53
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:annex" mode="contents"/>
54
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:bibliography/rsd:references[@id != '_normative_references' and @id != '_references']" mode="contents"/>
47
+ <xsl:call-template name="processMainSectionsDefault_Contents"/>
55
48
 
56
49
  </contents>
57
50
  </xsl:variable>
@@ -230,21 +223,14 @@
230
223
 
231
224
  <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt"><xsl:value-of select="$doctitle"/></fo:block>
232
225
 
233
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:introduction" mode="introduction"/>
234
-
235
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/rsd:clause[@id='_scope']"/>
236
-
237
- <!-- Normative references -->
238
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:bibliography/rsd:references[@id = '_normative_references' or @id = '_references']"/>
226
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:abstract"/>
227
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:foreword"/>
228
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:executivesummary"/>
229
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:introduction"/>
230
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:clause"/>
231
+ <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:acknowledgements"/>
239
232
 
240
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/rsd:terms"/> <!-- Terms and definitions -->
241
-
242
-
243
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:sections/*[local-name() != 'terms' and not(@id='_scope') ]"/>
244
-
245
-
246
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:annex"/>
247
- <xsl:apply-templates select="/rsd:rsd-standard/rsd:bibliography/rsd:references[@id != '_normative_references' and @id != '_references']"/>
233
+ <xsl:call-template name="processMainSectionsDefault"/>
248
234
 
249
235
  </fo:block>
250
236
  </fo:flow>
@@ -380,25 +366,6 @@
380
366
  </xsl:template>
381
367
 
382
368
 
383
- <!-- Introduction -->
384
- <xsl:template match="rsd:rsd-standard/rsd:preface/rsd:introduction" mode="introduction">
385
- <fo:block break-after="page"/>
386
- <xsl:apply-templates select="current()"/>
387
- </xsl:template>
388
- <!-- Abstract -->
389
- <xsl:template match="rsd:rsd-standard/rsd:preface/rsd:abstract" mode="abstract">
390
- <fo:block break-after="page"/>
391
- <xsl:apply-templates select="current()"/>
392
- </xsl:template>
393
- <!-- Preface -->
394
- <xsl:template match="rsd:rsd-standard/rsd:preface/rsd:foreword" mode="preface">
395
- <fo:block break-after="page"/>
396
- <xsl:apply-templates select="current()"/>
397
- </xsl:template>
398
-
399
-
400
-
401
-
402
369
  <!-- ====== -->
403
370
  <!-- title -->
404
371
  <!-- ====== -->
@@ -624,7 +591,7 @@
624
591
  </xsl:template>
625
592
 
626
593
 
627
- <xsl:template match="rsd:references[@id != '_normative_references' and @id != '_references']/rsd:bibitem">
594
+ <xsl:template match="rsd:references[not(@normative='true')]/rsd:bibitem">
628
595
  <fo:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm">
629
596
  <fo:list-item>
630
597
  <fo:list-item-label end-indent="label-end()">
@@ -759,17 +726,17 @@
759
726
 
760
727
 
761
728
  <!-- [position() &gt; 1] -->
762
- <xsl:template match="rsd:references[@id != '_normative_references' and @id != '_references']">
729
+ <xsl:template match="rsd:references[not(@normative='true')]">
763
730
  <fo:block break-after="page"/>
764
731
  <fo:block id="{@id}">
765
732
  <xsl:apply-templates/>
766
733
  </fo:block>
767
734
  </xsl:template>
768
735
 
769
- <xsl:template match="rsd:references[@id != '_normative_references' and @id != '_references']/rsd:bibitem" mode="contents"/>
736
+ <xsl:template match="rsd:references[not(@normative='true')]/rsd:bibitem" mode="contents"/>
770
737
 
771
738
  <!-- <xsl:template match="rsd:references[@id = '_bibliography']/rsd:bibitem/rsd:title"> [position() &gt; 1]-->
772
- <xsl:template match="rsd:references[@id != '_normative_references' and @id != '_references']/rsd:bibitem/rsd:title">
739
+ <xsl:template match="rsd:references[not(@normative='true')]/rsd:bibitem/rsd:title">
773
740
  <fo:inline font-style="italic">
774
741
  <xsl:apply-templates/>
775
742
  </fo:inline>
@@ -1105,6 +1072,7 @@
1105
1072
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
1106
1073
 
1107
1074
 
1075
+
1108
1076
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
1109
1077
 
1110
1078
 
@@ -1126,6 +1094,8 @@
1126
1094
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1127
1095
 
1128
1096
 
1097
+
1098
+
1129
1099
 
1130
1100
 
1131
1101
  </xsl:attribute-set><xsl:attribute-set name="example-p-style">
@@ -1142,6 +1112,8 @@
1142
1112
 
1143
1113
 
1144
1114
 
1115
+
1116
+
1145
1117
  </xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
1146
1118
 
1147
1119
  <xsl:attribute name="padding-right">10mm</xsl:attribute>
@@ -1161,6 +1133,7 @@
1161
1133
 
1162
1134
 
1163
1135
 
1136
+
1164
1137
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1165
1138
 
1166
1139
 
@@ -1310,7 +1283,7 @@
1310
1283
 
1311
1284
 
1312
1285
 
1313
-
1286
+
1314
1287
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1315
1288
 
1316
1289
  </xsl:attribute-set><xsl:attribute-set name="image-style">
@@ -1355,7 +1328,43 @@
1355
1328
  <xsl:attribute name="space-after">6pt</xsl:attribute>
1356
1329
 
1357
1330
 
1358
- </xsl:attribute-set><xsl:template match="text()">
1331
+ </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1332
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1333
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1334
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1335
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1336
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1337
+ </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1338
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1339
+
1340
+ <!-- Normative references -->
1341
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
1342
+ <!-- Terms and definitions -->
1343
+ <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"/>
1344
+ <!-- Another main sections -->
1345
+ <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"/>
1346
+ <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1347
+ <!-- Bibliography -->
1348
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
1349
+ </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1350
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1351
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1352
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1353
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1354
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1355
+ </xsl:template><xsl:template name="processMainSectionsDefault">
1356
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1357
+
1358
+ <!-- Normative references -->
1359
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1360
+ <!-- Terms and definitions -->
1361
+ <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']]"/>
1362
+ <!-- Another main sections -->
1363
+ <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'])]"/>
1364
+ <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1365
+ <!-- Bibliography -->
1366
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1367
+ </xsl:template><xsl:template match="text()">
1359
1368
  <xsl:value-of select="."/>
1360
1369
  </xsl:template><xsl:template match="*[local-name()='br']">
1361
1370
  <xsl:value-of select="$linebreak"/>
@@ -1432,6 +1441,7 @@
1432
1441
 
1433
1442
 
1434
1443
 
1444
+
1435
1445
  <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">
1436
1446
 
1437
1447
 
@@ -1444,6 +1454,7 @@
1444
1454
 
1445
1455
 
1446
1456
 
1457
+
1447
1458
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
1448
1459
  <xsl:choose>
1449
1460
  <xsl:when test=". = 1 or . = 0">
@@ -1694,6 +1705,15 @@
1694
1705
  </fo:table-row>
1695
1706
  </xsl:template><xsl:template match="*[local-name()='th']">
1696
1707
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
1708
+ <xsl:attribute name="text-align">
1709
+ <xsl:choose>
1710
+ <xsl:when test="@align">
1711
+ <xsl:value-of select="@align"/>
1712
+ </xsl:when>
1713
+ <xsl:otherwise>center</xsl:otherwise>
1714
+ </xsl:choose>
1715
+ </xsl:attribute>
1716
+
1697
1717
 
1698
1718
 
1699
1719
 
@@ -1718,6 +1738,14 @@
1718
1738
  </fo:table-cell>
1719
1739
  </xsl:template><xsl:template match="*[local-name()='td']">
1720
1740
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
1741
+ <xsl:attribute name="text-align">
1742
+ <xsl:choose>
1743
+ <xsl:when test="@align">
1744
+ <xsl:value-of select="@align"/>
1745
+ </xsl:when>
1746
+ <xsl:otherwise>left</xsl:otherwise>
1747
+ </xsl:choose>
1748
+ </xsl:attribute>
1721
1749
 
1722
1750
 
1723
1751
 
@@ -2900,6 +2928,117 @@
2900
2928
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
2901
2929
  <xsl:apply-templates/>
2902
2930
  </fo:block>
2931
+ </xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
2932
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
2933
+ <fo:block-container margin-left="0mm" margin-right="0mm">
2934
+ <fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">
2935
+ <xsl:variable name="simple-table">
2936
+ <xsl:call-template name="getSimpleTable"/>
2937
+ </xsl:variable>
2938
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
2939
+ <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
2940
+ <fo:table-column column-width="35mm"/>
2941
+ <fo:table-column column-width="115mm"/>
2942
+ </xsl:if>
2943
+ <xsl:apply-templates mode="requirement"/>
2944
+ </fo:table>
2945
+ <!-- fn processing -->
2946
+ <xsl:if test=".//*[local-name() = 'fn']">
2947
+ <xsl:for-each select="*[local-name() = 'tbody']">
2948
+ <fo:block font-size="90%" border-bottom="1.pt solid black">
2949
+ <xsl:call-template name="fn_display"/>
2950
+ </fo:block>
2951
+ </xsl:for-each>
2952
+ </xsl:if>
2953
+ </fo:block-container>
2954
+ </fo:block-container>
2955
+ </xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
2956
+ <fo:table-header>
2957
+ <xsl:apply-templates mode="requirement"/>
2958
+ </fo:table-header>
2959
+ </xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
2960
+ <fo:table-body>
2961
+ <xsl:apply-templates mode="requirement"/>
2962
+ </fo:table-body>
2963
+ </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
2964
+ <fo:table-row>
2965
+ <xsl:apply-templates mode="requirement"/>
2966
+ </fo:table-row>
2967
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
2968
+ <fo:table-cell text-align="{@align}">
2969
+ <xsl:attribute name="text-align">
2970
+ <xsl:choose>
2971
+ <xsl:when test="@align">
2972
+ <xsl:value-of select="@align"/>
2973
+ </xsl:when>
2974
+ <xsl:otherwise>center</xsl:otherwise>
2975
+ </xsl:choose>
2976
+ </xsl:attribute>
2977
+ <xsl:if test="@colspan">
2978
+ <xsl:attribute name="number-columns-spanned">
2979
+ <xsl:value-of select="@colspan"/>
2980
+ </xsl:attribute>
2981
+ </xsl:if>
2982
+ <xsl:if test="@rowspan">
2983
+ <xsl:attribute name="number-rows-spanned">
2984
+ <xsl:value-of select="@rowspan"/>
2985
+ </xsl:attribute>
2986
+ </xsl:if>
2987
+
2988
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
2989
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2990
+ <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
2991
+ </xsl:if>
2992
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
2993
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2994
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
2995
+ </xsl:if>
2996
+
2997
+ <fo:block>
2998
+ <xsl:apply-templates/>
2999
+ </fo:block>
3000
+ </fo:table-cell>
3001
+ </xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
3002
+ <fo:table-cell text-align="{@align}">
3003
+ <xsl:attribute name="text-align">
3004
+ <xsl:choose>
3005
+ <xsl:when test="@align">
3006
+ <xsl:value-of select="@align"/>
3007
+ </xsl:when>
3008
+ <xsl:otherwise>left</xsl:otherwise>
3009
+ </xsl:choose>
3010
+ </xsl:attribute>
3011
+ <xsl:if test="@colspan">
3012
+ <xsl:attribute name="number-columns-spanned">
3013
+ <xsl:value-of select="@colspan"/>
3014
+ </xsl:attribute>
3015
+ </xsl:if>
3016
+ <xsl:if test="@rowspan">
3017
+ <xsl:attribute name="number-rows-spanned">
3018
+ <xsl:value-of select="@rowspan"/>
3019
+ </xsl:attribute>
3020
+ </xsl:if>
3021
+
3022
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
3023
+ <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
3024
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
3025
+ <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> <!-- 2nd line and below -->
3026
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
3027
+ </xsl:if>
3028
+ </xsl:if>
3029
+
3030
+ <fo:block>
3031
+ <xsl:apply-templates/>
3032
+ </fo:block>
3033
+ </fo:table-cell>
3034
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
3035
+ <fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
3036
+ <xsl:apply-templates/>
3037
+ </fo:block>
3038
+ </xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
3039
+ <fo:block margin-bottom="10pt">
3040
+ <xsl:apply-templates/>
3041
+ </fo:block>
2903
3042
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
2904
3043
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
2905
3044
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3148,7 +3287,7 @@
3148
3287
 
3149
3288
 
3150
3289
 
3151
- <xsl:variable name="pos"><xsl:number count="rsd:sections/rsd:clause[not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]"/></xsl:variable> <!-- | rsd:sections/rsd:terms -->
3290
+ <xsl:variable name="pos"><xsl:number count="rsd:sections/rsd:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!-- | rsd:sections/rsd:terms -->
3152
3291
  <xsl:if test="$pos &gt;= 2">
3153
3292
  <xsl:attribute name="space-before">18pt</xsl:attribute>
3154
3293
  </xsl:if>
@@ -3177,7 +3316,7 @@
3177
3316
  <fo:block id="{@id}">
3178
3317
  <xsl:apply-templates/>
3179
3318
  </fo:block>
3180
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@id = '_normative_references' or @id = '_references']">
3319
+ </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3181
3320
 
3182
3321
  <fo:block id="{@id}">
3183
3322
  <xsl:apply-templates/>
@@ -3429,7 +3568,8 @@
3429
3568
 
3430
3569
 
3431
3570
 
3432
-
3571
+
3572
+
3433
3573
  </xsl:variable>
3434
3574
  <xsl:if test="$documentNS != $XSLNS">
3435
3575
  <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/ribose/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "1.6.0"
3
+ VERSION = "1.6.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
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: isodoc