metanorma-ieee 1.5.0 → 1.5.2

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 (13) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/isodoc/ieee/base_convert.rb +1 -24
  4. data/lib/isodoc/ieee/html/ieee.css +12 -6
  5. data/lib/isodoc/ieee/html/ieee.scss +12 -6
  6. data/lib/isodoc/ieee/ieee.amendment.xsl +173 -72
  7. data/lib/isodoc/ieee/ieee.standard.xsl +173 -72
  8. data/lib/isodoc/ieee/presentation_concepts.rb +9 -8
  9. data/lib/metanorma/ieee/basicdoc.rng +6 -6
  10. data/lib/metanorma/ieee/isodoc.rng +8 -60
  11. data/lib/metanorma/ieee/version.rb +1 -1
  12. data/metanorma-ieee.gemspec +1 -1
  13. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 801b502833c67f60c19cdc1f9001296d80366f8685ff7766f81f6803d32af790
4
- data.tar.gz: 93a7ac02afbd124377b1dbbcb44cf3afb511bfc20f066ec497cf925e84683ea9
3
+ metadata.gz: b1f3bd984e4cf3c4cbfee3938fbd76e32aefa2143de7da149590c4af00e622f6
4
+ data.tar.gz: 6df88d7475cff636f3a36c25726379dfe9934eeb973b1220c5f97b119d096439
5
5
  SHA512:
6
- metadata.gz: 65e1510b100c4e47212732bd1cad5a43035dde919b60e65d15c7b57d92a64db1b2ab3f4a7f0cc7191da413ba53f7bcc561ec1328946e89deb24c45a260d97e81
7
- data.tar.gz: bc45ccdfdbe71458065930eaf4bb3f8a9089c51f63d2b77067cf8bcb6ab75ce6f367a9b9d6bbe142ffd914b55da99d53a8e1c2179d39feb671b269e3a52734c1
6
+ metadata.gz: badd50b4e680f74803f501bc8203cc26ea7845947af04a1c0daf4157812d530ad0fce25b3432b3391cfc71d19bfb7f65c157712c61c7c0b01c90620852a59e2f
7
+ data.tar.gz: 91366936d455a1b7ec2b06a1e11cb42146f73d53e6d56388b0413df33c7bfa96ae2ad540967b9de80557e65dd93fffb3a9eedc8b7de80f4efd2de6c61aa41550
data/README.adoc CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  image:https://img.shields.io/gem/v/metanorma-ieee.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ieee"]
4
4
  image:https://github.com/metanorma/metanorma-ieee/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-ieee/actions?workflow=rake"]
5
- image:https://codeclimate.com/github/metanorma/metanorma-ieee/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ieee"]
5
+ // image:https://codeclimate.com/github/metanorma/metanorma-ieee/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-ieee"]
6
6
  image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-ieee.svg["Pull Requests", link="https://github.com/metanorma/metanorma-ieee/pulls"]
7
7
  image:https://img.shields.io/github/commits-since/metanorma/metanorma-ieee/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-ieee/releases"]
8
8
 
data/lib/isodoc/ieee/base_convert.rb CHANGED
@@ -34,29 +34,6 @@ module IsoDoc
34
34
  super.merge(type: node["type"])
35
35
  end
36
36
 
37
- #TODO kill
38
- def note_p_parsex(node, div)
39
- name = node&.at(ns("./fmt-name"))&.remove
40
- div.p do |p|
41
- name and p.span class: "note_label" do |s|
42
- name.children.each { |n| parse(n, s) }
43
- end
44
- node.first_element_child.children.each { |n| parse(n, p) }
45
- end
46
- node.element_children[1..-1].each { |n| parse(n, div) }
47
- end
48
-
49
- #TODO kill
50
- def note_parse1x(node, div)
51
- name = node&.at(ns("./name"))&.remove
52
- name and div.p do |p|
53
- p.span class: "note_label" do |s|
54
- name.children.each { |n| parse(n, s) }
55
- end
56
- end
57
- node.children.each { |n| parse(n, div) }
58
- end
59
-
60
37
  def example_label(_node, div, name)
61
38
  return if name.nil?
62
39
 
@@ -65,7 +42,7 @@ module IsoDoc
65
42
  end
66
43
  end
67
44
 
68
- def span_parse(node, out)
45
+ def span_parse(node, out)
69
46
  node["class"] == "fmt-obligation" and
70
47
  node["class"] = "obligation"
71
48
  super
data/lib/isodoc/ieee/html/ieee.css CHANGED
@@ -2773,7 +2773,8 @@ div.WordSection1 {
2773
2773
  mso-footer-margin: 36pt;
2774
2774
  mso-line-numbers-count-by: 1;
2775
2775
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
2776
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2776
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2777
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2777
2778
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2778
2779
  mso-paper-source: 0;
2779
2780
  }
@@ -2784,7 +2785,8 @@ div.WordSection1 {
2784
2785
  mso-footer-margin: 36pt;
2785
2786
  mso-line-numbers-count-by: 1;
2786
2787
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1l;
2787
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
2788
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
2789
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2788
2790
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
2789
2791
  mso-paper-source: 0;
2790
2792
  }
@@ -2795,7 +2797,8 @@ div.WordSection1 {
2795
2797
  mso-footer-margin: 36pt;
2796
2798
  mso-line-numbers-count-by: 1;
2797
2799
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
2798
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2800
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2801
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2799
2802
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2800
2803
  mso-paper-source: 0;
2801
2804
  }
@@ -2811,7 +2814,8 @@ div.WordSection2 {
2811
2814
  mso-footer-margin: 36pt;
2812
2815
  mso-line-numbers-count-by: 1;
2813
2816
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
2814
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2817
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2818
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2815
2819
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2816
2820
  mso-paper-source: 0;
2817
2821
  }
@@ -2822,7 +2826,8 @@ div.WordSection2 {
2822
2826
  mso-footer-margin: 36pt;
2823
2827
  mso-line-numbers-count-by: 1;
2824
2828
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
2825
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2829
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2830
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2826
2831
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2827
2832
  mso-paper-source: 0;
2828
2833
  }
@@ -2833,7 +2838,8 @@ div.WordSection2 {
2833
2838
  mso-footer-margin: 36pt;
2834
2839
  mso-line-numbers-count-by: 1;
2835
2840
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1l;
2836
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
2841
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
2842
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
2837
2843
  mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
2838
2844
  mso-paper-source: 0;
2839
2845
  }
