metanorma-rsd 1.4.5 → 1.4.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5ba559a92fb5dfdc07a3841c0f0fee4532efc6707667ed1e7d36b034d1869c02
4
- data.tar.gz: 5b1155129af97fc10d19de0189355311ab5e212a4b81ebc0ae5357d197679d25
3
+ metadata.gz: a2f5e7c53b654ca587a2e0dee5e465895f576c0476f980e83de06a58d0475406
4
+ data.tar.gz: 71fb697002831c0431ab71fac38d762f67334c2232e6ba074e6f3581c83580b1
5
5
  SHA512:
6
- metadata.gz: 7bbe7a4ac00c6222f13d572cd29edb7f069b5723a2fe43c94a1fbfaca4de2cc544f1f0887b9dcb34089c413dd8289e233719411dc4fbe5be7d343fe62d60648a
7
- data.tar.gz: 8f8a7871dc1145a3e3c55822b02cdff99b794eaa67ac2c4732cdffef0fd44831c53cf4836bf9d3a195ce03cbb15f962bd4aaa01cbb5de1e209d9a4635a641d95
6
+ metadata.gz: 26e04a9edc4c3b9769d1f4b96234c225d01acd2e8da592dca1e9d3a41d005ffbb83c04cbfc190b0616f6acfbf6fb3bd8c0add70c2d21072b76a9c58189b125ca
7
+ data.tar.gz: 7d43664c157b3d1860cbd7f97a20f634410cf8536937da17e23fb1ae92fbc521bf9ac2c38abdbe5fa88c5cb71922cb9ad7bb5adc7aa9de5ad3528f4ecd7ef3a9
@@ -129,6 +129,9 @@
129
129
  </choice>
130
130
  </attribute>
131
131
  </optional>
132
+ <attribute name="normative">
133
+ <data type="boolean"/>
134
+ </attribute>
132
135
  <optional>
133
136
  <ref name="section-title"/>
134
137
  </optional>
@@ -303,11 +306,11 @@
303
306
  <ref name="paragraph"/>
304
307
  </element>
305
308
  </define>
306
- <define name="TextElement" combine="choice">
307
- <ref name="concept"/>
308
- </define>
309
309
  </include>
310
310
  <!-- end overrides -->
311
+ <define name="TextElement" combine="choice">
312
+ <ref name="concept"/>
313
+ </define>
311
314
  <define name="concept">
312
315
  <element name="concept">
313
316
  <optional>
@@ -13,18 +13,6 @@ module IsoDoc
13
13
  revdate = get[:revdate]
14
14
  set(:revdate_MMMddyyyy, MMMddyyyy(revdate))
15
15
  end
16
-
17
- def MMMddyyyy(isodate)
18
- return nil if isodate.nil?
19
- arr = isodate.split("-")
20
- date = if arr.size == 1 and (/^\d+$/.match isodate)
21
- Date.new(*arr.map(&:to_i)).strftime("%Y")
22
- elsif arr.size == 2
23
- Date.new(*arr.map(&:to_i)).strftime("%B %Y")
24
- else
25
- Date.parse(isodate).strftime("%B %d, %Y")
26
- end
27
- end
28
16
  end
29
17
  end
30
18
  end
@@ -7,6 +7,8 @@
7
7
 
8
8
 
9
9
 
10
+ <xsl:variable name="debug">false</xsl:variable>
11
+
10
12
  <xsl:variable name="copyright">
11
13
  <xsl:value-of select="/rsd:rsd-standard/rsd:boilerplate/rsd:copyright-statement/rsd:clause[1]"/>
12
14
  <xsl:text> – All rights reserved</xsl:text>
@@ -1174,22 +1176,7 @@
1174
1176
  </fo:list-item-body>
1175
1177
  </fo:list-item>
1176
1178
  </xsl:template>
1177
-
1178
- <xsl:template match="rsd:link">
1179
- <fo:inline>
1180
- <fo:basic-link external-destination="{@target}" text-decoration="underline" fox:alt-text="{@target}" color="{$color-link}">
1181
- <xsl:choose>
1182
- <xsl:when test="normalize-space(.) = ''">
1183
- <xsl:value-of select="@target"/>
1184
- </xsl:when>
1185
- <xsl:otherwise>
1186
- <xsl:apply-templates/>
1187
- </xsl:otherwise>
1188
- </xsl:choose>
1189
- </fo:basic-link>
1190
- </fo:inline>
1191
- </xsl:template>
1192
-
1179
+
1193
1180
  <xsl:template match="rsd:preferred">
1194
1181
  <xsl:param name="sectionNum"/>
1195
1182
  <xsl:variable name="section">
@@ -1249,9 +1236,9 @@
1249
1236
  <xsl:text>[SOURCE: </xsl:text>
1250
1237
  <fo:inline text-decoration="underline" color="{$color-link}">
1251
1238
  <xsl:value-of select="rsd:origin/@citeas"/>
1252
- <xsl:if test="rsd:origin/rsd:locality/rsd:referenceFrom">
1253
- <xsl:text>, </xsl:text><xsl:value-of select="rsd:origin/rsd:locality/rsd:referenceFrom"/>
1254
- </xsl:if>
1239
+
1240
+ <xsl:apply-templates select="rsd:origin/rsd:localityStack"/>
1241
+
1255
1242
  </fo:inline>
1256
1243
  </fo:basic-link>
1257
1244
  <xsl:apply-templates select="rsd:modification"/>
@@ -1341,10 +1328,7 @@
1341
1328
  <xsl:template match="rsd:source">
1342
1329
  <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
1343
1330
  <xsl:value-of select="@citeas" disable-output-escaping="yes"/>
1344
- <xsl:if test="rsd:locality">
1345
- <xsl:text>, </xsl:text>
1346
- <xsl:apply-templates select="rsd:locality"/>
1347
- </xsl:if>
1331
+ <xsl:apply-templates select="rsd:localityStack"/>
1348
1332
  </fo:basic-link>
1349
1333
  </xsl:template>
1350
1334
 
@@ -1562,15 +1546,7 @@
1562
1546
  </xsl:when>
1563
1547
  <xsl:otherwise/>
1564
1548
  </xsl:choose>
1565
- <xsl:if test="rsd:locality">
1566
- <xsl:text>, </xsl:text>
1567
- <!-- <xsl:choose>
1568
- <xsl:when test="rsd:locality/@type = 'section'">Section </xsl:when>
1569
- <xsl:when test="rsd:locality/@type = 'clause'">Clause </xsl:when>
1570
- <xsl:otherwise></xsl:otherwise>
1571
- </xsl:choose> -->
1572
- <xsl:apply-templates select="rsd:locality"/>
1573
- </xsl:if>
1549
+ <xsl:apply-templates select="rsd:localityStack"/>
1574
1550
  <xsl:apply-templates select="text()"/>
1575
1551
  </fo:basic-link>
1576
1552
  </xsl:template>
@@ -5425,11 +5401,17 @@
5425
5401
  </xsl:template>
5426
5402
 
5427
5403
 
5428
- <xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
5404
+ <xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="link-style">
5405
+
5406
+ <xsl:attribute name="color">blue</xsl:attribute>
5407
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
5408
+
5409
+
5410
+ </xsl:attribute-set><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
5429
5411
  <xsl:value-of select="."/>
5430
5412
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='br']">
5431
5413
  <xsl:value-of select="$linebreak"/>
5432
- </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']//text() | *[local-name()='th']//text()" priority="1">
5414
+ </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
5433
5415
  <xsl:call-template name="add-zero-spaces"/>
5434
5416
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']">
5435
5417
 
@@ -5445,7 +5427,9 @@
5445
5427
 
5446
5428
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
5447
5429
 
5448
-
5430
+ <!-- <xsl:if test="$namespace = 'iso'">
5431
+ <fo:block space-before="6pt">&#xA0;</fo:block>
5432
+ </xsl:if> -->
5449
5433
 
5450
5434
  <xsl:choose>
5451
5435
  <xsl:when test="@unnumbered = 'true'"/>
@@ -5485,11 +5469,11 @@
5485
5469
  </xsl:call-template>
5486
5470
  </xsl:variable>
5487
5471
 
5488
- <xsl:variable name="colwidths2">
5472
+ <!-- <xsl:variable name="colwidths2">
5489
5473
  <xsl:call-template name="calculate-column-widths">
5490
5474
  <xsl:with-param name="cols-count" select="$cols-count"/>
5491
5475
  </xsl:call-template>
5492
- </xsl:variable>
5476
+ </xsl:variable> -->
5493
5477
 
