metanorma-ribose 2.7.4 → 2.7.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8c4cb0cfa512d21d60215aaddc28433aa82aca27b0b96c17284707e9115e4cff
4
- data.tar.gz: b2ddf087d596cbbb85793e2f2bdd4c5529900dbfdd463662c509b32ca405092c
3
+ metadata.gz: cf3fee5a39248ff621505332a4e82a4b98bfc0121fa8c0ce749f1f2235d698c9
4
+ data.tar.gz: 9c4b2e8b6cab3b7920fca3958cb111d4c71334c0b7dc0011edded5397f1eae77
5
5
  SHA512:
6
- metadata.gz: ed16916f277c36593b6755ec6541b44041f0444126308bab2bce1f014a283a607a3ec378f709504eeb4d9776430562c29c4fe39cceb25180e09d933b4efb8015
7
- data.tar.gz: e0840c816a8a940babff0100d620146fc371b1bf4a713324f304e070bb12b03af3bf927f867874bb5d4bb278c3690c28af75700f2f8d4c7700a52d1caa08084f
6
+ metadata.gz: 8d12f90992e8cb7904cd8a3b52088e35f1b13dfa5cd88d7973ec2b44326dbcf509aa0e8ae6a9408b781ad5a0745e61d6fcb93841b9d0928dbad19a0fabe45447
7
+ data.tar.gz: 5fabf751ffa51aa9e0efa910b29519b50501759af1cb3fe8bf6aff4279b7fb15e2d4fbf9111f3a1bc3a77dd8550299dea6ab439808e0c48ceb749d8ed9cadee1
@@ -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>
@@ -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" >
@@ -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" %}
@@ -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="."/> -->
@@ -525,6 +527,9 @@
525
527
  </fo:page-sequence>
526
528
  </xsl:template> <!-- END: cover-page -->
527
529
 
530
+ <xsl:template name="inner-cover-page">
531
+ </xsl:template>
532
+
528
533
  <xsl:template name="back-page">
529
534
  </xsl:template>
530
535
 
@@ -615,6 +620,8 @@
615
620
  </fo:block>
616
621
  </xsl:template>
617
622
 
623
+ <xsl:variable name="toc_item_indent">7</xsl:variable>
624
+
618
625
  <xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="3">
619
626
  <fo:block role="SKIP">
620
627
  <xsl:apply-templates/>
@@ -801,9 +808,11 @@
801
808
  <!-- <xsl:when test="ancestor::mn:preface and $level &gt;= 2">12pt</xsl:when>
802
809
  <xsl:when test="ancestor::mn:preface">13pt</xsl:when> -->
803
810
  <xsl:when test="$level = 1">22pt</xsl:when>
804
- <xsl:when test="$level = 2">13pt</xsl:when>
811
+ <!-- <xsl:when test="$level = 2">13pt</xsl:when>
805
812
  <xsl:when test="$level &gt;= 3">11pt</xsl:when>
806
- <xsl:otherwise>16pt</xsl:otherwise>
813
+ <xsl:otherwise>16pt</xsl:otherwise> -->
814
+ <xsl:when test="$level &gt;= 2">13pt</xsl:when>
815
+ <xsl:otherwise>13pt</xsl:otherwise>
807
816
  </xsl:choose>
808
817
  </xsl:variable>
809
818
 
@@ -1095,6 +1104,31 @@
1095
1104
  </xsl:choose>
1096
1105
  </xsl:template>
1097
1106
 