data/lib/isodoc/ieee/html/ieee.scss CHANGED
@@ -2512,7 +2512,8 @@ div.WordSection1
2512
2512
  mso-footer-margin:36.0pt;
2513
2513
  mso-line-numbers-count-by:1;
2514
2514
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
2515
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2515
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2516
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2516
2517
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2517
2518
  mso-paper-source:0;}
2518
2519
  @page WordSection2L
@@ -2522,7 +2523,8 @@ div.WordSection1
2522
2523
  mso-footer-margin:36.0pt;
2523
2524
  mso-line-numbers-count-by:1;
2524
2525
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
2525
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
2526
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
2527
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2526
2528
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
2527
2529
  mso-paper-source:0;}
2528
2530
  @page WordSection2P
@@ -2532,7 +2534,8 @@ div.WordSection1
2532
2534
  mso-footer-margin:36.0pt;
2533
2535
  mso-line-numbers-count-by:1;
2534
2536
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
2535
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2537
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2538
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2536
2539
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2537
2540
  mso-paper-source:0;}
2538
2541
  div.WordSection2
@@ -2545,7 +2548,8 @@ div.WordSection2
2545
2548
  mso-footer-margin:36.0pt;
2546
2549
  mso-line-numbers-count-by:1;
2547
2550
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
2548
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2551
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2552
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2549
2553
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2550
2554
  mso-paper-source:0;}
2551
2555
  @page WordSection3P
@@ -2555,7 +2559,8 @@ div.WordSection2
2555
2559
  mso-footer-margin:36.0pt;
2556
2560
  mso-line-numbers-count-by:1;
2557
2561
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
2558
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
2562
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;*/
2563
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2559
2564
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
2560
2565
  mso-paper-source:0;}
2561
2566
  @page WordSection3L
@@ -2565,7 +2570,8 @@ div.WordSection2
2565
2570
  mso-footer-margin:36.0pt;
2566
2571
  mso-line-numbers-count-by:1;
2567
2572
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
2568
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
2573
+ /*mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;*/
2574
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
2569
2575
  mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1l;
2570
2576
  mso-paper-source:0;}
2571
2577
  div.WordSection3
data/lib/isodoc/ieee/ieee.amendment.xsl CHANGED
@@ -127,7 +127,15 @@
127
127
  <!-- IEEE cover page -->
128
128
 
129
129
  <!-- IEEE standard cover page -->
130
- <fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
130
+ <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
131
+ <fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
132
+ <fo:region-before region-name="header" extent="62mm" precedence="true"/>
133
+ <fo:region-after region-name="footer" extent="25mm"/>
134
+ <fo:region-start region-name="left-region" extent="21.2mm"/>
135
+ <fo:region-end region-name="right-region" extent="25mm"/>
136
+ </fo:simple-page-master>
137
+ <!-- IEEE standard back page -->
138
+ <fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
131
139
  <fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
132
140
  <fo:region-before region-name="header" extent="62mm" precedence="true"/>
133
141
  <fo:region-after region-name="footer" extent="25mm"/>
@@ -256,7 +264,7 @@
256
264
  <!-- ======================= -->
257
265
 
258
266
  <!-- Index pages -->
259
- <fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
267
+ <fo:simple-page-master master-name="index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
260
268
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
261
269
  <fo:region-before region-name="header" extent="{$marginTop}mm"/>
262
270
  <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
@@ -903,7 +911,7 @@
903
911
  <xsl:attribute name="initial-page-number">1</xsl:attribute>
904
912
  </xsl:if> -->
905
913
  <xsl:if test=".//mn:indexsect">
906
- <xsl:attribute name="master-reference">page-index</xsl:attribute>
914
+ <xsl:attribute name="master-reference">index</xsl:attribute>
907
915
  </xsl:if>
908
916
 
909
917
  <xsl:call-template name="insertFootnoteSeparator"/>
@@ -1221,7 +1229,7 @@
1221
1229
  <xsl:apply-templates select="mnx:title"/>
1222
1230
 
1223
1231
  <fo:inline keep-together.within-line="always">
1224
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1232
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1225
1233
  <fo:inline>
1226
1234
  <fo:page-number-citation ref-id="{@id}"/>
1227
1235
  </fo:inline>
@@ -1233,24 +1241,24 @@
1233
1241
  </xsl:for-each>
1234
1242
 
1235
1243
  <!-- List of Tables -->
1236
- <xsl:if test="$contents//mnx:tables/mnx:table">
1237
- <xsl:call-template name="insertListOf_Title">
1238
- <xsl:with-param name="title" select="$title-list-tables"/>
1239
- </xsl:call-template>
1240
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
1241
- <xsl:call-template name="insertListOf_Item"/>
1242
- </xsl:for-each>
1243
- </xsl:if>
1244
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
1245
+ <xsl:if test="position() = 1">
1246
+ <xsl:call-template name="insertListOf_Title">
1247
+ <xsl:with-param name="title" select="$title-list-tables"/>
1248
+ </xsl:call-template>
1249
+ </xsl:if>
1250
+ <xsl:call-template name="insertListOf_Item"/>
1251
+ </xsl:for-each>
1244
1252
 
1245
1253
  <!-- List of Figures -->
1246
- <xsl:if test="$contents//mnx:figures/mnx:figure">
1247
- <xsl:call-template name="insertListOf_Title">
1248
- <xsl:with-param name="title" select="$title-list-figures"/>
1249
- </xsl:call-template>
1250
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1251
- <xsl:call-template name="insertListOf_Item"/>
1252
- </xsl:for-each>
1253
- </xsl:if>
1254
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1255
+ <xsl:if test="position() = 1">
1256
+ <xsl:call-template name="insertListOf_Title">
1257
+ <xsl:with-param name="title" select="$title-list-figures"/>
1258
+ </xsl:call-template>
1259
+ </xsl:if>
1260
+ <xsl:call-template name="insertListOf_Item"/>
1261
+ </xsl:for-each>
1254
1262
 
1255
1263
  </xsl:when> <!-- $stage = 'draft' -->
1256
1264
 
@@ -1290,7 +1298,7 @@
1290
1298
  <xsl:apply-templates select="mnx:title"/>
1291
1299
 