5494
5478
  <!-- cols-count=<xsl:copy-of select="$cols-count"/>
5495
5479
  colwidthsNew=<xsl:copy-of select="$colwidths"/>
@@ -5509,7 +5493,9 @@
5509
5493
 
5510
5494
 
5511
5495
 
5512
- <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm">
5496
+
5497
+ <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
5498
+
5513
5499
 
5514
5500
 
5515
5501
 
@@ -5531,6 +5517,9 @@
5531
5517
  </xsl:for-each>
5532
5518
  <xsl:apply-templates/>
5533
5519
  </fo:table>
5520
+
5521
+
5522
+
5534
5523
  </fo:block-container>
5535
5524
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']" mode="process">
5536
5525
  <xsl:apply-templates/>
@@ -5584,9 +5573,13 @@
5584
5573
  </xsl:when>
5585
5574
  <xsl:otherwise>
5586
5575
  <xsl:for-each select="xalan:nodeset($table)//tr">
5576
+ <xsl:variable name="td_text">
5577
+ <xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
5578
+ </xsl:variable>
5587
5579
  <xsl:variable name="words">
5588
5580
  <xsl:call-template name="tokenize">
5589
- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', ' ')"/>
5581
+ <!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', ' ')"/> -->
5582
+ <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/>
5590
5583
  </xsl:call-template>
5591
5584
  </xsl:variable>
5592
5585
  <xsl:variable name="max_length">
@@ -5627,58 +5620,82 @@
5627
5620
  <xsl:with-param name="table" select="$table"/>
5628
5621
  </xsl:call-template>
5629
5622
  </xsl:if>
5623
+ </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()" mode="td_text">
5624
+ <xsl:variable name="zero-space">​</xsl:variable>
5625
+ <xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
5630
5626
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table2']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']" mode="process">
5631
- <!-- <fo:table-header font-weight="bold">
5632
- <xsl:apply-templates />
5633
- </fo:table-header> -->
5634
- <xsl:apply-templates/>
5627
+ <!-- font-weight="bold" -->
5628
+ <fo:table-header>
5629
+ <xsl:apply-templates/>
5630
+ </fo:table-header>
5635
5631
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']" mode="process">
5636
5632
  <xsl:apply-templates/>
5633
+ </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="insertTableFooter">
5634
+ <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
5635
+ <xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
5636
+
5637
+ <fo:table-footer>
5638
+
5639
+ <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
5640
+
5641
+ <!-- if there are note(s) or fn(s) then create footer row -->
5642
+ <xsl:if test="$isNoteOrFnExist = 'true'">
5643
+
5644
+ <xsl:variable name="cols-count">
5645
+ <xsl:choose>
5646
+ <xsl:when test="../*[local-name()='thead']">
5647
+ <!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
5648
+ <xsl:call-template name="calculate-columns-numbers">
5649
+ <xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
5650
+ </xsl:call-template>
5651
+ </xsl:when>
5652
+ <xsl:otherwise>
5653
+ <!-- <xsl:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
5654
+ <xsl:call-template name="calculate-columns-numbers">
5655
+ <xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
5656
+ </xsl:call-template>
5657
+ </xsl:otherwise>
5658
+ </xsl:choose>
5659
+ </xsl:variable>
5660
+
5661
+ <fo:table-row>
5662
+ <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
5663
+
5664
+
5665
+
5666
+ <!-- fn will be processed inside 'note' processing -->
5667
+
5668
+
5669
+ <!-- except gb -->
5670
+
5671
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
5672
+
5673
+
5674
+ <!-- horizontal row separator -->
5675
+
5676
+
5677
+ <!-- fn processing -->
5678
+ <xsl:call-template name="fn_display"/>
5679
+
5680
+ </fo:table-cell>
5681
+ </fo:table-row>
5682
+
5683
+ </xsl:if>
5684
+ </fo:table-footer>
5685
+
5686
+ </xsl:if>
5637
5687
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tbody']">
5638
- <xsl:variable name="cols-count">
5639
- <xsl:choose>
5640
- <xsl:when test="../*[local-name()='thead']">
5641
- <!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
5642
- <xsl:call-template name="calculate-columns-numbers">
5643
- <xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
5644
- </xsl:call-template>
5645
- </xsl:when>
5646
- <xsl:otherwise>
5647
- <!-- <xsl:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
5648
- <xsl:call-template name="calculate-columns-numbers">
5649
- <xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
5650
- </xsl:call-template>
5651
- </xsl:otherwise>
5652
- </xsl:choose>
5653
- </xsl:variable>
5654
-
5688
+
5689
+ <xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
5690
+
5691
+ <xsl:call-template name="insertTableFooter"/>
5692
+
5655
5693
  <fo:table-body>
5656
- <xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
5657
5694
  <xsl:apply-templates/>
5658
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
5659
- <!-- if there are note(s) or fn(s) then create footer row -->
5660
- <xsl:if test="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']">
5661
- <fo:table-row>
5662
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
5663
-
5664
-
5665
-
5666
- <!-- fn will be processed inside 'note' processing -->
5667
-
5668
-
5669
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
5670
-
5671
- <!-- horizontal row separator -->
5672
-
5673
-
5674
- <!-- fn processing -->
5675
- <xsl:call-template name="fn_display"/>
5676
-
5677
- </fo:table-cell>
5678
- </fo:table-row>
5679
-
5680
- </xsl:if>
5695
+ <!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
5696
+
5681
5697
  </fo:table-body>
5698
+
5682
5699
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']">
5683
5700
  <xsl:variable name="parent-name" select="local-name(..)"/>
5684
5701
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -5696,6 +5713,7 @@
5696
5713
 
5697
5714
  </xsl:if>
5698
5715
 
5716
+
5699
5717
  <xsl:apply-templates/>
5700
5718
  </fo:table-row>
5701
5719
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th']">
@@ -5730,6 +5748,8 @@
5730
5748
 
5731
5749
 
5732
5750
 
5751
+
5752
+
5733
5753
  <xsl:if test="@colspan">
5734
5754
  <xsl:attribute name="number-columns-spanned">
5735
5755
  <xsl:value-of select="@colspan"/>
@@ -5762,10 +5782,13 @@
5762
5782
  <fo:block font-size="10pt" margin-bottom="12pt">
5763
5783
 
5764
5784
 
5785
+
5765
5786
  <fo:inline padding-right="2mm">
5787
+
5766
5788
  <xsl:text>NOTE </xsl:text>
5767
5789
 
5768
5790
 
5791
+
5769
5792
  </fo:inline>
5770
5793
  <xsl:apply-templates mode="process"/>
5771
5794
  </fo:block>
@@ -5788,12 +5811,14 @@
5788
5811
  <fo:block margin-bottom="12pt">
5789
5812
 
5790
5813
 
5814
+
5791
5815
  <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
5792
5816
 
5793
5817
 
5794
5818
 
5795
5819
 
5796
5820
 
5821
+
5797
5822
  <xsl:value-of select="@reference"/>
5798
5823
 
5799
5824
  </fo:inline>
@@ -5877,6 +5902,7 @@
5877
5902
 
5878
5903
 
5879
5904
 
5905
+
5880
5906
  <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
5881
5907
 
5882
5908
  <xsl:value-of select="@reference"/>
@@ -5903,6 +5929,7 @@
5903
5929
 
5904
5930
 
5905
5931
 
5932
+
5906
5933
  <xsl:text>where</xsl:text>
5907
5934
  </fo:block>
5908
5935
  </xsl:when>
@@ -5910,6 +5937,7 @@
5910
5937
  <fo:block font-weight="bold" text-align="left" margin-bottom="12pt">
5911
5938
 
5912
5939
 
5940
+
5913
5941
  <xsl:text>Key</xsl:text>
5914
5942
  </fo:block>
5915
5943
  </xsl:when>
@@ -5921,9 +5949,9 @@
5921
5949
 
5922
5950
 
5923
5951
 
5924
-
5925
5952
  <fo:block>
5926
5953
 
5954
+
5927
5955
  <!-- create virtual html table for dl/[dt and dd] -->
5928
5956
  <xsl:variable name="html-table">
5929
5957
  <xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
@@ -5943,6 +5971,7 @@
5943
5971
  <!-- colwidths=<xsl:value-of select="$colwidths"/> -->
5944
5972
 
5945
5973
  <fo:table width="95%" table-layout="fixed">
5974
+
5946
5975
  <xsl:choose>
5947
5976
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
5948
5977
  <!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
@@ -6040,6 +6069,7 @@
6040
6069
  <fo:table-cell>
6041
6070
  <fo:block margin-top="6pt">
6042
6071
 
6072
+
6043
6073
  <xsl:if test="normalize-space($key_iso) = 'true'">
6044
6074
  <xsl:attribute name="margin-top">0</xsl:attribute>
6045
6075
 
@@ -6047,6 +6077,7 @@
6047
6077
 
6048
6078
 
6049
6079
  <xsl:apply-templates/>
6080
+
6050
6081
  </fo:block>
6051
6082
  </fo:table-cell>
6052
6083
  <fo:table-cell>
@@ -6063,7 +6094,7 @@
6063
6094
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']"/><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="process">
6064
6095
  <xsl:apply-templates/>
6065
6096
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
6066
- <fo:inline><xsl:apply-templates/></fo:inline>
6097
+ <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
6067
6098
  </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='em']">
6068
6099
  <fo:inline font-style="italic">
6069
6100
  <xsl:apply-templates/>
@@ -6178,6 +6209,7 @@
6178
6209
  <xsl:variable name="zero-space-after-dot">.</xsl:variable>
6179
6210
  <xsl:variable name="zero-space-after-colon">:</xsl:variable>
6180
6211
  <xsl:variable name="zero-space-after-equal">=</xsl:variable>
6212
+ <xsl:variable name="zero-space-after-underscore">_</xsl:variable>
6181
6213
  <xsl:variable name="zero-space">​</xsl:variable>
6182
6214
  <xsl:choose>
6183
6215
  <xsl:when test="contains($text, $zero-space-after-chars)">
@@ -6212,6 +6244,14 @@
6212
6244
  <xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
6213
6245
  </xsl:call-template>
6214
6246
  </xsl:when>
6247
+ <xsl:when test="contains($text, $zero-space-after-underscore)">
6248
+ <xsl:value-of select="substring-before($text, $zero-space-after-underscore)"/>
6249
+ <xsl:value-of select="$zero-space-after-underscore"/>
6250
+ <xsl:value-of select="$zero-space"/>
6251
+ <xsl:call-template name="add-zero-spaces">
6252
+ <xsl:with-param name="text" select="substring-after($text, $zero-space-after-underscore)"/>
6253
+ </xsl:call-template>
6254
+ </xsl:when>
6215
6255
  <xsl:otherwise>
6216
6256
  <xsl:value-of select="$text"/>
6217
6257
  </xsl:otherwise>
@@ -6388,4 +6428,40 @@
6388
6428
  <xsl:copy-of select="."/>
6389
6429
  </fo:instream-foreign-object>
6390
6430
  </fo:inline>
6431
+ </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='localityStack']">
6432
+ <xsl:for-each select="*[local-name()='locality']">
6433
+ <xsl:if test="position() =1"><xsl:text>, </xsl:text></xsl:if>
6434
+ <xsl:apply-templates select="."/>
6435
+ <xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
6436
+ </xsl:for-each>
6437
+ </xsl:template><xsl:template xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='link']" name="link">
6438
+ <xsl:variable name="target">
6439
+ <xsl:choose>
6440
+ <xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
6441
+ <xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
6442
+ </xsl:when>
6443
+ <xsl:otherwise>
6444
+ <xsl:value-of select="normalize-space(@target)"/>
6445
+ </xsl:otherwise>
6446
+ </xsl:choose>
6447
+ </xsl:variable>
6448
+ <fo:inline xsl:use-attribute-sets="link-style">
6449
+ <xsl:choose>
6450
+ <xsl:when test="$target = ''">
6451
+ <xsl:apply-templates/>
6452
+ </xsl:when>
6453
+ <xsl:otherwise>
6454
+ <fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
6455
+ <xsl:choose>
6456
+ <xsl:when test="normalize-space(.) = ''">
6457
+ <xsl:value-of select="$target"/>
6458
+ </xsl:when>
6459
+ <xsl:otherwise>
6460
+ <xsl:apply-templates/>
6461
+ </xsl:otherwise>
6462
+ </xsl:choose>
6463
+ </fo:basic-link>
6464
+ </xsl:otherwise>
6465
+ </xsl:choose>
6466
+ </fo:inline>
6391
6467
  </xsl:template></xsl:stylesheet>
@@ -2,16 +2,13 @@ require "metanorma/processor"
2
2
 