1107
+ <xsl:template match="*[local-name() = 'td']//text() | *[local-name() = 'th']//text()" priority="3">
1108
+ <xsl:variable name="content">
1109
+ <xsl:choose>
1110
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
1111
+ <!-- url -->
1112
+ <xsl:call-template name="add-zero-spaces-link-java"/>
1113
+ </xsl:when>
1114
+ <xsl:otherwise>
1115
+ <xsl:call-template name="add-zero-spaces-java"/>
1116
+ </xsl:otherwise>
1117
+ </xsl:choose>
1118
+ </xsl:variable>
1119
+
1120
+ <!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
1121
+ <xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1​$2$3')"/>
1122
+
1123
+ <!-- add zero-width space (#x200B) before character '(' if preceding and following are word chars -->
1124
+ <xsl:variable name="content3" select="java:replaceAll(java:java.lang.String.new($content2), '(\w)(\()(\w)', '$1​$2$3')"/>
1125
+
1126
+ <!-- replace sequence #x200B to one &#x200B -->
1127
+ <xsl:variable name="content4" select="java:replaceAll(java:java.lang.String.new($content3), '\u200b{2,}', '​')"/>
1128
+
1129
+ <xsl:value-of select="$content4"/>
1130
+ </xsl:template>
1131
+
1098
1132
  <xsl:template match="mn:clause" priority="2">
1099
1133
  <fo:block-container xsl:use-attribute-sets="clause-style">
1100
1134
  <xsl:call-template name="refine_clause-style"/>
@@ -2301,10 +2335,20 @@
2301
2335
 
2302
2336
  <xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
2303
2337
 
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>
2338
+ <xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1"> <!-- https://github.com/metanorma/metanorma-ribose/issues/421 -->
2339
+ <xsl:choose>
2340
+ <!-- commented (ancestor::mn:td or ancestor::mn:th) and
2341
+ for https://github.com/metanorma/metanorma-taste/issues/24#issuecomment-3302963697 -->
2342
+ <xsl:when test="normalize-space(java:matches(java:java.lang.String.new(.), '^(http://|https://|www\.)?(.*)')) = 'true'">
2343
+ <xsl:value-of select="."/>
2344
+ </xsl:when>
2345
+ <xsl:otherwise>
2346
+ <xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
2347
+ <xsl:value-of select="."/>
2348
+ </xsl:element>
2349
+ </xsl:otherwise>
2350
+ </xsl:choose>
2351
+
2308
2352
  </xsl:template>
2309
2353
 
2310
2354
  <xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
@@ -2979,7 +3023,6 @@
2979
3023
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
2980
3024
 
2981
3025
  <xsl:template name="refine_feedback-statement-title-style">
2982
-
2983
3026
  </xsl:template>
2984
3027
 
2985
3028
  <xsl:attribute-set name="feedback-statement-p-style">
@@ -3274,7 +3317,7 @@
3274
3317
  <xsl:attribute name="text-align">center</xsl:attribute>
3275
3318
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3276
3319
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3277
- <xsl:attribute name="font-size">13pt</xsl:attribute>
3320
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
3278
3321
  <xsl:attribute name="font-weight">300</xsl:attribute>
3279
3322
  <xsl:attribute name="color">black</xsl:attribute>
3280
3323
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -3336,7 +3379,8 @@
3336
3379
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
3337
3380
  <xsl:variable name="_font-size"><!-- inherit -->
3338
3381
  <xsl:choose>
3339
- <xsl:when test="ancestor::mn:table[not(parent::mn:sourcecode[@linenums = 'true'])]">inherit</xsl:when>
3382
+ <!-- <xsl:when test="ancestor::mn:table[not(parent::mn:sourcecode[@linenums = 'true'])]">inherit</xsl:when> -->
3383
+ <xsl:when test="ancestor::mn:table">95%</xsl:when>
3340
3384
  <xsl:otherwise>95%</xsl:otherwise><!-- 110% -->
3341
3385
  </xsl:choose>
3342
3386
  </xsl:variable>
@@ -3766,7 +3810,7 @@
3766
3810
  <xsl:template name="refine_tt-style">
3767
3811
  <xsl:variable name="_font-size"> <!-- inherit -->
3768
3812
  <xsl:choose>
3769
- <xsl:when test="ancestor::mn:table">inherit</xsl:when>
3813
+ <xsl:when test="ancestor::mn:table">95%</xsl:when> <!-- 95% in https://github.com/metanorma/metanorma-ribose/issues/421, was inherit -->
3770
3814
  <xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
3771
3815
  </xsl:choose>
3772
3816
  </xsl:variable>
@@ -5361,7 +5405,7 @@
5361
5405
  <xsl:attribute-set name="table-name-style">
5362
5406
  <xsl:attribute name="role">Caption</xsl:attribute>
5363
5407
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5364
- <xsl:attribute name="font-size">13pt</xsl:attribute>
5408
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
5365
5409
  <xsl:attribute name="font-weight">300</xsl:attribute>
5366
5410
  <xsl:attribute name="color">black</xsl:attribute>
5367
5411
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -8856,16 +8900,23 @@
8856
8900
  </xsl:attribute-set> <!-- quote-style -->
8857
8901
 
8858
8902
  <xsl:template name="refine_quote-style">
8859
- </xsl:template>
8903
+ </xsl:template> <!-- refine_quote-style -->
8860
8904
 
8861
8905
  <xsl:attribute-set name="quote-source-style">
8862
8906
  <xsl:attribute name="text-align">right</xsl:attribute>
8863
8907
  <xsl:attribute name="margin-right">25mm</xsl:attribute>
8864
- </xsl:attribute-set>
8908
+ </xsl:attribute-set> <!-- quote-source-style -->
8865
8909
 
8866
8910
  <xsl:template name="refine_quote-source-style">
8867
8911
  </xsl:template>
8868
8912
 
8913
+ <xsl:attribute-set name="source-style">
8914
+ </xsl:attribute-set> <!-- source-style -->
8915
+
8916
+ <xsl:template name="refine_source-style">
8917
+
8918
+ </xsl:template> <!-- refine_source-style -->
8919
+
8869
8920
  <!-- ====== -->
8870
8921
  <!-- quote -->
8871
8922
  <!-- source -->
@@ -8913,7 +8964,9 @@
8913
8964
  </xsl:if>
8914
8965
  <xsl:choose>
8915
8966
  <xsl:when test="not(parent::quote)">
8916
- <fo:block>
8967
+ <fo:block xsl:use-attribute-sets="source-style">
8968
+ <xsl:call-template name="refine_source-style"/>
8969
+
8917
8970
  <xsl:call-template name="insert_basic_link">
8918
8971
  <xsl:with-param name="element">
8919
8972
  <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -8979,7 +9032,7 @@
8979
9032
 
8980
9033
  <xsl:attribute-set name="figure-name-style">
8981
9034
  <xsl:attribute name="role">Caption</xsl:attribute>
8982
- <xsl:attribute name="font-size">13pt</xsl:attribute>
9035
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
8983
9036
  <xsl:attribute name="font-weight">300</xsl:attribute>
8984
9037
  <xsl:attribute name="color">black</xsl:attribute>
8985
9038
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -11027,7 +11080,7 @@
11027
11080
 
11028
11081
  <xsl:template name="refine_fn-reference-style">
11029
11082
  <!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
11030
- <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
11083
+ <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
11084
  </xsl:template> <!-- refine_fn-reference-style -->
11032
11085
 
11033
11086
  <xsl:attribute-set name="fn-style">
@@ -11038,6 +11091,7 @@
11038
11091
  </xsl:template>
11039
11092
 
11040
11093
  <xsl:attribute-set name="fn-num-style">
11094
+ <xsl:attribute name="role">Reference</xsl:attribute>
11041
11095
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
11042
11096
  <xsl:attribute name="font-size">65%</xsl:attribute>
11043
11097
  <xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -11113,33 +11167,16 @@
11113
11167
  <xsl:variable name="ref_id" select="@target"/>
11114
11168
 
11115
11169
  <xsl:variable name="footnote_inline">
11116
- <fo:inline role="Reference">
11170
+ <fo:inline xsl:use-attribute-sets="fn-num-style">
11117
11171
 
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>
11172
+ <xsl:call-template name="refine_fn-num-style"/>
11136
11173
 
11137
11174
  <!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
11138
11175
  <!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
11139
11176
  <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
11140
11177
  </xsl:if> -->
11141
11178
 
11142
- <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
11179
+ <xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
11143
11180
 
11144
11181
  <xsl:call-template name="insert_basic_link">
11145
11182
  <xsl:with-param name="element">
@@ -11435,25 +11472,41 @@
11435
11472
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
11436
11473
 
11437
11474
  <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>
11475
+ <xsl:variable name="bibitems_bibliotag_num_only">
11476
+ <xsl:for-each select="following-sibling::mn:bibitem[not(@hidden='true')]/mn:biblio-tag">
11477
+ <xsl:copy>
11478
+ <xsl:apply-templates select=".">
11479
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11480
+ </xsl:apply-templates>
11481
+ </xsl:copy>
11482
+ </xsl:for-each>
11483
+ </xsl:variable>
11484
+ <xsl:variable name="bibitems_bibliotag">
11485
+ <xsl:copy-of select="xalan:nodeset($bibitems_bibliotag_num_only)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = '']"/>
11486
+ <xsl:if test="not(xalan:nodeset($bibitems_bibliotag_num_only)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = ''])">
11487
+ <mn:biblio-tag>
11488
+ <xsl:apply-templates select="mn:biblio-tag">
11489
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11490
+ </xsl:apply-templates>
11491
+ </mn:biblio-tag>
11446
11492
  </xsl:if>
11447
11493
  </xsl:variable>
11494
+ <!-- <xsl:copy-of select="$bibitems_bibliotag"/> -->
11495
+ <xsl:variable name="last_bibitem_bibliotag" select="xalan:nodeset($bibitems_bibliotag)/mn:biblio-tag[normalize-space(translate(., '[]1234567890', '')) = ''][last()]"/>
11448
11496
  <xsl:variable name="last_bibitem_bibliotag_number_length" select="string-length(translate($last_bibitem_bibliotag, '[] ', ''))"/>
11449
11497
  <xsl:if test="$last_bibitem_bibliotag_number_length &gt; 1">
11450
11498
  <xsl:attribute name="provisional-distance-between-starts">
11499
+ <!-- if biblio-tag is number, i.e. [1], [10] -->
11451
11500
  <xsl:choose>
11452
11501
  <xsl:when test="$last_bibitem_bibliotag_number_length = 2">9.2mm</xsl:when>
11453
11502
  <xsl:when test="$last_bibitem_bibliotag_number_length &gt;= 3">11mm</xsl:when>
11454
11503
  </xsl:choose>
11455
11504
  </xsl:attribute>
11456
11505
  </xsl:if>
11506
+ <xsl:if test="$last_bibitem_bibliotag_number_length = 0">
11507
+ <!-- <biblio-tag>[PDF Declarations]</biblio-tag> -->
11508
+ <xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
11509
+ </xsl:if>
11457
11510
  </xsl:template>
11458
11511
 
11459
11512
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
@@ -11477,31 +11530,6 @@
11477
11530
  <xsl:template name="refine_bibitem-non-normative-list-body-style">
11478
11531
  </xsl:template>
11479
11532
 
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
11533
  <xsl:attribute-set name="references-non-normative-style">
11506
11534
  </xsl:attribute-set> <!-- references-non-normative-style -->
11507
11535
 
@@ -11577,16 +11605,31 @@
11577
11605
  <!-- continue from <xsl:template match="mn:references[not(@normative='true')]" priority="3"> -->
11578
11606
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11579
11607
  <xsl:call-template name="refine_bibitem-non-normative-list-style"/>
11608
+ <xsl:variable name="biblio_tag_first_part">
11609
+ <xsl:apply-templates select="mn:biblio-tag">
11610
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11611
+ </xsl:apply-templates>
11612
+ </xsl:variable>
11580
11613
  <fo:list-item>
11581
11614
  <fo:list-item-label end-indent="label-end()">
11582
11615
  <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>
11616
+ <!-- if biblio-tag is number -->
11617
+ <xsl:if test="normalize-space(translate($biblio_tag_first_part, '[] 1234567890', '')) = ''">
11618
+ <xsl:value-of select="$biblio_tag_first_part"/>
11619
+ </xsl:if>
11586
11620
  </fo:block>
11587
11621
  </fo:list-item-label>
11588
11622
  <fo:list-item-body start-indent="body-start()">
11589
11623
  <fo:block>
11624
+ <!-- if biblio-tag isn't number -->
11625
+ <xsl:if test="normalize-space(translate($biblio_tag_first_part, '[] 1234567890', '')) != ''">
11626
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
11627
+ <xsl:attribute name="text-indent">-8mm</xsl:attribute>
11628
+ <xsl:if test="not(contains($biblio_tag_first_part, '['))">[</xsl:if>
11629
+ <xsl:value-of select="$biblio_tag_first_part"/>
11630
+ <xsl:if test="not(contains($biblio_tag_first_part, '['))">]</xsl:if>
11631
+ <xsl:text> </xsl:text>
11632
+ </xsl:if>
11590
11633
  <xsl:apply-templates select="mn:biblio-tag">
11591
11634
  <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11592
11635
  </xsl:apply-templates>
@@ -12232,7 +12275,7 @@
12232
12275
  <!-- =================== -->
12233
12276
 
12234
12277
  <xsl:attribute-set name="toc-style">
12235
- <xsl:attribute name="margin-left">32mm</xsl:attribute>
12278
+ <xsl:attribute name="margin-left">10mm</xsl:attribute> <!-- 32mm -->
12236
12279
  <xsl:attribute name="margin-right">-17mm</xsl:attribute>
12237
12280
  <xsl:attribute name="role">TOC</xsl:attribute>
12238
12281
  </xsl:attribute-set>
@@ -12242,7 +12285,7 @@
12242
12285
 
12243
12286
  <xsl:attribute-set name="toc-title-style">
12244
12287
  <xsl:attribute name="role">H1</xsl:attribute>
12245
- <xsl:attribute name="font-size">27pt</xsl:attribute>
12288
+ <xsl:attribute name="font-size">22pt</xsl:attribute> <!-- 27pt -->
12246
12289
  <xsl:attribute name="font-weight">bold</xsl:attribute>
12247
12290
  <xsl:attribute name="color">black</xsl:attribute>
12248
12291
  <xsl:attribute name="margin-left">-15mm</xsl:attribute>
@@ -12266,7 +12309,7 @@
12266
12309
 
12267
12310
  <xsl:attribute-set name="toc-item-style">
12268
12311
  <xsl:attribute name="role">TOCI</xsl:attribute>
12269
- <xsl:attribute name="font-size">13pt</xsl:attribute>
12312
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12270
12313
  </xsl:attribute-set> <!-- END: toc-item-style -->
12271
12314
 
12272
12315
  <xsl:template name="refine_toc-item-style">
@@ -12280,7 +12323,7 @@
12280
12323
  <xsl:attribute name="color">black</xsl:attribute>
12281
12324
  </xsl:if>
12282
12325
  <xsl:if test="@level &gt;= 2">
12283
- <xsl:attribute name="margin-left"><xsl:value-of select="(@level - 1) * 16.5"/>mm</xsl:attribute>
12326
+ <xsl:attribute name="margin-left"><xsl:value-of select="(@level - 1) * $toc_item_indent"/>mm</xsl:attribute> <!-- 16.5 -->
12284
12327
  <xsl:attribute name="space-before">4pt</xsl:attribute>
12285
12328
  <xsl:attribute name="space-after">5pt</xsl:attribute>
12286
12329
  </xsl:if>
@@ -12303,7 +12346,7 @@
12303
12346
 
12304
12347
  <!-- List of Figures, Tables -->
12305
12348
  <xsl:attribute-set name="toc-listof-title-style">
12306
- <xsl:attribute name="font-size">13pt</xsl:attribute>
12349
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12307
12350
  <xsl:attribute name="font-weight">bold</xsl:attribute>
12308
12351
  <xsl:attribute name="color">black</xsl:attribute>
12309
12352
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -12322,8 +12365,8 @@
12322
12365
 
12323
12366
  <xsl:attribute-set name="toc-listof-item-style">
12324
12367
  <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>
12368
+ <!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
12369
+ <xsl:attribute name="margin-left"><xsl:value-of select="$toc_item_indent"/>mm</xsl:attribute> <!-- 16.5mm -->
12327
12370
  <xsl:attribute name="space-before">4pt</xsl:attribute>
12328
12371
  </xsl:attribute-set>
12329
12372
 
@@ -13874,14 +13917,17 @@
13874
13917
  </xsl:attribute-set>
13875
13918
 
13876
13919
  <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>
13920
+ <!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
13921
+ <!-- <xsl:if test="$namespace = 'rsd'">
13922
+ <xsl:variable name="level">
13923
+ <xsl:call-template name="getLevel">
13924
+ <xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
13925
+ </xsl:call-template>
13926
+ </xsl:variable>
13927
+ <xsl:if test="$level &gt;= 4">
13928
+ <xsl:attribute name="margin-left">13mm</xsl:attribute>
13929
+ </xsl:if>
13930
+ </xsl:if> -->
13885
13931
  </xsl:template>
13886
13932
 
13887
13933
  <!-- main sections -->
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ribose
3
- VERSION = "2.7.4".freeze
3
+ VERSION = "2.7.5".freeze
4
4
  end
5
5
  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.5
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-09-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic