metanorma-ribose 2.7.4 → 2.7.6

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ribose/html/header.html +9 -9
  3. data/lib/isodoc/ribose/html/html_rsd_titlepage.html +3 -3
  4. data/lib/isodoc/ribose/html/word_rsd_titlepage.html +2 -2
  5. data/lib/isodoc/ribose/ribose.standard.xsl +320 -246
  6. data/lib/metanorma/ribose/biblio.rng +1 -1
  7. data/lib/metanorma/ribose/isodoc.rng +35 -10
  8. data/lib/metanorma/ribose/version.rb +1 -1
  9. data/metanorma-ribose.gemspec +1 -1
  10. data/metanorma.yml +2 -0
  11. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8c4cb0cfa512d21d60215aaddc28433aa82aca27b0b96c17284707e9115e4cff
4
- data.tar.gz: b2ddf087d596cbbb85793e2f2bdd4c5529900dbfdd463662c509b32ca405092c
3
+ metadata.gz: 38b190ae398a5e6724c9abc62418739045c05c00d5a5dcf1b9c1249077dd9885
4
+ data.tar.gz: 07f2118fd348f5a6adc2fe5f70f5be9aad98d965bbebabac624cfae45807be6a
5
5
  SHA512:
6
- metadata.gz: ed16916f277c36593b6755ec6541b44041f0444126308bab2bce1f014a283a607a3ec378f709504eeb4d9776430562c29c4fe39cceb25180e09d933b4efb8015
7
- data.tar.gz: e0840c816a8a940babff0100d620146fc371b1bf4a713324f304e070bb12b03af3bf927f867874bb5d4bb278c3690c28af75700f2f8d4c7700a52d1caa08084f
6
+ metadata.gz: b4204c8891cd12fc5a63dacc28eee280f9f2ee36a7ede9708fc04c0ce74277b162df90ede83d8e096dea1264bdf7d25e11fa7c31897040eb7db6ea65a19676c1
7
+ data.tar.gz: d70bb849797f7f7002f6e9a7840187e3d9b175960b77a2f93411df2f80fefd8341b92bbf25c42a0bc39d3cd6110b446c6c071e75fe7f4e4c4ea2810d14cafff5
data/lib/isodoc/ribose/html/header.html CHANGED
@@ -93,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
93
93
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
94
94
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
95
95
  style='mso-tab-count:1'>                                                                                                                                                                           </span>©
96
- {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
96
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
97
97
 
98
98
  </div>
99
99
 
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
129
129
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
130
130
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
131
131
  1'>                                                                                                                                                                           </span>©
132
- {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
132
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
133
133
  </div>
134
134
 
135
135
  <div style='mso-element:footer' id=ef2l>
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
144
144
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
145
145
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
146
146
  1'>                                                                                                                                                                           </span>©
147
- {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
147
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
148
148
  </div>
149
149
 
150
150
  <div style='mso-element:footer' id=f2>
151
151
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
152
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All
152
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
153
153
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
154
154
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
155
155
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
@@ -163,7 +163,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
163
163
 
164
164
  <div style='mso-element:footer' id=f2l>
165
165
  <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
166
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All
166
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
167
167
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
168
168
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
169
169
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
@@ -188,7 +188,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
188
188
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
189
189
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
190
190
  style='mso-tab-count:1'>                                                                                                                                                                           </span>©
191
- {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
191
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
192
192
  </div>
193
193
 
194
194
  <div style='mso-element:footer' id=ef3l>
@@ -204,12 +204,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
204
204
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
205
205
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
206
206
  style='mso-tab-count:1'>                                                                                                                                                                           </span>©
207
- {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
207
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
208
208
  </div>
209
209
 
210
210
  <div style='mso-element:footer' id=f3>
211
211
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
212
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All
212
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
213
213
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
214
214
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
215
215
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
@@ -224,7 +224,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
224
224
 
225
225
  <div style='mso-element:footer' id=f3l>
226
226
  <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
227
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ Publisher }}&nbsp;{{ docyear }}&nbsp;– All
227
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
228
228
  rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
229
229
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
230
230
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
data/lib/isodoc/ribose/html/html_rsd_titlepage.html CHANGED
@@ -3,7 +3,7 @@
3
3
  </div>
4
4
 
5
5
  <div class="document-type-band" id="{{ doctype | downcase | replace: ' ', '-' }}-band">
6
- <p class="document-type">Ribose {{ doctype }}</p>
6
+ <p class="document-type">{{ agency }} {{ doctype }}</p>
7
7
  </div>
8
8
 
9
9
 
@@ -28,7 +28,7 @@
28
28
  </div>
29
29
 
30
30
  <div class="coverpage-logo">
31
- <span>Ribose Group Inc. {{ docyear }}</span>
31
+ <span>{{ publisher }} {{ docyear }}</span>
32
32
  </div>
33
33
 
34
34
  <div class="coverpage-tc-name">
@@ -40,7 +40,7 @@
40
40
 
41
41
  <div class="WordSection11">
42
42
  <div class="coverpage-stage-block" >
43
- <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">Ribose {{ doctype }}</span>
43
+ <span class="coverpage-stage" id="{{ doctype | replace: ' ', '-' | downcase }}">{{ agency }} {{ doctype }}</span>
44
44
  </div>
45
45
 
46
46
  <div class="coverpage-stage-block" >
data/lib/isodoc/ribose/html/word_rsd_titlepage.html CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  {% if tc %}
4
4
  <p class="MsoNormal" align="right" style='text-align:right'><span
5
- style='mso-no-proof:yes'>Ribose&#xA0;{{ tc | join: "/" }}</span></p>
5
+ style='mso-no-proof:yes'>{{ agency }}&#xA0;{{ tc | join: "/" }}</span></p>
6
6
  {% endif %}
7
7
 
8
8
  <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
@@ -27,7 +27,7 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
27
27
 
28
28
  <p class="MsoNormal" align="center" style='text-align:center;border:none;
29
29
  mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
30
- lang="EN-GB" style='font-size:16.0pt'>Ribose {{ doctype }}</span></p>
30
+ lang="EN-GB" style='font-size:16.0pt'>{{ agency }} {{ doctype }}</span></p>
31
31
 
32
32
 
33
33
  {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
data/lib/isodoc/ribose/ribose.standard.xsl CHANGED
@@ -333,6 +333,8 @@
333
333
 
334
334
  <xsl:call-template name="cover-page"/>
335
335
 
336
+ <xsl:call-template name="inner-cover-page"/>
337
+
336
338
  <xsl:variable name="updated_xml">
337
339
  <xsl:call-template name="updateXML"/>
338
340
  <!-- <xsl:copy-of select="."/> -->
@@ -421,110 +423,120 @@
421
423
 
422
424
  <xsl:template name="cover-page">
423
425
  <!-- Cover Page -->
424
- <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
425
-
426
- <fo:flow flow-name="xsl-region-body" color="black">
427
- <!-- background image -->
428
- <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
429
- <fo:block>
430
- <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/> -->
431
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" height="{$pageHeight}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
432
- </fo:block>
433
- </fo:block-container>
426
+ <xsl:choose>
427
+ <xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
428
+ <xsl:call-template name="insertCoverPageFullImage"/>
429
+ </xsl:when>
430
+ <xsl:otherwise>
431
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
432
+
433
+ <fo:flow flow-name="xsl-region-body" color="black">
434
+ <!-- background image -->
435
+ <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
436
+ <fo:block>
437
+ <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/> -->
438
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Cover-Background))}" height="{$pageHeight}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
439
+ </fo:block>
440
+ </fo:block-container>
434
441
 
435
- <!-- Ribose logo -->
436
- <fo:block-container absolute-position="fixed" left="171mm" top="{$pageHeight - 33.4}mm" height="30mm" width="40mm" id="__internal_layout__logo_{generate-id()}"> <!-- top="246mm" -->
437
- <fo:block>
438
- <fo:instream-foreign-object content-width="32mm" fox:alt-text="Ribose Logo">
439
- <xsl:copy-of select="$Ribose-Logo"/>
440
- </fo:instream-foreign-object>
441
- </fo:block>
442
- </fo:block-container>
442
+ <!-- Ribose logo -->
443
+ <fo:block-container absolute-position="fixed" left="171mm" top="{$pageHeight - 33.4}mm" height="30mm" width="40mm" id="__internal_layout__logo_{generate-id()}"> <!-- top="246mm" -->
444
+ <fo:block>
445
+ <fo:instream-foreign-object content-width="32mm" fox:alt-text="Ribose Logo">
446
+ <xsl:copy-of select="$Ribose-Logo"/>
447
+ </fo:instream-foreign-object>
448
+ </fo:block>
449
+ </fo:block-container>
443
450
 
444
- <fo:block-container absolute-position="fixed" left="0mm" top="{$pageHeight - 52.4}mm" height="41mm" display-align="after"> <!-- top="227mm" -->
445
- <fo:block font-size="10pt" line-height="1.4">
446
- <fo:table table-layout="fixed" width="100%">
447
- <fo:table-column column-width="proportional-column-width(13)"/>
448
- <fo:table-column column-width="proportional-column-width(38)"/>
449
- <fo:table-column column-width="proportional-column-width(90)"/>
450
- <fo:table-column column-width="proportional-column-width(61)"/>
451
- <fo:table-column column-width="proportional-column-width(12)"/>
452
- <fo:table-body>
453
- <fo:table-row>
454
- <fo:table-cell><fo:block/></fo:table-cell>
455
- <fo:table-cell display-align="before" border-right="0.5pt solid black" padding-top="1.5mm" padding-right="5mm">
456
- <!-- Author's list -->
457
- <fo:block>
458
- <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='author']/mn:person/mn:name/mn:completename">
451
+ <fo:block-container absolute-position="fixed" left="0mm" top="{$pageHeight - 52.4}mm" height="41mm" display-align="after"> <!-- top="227mm" -->
452
+ <fo:block font-size="10pt" line-height="1.4">
453
+ <fo:table table-layout="fixed" width="100%">
454
+ <fo:table-column column-width="proportional-column-width(13)"/>
455
+ <fo:table-column column-width="proportional-column-width(38)"/>
456
+ <fo:table-column column-width="proportional-column-width(90)"/>
457
+ <fo:table-column column-width="proportional-column-width(61)"/>
458
+ <fo:table-column column-width="proportional-column-width(12)"/>
459
+ <fo:table-body>
460
+ <fo:table-row>
461
+ <fo:table-cell><fo:block/></fo:table-cell>
462
+ <fo:table-cell display-align="before" border-right="0.5pt solid black" padding-top="1.5mm" padding-right="5mm">
463
+ <!-- Author's list -->
459
464
  <fo:block>
460
- <xsl:apply-templates/>
465
+ <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='author']/mn:person/mn:name/mn:completename">
466
+ <fo:block>
467
+ <xsl:apply-templates/>
468
+ </fo:block>
469
+ </xsl:for-each>
461
470
  </fo:block>
462
- </xsl:for-each>
463
- </fo:block>
464
- </fo:table-cell>
465
- <fo:table-cell display-align="before" padding-top="1.5mm" padding-left="8mm">
466
- <fo:block>
467
- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:security"/>
468
- <fo:block>
469
- <xsl:call-template name="convertDate">
470
- <xsl:with-param name="date" select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/>
471
- <xsl:with-param name="format" select="'Month DD, YYYY'"/>
472
- </xsl:call-template>
473
- </fo:block>
474
- <fo:block><xsl:value-of select="$docnumber_version"/></fo:block>
475
- <!-- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/> -->
476
- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
477
- <fo:block>
478
- <xsl:text>© </xsl:text>
479
- <xsl:value-of select="$copyright_year"/>
480
- <xsl:text> </xsl:text>
481
- <xsl:variable name="publisher" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='publisher']/mn:organization/mn:name"/>
482
- <xsl:value-of select="$publisher"/>
483
- <xsl:if test="substring($publisher, string-length($publisher)) != '.'"><xsl:text>.</xsl:text></xsl:if>
484
- <xsl:text> </xsl:text>
485
- <xsl:call-template name="getLocalizedString">
486
- <xsl:with-param name="key">all_rights_reserved</xsl:with-param>
487
- </xsl:call-template>
488
- </fo:block>
489
- </fo:block>
490
- </fo:table-cell>
491
- <fo:table-cell display-align="after">
492
- <fo:block text-align="right">
493
- <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Ribose-Logo))}" width="32mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Ribose Logo"/> -->
494
- </fo:block>
495
- </fo:table-cell>
496
- <fo:table-cell><fo:block/></fo:table-cell>
497
- </fo:table-row>
498
- </fo:table-body>
499
- </fo:table>
500
- </fo:block>
501
- </fo:block-container>
471
+ </fo:table-cell>
472
+ <fo:table-cell display-align="before" padding-top="1.5mm" padding-left="8mm">
473
+ <fo:block>
474
+ <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:security"/>
475
+ <fo:block>
476
+ <xsl:call-template name="convertDate">
477
+ <xsl:with-param name="date" select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/>
478
+ <xsl:with-param name="format" select="'Month DD, YYYY'"/>
479
+ </xsl:call-template>
480
+ </fo:block>
481
+ <fo:block><xsl:value-of select="$docnumber_version"/></fo:block>
482
+ <!-- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/> -->
483
+ <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
484
+ <fo:block>
485
+ <xsl:text>© </xsl:text>
486
+ <xsl:value-of select="$copyright_year"/>
487
+ <xsl:text> </xsl:text>
488
+ <xsl:variable name="publisher" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='publisher']/mn:organization/mn:name"/>
489
+ <xsl:value-of select="$publisher"/>
490
+ <xsl:if test="substring($publisher, string-length($publisher)) != '.'"><xsl:text>.</xsl:text></xsl:if>
491
+ <xsl:text> </xsl:text>
492
+ <xsl:call-template name="getLocalizedString">
493
+ <xsl:with-param name="key">all_rights_reserved</xsl:with-param>
494
+ </xsl:call-template>
495
+ </fo:block>
496
+ </fo:block>
497
+ </fo:table-cell>
498
+ <fo:table-cell display-align="after">
499
+ <fo:block text-align="right">
500
+ <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Ribose-Logo))}" width="32mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Ribose Logo"/> -->
501
+ </fo:block>
502
+ </fo:table-cell>
503
+ <fo:table-cell><fo:block/></fo:table-cell>
504
+ </fo:table-row>
505
+ </fo:table-body>
506
+ </fo:table>
507
+ </fo:block>
508
+ </fo:block-container>
502
509
 
503
- <!-- title and version -->
504
- <fo:block-container margin-top="{$pageHeight - 279.4}mm" height="60mm" display-align="center">
505
- <xsl:variable name="title" select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang]"/>
506
- <xsl:if test="string-length($title) &gt; 80">
507
- <xsl:attribute name="margin-right">-30mm</xsl:attribute>
508
- </xsl:if>
510
+ <!-- title and version -->
511
+ <fo:block-container margin-top="{$pageHeight - 279.4}mm" height="60mm" display-align="center">
512
+ <xsl:variable name="title" select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang]"/>
513
+ <xsl:if test="string-length($title) &gt; 80">
514
+ <xsl:attribute name="margin-right">-30mm</xsl:attribute>
515
+ </xsl:if>
509
516
 
510
- <xsl:variable name="titles">
511
- <xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and (@type = 'intro' or not(@type))]"/>
512
- <xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'main'][last()]"/>
513
- </xsl:variable>
514
- <xsl:for-each select="xalan:nodeset($titles)/mn:title">
515
- <fo:block font-size="27pt" font-weight="bold" role="H1">
516
- <xsl:apply-templates/><xsl:if test="position() != last()"><xsl:value-of select="$nonbreak_space_em_dash"/></xsl:if>
517
- </fo:block>
518
- </xsl:for-each>
517
+ <xsl:variable name="titles">
518
+ <xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and (@type = 'intro' or not(@type))]"/>
519
+ <xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'main'][last()]"/>
520
+ </xsl:variable>
521
+ <xsl:for-each select="xalan:nodeset($titles)/mn:title">
522
+ <fo:block font-size="27pt" font-weight="bold" role="H1">
523
+ <xsl:apply-templates/><xsl:if test="position() != last()"><xsl:value-of select="$nonbreak_space_em_dash"/></xsl:if>
524
+ </fo:block>
525
+ </xsl:for-each>
519
526
 
520
- <fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
521
- <xsl:value-of select="$docnumber_version"/>
522
- </fo:block>
523
- </fo:block-container>
524
- </fo:flow>
525
- </fo:page-sequence>
527
+ <fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
528
+ <xsl:value-of select="$docnumber_version"/>
529
+ </fo:block>
530
+ </fo:block-container>
531
+ </fo:flow>
532
+ </fo:page-sequence>
533
+ </xsl:otherwise>
534
+ </xsl:choose>
526
535
  </xsl:template> <!-- END: cover-page -->
527
536
 
537
+ <xsl:template name="inner-cover-page">
538
+ </xsl:template>
539
+
528
540
  <xsl:template name="back-page">
529
541
  </xsl:template>
530
542
 
@@ -615,6 +627,8 @@
615
627
  </fo:block>
616
628
  </xsl:template>
617
629
 
630
+ <xsl:variable name="toc_item_indent">7</xsl:variable>
631
+
618
632
  <xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="3">
619
633
  <fo:block role="SKIP">
620
634
  <xsl:apply-templates/>
@@ -801,9 +815,11 @@
801
815
  <!-- <xsl:when test="ancestor::mn:preface and $level &gt;= 2">12pt</xsl:when>
802
816
  <xsl:when test="ancestor::mn:preface">13pt</xsl:when> -->
803
817
  <xsl:when test="$level = 1">22pt</xsl:when>
804
- <xsl:when test="$level = 2">13pt</xsl:when>
818
+ <!-- <xsl:when test="$level = 2">13pt</xsl:when>
805
819
  <xsl:when test="$level &gt;= 3">11pt</xsl:when>
806
- <xsl:otherwise>16pt</xsl:otherwise>
820
+ <xsl:otherwise>16pt</xsl:otherwise> -->
821
+ <xsl:when test="$level &gt;= 2">13pt</xsl:when>
822
+ <xsl:otherwise>13pt</xsl:otherwise>
807
823
  </xsl:choose>
808
824
  </xsl:variable>
809
825
 
@@ -1004,15 +1020,17 @@
1004
1020
 
1005
1021
  <xsl:template match="mn:fmt-preferred | mn:fmt-deprecates | mn:fmt-admitted" priority="2">
1006
1022
 
1007
- <fo:block xsl:use-attribute-sets="preferred-style">
1008
- <xsl:call-template name="refine_preferred-style"/>
1023
+ <fo:block xsl:use-attribute-sets="term-preferred-block-style">
1024
+ <xsl:call-template name="refine_term-preferred-block-style"/>
1009
1025
  <xsl:if test="preceding-sibling::*[1][self::mn:fmt-name]">
1010
- <fo:inline padding-right="1mm">
1026
+ <fo:inline xsl:use-attribute-sets="term-number-style">
1027
+ <xsl:call-template name="refine_term-number-style"/>
1028
+
1011
1029
  <xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
1012
1030
  </fo:inline>
1013
1031
  </xsl:if>
1014
1032
 
1015
- <fo:inline padding-right="4mm"><xsl:if test="self::mn:fmt-preferred"><xsl:call-template name="refine_preferred-term-style"/></xsl:if><xsl:apply-templates/></fo:inline>
1033
+ <fo:inline xsl:use-attribute-sets="term-preferred-style"><xsl:call-template name="refine_term-preferred-style"/><xsl:apply-templates/></fo:inline>
1016
1034
 
1017
1035
  <xsl:variable name="term_kind">
1018
1036
  <xsl:choose>
@@ -1095,6 +1113,31 @@
1095
1113
  </xsl:choose>
1096
1114
  </xsl:template>
1097
1115
 
1116
+ <xsl:template match="*[local-name() = 'td']//text() | *[local-name() = 'th']//text()" priority="3">
1117
+ <xsl:variable name="content">
1118
+ <xsl:choose>
1119
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
1120
+ <!-- url -->
1121
+ <xsl:call-template name="add-zero-spaces-link-java"/>
1122
+ </xsl:when>
1123
+ <xsl:otherwise>
1124
+ <xsl:call-template name="add-zero-spaces-java"/>
1125
+ </xsl:otherwise>
1126
+ </xsl:choose>
1127
+ </xsl:variable>
1128
+
1129
+ <!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
1130
+ <xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1​$2$3')"/>
1131
+
1132
+ <!-- add zero-width space (#x200B) before character '(' if preceding and following are word chars -->
1133
+ <xsl:variable name="content3" select="java:replaceAll(java:java.lang.String.new($content2), '(\w)(\()(\w)', '$1​$2$3')"/>
1134
+
1135
+ <!-- replace sequence #x200B to one &#x200B -->
1136
+ <xsl:variable name="content4" select="java:replaceAll(java:java.lang.String.new($content3), '\u200b{2,}', '​')"/>
1137
+
1138
+ <xsl:value-of select="$content4"/>
1139
+ </xsl:template>
1140
+
1098
1141
  <xsl:template match="mn:clause" priority="2">
1099
1142
  <fo:block-container xsl:use-attribute-sets="clause-style">
1100
1143
  <xsl:call-template name="refine_clause-style"/>
@@ -1113,13 +1156,20 @@
1113
1156
  <xsl:template name="insertHeaderFooter">
1114
1157
  <xsl:param name="section"/>
1115
1158
 
1116
- <xsl:call-template name="insertHoneycomb">
1159
+ <xsl:call-template name="insertHeader">
1117
1160
  <xsl:with-param name="section" select="$section"/>
1118
1161
  </xsl:call-template>
1119
1162
 
1120
1163
  <xsl:call-template name="insertFooter"/>
1121
1164
  </xsl:template>
1122
1165
 
1166
+ <xsl:template name="insertHeader">
1167
+ <xsl:param name="section"/>
1168
+ <xsl:call-template name="insertHoneycomb">
1169
+ <xsl:with-param name="section" select="$section"/>
1170
+ </xsl:call-template>
1171
+ </xsl:template>
1172
+
1123
1173
  <xsl:template name="insertHoneycomb">
1124
1174
  <xsl:param name="section"/>
1125
1175
  <!-- LT - left top -->
@@ -2301,10 +2351,20 @@
2301
2351
 
2302
2352
  <xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
2303
2353
 
2304
- <xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1">
2305
- <xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
2306
- <xsl:value-of select="."/>
2307
- </xsl:element>
2354
+ <xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1"> <!-- https://github.com/metanorma/metanorma-ribose/issues/421 -->
2355
+ <xsl:choose>
2356
+ <!-- commented (ancestor::mn:td or ancestor::mn:th) and
2357
+ for https://github.com/metanorma/metanorma-taste/issues/24#issuecomment-3302963697 -->
2358
+ <xsl:when test="normalize-space(java:matches(java:java.lang.String.new(.), '^(http://|https://|www\.)?(.*)')) = 'true'">
2359
+ <xsl:value-of select="."/>
2360
+ </xsl:when>
2361
+ <xsl:otherwise>
2362
+ <xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
2363
+ <xsl:value-of select="."/>
2364
+ </xsl:element>
2365
+ </xsl:otherwise>
2366
+ </xsl:choose>
2367
+
2308
2368
  </xsl:template>
2309
2369
 
2310
2370
  <xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
@@ -2979,7 +3039,6 @@
2979
3039
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
2980
3040
 
2981
3041
  <xsl:template name="refine_feedback-statement-title-style">
2982
-
2983
3042
  </xsl:template>
2984
3043
 
2985
3044
  <xsl:attribute-set name="feedback-statement-p-style">
@@ -3274,7 +3333,7 @@
3274
3333
  <xsl:attribute name="text-align">center</xsl:attribute>
3275
3334
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3276
3335
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3277
- <xsl:attribute name="font-size">13pt</xsl:attribute>
3336
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
3278
3337
  <xsl:attribute name="font-weight">300</xsl:attribute>
3279
3338
  <xsl:attribute name="color">black</xsl:attribute>
3280
3339
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -3336,7 +3395,8 @@
3336
3395
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
3337
3396
  <xsl:variable name="_font-size"><!-- inherit -->
3338
3397
  <xsl:choose>
3339
- <xsl:when test="ancestor::mn:table[not(parent::mn:sourcecode[@linenums = 'true'])]">inherit</xsl:when>
3398
+ <!-- <xsl:when test="ancestor::mn:table[not(parent::mn:sourcecode[@linenums = 'true'])]">inherit</xsl:when> -->
3399
+ <xsl:when test="ancestor::mn:table">95%</xsl:when>
3340
3400
  <xsl:otherwise>95%</xsl:otherwise><!-- 110% -->
3341
3401
  </xsl:choose>
3342
3402
  </xsl:variable>
@@ -3766,7 +3826,7 @@
3766
3826
  <xsl:template name="refine_tt-style">
3767
3827
  <xsl:variable name="_font-size"> <!-- inherit -->
3768
3828
  <xsl:choose>
3769
- <xsl:when test="ancestor::mn:table">inherit</xsl:when>
3829
+ <xsl:when test="ancestor::mn:table">95%</xsl:when> <!-- 95% in https://github.com/metanorma/metanorma-ribose/issues/421, was inherit -->
3770
3830
  <xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
3771
3831
  </xsl:choose>
3772
3832
  </xsl:variable>
@@ -4666,21 +4726,22 @@
4666
4726
  <xsl:template name="refine_term-style">
4667
4727
  </xsl:template>
4668
4728
 
4669
- <xsl:attribute-set name="term-name-style">
4729
+ <xsl:attribute-set name="term-number-style">
4670
4730
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4671
4731
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4732
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
4672
4733
  </xsl:attribute-set> <!-- term-name-style -->
4673
4734
 
4674
- <xsl:template name="refine_term-name-style">
4735
+ <xsl:template name="refine_term-number-style">
4675
4736
  </xsl:template>
4676
4737
 
4677
- <xsl:attribute-set name="preferred-style">
4738
+ <xsl:attribute-set name="term-preferred-block-style">
4678
4739
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4679
4740
  <xsl:attribute name="color">black</xsl:attribute>
4680
4741
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4681
- </xsl:attribute-set> <!-- preferred-style -->
4742
+ </xsl:attribute-set> <!-- preferred-block-style -->
4682
4743
 
4683
- <xsl:template name="refine_preferred-style">
4744
+ <xsl:template name="refine_term-preferred-block-style">
4684
4745
  <xsl:variable name="level">
4685
4746
  <xsl:call-template name="getLevel"/>
4686
4747
  </xsl:variable>
@@ -4700,78 +4761,75 @@
4700
4761
  </xsl:if>
4701
4762
  </xsl:template>
4702
4763
 
4703
- <xsl:attribute-set name="preferred-block-style">
4704
- </xsl:attribute-set> <!-- preferred-block-style -->
4705
-
4706
- <xsl:template name="refine_preferred-block-style">
4707
- </xsl:template>
4708
-
4709
- <xsl:attribute-set name="preferred-term-style">
4764
+ <xsl:attribute-set name="term-preferred-style">
4710
4765
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4711
4766
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4767
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
4712
4768
  </xsl:attribute-set> <!-- preferred-term-style -->
4713
4769
 
4714
- <xsl:template name="refine_preferred-term-style">
4715
- <xsl:attribute name="font-weight">normal</xsl:attribute>
4716
- <xsl:attribute name="color">black</xsl:attribute>
4770
+ <xsl:template name="refine_term-preferred-style">
4771
+ <xsl:if test="self::mn:fmt-preferred">
4772
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
4773
+ <xsl:attribute name="color">black</xsl:attribute>
4774
+ </xsl:if>
4717
4775
 
4718
4776
  </xsl:template>
4719
4777
 
4720
- <xsl:attribute-set name="domain-style">
4721
- </xsl:attribute-set> <!-- domain-style -->
4778
+ <xsl:attribute-set name="term-domain-style">
4779
+ </xsl:attribute-set> <!-- term-domain-style -->
4722
4780
 
4723
- <xsl:template name="refine_domain-style">
4781
+ <xsl:template name="refine_term-domain-style">
4724
4782
  </xsl:template>
4725
4783
 
4726
- <xsl:attribute-set name="admitted-style">
4784
+ <xsl:attribute-set name="term-admitted-style">
4727
4785
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4728
4786
  <xsl:attribute name="color">black</xsl:attribute>
4729
- </xsl:attribute-set> <!-- admitted-style -->
4787
+ </xsl:attribute-set> <!-- term-admitted-style -->
4730
4788
 
4731
- <xsl:template name="refine_admitted-style">
4789
+ <xsl:template name="refine_term-admitted-style">
4732
4790
  </xsl:template>
4733
4791
 
4734
- <xsl:attribute-set name="deprecates-style">
4792
+ <xsl:attribute-set name="term-deprecates-style">
4735
4793
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4736
4794
  <xsl:attribute name="color">black</xsl:attribute>
4737
- </xsl:attribute-set> <!-- deprecates-style -->
4795
+ </xsl:attribute-set> <!-- term-deprecates-style -->
4738
4796
 
4739
- <xsl:template name="refine_deprecates-style">
4797
+ <xsl:template name="refine_term-deprecates-style">
4740
4798
  </xsl:template>
4741
4799
 
4742
- <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
4800
+ <xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
4743
4801
  </xsl:attribute-set>
4744
4802
 
4745
- <xsl:template name="refine_related-block-style">
4803
+ <xsl:template name="refine_term-related-block-style">
4746
4804
  </xsl:template>
4747
4805
 
4748
- <xsl:attribute-set name="definition-style">
4806
+ <xsl:attribute-set name="term-definition-style">
4749
4807
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
4750
4808
  <xsl:attribute name="space-before">12pt</xsl:attribute>
4751
4809
  <xsl:attribute name="space-after">6pt</xsl:attribute>
4752
- </xsl:attribute-set> <!-- definition-style -->
4810
+ </xsl:attribute-set> <!-- term-definition-style -->
4753
4811
 
4754
- <xsl:template name="refine_definition-style">
4812
+ <xsl:template name="refine_term-definition-style">
4755
4813
  </xsl:template>
4756
4814
 
4757
- <xsl:attribute-set name="termsource-style">
4815
+ <xsl:attribute-set name="term-termsource-style">
4758
4816
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
4759
- </xsl:attribute-set> <!-- termsource-style -->
4817
+ </xsl:attribute-set> <!-- term-termsource-style -->
4760
4818
 
4761
- <xsl:template name="refine_termsource-style">
4762
- </xsl:template> <!-- refine_termsource-style -->
4819
+ <xsl:template name="refine_term-termsource-style">
4820
+ </xsl:template> <!-- refine_term-termsource-style -->
4763
4821
 
4764
- <xsl:attribute-set name="termsource-text-style">
4822
+ <xsl:attribute-set name="term-termsource-text-style">
4765
4823
  <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4766
- </xsl:attribute-set> <!-- termsource-text-style -->
4824
+ </xsl:attribute-set> <!-- term-termsource-text-style -->
4767
4825
 
4768
- <xsl:template name="refine_termsource-text-style">
4826
+ <xsl:template name="refine_term-termsource-text-style">
4769
4827
  </xsl:template>
4770
4828
 
4771
- <xsl:attribute-set name="origin-style">
4772
- </xsl:attribute-set> <!-- origin-style -->
4829
+ <xsl:attribute-set name="term-origin-style">
4830
+ </xsl:attribute-set> <!-- term-origin-style -->
4773
4831
 
4774
- <xsl:template name="refine_origin-style">
4832
+ <xsl:template name="refine_term-origin-style">
4775
4833
  </xsl:template>
4776
4834
 
4777
4835
  <!-- ====== -->
@@ -4815,9 +4873,9 @@
4815
4873
  <!-- modification -->
4816
4874
  <!-- ====== -->
4817
4875
  <xsl:template match="mn:fmt-termsource" name="termsource">
4818
- <fo:block xsl:use-attribute-sets="termsource-style">
4876
+ <fo:block xsl:use-attribute-sets="term-termsource-style">
4819
4877
 
4820
- <xsl:call-template name="refine_termsource-style"/>
4878
+ <xsl:call-template name="refine_term-termsource-style"/>
4821
4879
 
4822
4880
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4823
4881
  <xsl:variable name="termsource_text">
@@ -4865,8 +4923,8 @@
4865
4923
 
4866
4924
  <!-- text SOURCE: -->
4867
4925
  <xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
4868
- <fo:inline xsl:use-attribute-sets="termsource-text-style">
4869
- <xsl:call-template name="refine_termsource-text-style"/>
4926
+ <fo:inline xsl:use-attribute-sets="term-termsource-text-style">
4927
+ <xsl:call-template name="refine_term-termsource-text-style"/>
4870
4928
  <xsl:value-of select="."/>
4871
4929
  </fo:inline>
4872
4930
  </xsl:template>
@@ -4878,8 +4936,8 @@
4878
4936
  <xsl:if test="normalize-space(@citeas) = ''">
4879
4937
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
4880
4938
  </xsl:if>
4881
- <fo:inline xsl:use-attribute-sets="origin-style">
4882
- <xsl:call-template name="refine_origin-style"/>
4939
+ <fo:inline xsl:use-attribute-sets="term-origin-style">
4940
+ <xsl:call-template name="refine_term-origin-style"/>
4883
4941
  <xsl:apply-templates/>
4884
4942
  </fo:inline>
4885
4943
  </fo:basic-link>
@@ -4927,14 +4985,14 @@
4927
4985
  <xsl:variable name="levelTerm">
4928
4986
  <xsl:call-template name="getLevelTermName"/>
4929
4987
  </xsl:variable>
4930
- <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
4988
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
4931
4989
 
4932
- <xsl:call-template name="refine_preferred-block-style"/>
4990
+ <xsl:call-template name="refine_term-preferred-block-style"/>
4933
4991
 
4934
4992
  <xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
4935
4993
 
4936
- <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
4937
- <xsl:call-template name="refine_term-name-style"/>
4994
+ <fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
4995
+ <xsl:call-template name="refine_term-number-style"/>
4938
4996
 
4939
4997
  <xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
4940
4998
  <xsl:call-template name="setIDforNamedDestination"/>
@@ -4944,8 +5002,8 @@
4944
5002
  </fo:block>
4945
5003
  </xsl:if>
4946
5004
 
4947
- <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
4948
- <xsl:call-template name="refine_preferred-term-style"/>
5005
+ <fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
5006
+ <xsl:call-template name="refine_term-preferred-style"/>
4949
5007
 
4950
5008
  <xsl:apply-templates/>
4951
5009
  </fo:block>
@@ -4965,15 +5023,15 @@
4965
5023
  <xsl:template match="mn:domain"/>
4966
5024
 
4967
5025
  <xsl:template match="mn:fmt-admitted">
4968
- <fo:block xsl:use-attribute-sets="admitted-style">
4969
- <xsl:call-template name="refine_admitted-style"/>
5026
+ <fo:block xsl:use-attribute-sets="term-admitted-style">
5027
+ <xsl:call-template name="refine_term-admitted-style"/>
4970
5028
  <xsl:apply-templates/>
4971
5029
  </fo:block>
4972
5030
  </xsl:template>
4973
5031
 
4974
5032
  <xsl:template match="mn:fmt-deprecates">
4975
- <fo:block xsl:use-attribute-sets="deprecates-style">
4976
- <xsl:call-template name="refine_deprecates-style"/>
5033
+ <fo:block xsl:use-attribute-sets="term-deprecates-style">
5034
+ <xsl:call-template name="refine_term-deprecates-style"/>
4977
5035
  <xsl:apply-templates/>
4978
5036
  </fo:block>
4979
5037
  </xsl:template>
@@ -4986,8 +5044,8 @@
4986
5044
  <!-- End Preferred, admitted, deprecated -->
4987
5045
 
4988
5046
  <xsl:template match="mn:fmt-related">
4989
- <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
4990
- <xsl:call-template name="refine_related-block-style"/>
5047
+ <fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
5048
+ <xsl:call-template name="refine_term-related-block-style"/>
4991
5049
  <xsl:apply-templates/>
4992
5050
  </fo:block>
4993
5051
  </xsl:template>
@@ -5001,8 +5059,8 @@
5001
5059
  <!-- definition -->
5002
5060
  <!-- ========== -->
5003
5061
  <xsl:template match="mn:fmt-definition">
5004
- <fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
5005
- <xsl:call-template name="refine_definition-style"/>
5062
+ <fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
5063
+ <xsl:call-template name="refine_term-definition-style"/>
5006
5064
  <xsl:apply-templates/>
5007
5065
  </fo:block>
5008
5066
  </xsl:template>
@@ -5361,7 +5419,7 @@
5361
5419
  <xsl:attribute-set name="table-name-style">
5362
5420
  <xsl:attribute name="role">Caption</xsl:attribute>
5363
5421
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5364
- <xsl:attribute name="font-size">13pt</xsl:attribute>
5422
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
5365
5423
  <xsl:attribute name="font-weight">300</xsl:attribute>
5366
5424
  <xsl:attribute name="color">black</xsl:attribute>
5367
5425
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -8856,16 +8914,23 @@
8856
8914
  </xsl:attribute-set> <!-- quote-style -->
8857
8915
 
8858
8916
  <xsl:template name="refine_quote-style">
8859
- </xsl:template>
8917
+ </xsl:template> <!-- refine_quote-style -->
8860
8918
 
8861
8919
  <xsl:attribute-set name="quote-source-style">
8862
8920
  <xsl:attribute name="text-align">right</xsl:attribute>
8863
8921
  <xsl:attribute name="margin-right">25mm</xsl:attribute>
8864
- </xsl:attribute-set>
8922
+ </xsl:attribute-set> <!-- quote-source-style -->
8865
8923
 
8866
8924
  <xsl:template name="refine_quote-source-style">
8867
8925
  </xsl:template>
8868
8926
 
8927
+ <xsl:attribute-set name="source-style">
8928
+ </xsl:attribute-set> <!-- source-style -->
8929
+
8930
+ <xsl:template name="refine_source-style">
8931
+
8932
+ </xsl:template> <!-- refine_source-style -->
8933
+
8869
8934
  <!-- ====== -->
8870
8935
  <!-- quote -->
8871
8936
  <!-- source -->
@@ -8913,7 +8978,9 @@
8913
8978
  </xsl:if>
8914
8979
  <xsl:choose>
8915
8980
  <xsl:when test="not(parent::quote)">
8916
- <fo:block>
8981
+ <fo:block xsl:use-attribute-sets="source-style">
8982
+ <xsl:call-template name="refine_source-style"/>
8983
+
8917
8984
  <xsl:call-template name="insert_basic_link">
8918
8985
  <xsl:with-param name="element">
8919
8986
  <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -8979,7 +9046,7 @@
8979
9046
 
8980
9047
  <xsl:attribute-set name="figure-name-style">
8981
9048
  <xsl:attribute name="role">Caption</xsl:attribute>
8982
- <xsl:attribute name="font-size">13pt</xsl:attribute>
9049
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
8983
9050
  <xsl:attribute name="font-weight">300</xsl:attribute>
8984
9051
  <xsl:attribute name="color">black</xsl:attribute>
8985
9052
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -11027,7 +11094,7 @@
11027
11094
 
11028
11095
  <xsl:template name="refine_fn-reference-style">
11029
11096
  <!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
11030
- <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
11097
+ <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
11031
11098
  </xsl:template> <!-- refine_fn-reference-style -->
11032
11099
 
11033
11100
  <xsl:attribute-set name="fn-style">
@@ -11038,6 +11105,7 @@
11038
11105
  </xsl:template>
11039
11106
 
11040
11107
  <xsl:attribute-set name="fn-num-style">
11108
+ <xsl:attribute name="role">Reference</xsl:attribute>
11041
11109
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
11042
11110
  <xsl:attribute name="font-size">65%</xsl:attribute>
11043
11111
  <xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -11113,33 +11181,16 @@
11113
11181
  <xsl:variable name="ref_id" select="@target"/>
11114
11182
 
11115
11183
  <xsl:variable name="footnote_inline">
11116
- <fo:inline role="Reference">
11184
+ <fo:inline xsl:use-attribute-sets="fn-num-style">
11117
11185
 
11118
- <xsl:variable name="fn_styles">
11119
- <xsl:choose>
11120
- <xsl:when test="ancestor::mn:bibitem">
11121
- <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
11122
- <xsl:call-template name="refine_bibitem-note-fn-style"/>
11123
- </fn_styles>
11124
- </xsl:when>
11125
- <xsl:otherwise>
11126
- <fn_styles xsl:use-attribute-sets="fn-num-style">
11127
- <xsl:call-template name="refine_fn-num-style"/>
11128
- </fn_styles>
11129
- </xsl:otherwise>
11130
- </xsl:choose>
11131
- </xsl:variable>
11132
-
11133
- <xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
11134
- <xsl:copy-of select="."/>
11135
- </xsl:for-each>
11186
+ <xsl:call-template name="refine_fn-num-style"/>
11136
11187
 
11137
11188
  <!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
11138
11189
  <!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
11139
11190
  <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
11140
11191
  </xsl:if> -->
11141
11192
 
11142
- <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
11193
+ <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
11143
11194
 
11144
11195
  <xsl:call-template name="insert_basic_link">
11145
11196
  <xsl:with-param name="element">
@@ -11435,25 +11486,41 @@
11435
11486
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
11436
11487
 
11437
11488
  <xsl:template name="refine_bibitem-non-normative-list-style">
11438
- <xsl:variable name="last_bibitem_bibliotag">
11439
- <xsl:apply-templates select="following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag">
11440
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11441
- </xsl:apply-templates>
11442
- <xsl:if test="not(following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag)">
11443
- <xsl:apply-templates select="mn:biblio-tag">
11444
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11445
- </xsl:apply-templates>
11489
+ <xsl:variable name="bibitems_bibliotag_num_only">
11490
+ <xsl:for-each select="following-sibling::mn:bibitem[not(@hidden='true')]/mn:biblio-tag">
11491
+ <xsl:copy>
11492
+ <xsl:apply-templates select=".">
11493
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11494
+ </xsl:apply-templates>
11495
+ </xsl:copy>
11496
+ </xsl:for-each>
11497
+ </xsl:variable>
11498
+ <xsl:variable name="bibitems_bibliotag">
11499
+ <xsl:copy-of select="xalan:nodeset($bibitems_bibliotag_num_only)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = '']"/>
11500
+ <xsl:if test="not(xalan:nodeset($bibitems_bibliotag_num_only)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = ''])">
11501
+ <mn:biblio-tag>
11502
+ <xsl:apply-templates select="mn:biblio-tag">
11503
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11504
+ </xsl:apply-templates>
11505
+ </mn:biblio-tag>
11446
11506
  </xsl:if>
11447
11507
  </xsl:variable>
11508
+ <!-- <xsl:copy-of select="$bibitems_bibliotag"/> -->
11509
+ <xsl:variable name="last_bibitem_bibliotag" select="xalan:nodeset($bibitems_bibliotag)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = ''][last()]"/>
11448
11510
  <xsl:variable name="last_bibitem_bibliotag_number_length" select="string-length(translate($last_bibitem_bibliotag, '[] ', ''))"/>
11449
11511
  <xsl:if test="$last_bibitem_bibliotag_number_length &gt; 1">
11450
11512
  <xsl:attribute name="provisional-distance-between-starts">
11513
+ <!-- if biblio-tag is number, i.e. [1], [10] -->
11451
11514
  <xsl:choose>
11452
11515
  <xsl:when test="$last_bibitem_bibliotag_number_length = 2">9.2mm</xsl:when>
11453
11516
  <xsl:when test="$last_bibitem_bibliotag_number_length &gt;= 3">11mm</xsl:when>
11454
11517
  </xsl:choose>
11455
11518
  </xsl:attribute>
11456
11519
  </xsl:if>
11520
+ <xsl:if test="$last_bibitem_bibliotag_number_length = 0">
11521
+ <!-- <biblio-tag>[PDF Declarations]</biblio-tag> -->
11522
+ <xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
11523
+ </xsl:if>
11457
11524
  </xsl:template>
11458
11525
 
11459
11526
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
@@ -11477,31 +11544,6 @@
11477
11544
  <xsl:template name="refine_bibitem-non-normative-list-body-style">
11478
11545
  </xsl:template>
11479
11546
 
11480
- <!-- footnote reference number for bibitem, in the text -->
11481
- <xsl:attribute-set name="bibitem-note-fn-style">
11482
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
11483
- <xsl:attribute name="font-size">65%</xsl:attribute>
11484
- <xsl:attribute name="vertical-align">super</xsl:attribute>
11485
- </xsl:attribute-set> <!-- bibitem-note-fn-style -->
11486
-
11487
- <xsl:template name="refine_bibitem-note-fn-style">
11488
- </xsl:template>
11489
-
11490
- <!-- footnote number on the page bottom -->
11491
- <xsl:attribute-set name="bibitem-note-fn-number-style">
11492
- <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
11493
- <xsl:attribute name="font-size">60%</xsl:attribute>
11494
- <xsl:attribute name="vertical-align">super</xsl:attribute>
11495
- </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
11496
-
11497
- <!-- footnote body (text) on the page bottom -->
11498
- <xsl:attribute-set name="bibitem-note-fn-body-style">
11499
- <xsl:attribute name="font-size">10pt</xsl:attribute>
11500
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
11501
- <xsl:attribute name="start-indent">0pt</xsl:attribute>
11502
- <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
11503
- </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
11504
-
11505
11547
  <xsl:attribute-set name="references-non-normative-style">
11506
11548
  </xsl:attribute-set> <!-- references-non-normative-style -->
11507
11549
 
@@ -11577,16 +11619,31 @@
11577
11619
  <!-- continue from <xsl:template match="mn:references[not(@normative='true')]" priority="3"> -->
11578
11620
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11579
11621
  <xsl:call-template name="refine_bibitem-non-normative-list-style"/>
11622
+ <xsl:variable name="biblio_tag_first_part">
11623
+ <xsl:apply-templates select="mn:biblio-tag">
11624
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11625
+ </xsl:apply-templates>
11626
+ </xsl:variable>
11580
11627
  <fo:list-item>
11581
11628
  <fo:list-item-label end-indent="label-end()">
11582
11629
  <fo:block role="SKIP">
11583
- <xsl:apply-templates select="mn:biblio-tag">
11584
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11585
- </xsl:apply-templates>
11630
+ <!-- if biblio-tag is number -->
11631
+ <xsl:if test="normalize-space(translate($biblio_tag_first_part, '[] 1234567890', '')) = ''">
11632
+ <xsl:value-of select="$biblio_tag_first_part"/>
11633
+ </xsl:if>
11586
11634
  </fo:block>
11587
11635
  </fo:list-item-label>
11588
11636
  <fo:list-item-body start-indent="body-start()">
11589
11637
  <fo:block>
11638
+ <!-- if biblio-tag isn't number -->
11639
+ <xsl:if test="normalize-space(translate($biblio_tag_first_part, '[] 1234567890', '')) != ''">
11640
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
11641
+ <xsl:attribute name="text-indent">-8mm</xsl:attribute>
11642
+ <xsl:if test="not(contains($biblio_tag_first_part, '['))">[</xsl:if>
11643
+ <xsl:value-of select="$biblio_tag_first_part"/>
11644
+ <xsl:if test="not(contains($biblio_tag_first_part, '['))">]</xsl:if>
11645
+ <xsl:text> </xsl:text>
11646
+ </xsl:if>
11590
11647
  <xsl:apply-templates select="mn:biblio-tag">
11591
11648
  <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11592
11649
  </xsl:apply-templates>
@@ -12232,7 +12289,7 @@
12232
12289
  <!-- =================== -->
12233
12290
 
12234
12291
  <xsl:attribute-set name="toc-style">
12235
- <xsl:attribute name="margin-left">32mm</xsl:attribute>
12292
+ <xsl:attribute name="margin-left">10mm</xsl:attribute> <!-- 32mm -->
12236
12293
  <xsl:attribute name="margin-right">-17mm</xsl:attribute>
12237
12294
  <xsl:attribute name="role">TOC</xsl:attribute>
12238
12295
  </xsl:attribute-set>
@@ -12242,7 +12299,7 @@
12242
12299
 
12243
12300
  <xsl:attribute-set name="toc-title-style">
12244
12301
  <xsl:attribute name="role">H1</xsl:attribute>
12245
- <xsl:attribute name="font-size">27pt</xsl:attribute>
12302
+ <xsl:attribute name="font-size">22pt</xsl:attribute> <!-- 27pt -->
12246
12303
  <xsl:attribute name="font-weight">bold</xsl:attribute>
12247
12304
  <xsl:attribute name="color">black</xsl:attribute>
12248
12305
  <xsl:attribute name="margin-left">-15mm</xsl:attribute>
@@ -12266,7 +12323,7 @@
12266
12323
 
12267
12324
  <xsl:attribute-set name="toc-item-style">
12268
12325
  <xsl:attribute name="role">TOCI</xsl:attribute>
12269
- <xsl:attribute name="font-size">13pt</xsl:attribute>
12326
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12270
12327
  </xsl:attribute-set> <!-- END: toc-item-style -->
12271
12328
 
12272
12329
  <xsl:template name="refine_toc-item-style">
@@ -12280,7 +12337,7 @@
12280
12337
  <xsl:attribute name="color">black</xsl:attribute>
12281
12338
  </xsl:if>
12282
12339
  <xsl:if test="@level &gt;= 2">
12283
- <xsl:attribute name="margin-left"><xsl:value-of select="(@level - 1) * 16.5"/>mm</xsl:attribute>
12340
+ <xsl:attribute name="margin-left"><xsl:value-of select="(@level - 1) * $toc_item_indent"/>mm</xsl:attribute> <!-- 16.5 -->
12284
12341
  <xsl:attribute name="space-before">4pt</xsl:attribute>
12285
12342
  <xsl:attribute name="space-after">5pt</xsl:attribute>
12286
12343
  </xsl:if>
@@ -12303,7 +12360,7 @@
12303
12360
 
12304
12361
  <!-- List of Figures, Tables -->
12305
12362
  <xsl:attribute-set name="toc-listof-title-style">
12306
- <xsl:attribute name="font-size">13pt</xsl:attribute>
12363
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12307
12364
  <xsl:attribute name="font-weight">bold</xsl:attribute>
12308
12365
  <xsl:attribute name="color">black</xsl:attribute>
12309
12366
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -12322,8 +12379,8 @@
12322
12379
 
12323
12380
  <xsl:attribute-set name="toc-listof-item-style">
12324
12381
  <xsl:attribute name="role">TOCI</xsl:attribute>
12325
- <xsl:attribute name="font-size">13pt</xsl:attribute>
12326
- <xsl:attribute name="margin-left">16.5mm</xsl:attribute>
12382
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12383
+ <xsl:attribute name="margin-left"><xsl:value-of select="$toc_item_indent"/>mm</xsl:attribute> <!-- 16.5mm -->
12327
12384
  <xsl:attribute name="space-before">4pt</xsl:attribute>
12328
12385
  </xsl:attribute-set>
12329
12386
 
@@ -13874,14 +13931,17 @@
13874
13931
  </xsl:attribute-set>
13875
13932
 
13876
13933
  <xsl:template name="refine_clause-style">
13877
- <xsl:variable name="level">
13878
- <xsl:call-template name="getLevel">
13879
- <xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
13880
- </xsl:call-template>
13881
- </xsl:variable>
13882
- <xsl:if test="$level &gt;= 4">
13883
- <xsl:attribute name="margin-left">13mm</xsl:attribute>
13884
- </xsl:if>
13934
+ <!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
13935
+ <!-- <xsl:if test="$namespace = 'rsd'">
13936
+ <xsl:variable name="level">
13937
+ <xsl:call-template name="getLevel">
13938
+ <xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
13939
+ </xsl:call-template>
13940
+ </xsl:variable>
13941
+ <xsl:if test="$level &gt;= 4">
13942
+ <xsl:attribute name="margin-left">13mm</xsl:attribute>
13943
+ </xsl:if>
13944
+ </xsl:if> -->
13885
13945
  </xsl:template>
13886
13946
 
13887
13947
  <!-- main sections -->
@@ -14948,6 +15008,20 @@
14948
15008
  </fo:block-container>
14949
15009
  </xsl:template>
14950
15010
 
15011
+ <!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
15012
+ <xsl:template name="insertCoverPageFullImage">
15013
+ <xsl:param name="name">coverpage-image</xsl:param>
15014
+ <xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
15015
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
15016
+ <fo:flow flow-name="xsl-region-body">
15017
+ <xsl:call-template name="insertBackgroundPageImage">
15018
+ <xsl:with-param name="number" select="position()"/>
15019
+ </xsl:call-template>
15020
+ </fo:flow>
15021
+ </fo:page-sequence>
15022
+ </xsl:for-each>
15023
+ </xsl:template>
15024
+
14951
15025
  <xsl:template name="insertPageImage">
14952
15026
  <xsl:param name="svg_content_height" select="$pageHeight"/>
14953
15027
  <xsl:param name="bitmap_width" select="$pageWidth"/>
data/lib/metanorma/ribose/biblio.rng CHANGED
@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
869
869
  </zeroOrMore>
870
870
  </element>
871
871
  </define>
872
- <define name="BibItemType" combine="choice">
872
+ <define name="BibItemType">
873
873
  <a:documentation>Type of bibliographic item.
874
874
  The value list complies with the types provided in ISO 690:2021.
875
875
  NOTE: These values represent a strict superset to BibTeX
data/lib/metanorma/ribose/isodoc.rng CHANGED
@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
311
311
  </ref>
312
312
  </optional>
313
313
  <choice>
314
- <a:documentation>Content of the figure</a:documentation>
315
- <ref name="image"/>
314
+ <a:documentation>Content of the figure </a:documentation>
315
+ <ref name="image">
316
+ <a:documentation>by default the content of a figure is a media file</a:documentation>
317
+ </ref>
316
318
  <ref name="video"/>
317
319
  <ref name="audio"/>
318
- <ref name="pre"/>
320
+ <ref name="pre">
321
+ <a:documentation>figures can contain ASCII art</a:documentation>
322
+ </ref>
319
323
  <oneOrMore>
320
- <ref name="paragraph-with-footnote"/>
324
+ <ref name="paragraph-with-footnote">
325
+ <a:documentation>figures can contain discursive art</a:documentation>
326
+ </ref>
321
327
  </oneOrMore>
322
328
  <zeroOrMore>
323
- <ref name="figure"/>
329
+ <ref name="figure">
330
+ <a:documentation>subfigures, nested directly within a figure</a:documentation>
331
+ </ref>
324
332
  </zeroOrMore>
333
+ <ref name="table">
334
+ <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
335
+ </ref>
325
336
  </choice>
326
337
  <zeroOrMore>
327
338
  <ref name="fn">
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
354
365
  </ref>
355
366
  </optional>
356
367
  <choice>
357
- <a:documentation>Content of the figure</a:documentation>
358
- <ref name="image-no-id"/>
368
+ <a:documentation>Content of the figure </a:documentation>
369
+ <ref name="image-no-id">
370
+ <a:documentation>by default the content of a figure is a media file</a:documentation>
371
+ </ref>
359
372
  <ref name="video-no-id"/>
360
373
  <ref name="audio-no-id"/>
361
- <ref name="pre-no-id"/>
374
+ <ref name="pre-no-id">
375
+ <a:documentation>figures can contain ASCII art</a:documentation>
376
+ </ref>
362
377
  <oneOrMore>
363
- <ref name="paragraph-with-footnote-no-id"/>
378
+ <ref name="paragraph-with-footnote-no-id">
379
+ <a:documentation>figures can contain discursive art</a:documentation>
380
+ </ref>
364
381
  </oneOrMore>
365
382
  <zeroOrMore>
366
- <ref name="figure-no-id"/>
383
+ <ref name="figure-no-id">
384
+ <a:documentation>subfigures, nested directly within a figure</a:documentation>
385
+ </ref>
367
386
  </zeroOrMore>
387
+ <ref name="table-no-id">
388
+ <a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
389
+ </ref>
368
390
  </choice>
369
391
  <zeroOrMore>
370
392
  <ref name="fn">
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
876
898
  <data type="boolean"/>
877
899
  </attribute>
878
900
  </optional>
901
+ <ref name="LocalizedStringAttributes">
902
+ <a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
903
+ </ref>
879
904
  <ref name="ReducedBibliographicItem"/>
880
905
  </element>
881
906
  </define>
data/lib/metanorma/ribose/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "2.7.4".freeze
3
+ VERSION = "2.7.6".freeze
4
4
  end
5
5
  end
data/metanorma-ribose.gemspec CHANGED
@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
42
42
  spec.add_development_dependency "sassc-embedded", "~> 1"
43
43
  spec.add_development_dependency "simplecov", "~> 0.15"
44
44
  spec.add_development_dependency "timecop", "~> 0.9"
45
- spec.add_development_dependency "canon"
45
+ spec.add_development_dependency "canon", "= 0.1.3"
46
46
  end
data/metanorma.yml CHANGED
@@ -56,5 +56,7 @@ fonts_manifest:
56
56
  Open Sans Semibold:
57
57
  Source Sans 3:
58
58
  STIX Two Math:
59
+ Noto Sans Mono:
60
+ Noto Sans Mono Light:
59
61
  Source Serif Pro:
60
62
  Source Code Pro:
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: 2.7.4
4
+ version: 2.7.6
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-09-15 00:00:00.000000000 Z
11
+ date: 2025-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -182,16 +182,16 @@ dependencies:
182
182
  name: canon
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - '='
186
186
  - !ruby/object:Gem::Version
187
- version: '0'
187
+ version: 0.1.3
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '='
193
193
  - !ruby/object:Gem::Version
194
- version: '0'
194
+ version: 0.1.3
195
195
  description: |
196
196
  metanorma-ribose lets you write Ribose standards in AsciiDoc syntax.
197
197