3
3
  module Metanorma
4
4
  module Rsd
5
- def self.pdf_fonts
5
+ def self.fonts_used
6
6
  ["SourceSansPro-Light", "SourceSerifPro", "SourceCodePro-Light", "HanSans"]
7
7
  end
8
8
 
9
- class Processor < Metanorma::Processor
10
-
11
- def initialize
12
- @short = :rsd
13
- @input_format = :asciidoc
14
- @asciidoctor_backend = :rsd
9
+ class Processor < Metanorma::Generic::Processor
10
+ def configuration
11
+ Metanorma::Rsd.configuration
15
12
  end
16
13
 
17
14
  def output_formats
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Rsd
3
- VERSION = "1.4.5"
3
+ VERSION = "1.4.6"
4
4
  end
5
5
  end
data/metanorma.yml CHANGED
@@ -1,3 +1,4 @@
1
+ metanorma_name: rsd
1
2
  organization_name_short: Ribose
2
3
  organization_name_long: Ribose
3
4
  document_namespace: https://www.metanorma.org/ns/rsd
@@ -7,6 +8,9 @@ validate_rng_file: lib/asciidoctor/rsd/rsd.rng
7
8
  htmlcoverpage: lib/isodoc/rsd/html/html_rsd_titlepage.html
8
9
  htmlintropage: lib/isodoc/rsd/html/html_rsd_intro.html
9
10
  htmlstylesheet: lib/isodoc/rsd/html/htmlstyle.scss
11
+ html_bodyfont: '"Source Sans Pro",sans-serif'
12
+ html_headerfont: '"Source Sans Pro",sans-serif'
13
+ html_monospacefont: '"Source Code Pro",monospace'
10
14
  scripts: lib/isodoc/rsd/html/scripts.html
11
15
  scripts_pdf: lib/isodoc/rsd/html/scripts.pdf.html
12
16
  standardstylesheet: lib/isodoc/rsd/html/rsd.scss
@@ -14,9 +18,9 @@ header: lib/isodoc/rsd/html/header.html
14
18
  wordcoverpage: lib/isodoc/rsd/html/word_rsd_titlepage.html
15
19
  wordintropage: lib/isodoc/rsd/html/word_rsd_intro.html
16
20
  wordstylesheet: lib/isodoc/rsd/html/wordstyle.scss
17
- word_bodyfont: '"Source Sans Pro",sans-serif'
18
- word_headerfont: '"Source Sans Pro",sans-serif'
19
- word_monospacefont: '"Courier New",monospace'
21
+ word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
22
+ word_headerfont: '"Source Sans Pro","Arial",sans-serif'
23
+ word_monospacefont: '"Source Code Pro",monospace'
20
24
  docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}"
21
25
  published_stages:
22
26
  - published
@@ -27,3 +31,6 @@ stage_abbreviations:
27
31
  metadata_extensions:
28
32
  - security
29
33
  - recipient
34
+ webfont:
35
+ - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,600,600i&display=swap"
36
+ - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&display=swap"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-rsd
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.5
4
+ version: 1.4.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: 2020-05-01 00:00:00.000000000 Z
11
+ date: 2020-05-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -226,7 +226,6 @@ files:
226
226
  - lib/asciidoctor/rsd/isodoc.rng
227
227
  - lib/asciidoctor/rsd/reqt.rng
228
228
  - lib/asciidoctor/rsd/rsd.rng
229
- - lib/asciidoctor/rsd/validate.rb
230
229
  - lib/isodoc/rsd/base_convert.rb
231
230
  - lib/isodoc/rsd/html/header.html
232
231
  - lib/isodoc/rsd/html/html_rsd_intro.html
@@ -1,22 +0,0 @@
1
- module Asciidoctor
2
- module Rsd
3
- class Converter < Standoc::Converter
4
- def content_validate(doc)
5
- super
6
- bibdata_validate(doc.root)
7
- end
8
-
9
- def bibdata_validate(doc)
10
- stage_validate(doc)
11
- end
12
-
13
- def stage_validate(xmldoc)
14
- stage = xmldoc&.at("//bibdata/status/stage")&.text
15
- %w(proposal working-draft committee-draft draft-standard final-draft
16
- published withdrawn).include? stage or
17
- @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
18
- end
19
- end
20
- end
21
- end
22
-