1292
1300
  <fo:inline keep-together.within-line="always">
1293
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1301
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1294
1302
  <fo:inline>
1295
1303
  <fo:page-number-citation ref-id="{@id}"/>
1296
1304
  </fo:inline>
@@ -1305,26 +1313,26 @@
1305
1313
  </xsl:for-each>
1306
1314
 
1307
1315
  <!-- List of Figures -->
1308
- <xsl:if test="$contents//mnx:figures/mnx:figure">
1309
- <fo:block break-after="page"/>
1310
- <xsl:call-template name="insertListOf_Title">
1311
- <xsl:with-param name="title" select="'Figures'"/>
1312
- </xsl:call-template>
1313
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1314
- <xsl:call-template name="insertListOf_Item"/>
1315
- </xsl:for-each>
1316
- </xsl:if>
1316
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1317
+ <xsl:if test="position() = 1">
1318
+ <fo:block break-after="page"/>
1319
+ <xsl:call-template name="insertListOf_Title">
1320
+ <xsl:with-param name="title" select="'Figures'"/>
1321
+ </xsl:call-template>
1322
+ </xsl:if>
1323
+ <xsl:call-template name="insertListOf_Item"/>
1324
+ </xsl:for-each>
1317
1325
 
1318
1326
  <!-- List of Tables -->
1319
- <xsl:if test="$contents//mnx:tables/mnx:table">
1320
- <fo:block break-after="page"/>
1321
- <xsl:call-template name="insertListOf_Title">
1322
- <xsl:with-param name="title" select="'Tables'"/>
1323
- </xsl:call-template>
1324
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
1325
- <xsl:call-template name="insertListOf_Item"/>
1326
- </xsl:for-each>
1327
- </xsl:if>
1327
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
1328
+ <xsl:if test="position() = 1">
1329
+ <fo:block break-after="page"/>
1330
+ <xsl:call-template name="insertListOf_Title">
1331
+ <xsl:with-param name="title" select="'Tables'"/>
1332
+ </xsl:call-template>
1333
+ </xsl:if>
1334
+ <xsl:call-template name="insertListOf_Item"/>
1335
+ </xsl:for-each>
1328
1336
 
1329
1337
  </xsl:when> <!-- $stage = 'published' or 'approved' -->
1330
1338
  </xsl:choose>
@@ -1399,24 +1407,17 @@
1399
1407
  </xsl:if>
1400
1408
  </xsl:template>
1401
1409
 
1402
- <xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
1410
+ <xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" name="toc" priority="3">
1403
1411
  <xsl:choose>
1404
- <xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
1405
- <fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
1406
- <xsl:if test="$stage = 'published' or $stage = 'approved'">
1407
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1408
- </xsl:if>
1409
- <!-- Contents -->
1410
- <!-- <xsl:call-template name="getLocalizedString">
1411
- <xsl:with-param name="key">table_of_contents</xsl:with-param>
1412
- </xsl:call-template> -->
1413
- <xsl:apply-templates/>
1414
- </fo:block>
1415
- </xsl:when>
1416
1412
  <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
1413
+ <!-- no title -->
1417
1414
  </xsl:when>
1418
1415
  <xsl:otherwise>
1419
- <fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
1416
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1417
+ <xsl:if test="($current_template = 'standard' or $current_template = 'draft') and ($stage = 'published' or $stage = 'approved')">
1418
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1419
+ </xsl:if>
1420
+ <!-- Contents -->
1420
1421
  <xsl:apply-templates/>
1421
1422
  </fo:block>
1422
1423
  </xsl:otherwise>
@@ -1957,13 +1958,10 @@
1957
1958
 
1958
1959
  <xsl:template name="insertListOf_Title">
1959
1960
  <xsl:param name="title"/>
1960
- <fo:block role="TOCI" space-before="12pt" keep-with-next="always">
1961
- <xsl:if test="$current_template = 'standard'">
1962
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1963
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1964
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1965
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1966
- </xsl:if>
1961
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
1962
+
1963
+ <xsl:call-template name="refine_toc-listof-title-style"/>
1964
+
1967
1965
  <xsl:value-of select="$title"/>
1968
1966
  </fo:block>
1969
1967
  </xsl:template>
@@ -1972,8 +1970,7 @@
1972
1970
 
1973
1971
  <xsl:choose>
1974
1972
  <xsl:when test="$current_template = 'standard'">
1975
- <fo:list-block provisional-distance-between-starts="22.5mm" font-weight="normal" role="TOCI" margin-left="2mm">
1976
-
1973
+ <fo:list-block xsl:use-attribute-sets="toc-listof-item-style">
1977
1974
  <fo:list-item>
1978
1975
  <fo:list-item-label end-indent="label-end()">
1979
1976
  <fo:block>
@@ -1998,8 +1995,8 @@
1998
1995
  </fo:list-item-body>
1999
1996
  </fo:list-item>
2000
1997
  </fo:list-block>
2001
-
2002
1998
  </xsl:when>
1999
+
2003
2000
  <xsl:otherwise>
2004
2001
  <fo:block role="TOCI" font-weight="normal" text-align-last="justify" margin-left="12mm">
2005
2002
  <fo:basic-link internal-destination="{@id}">
@@ -3339,7 +3336,7 @@
3339
3336
  <xsl:param name="cutoff_date"/>
3340
3337
  <xsl:param name="expiration_date"/>
3341
3338
 
3342
- <fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
3339
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
3343
3340
 
3344
3341
  <fo:static-content flow-name="header" role="artifact">
3345
3342
  <fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -3666,7 +3663,7 @@
3666
3663
  </xsl:template> <!-- END: back-page -->
3667
3664
 
3668
3665
  <xsl:template name="insertBackPage_Standard">
3669
- <fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
3666
+ <fo:page-sequence master-reference="back-page" force-page-count="no-force">
3670
3667
 
3671
3668
  <fo:static-content flow-name="header" role="artifact">
3672
3669
  <fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -8963,6 +8960,16 @@
8963
8960
  </xsl:variable>
8964
8961
  <xsl:variable name="quot">"</xsl:variable>
8965
8962
  <xsl:variable name="styles_">
8963
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
8964
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
8965
+ <style name="border-top">none</style>
8966
+ <style name="border-right">none</style>
8967
+ <style name="border-left">none</style>
8968
+ <style name="border-bottom">none</style>
8969
+ <style name="color">inherit</style>
8970
+ <style name="background-color">transparent</style>
8971
+ </xsl:if>
8972
+
8966
8973
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
8967
8974
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8968
8975
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -10960,7 +10967,10 @@
10960
10967
 
10961
10968
  <xsl:call-template name="setNamedDestination"/>
10962
10969
 
10963
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
10970
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
10971
+ <xsl:if test="not(parent::mn:references)">
10972
+ <xsl:copy-of select="@id"/>
10973
+ </xsl:if>
10964
10974
 
10965
10975
  <xsl:call-template name="setBlockSpanAll"/>
10966
10976
 
@@ -13432,7 +13442,7 @@
13432
13442
 
13433
13443
  <xsl:template name="insertFootnoteSeparatorCommon">
13434
13444
  <xsl:param name="leader_length">30%</xsl:param>
13435
- <fo:static-content flow-name="xsl-footnote-separator">
13445
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
13436
13446
  <fo:block>
13437
13447
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
13438
13448
  </fo:block>
@@ -13697,8 +13707,8 @@
13697
13707
  </xsl:template> <!-- bibitem -->
13698
13708
 
13699
13709
  <!-- Bibliography (non-normative references) -->
13700
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
13701
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
13710
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
13711
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
13702
13712
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
13703
13713
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
13704
13714
  <xsl:call-template name="setNamedDestination"/>
@@ -13761,7 +13771,7 @@
13761
13771
  </fo:list-item>
13762
13772
  </xsl:otherwise>
13763
13773
  </xsl:choose>
13764
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
13774
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
13765
13775
  <xsl:with-param name="skip">false</xsl:with-param>
13766
13776
  </xsl:apply-templates>
13767
13777
  </xsl:template>
@@ -13778,8 +13788,26 @@
13778
13788
  </xsl:apply-templates>
13779
13789
  <xsl:apply-templates select="mn:formattedref"/>
13780
13790
  <!-- end bibitem processing -->
13791
+
13792
+ <xsl:call-template name="processBibliographyNote"/>
13781
13793
  </xsl:template> <!-- processBibitem (bibitem) -->
13782
13794
 
13795
+ <xsl:template name="processBibliographyNote">
13796
+ <xsl:if test="self::mn:note">
13797
+ <xsl:variable name="note_node">
13798
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
13799
+ <xsl:copy> <!-- skip @id -->
13800
+ <xsl:copy-of select="node()"/>
13801
+ </xsl:copy>
13802
+ </xsl:element>
13803
+ </xsl:variable>
13804
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
13805
+ <xsl:call-template name="note"/>
13806
+ </xsl:for-each> -->
13807
+ <xsl:call-template name="note"/>
13808
+ </xsl:if>
13809
+ </xsl:template>
13810
+
13783
13811
  <xsl:template match="mn:title" mode="title">
13784
13812
  <fo:inline><xsl:apply-templates/></fo:inline>
13785
13813
  </xsl:template>
@@ -14325,6 +14353,79 @@
14325
14353
  <!-- End Form's elements processing -->
14326
14354
  <!-- =================== -->
14327
14355
 
14356
+ <xsl:attribute-set name="toc-style">
14357
+ </xsl:attribute-set>
14358
+
14359
+ <xsl:template name="refine_toc-style">
14360
+ </xsl:template>
14361
+
14362
+ <xsl:attribute-set name="toc-title-style">
14363
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14364
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
14365
+ <xsl:attribute name="role">H1</xsl:attribute>
14366
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14367
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
14368
+ <xsl:attribute name="margin-bottom">24pt</xsl:attribute>
14369
+ </xsl:attribute-set>
14370
+
14371
+ <xsl:template name="refine_toc-title-style">
14372
+ </xsl:template>
14373
+
14374
+ <xsl:attribute-set name="toc-title-page-style">
14375
+ </xsl:attribute-set> <!-- toc-title-page-style -->
14376
+
14377
+ <xsl:template name="refine_toc-title-page-style">
14378
+ </xsl:template>
14379
+
14380
+ <xsl:attribute-set name="toc-item-block-style">
14381
+ </xsl:attribute-set>
14382
+
14383
+ <xsl:template name="refine_toc-item-block-style">
14384
+ </xsl:template>
14385
+
14386
+ <xsl:attribute-set name="toc-item-style">
14387
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14388
+ </xsl:attribute-set> <!-- END: toc-item-style -->
14389
+
14390
+ <xsl:template name="refine_toc-item-style">
14391
+ </xsl:template> <!-- END: refine_toc-item-style -->
14392
+
14393
+ <xsl:attribute-set name="toc-leader-style">
14394
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
14395
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
14396
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
14397
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
14398
+
14399
+ <xsl:attribute-set name="toc-pagenumber-style">
14400
+ </xsl:attribute-set>
14401
+
14402
+ <!-- List of Figures, Tables -->
14403
+ <xsl:attribute-set name="toc-listof-title-style">
14404
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14405
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
14406
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
14407
+ </xsl:attribute-set>
14408
+
14409
+ <xsl:template name="refine_toc-listof-title-style">
14410
+ <xsl:if test="$current_template = 'standard'">
14411
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
14412
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14413
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14414
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
14415
+ </xsl:if>
14416
+ </xsl:template>
14417
+
14418
+ <xsl:attribute-set name="toc-listof-item-block-style">
14419
+ </xsl:attribute-set>
14420
+
14421
+ <xsl:attribute-set name="toc-listof-item-style">
14422
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14423
+ <xsl:attribute name="provisional-distance-between-starts">22.5mm</xsl:attribute>
14424
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
14425
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14426
+ <xsl:attribute name="margin-left">2mm</xsl:attribute>
14427
+ </xsl:attribute-set>
14428
+
14328
14429
  <xsl:template name="processPrefaceSectionsDefault_Contents">
14329
14430
  <xsl:variable name="nodes_preface_">
14330
14431
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -14662,7 +14763,7 @@
14662
14763
  </xsl:if>
14663
14764
 
14664
14765
  <xsl:for-each select="$contents_nodes/mnx:doc">
14665
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14766
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14666
14767
  <xsl:if test="@bundle = 'true'">
14667
14768
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
14668
14769
  </xsl:if>
@@ -14696,7 +14797,7 @@
14696
14797
  </xsl:choose>
14697
14798
  </fo:bookmark-title>
14698
14799
 
14699
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
14800
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
14700
14801
 
14701
14802
  <xsl:call-template name="insertFigureBookmarks">
14702
14803
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/ieee/ieee.standard.xsl CHANGED
@@ -127,7 +127,15 @@
127
127
  <!-- IEEE cover page -->
128
128
 
129
129
  <!-- IEEE standard cover page -->
130
- <fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
130
+ <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
131
+ <fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
132
+ <fo:region-before region-name="header" extent="62mm" precedence="true"/>
133
+ <fo:region-after region-name="footer" extent="25mm"/>
134
+ <fo:region-start region-name="left-region" extent="21.2mm"/>
135
+ <fo:region-end region-name="right-region" extent="25mm"/>
136
+ </fo:simple-page-master>
137
+ <!-- IEEE standard back page -->
138
+ <fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
131
139
  <fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
132
140
  <fo:region-before region-name="header" extent="62mm" precedence="true"/>
133
141
  <fo:region-after region-name="footer" extent="25mm"/>
@@ -256,7 +264,7 @@
256
264
  <!-- ======================= -->
257
265
 
258
266
  <!-- Index pages -->
259
- <fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
267
+ <fo:simple-page-master master-name="index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
260
268
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
261
269
  <fo:region-before region-name="header" extent="{$marginTop}mm"/>
262
270
  <fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
@@ -903,7 +911,7 @@
903
911
  <xsl:attribute name="initial-page-number">1</xsl:attribute>
904
912
  </xsl:if> -->
905
913
  <xsl:if test=".//mn:indexsect">
906
- <xsl:attribute name="master-reference">page-index</xsl:attribute>
914
+ <xsl:attribute name="master-reference">index</xsl:attribute>
907
915
  </xsl:if>
908
916
 
909
917
  <xsl:call-template name="insertFootnoteSeparator"/>
@@ -1221,7 +1229,7 @@
1221
1229
  <xsl:apply-templates select="mnx:title"/>
1222
1230
 
1223
1231
  <fo:inline keep-together.within-line="always">
1224
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1232
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1225
1233
  <fo:inline>
1226
1234
  <fo:page-number-citation ref-id="{@id}"/>
1227
1235
  </fo:inline>
@@ -1233,24 +1241,24 @@
1233
1241
  </xsl:for-each>
1234
1242
 
1235
1243
  <!-- List of Tables -->
1236
- <xsl:if test="$contents//mnx:tables/mnx:table">
1237
- <xsl:call-template name="insertListOf_Title">
1238
- <xsl:with-param name="title" select="$title-list-tables"/>
1239
- </xsl:call-template>
1240
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
1241
- <xsl:call-template name="insertListOf_Item"/>
1242
- </xsl:for-each>
1243
- </xsl:if>
1244
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
1245
+ <xsl:if test="position() = 1">
1246
+ <xsl:call-template name="insertListOf_Title">
1247
+ <xsl:with-param name="title" select="$title-list-tables"/>
1248
+ </xsl:call-template>
1249
+ </xsl:if>
1250
+ <xsl:call-template name="insertListOf_Item"/>
1251
+ </xsl:for-each>
1244
1252
 
1245
1253
  <!-- List of Figures -->
1246
- <xsl:if test="$contents//mnx:figures/mnx:figure">
1247
- <xsl:call-template name="insertListOf_Title">
1248
- <xsl:with-param name="title" select="$title-list-figures"/>
1249
- </xsl:call-template>
1250
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1251
- <xsl:call-template name="insertListOf_Item"/>
1252
- </xsl:for-each>
1253
- </xsl:if>
1254
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1255
+ <xsl:if test="position() = 1">
1256
+ <xsl:call-template name="insertListOf_Title">
1257
+ <xsl:with-param name="title" select="$title-list-figures"/>
1258
+ </xsl:call-template>
1259
+ </xsl:if>
1260
+ <xsl:call-template name="insertListOf_Item"/>
1261
+ </xsl:for-each>
1254
1262
 
1255
1263
  </xsl:when> <!-- $stage = 'draft' -->
1256
1264
 
@@ -1290,7 +1298,7 @@
1290
1298
  <xsl:apply-templates select="mnx:title"/>
1291
1299
 
1292
1300
  <fo:inline keep-together.within-line="always">
1293
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
1301
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
1294
1302
  <fo:inline>
1295
1303
  <fo:page-number-citation ref-id="{@id}"/>
1296
1304
  </fo:inline>
@@ -1305,26 +1313,26 @@
1305
1313
  </xsl:for-each>
1306
1314
 
1307
1315
  <!-- List of Figures -->
1308
- <xsl:if test="$contents//mnx:figures/mnx:figure">
1309
- <fo:block break-after="page"/>
1310
- <xsl:call-template name="insertListOf_Title">
1311
- <xsl:with-param name="title" select="'Figures'"/>
1312
- </xsl:call-template>
1313
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1314
- <xsl:call-template name="insertListOf_Item"/>
1315
- </xsl:for-each>
1316
- </xsl:if>
1316
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
1317
+ <xsl:if test="position() = 1">
1318
+ <fo:block break-after="page"/>
1319
+ <xsl:call-template name="insertListOf_Title">
1320
+ <xsl:with-param name="title" select="'Figures'"/>
1321
+ </xsl:call-template>
1322
+ </xsl:if>
1323
+ <xsl:call-template name="insertListOf_Item"/>
1324
+ </xsl:for-each>
1317
1325
 
1318
1326
  <!-- List of Tables -->
1319
- <xsl:if test="$contents//mnx:tables/mnx:table">
1320
- <fo:block break-after="page"/>
1321
- <xsl:call-template name="insertListOf_Title">
1322
- <xsl:with-param name="title" select="'Tables'"/>
1323
- </xsl:call-template>
1324
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
1325
- <xsl:call-template name="insertListOf_Item"/>
1326
- </xsl:for-each>
1327
- </xsl:if>
1327
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
1328
+ <xsl:if test="position() = 1">
1329
+ <fo:block break-after="page"/>
1330
+ <xsl:call-template name="insertListOf_Title">
1331
+ <xsl:with-param name="title" select="'Tables'"/>
1332
+ </xsl:call-template>
1333
+ </xsl:if>
1334
+ <xsl:call-template name="insertListOf_Item"/>
1335
+ </xsl:for-each>
1328
1336
 
1329
1337
  </xsl:when> <!-- $stage = 'published' or 'approved' -->
1330
1338
  </xsl:choose>
@@ -1399,24 +1407,17 @@
1399
1407
  </xsl:if>
1400
1408
  </xsl:template>
1401
1409
 
1402
- <xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
1410
+ <xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" name="toc" priority="3">
1403
1411
  <xsl:choose>
1404
- <xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
1405
- <fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
1406
- <xsl:if test="$stage = 'published' or $stage = 'approved'">
1407
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1408
- </xsl:if>
1409
- <!-- Contents -->
1410
- <!-- <xsl:call-template name="getLocalizedString">
1411
- <xsl:with-param name="key">table_of_contents</xsl:with-param>
1412
- </xsl:call-template> -->
1413
- <xsl:apply-templates/>
1414
- </fo:block>
1415
- </xsl:when>
1416
1412
  <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
1413
+ <!-- no title -->
1417
1414
  </xsl:when>
1418
1415
  <xsl:otherwise>
1419
- <fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
1416
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1417
+ <xsl:if test="($current_template = 'standard' or $current_template = 'draft') and ($stage = 'published' or $stage = 'approved')">
1418
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1419
+ </xsl:if>
1420
+ <!-- Contents -->
1420
1421
  <xsl:apply-templates/>
1421
1422
  </fo:block>
1422
1423
  </xsl:otherwise>
@@ -1957,13 +1958,10 @@
1957
1958
 
1958
1959
  <xsl:template name="insertListOf_Title">
1959
1960
  <xsl:param name="title"/>
1960
- <fo:block role="TOCI" space-before="12pt" keep-with-next="always">
1961
- <xsl:if test="$current_template = 'standard'">
1962
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1963
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1964
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1965
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1966
- </xsl:if>
1961
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
1962
+
1963
+ <xsl:call-template name="refine_toc-listof-title-style"/>
1964
+
1967
1965
  <xsl:value-of select="$title"/>
1968
1966
  </fo:block>
1969
1967
  </xsl:template>
@@ -1972,8 +1970,7 @@
1972
1970
 
1973
1971
  <xsl:choose>
1974
1972
  <xsl:when test="$current_template = 'standard'">
1975
- <fo:list-block provisional-distance-between-starts="22.5mm" font-weight="normal" role="TOCI" margin-left="2mm">
1976
-
1973
+ <fo:list-block xsl:use-attribute-sets="toc-listof-item-style">
1977
1974
  <fo:list-item>
1978
1975
  <fo:list-item-label end-indent="label-end()">
1979
1976
  <fo:block>
@@ -1998,8 +1995,8 @@
1998
1995
  </fo:list-item-body>
1999
1996
  </fo:list-item>
2000
1997
  </fo:list-block>
2001
-
2002
1998
  </xsl:when>
1999
+
2003
2000
  <xsl:otherwise>
2004
2001
  <fo:block role="TOCI" font-weight="normal" text-align-last="justify" margin-left="12mm">
2005
2002
  <fo:basic-link internal-destination="{@id}">
@@ -3339,7 +3336,7 @@
3339
3336
  <xsl:param name="cutoff_date"/>
3340
3337
  <xsl:param name="expiration_date"/>
3341
3338
 
3342
- <fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
3339
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
3343
3340
 
3344
3341
  <fo:static-content flow-name="header" role="artifact">
3345
3342
  <fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -3666,7 +3663,7 @@
3666
3663
  </xsl:template> <!-- END: back-page -->
3667
3664
 
3668
3665
  <xsl:template name="insertBackPage_Standard">
3669
- <fo:page-sequence master-reference="cover-and-back-page-standard" force-page-count="no-force">
3666
+ <fo:page-sequence master-reference="back-page" force-page-count="no-force">
3670
3667
 
3671
3668
  <fo:static-content flow-name="header" role="artifact">
3672
3669
  <fo:block-container position="absolute" left="14mm" top="17.8mm">
@@ -8963,6 +8960,16 @@
8963
8960
  </xsl:variable>
8964
8961
  <xsl:variable name="quot">"</xsl:variable>
8965
8962
  <xsl:variable name="styles_">
8963
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
8964
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
8965
+ <style name="border-top">none</style>
8966
+ <style name="border-right">none</style>
8967
+ <style name="border-left">none</style>
8968
+ <style name="border-bottom">none</style>
8969
+ <style name="color">inherit</style>
8970
+ <style name="background-color">transparent</style>
8971
+ </xsl:if>
8972
+
8966
8973
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
8967
8974
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8968
8975
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -10960,7 +10967,10 @@
10960
10967
 
10961
10968
  <xsl:call-template name="setNamedDestination"/>
10962
10969
 
10963
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
10970
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
10971
+ <xsl:if test="not(parent::mn:references)">
10972
+ <xsl:copy-of select="@id"/>
10973
+ </xsl:if>
10964
10974
 
10965
10975
  <xsl:call-template name="setBlockSpanAll"/>
10966
10976
 
@@ -13432,7 +13442,7 @@
13432
13442
 
13433
13443
  <xsl:template name="insertFootnoteSeparatorCommon">
13434
13444
  <xsl:param name="leader_length">30%</xsl:param>
13435
- <fo:static-content flow-name="xsl-footnote-separator">
13445
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
13436
13446
  <fo:block>
13437
13447
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
13438
13448
  </fo:block>
@@ -13697,8 +13707,8 @@
13697
13707
  </xsl:template> <!-- bibitem -->
13698
13708
 
13699
13709
  <!-- Bibliography (non-normative references) -->
13700
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
13701
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
13710
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
13711
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
13702
13712
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
13703
13713
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
13704
13714
  <xsl:call-template name="setNamedDestination"/>
@@ -13761,7 +13771,7 @@
13761
13771
  </fo:list-item>
13762
13772
  </xsl:otherwise>
13763
13773
  </xsl:choose>
13764
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
13774
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
13765
13775
  <xsl:with-param name="skip">false</xsl:with-param>
13766
13776
  </xsl:apply-templates>
13767
13777
  </xsl:template>
@@ -13778,8 +13788,26 @@
13778
13788
  </xsl:apply-templates>
13779
13789
  <xsl:apply-templates select="mn:formattedref"/>
13780
13790
  <!-- end bibitem processing -->
13791
+
13792
+ <xsl:call-template name="processBibliographyNote"/>
13781
13793
  </xsl:template> <!-- processBibitem (bibitem) -->
13782
13794
 
13795
+ <xsl:template name="processBibliographyNote">
13796
+ <xsl:if test="self::mn:note">
13797
+ <xsl:variable name="note_node">
13798
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
13799
+ <xsl:copy> <!-- skip @id -->
13800
+ <xsl:copy-of select="node()"/>
13801
+ </xsl:copy>
13802
+ </xsl:element>
13803
+ </xsl:variable>
13804
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
13805
+ <xsl:call-template name="note"/>
13806
+ </xsl:for-each> -->
13807
+ <xsl:call-template name="note"/>
13808
+ </xsl:if>
13809
+ </xsl:template>
13810
+
13783
13811
  <xsl:template match="mn:title" mode="title">
13784
13812
  <fo:inline><xsl:apply-templates/></fo:inline>
13785
13813
  </xsl:template>
@@ -14325,6 +14353,79 @@
14325
14353
  <!-- End Form's elements processing -->
14326
14354
  <!-- =================== -->
14327
14355
 
14356
+ <xsl:attribute-set name="toc-style">
14357
+ </xsl:attribute-set>
14358
+
14359
+ <xsl:template name="refine_toc-style">
14360
+ </xsl:template>
14361
+
14362
+ <xsl:attribute-set name="toc-title-style">
14363
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14364
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
14365
+ <xsl:attribute name="role">H1</xsl:attribute>
14366
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14367
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
14368
+ <xsl:attribute name="margin-bottom">24pt</xsl:attribute>
14369
+ </xsl:attribute-set>
14370
+
14371
+ <xsl:template name="refine_toc-title-style">
14372
+ </xsl:template>
14373
+
14374
+ <xsl:attribute-set name="toc-title-page-style">
14375
+ </xsl:attribute-set> <!-- toc-title-page-style -->
14376
+
14377
+ <xsl:template name="refine_toc-title-page-style">
14378
+ </xsl:template>
14379
+
14380
+ <xsl:attribute-set name="toc-item-block-style">
14381
+ </xsl:attribute-set>
14382
+
14383
+ <xsl:template name="refine_toc-item-block-style">
14384
+ </xsl:template>
14385
+
14386
+ <xsl:attribute-set name="toc-item-style">
14387
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14388
+ </xsl:attribute-set> <!-- END: toc-item-style -->
14389
+
14390
+ <xsl:template name="refine_toc-item-style">
14391
+ </xsl:template> <!-- END: refine_toc-item-style -->
14392
+
14393
+ <xsl:attribute-set name="toc-leader-style">
14394
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
14395
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
14396
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
14397
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
14398
+
14399
+ <xsl:attribute-set name="toc-pagenumber-style">
14400
+ </xsl:attribute-set>
14401
+
14402
+ <!-- List of Figures, Tables -->
14403
+ <xsl:attribute-set name="toc-listof-title-style">
14404
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14405
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
14406
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
14407
+ </xsl:attribute-set>
14408
+
14409
+ <xsl:template name="refine_toc-listof-title-style">
14410
+ <xsl:if test="$current_template = 'standard'">
14411
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
14412
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14413
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14414
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
14415
+ </xsl:if>
14416
+ </xsl:template>
14417
+
14418
+ <xsl:attribute-set name="toc-listof-item-block-style">
14419
+ </xsl:attribute-set>
14420
+
14421
+ <xsl:attribute-set name="toc-listof-item-style">
14422
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14423
+ <xsl:attribute name="provisional-distance-between-starts">22.5mm</xsl:attribute>
14424
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
14425
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14426
+ <xsl:attribute name="margin-left">2mm</xsl:attribute>
14427
+ </xsl:attribute-set>
14428
+
14328
14429
  <xsl:template name="processPrefaceSectionsDefault_Contents">
14329
14430
  <xsl:variable name="nodes_preface_">
14330
14431
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -14662,7 +14763,7 @@
14662
14763
  </xsl:if>
14663
14764
 
14664
14765
  <xsl:for-each select="$contents_nodes/mnx:doc">
14665
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14766
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
14666
14767
  <xsl:if test="@bundle = 'true'">
14667
14768
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
14668
14769
  </xsl:if>
@@ -14696,7 +14797,7 @@
14696
14797
  </xsl:choose>
14697
14798
  </fo:bookmark-title>
14698
14799
 
14699
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
14800
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
14700
14801
 
14701
14802
  <xsl:call-template name="insertFigureBookmarks">
14702
14803
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/ieee/presentation_concepts.rb CHANGED
@@ -38,15 +38,13 @@ module IsoDoc
38
38
  ret = [[coll[0]]]
39
39
  coll[1..-1].each do |r|
40
40
  if ret[-1][0]["type"] != r["type"]
41
- ret << [r]
42
- next
41
+ ret << [r] and next
43
42
  end
43
+
44
44
  ret[-1] << r
45
45
  end
46
46
  ret.map do |x|
47
- x.map do |y|
48
- to_xml(y)
49
- end.join("; ")
47
+ x.map { |y| to_xml(y) }.join("; ")
50
48
  end.map { |x| "<p>#{x}</p>" }.join("\n")
51
49
  end
52
50
 
@@ -86,11 +84,13 @@ module IsoDoc
86
84
 
87
85
  def admitted_to_related(docxml)
88
86
  docxml.xpath(ns("//term")).each do |t|
89
- t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx")).each_with_index do |a, i|
87
+ t.xpath(ns("./fmt-admitted/semx | ./fmt-preferred/semx"))
88
+ .each_with_index do |a, i|
90
89
  orig = semx_orig(a)
91
90
  (i.zero? ||
92
91
  orig.at(ns("./abbreviation-type | ./graphical-symbol"))) and next
93
- out = t.at(ns("./fmt-related")) || t.at(ns("./definition")).before("<fmt-related/>").previous
92
+ out = t.at(ns("./fmt-related")) || t.at(ns("./definition"))
93
+ .before("<fmt-related/>").previous
94
94
  admitted_to_related1(a, t.at(ns("./fmt-preferred/semx")), out)
95
95
  a.parent.name == "fmt-preferred" and a.remove
96
96
  end
@@ -133,7 +133,8 @@ module IsoDoc
133
133
  if desgn["element"] == "preferred"
134
134
  f = orig.parent.xpath(ns("./domain | ./subject"))
135
135
  .map { |u| to_xml(semx_fmt_dup(u)) }.join(", ")
136
- name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>" unless f.empty?
136
+ f.empty? or
137
+ name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
137
138
  end
138
139
  super
139
140
  end
data/lib/metanorma/ieee/basicdoc.rng CHANGED
@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
198
198
  </zeroOrMore>
199
199
  </element>
200
200
  </optional>
201
- <optional>
201
+ <zeroOrMore>
202
202
  <element name="description">
203
- <a:documentation>Description of the change described in this block</a:documentation>
204
- <zeroOrMore>
203
+ <a:documentation>Description(s) of the change described in this block</a:documentation>
204
+ <oneOrMore>
205
205
  <ref name="BasicBlock"/>
206
- </zeroOrMore>
206
+ </oneOrMore>
207
207
  </element>
208
- </optional>
208
+ </zeroOrMore>
209
209
  <optional>
210
210
  <element name="newcontent">
211
211
  <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
1291
1291
  <ref name="pure_strike"/>
1292
1292
  <ref name="pure_smallcap"/>
1293
1293
  <ref name="br"/>
1294
+ <ref name="stem"/>
1294
1295
  </choice>
1295
1296
  </define>
1296
1297
  <define name="NestedTextElement">
1297
1298
  <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
1298
1299
  <choice>
1299
1300
  <ref name="PureTextElement"/>
1300
- <ref name="stem"/>
1301
1301
  <ref name="eref"/>
1302
1302
  <ref name="xref"/>
1303
1303
  <ref name="hyperlink"/>
data/lib/metanorma/ieee/isodoc.rng CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <!-- VERSION v2.0.8 -->
3
+ <!-- VERSION v2.1.0 -->
4
4
 
5
5
  <!--
6
6
  ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
42
42
  but to `@anchor`, the user-supplied cross-reference</a:documentation>
43
43
  <text/>
44
44
  </define>
45
- <define name="index-primary">
46
- <element name="primary">
47
- <oneOrMore>
48
- <choice>
49
- <ref name="PureTextElement"/>
50
- <ref name="stem"/>
51
- </choice>
52
- </oneOrMore>
53
- </element>
54
- </define>
55
- <define name="index-secondary">
56
- <element name="secondary">
57
- <oneOrMore>
58
- <choice>
59
- <ref name="PureTextElement"/>
60
- <ref name="stem"/>
61
- </choice>
62
- </oneOrMore>
63
- </element>
64
- </define>
65
- <define name="index-tertiary">
66
- <element name="tertiary">
67
- <oneOrMore>
68
- <choice>
69
- <ref name="PureTextElement"/>
70
- <ref name="stem"/>
71
- </choice>
72
- </oneOrMore>
73
- </element>
74
- </define>
75
45
  <define name="review">
76
46
  <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
77
47
  the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
592
562
  </oneOrMore>
593
563
  </element>
594
564
  </define>
595
- <define name="sub">
596
- <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
597
- <element name="sub">
598
- <zeroOrMore>
599
- <choice>
600
- <ref name="PureTextElement"/>
601
- <ref name="stem"/>
602
- </choice>
603
- </zeroOrMore>
604
- </element>
605
- </define>
606
- <define name="sup">
607
- <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
608
- <element name="sup">
609
- <zeroOrMore>
610
- <choice>
611
- <ref name="PureTextElement"/>
612
- <ref name="stem"/>
613
- </choice>
614
- </zeroOrMore>
615
- </element>
616
- </define>
617
565
  <define name="pagebreak">
618
566
  <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
619
567
  <element name="pagebreak">
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
735
683
  <ref name="BlockAttributes"/>
736
684
  </define>
737
685
  <define name="TableAttributes" combine="interleave">
686
+ <optional>
687
+ <attribute name="plain">
688
+ <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
689
+ <data type="boolean"/>
690
+ </attribute>
691
+ </optional>
738
692
  <optional>
739
693
  <attribute name="width">
740
694
  <a:documentation>Width of the table block in rendering</a:documentation>
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
1088
1042
  <zeroOrMore>
1089
1043
  <choice>
1090
1044
  <ref name="PureTextElement"/>
1091
- <ref name="stem"/>
1092
1045
  <ref name="index"/>
1093
1046
  <ref name="index-xref"/>
1094
1047
  </choice>
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
1101
1054
  <zeroOrMore>
1102
1055
  <choice>
1103
1056
  <ref name="PureTextElement"/>
1104
- <ref name="stem"/>
1105
1057
  <ref name="index"/>
1106
1058
  <ref name="index-xref"/>
1107
1059
  </choice>
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
2019
1971
  <element name="name">
2020
1972
  <a:documentation>The symbolic form of the designation</a:documentation>
2021
1973
  <oneOrMore>
2022
- <choice>
2023
- <ref name="PureTextElement"/>
2024
- <ref name="stem"/>
2025
- </choice>
1974
+ <ref name="PureTextElement"/>
2026
1975
  </oneOrMore>
2027
1976
  </element>
2028
1977
  </element>
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
2075
2024
  <zeroOrMore>
2076
2025
  <choice>
2077
2026
  <ref name="PureTextElement"/>
2078
- <ref name="stem"/>
2079
2027
  <ref name="index"/>
2080
2028
  <ref name="index-xref"/>
2081
2029
  </choice>
data/lib/metanorma/ieee/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ieee
3
- VERSION = "1.5.0".freeze
3
+ VERSION = "1.5.2".freeze
4
4
  end
5
5
  end
data/metanorma-ieee.gemspec CHANGED
@@ -41,5 +41,5 @@ spec.add_development_dependency "rubocop-performance"
41
41
  spec.add_development_dependency "simplecov", "~> 0.15"
42
42
  spec.add_development_dependency "timecop", "~> 0.9"
43
43
  spec.add_development_dependency "webmock"
44
- spec.add_development_dependency "xml-c14n"
44
+ spec.add_development_dependency "canon"
45
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ieee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-07-05 00:00:00.000000000 Z
11
+ date: 2025-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -221,7 +221,7 @@ dependencies:
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
- name: xml-c14n
224
+ name: canon
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
227
  - - ">="