metanorma-csa 2.4.12 → 2.5.1

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: 16f333348982316e9e48357f5160eeeb6165df8d6a45c1cbe473e09545f831b8
4
- data.tar.gz: 5e84c06e9cf1d6725b18b961575549fb6f8a0cbe6fc13d31876cfd70b1d7065e
3
+ metadata.gz: dc7f3e19db0e8f8ac36c850c107dc38e455cb9ac8ea4b2fcde699a8f6c982fb0
4
+ data.tar.gz: af551eebc94bbdbe65eecc474b5252937e912ef704d954bc5d774f9a204df95d
5
5
  SHA512:
6
- metadata.gz: 704c0a9144835e2b2afeeec424a4cc9edac06dfefb3590bfdf2533051ee48a024064812209ad48869dd2995d0ba0bee134e9febecb90aee36ff7d6530d5e1977
7
- data.tar.gz: d960839132b96fe45bba8e84c96897e0e10a07f6be954adf49719de64e947a71d5e1c3f4b6ec9183b00bddc2539d8151aecc4532b6bdb27b866bd40787987f8f
6
+ metadata.gz: e8f9d11ebee9473e46cb0a45a553ef5758bb53a1a7d67ff45230d1e7bd970e5b11ea6356a3552a4b37828821c5be8277f644187ab052e77a63a36536c9366633
7
+ data.tar.gz: 8ec46ad091ee729cf444720580ca2efbc546d9a7462b04bd605d7f6ec5037e25db13c5a5b6470e04a9423ee14ecaf639bea518fe25730768fda7481b32bae167
@@ -1,5 +1,3 @@
1
- # frozen_string_literal: true
2
-
3
1
  require "isodoc"
4
2
 
5
3
  module IsoDoc
@@ -2460,13 +2460,35 @@
2460
2460
  </xsl:for-each>
2461
2461
  </xsl:element>
2462
2462
 
2463
- <xsl:call-template name="insertAnnexInSeparatePageSequences"/>
2463
+ <xsl:call-template name="insertAnnexAndBibliographyInSeparatePageSequences"/>
2464
2464
 
2465
- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/>
2465
+ <!-- <xsl:call-template name="insertBibliographyInSeparatePageSequences"/> -->
2466
2466
 
2467
2467
  <!-- <xsl:call-template name="insertIndexInSeparatePageSequences"/> -->
2468
2468
  </xsl:template> <!-- END: insertMainSectionsInSeparatePageSequences -->
2469
2469
 
2470
+ <xsl:template name="insertAnnexAndBibliographyInSeparatePageSequences">
2471
+ <xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]] | /*/*[local-name()='indexsect']">
2472
+ <xsl:sort select="@displayorder" data-type="number"/>
2473
+ <xsl:choose>
2474
+ <xsl:when test="local-name() = 'annex' or local-name() = 'indexsect'">
2475
+ <xsl:element name="page_sequence" namespace="{$namespace_full}">
2476
+ <xsl:attribute name="main_page_sequence"/>
2477
+ <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
2478
+ </xsl:element>
2479
+ </xsl:when>
2480
+ <xsl:otherwise> <!-- bibliography -->
2481
+ <xsl:element name="bibliography" namespace="{$namespace_full}"> <!-- save context element -->
2482
+ <xsl:element name="page_sequence" namespace="{$namespace_full}">
2483
+ <xsl:attribute name="main_page_sequence"/>
2484
+ <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
2485
+ </xsl:element>
2486
+ </xsl:element>
2487
+ </xsl:otherwise>
2488
+ </xsl:choose>
2489
+ </xsl:for-each>
2490
+ </xsl:template>
2491
+
2470
2492
  <xsl:template name="insertAnnexInSeparatePageSequences">
2471
2493
  <xsl:for-each select="/*/*[local-name()='annex']">
2472
2494
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -6651,6 +6673,12 @@
6651
6673
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
6652
6674
  <attachment filename="{@name}"/>
6653
6675
  </xsl:for-each>
6676
+ <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
6677
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
6678
+ <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
6679
+ <attachment filename="{$attachment_path}"/>
6680
+ </xsl:for-each>
6681
+ </xsl:if>
6654
6682
  </xsl:variable>
6655
6683
  <xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
6656
6684
 
@@ -6663,7 +6691,7 @@
6663
6691
  <xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
6664
6692
  </xsl:when>
6665
6693
  <!-- link to the PDF attachment -->
6666
- <xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
6694
+ <xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
6667
6695
  <xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
6668
6696
  </xsl:when>
6669
6697
  <!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
@@ -7314,7 +7342,16 @@
7314
7342
  </xsl:variable>
7315
7343
  <xsl:variable name="img_src">
7316
7344
  <xsl:choose>
7317
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
7345
+ <xsl:when test="not(starts-with(@src, 'data:'))">
7346
+ <xsl:choose>
7347
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7348
+ <xsl:value-of select="@src"/>
7349
+ </xsl:when>
7350
+ <xsl:otherwise>
7351
+ <xsl:value-of select="concat($basepath, @src)"/>
7352
+ </xsl:otherwise>
7353
+ </xsl:choose>
7354
+ </xsl:when>
7318
7355
  <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
7319
7356
  </xsl:choose>
7320
7357
  </xsl:variable>
@@ -7327,7 +7364,7 @@
7327
7364
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
7328
7365
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
7329
7366
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
7330
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7367
+ <xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7331
7368
  <xsl:value-of select="$scale"/>
7332
7369
  </xsl:template>
7333
7370
 
@@ -7346,7 +7383,14 @@
7346
7383
  <xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
7347
7384
  </xsl:when>
7348
7385
  <xsl:when test="not(starts-with(@src, 'data:'))">
7349
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7386
+ <xsl:choose>
7387
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7388
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7389
+ </xsl:when>
7390
+ <xsl:otherwise>
7391
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7392
+ </xsl:otherwise>
7393
+ </xsl:choose>
7350
7394
  </xsl:when>
7351
7395
  <xsl:otherwise>
7352
7396
  <xsl:value-of select="@src"/>
@@ -7368,7 +7412,14 @@
7368
7412
  </xsl:when>
7369
7413
  <xsl:when test="not(starts-with(@src, 'data:'))">
7370
7414
  <xsl:variable name="src">
7371
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7415
+ <xsl:choose>
7416
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7417
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7418
+ </xsl:when>
7419
+ <xsl:otherwise>
7420
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7421
+ </xsl:otherwise>
7422
+ </xsl:choose>
7372
7423
  </xsl:variable>
7373
7424
  <xsl:variable name="file" select="java:java.io.File.new(@src)"/>
7374
7425
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -11249,10 +11300,12 @@
11249
11300
  <xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
11250
11301
  <xsl:copy>
11251
11302
  <xsl:copy-of select="@*"/>
11252
- <xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
11253
- <xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
11254
- <xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
11255
- <xsl:value-of select="."/>
11303
+ <xsl:if test="1 = 2"> <!-- remove attachment/text(), because attachments added in the template 'addPDFUAmeta' before applying 'update_xml_step1' -->
11304
+ <xsl:variable name="name_filepath" select="concat($inputxml_basepath, @name)"/>
11305
+ <xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($name_filepath)))"/>
11306
+ <xsl:if test="$file_exists = 'false'"> <!-- copy attachment content only if file on disk doesnt exist -->
11307
+ <xsl:value-of select="normalize-space(.)"/>
11308
+ </xsl:if>
11256
11309
  </xsl:if>
11257
11310
  </xsl:copy>
11258
11311
  </xsl:template>
@@ -12125,25 +12178,37 @@
12125
12178
  </x:xmpmeta>
12126
12179
  <!-- add attachments -->
12127
12180
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
12128
- <xsl:choose>
12129
- <xsl:when test="normalize-space() != ''">
12130
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{.}" filename="{@name}"/>
12131
- </xsl:when>
12132
- <xsl:otherwise>
12133
- <!-- _{filename}_attachments -->
12134
- <!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
12135
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12136
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
12137
- </xsl:otherwise>
12138
- </xsl:choose>
12181
+ <xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
12182
+
12183
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" filename="{@name}">
12184
+ <xsl:attribute name="src">
12185
+ <xsl:choose>
12186
+ <xsl:when test="normalize-space() != ''">
12187
+ <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
12188
+ <xsl:value-of select="$src_attachment"/>
12189
+ </xsl:when>
12190
+ <xsl:otherwise>
12191
+ <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12192
+ <xsl:value-of select="$url"/>
12193
+ </xsl:otherwise>
12194
+ </xsl:choose>
12195
+ </xsl:attribute>
12196
+ <xsl:if test="$description != ''">
12197
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12198
+ </xsl:if>
12199
+ </pdf:embedded-file>
12139
12200
  </xsl:for-each>
12140
12201
  <!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
12141
12202
  <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
12142
12203
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
12143
12204
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
12144
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/>
12145
- <xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
12146
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$filename_embedded}"/>
12205
+ <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
12206
+ <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
12207
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$attachment_path}">
12208
+ <xsl:if test="$description != ''">
12209
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12210
+ </xsl:if>
12211
+ </pdf:embedded-file>
12147
12212
  </xsl:for-each>
12148
12213
  </xsl:if>
12149
12214
  </xsl:template> <!-- addPDFUAmeta -->
@@ -12521,7 +12586,14 @@
12521
12586
  <xsl:value-of select="$src"/>
12522
12587
  </xsl:when>
12523
12588
  <xsl:otherwise>
12524
- <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12589
+ <xsl:choose>
12590
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
12591
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
12592
+ </xsl:when>
12593
+ <xsl:otherwise>
12594
+ <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12595
+ </xsl:otherwise>
12596
+ </xsl:choose>
12525
12597
  </xsl:otherwise>
12526
12598
  </xsl:choose>
12527
12599
  </xsl:template>
@@ -229,6 +229,46 @@ h6:hover > a.anchor,
229
229
  .inline-header:hover > a.anchor {
230
230
  visibility: visible; }
231
231
 
232
+ /* collapsible snippets: collapsible before hidable */
233
+ .hidable {
234
+ max-height: 0;
235
+ overflow: hidden;
236
+ transition: max-height 0.2s ease-out; }
237
+
238
+ .collapsible {
239
+ background-color: #777;
240
+ color: white;
241
+ cursor: pointer;
242
+ padding: 12px 0;
243
+ margin: 0;
244
+ width: 100%;
245
+ border: none;
246
+ text-align: left;
247
+ outline: none;
248
+ font-size: 15px; }
249
+
250
+ .active, .collapsible:hover {
251
+ background-color: #555; }
252
+
253
+ .collapsible:after {
254
+ content: '\25bc';
255
+ color: white;
256
+ font-weight: bold;
257
+ float: right;
258
+ margin-left: 12px;
259
+ margin-right: 12px; }
260
+
261
+ .active:after {
262
+ content: "\25b2"; }
263
+
264
+ /* collapsible: */
265
+ .collapsible + .hidable {
266
+ margin-top: 0; }
267
+
268
+ .collapsible:not(.active) + .hidable {
269
+ overflow: hidden;
270
+ padding: 0; }
271
+
232
272
  #standard-band {
233
273
  background-color: #0AC442; }
234
274
 
@@ -1,22 +1,17 @@
1
- # frozen_string_literal: true
2
-
3
- require 'isodoc'
1
+ require_relative "base_convert"
2
+ require "isodoc"
3
+ require "metanorma-generic"
4
4
 
5
5
  module IsoDoc
6
6
  module Csa
7
- # A {Converter} implementation that generates CSA output, and a document
8
- # schema encapsulation of the document for validation
9
-
10
- class PdfConvert < IsoDoc::XslfoPdfConvert
7
+ class PdfConvert < IsoDoc::Generic::PdfConvert
11
8
  def initialize(options)
12
9
  @libdir = File.dirname(__FILE__)
13
10
  super
14
11
  end
15
12
 
16
- def pdf_stylesheet(docxml)
17
- "csa.standard.xsl"
18
- end
13
+ include BaseConvert
14
+ include Init
19
15
  end
20
16
  end
21
17
  end
22
-
@@ -1000,14 +1000,14 @@
1000
1000
  <define name="PureTextElement">
1001
1001
  <choice>
1002
1002
  <text/>
1003
- <ref name="em"/>
1004
- <ref name="strong"/>
1003
+ <ref name="pure_em"/>
1004
+ <ref name="pure_strong"/>
1005
1005
  <ref name="sub"/>
1006
1006
  <ref name="sup"/>
1007
- <ref name="tt"/>
1008
- <ref name="underline"/>
1009
- <ref name="strike"/>
1010
- <ref name="smallcap"/>
1007
+ <ref name="pure_tt"/>
1008
+ <ref name="pure_underline"/>
1009
+ <ref name="pure_strike"/>
1010
+ <ref name="pure_smallcap"/>
1011
1011
  <ref name="br"/>
1012
1012
  </choice>
1013
1013
  </define>
@@ -1031,6 +1031,13 @@
1031
1031
  </zeroOrMore>
1032
1032
  </element>
1033
1033
  </define>
1034
+ <define name="pure_em">
1035
+ <element name="em">
1036
+ <zeroOrMore>
1037
+ <ref name="PureTextElement"/>
1038
+ </zeroOrMore>
1039
+ </element>
1040
+ </define>
1034
1041
  <define name="strong">
1035
1042
  <element name="strong">
1036
1043
  <zeroOrMore>
@@ -1046,6 +1053,13 @@
1046
1053
  </zeroOrMore>
1047
1054
  </element>
1048
1055
  </define>
1056
+ <define name="pure_strong">
1057
+ <element name="strong">
1058
+ <zeroOrMore>
1059
+ <ref name="PureTextElement"/>
1060
+ </zeroOrMore>
1061
+ </element>
1062
+ </define>
1049
1063
  <define name="tt">
1050
1064
  <element name="tt">
1051
1065
  <zeroOrMore>
@@ -1060,6 +1074,13 @@
1060
1074
  </zeroOrMore>
1061
1075
  </element>
1062
1076
  </define>
1077
+ <define name="pure_tt">
1078
+ <element name="tt">
1079
+ <zeroOrMore>
1080
+ <ref name="PureTextElement"/>
1081
+ </zeroOrMore>
1082
+ </element>
1083
+ </define>
1063
1084
  <define name="keyword">
1064
1085
  <element name="keyword">
1065
1086
  <zeroOrMore>
@@ -1090,13 +1111,42 @@
1090
1111
  <zeroOrMore>
1091
1112
  <choice>
1092
1113
  <ref name="PureTextElement"/>
1114
+ <ref name="stem"/>
1115
+ <ref name="eref"/>
1116
+ <ref name="xref"/>
1117
+ <ref name="hyperlink"/>
1093
1118
  <ref name="index"/>
1094
1119
  <ref name="index-xref"/>
1095
1120
  </choice>
1096
1121
  </zeroOrMore>
1097
1122
  </element>
1098
1123
  </define>
1124
+ <define name="pure_strike">
1125
+ <element name="strike">
1126
+ <zeroOrMore>
1127
+ <ref name="PureTextElement"/>
1128
+ </zeroOrMore>
1129
+ </element>
1130
+ </define>
1099
1131
  <define name="underline">
1132
+ <element name="underline">
1133
+ <optional>
1134
+ <attribute name="style"/>
1135
+ </optional>
1136
+ <zeroOrMore>
1137
+ <choice>
1138
+ <ref name="PureTextElement"/>
1139
+ <ref name="stem"/>
1140
+ <ref name="eref"/>
1141
+ <ref name="xref"/>
1142
+ <ref name="hyperlink"/>
1143
+ <ref name="index"/>
1144
+ <ref name="index-xref"/>
1145
+ </choice>
1146
+ </zeroOrMore>
1147
+ </element>
1148
+ </define>
1149
+ <define name="pure_underline">
1100
1150
  <element name="underline">
1101
1151
  <optional>
1102
1152
  <attribute name="style"/>
@@ -1107,6 +1157,21 @@
1107
1157
  </element>
1108
1158
  </define>
1109
1159
  <define name="smallcap">
1160
+ <element name="smallcap">
1161
+ <zeroOrMore>
1162
+ <choice>
1163
+ <ref name="PureTextElement"/>
1164
+ <ref name="stem"/>
1165
+ <ref name="eref"/>
1166
+ <ref name="xref"/>
1167
+ <ref name="hyperlink"/>
1168
+ <ref name="index"/>
1169
+ <ref name="index-xref"/>
1170
+ </choice>
1171
+ </zeroOrMore>
1172
+ </element>
1173
+ </define>
1174
+ <define name="pure_smallcap">
1110
1175
  <element name="smallcap">
1111
1176
  <zeroOrMore>
1112
1177
  <ref name="PureTextElement"/>
@@ -1204,7 +1204,9 @@
1204
1204
  <optional>
1205
1205
  <ref name="formattedref"/>
1206
1206
  </optional>
1207
- <ref name="btitle"/>
1207
+ <oneOrMore>
1208
+ <ref name="btitle"/>
1209
+ </oneOrMore>
1208
1210
  <optional>
1209
1211
  <ref name="bplace"/>
1210
1212
  </optional>
@@ -662,6 +662,9 @@
662
662
  <value>LatexMath</value>
663
663
  </choice>
664
664
  </attribute>
665
+ <optional>
666
+ <attribute name="number-format"/>
667
+ </optional>
665
668
  <attribute name="block">
666
669
  <data type="boolean"/>
667
670
  </attribute>
@@ -20,15 +20,6 @@ module Metanorma
20
20
  )
21
21
  end
22
22
 
23
- def fonts_manifest
24
- {
25
- #"AzoSans" => nil,
26
- "Lato" => nil,
27
- "STIX Two Math" => nil,
28
- "Source Code Pro" => nil,
29
- }
30
- end
31
-
32
23
  def version
33
24
  "Metanorma::Csa #{Metanorma::Csa::VERSION}"
34
25
  end
@@ -66,6 +66,9 @@
66
66
  <ref name="MultilingualRenderingType"/>
67
67
  </attribute>
68
68
  </optional>
69
+ <optional>
70
+ <attribute name="class"/>
71
+ </optional>
69
72
  <optional>
70
73
  <ref name="reqtitle"/>
71
74
  </optional>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Csa
3
- VERSION = "2.4.12".freeze
3
+ VERSION = "2.5.1".freeze
4
4
  end
5
5
  end
data/lib/metanorma-csa.rb CHANGED
@@ -1,12 +1,12 @@
1
- require 'asciidoctor' unless defined? Asciidoctor::Converter
2
- require_relative 'metanorma/csa/converter'
3
- require_relative 'isodoc/csa/html_convert'
4
- require_relative 'isodoc/csa/pdf_convert'
5
- require_relative 'isodoc/csa/word_convert'
6
- require_relative 'metanorma/csa/version'
1
+ require "asciidoctor" unless defined? Asciidoctor::Converter
2
+ require_relative "metanorma/csa/converter"
3
+ require_relative "isodoc/csa/html_convert"
4
+ require_relative "isodoc/csa/pdf_convert"
5
+ require_relative "isodoc/csa/word_convert"
6
+ require_relative "metanorma/csa/version"
7
7
  require "metanorma"
8
8
 
9
9
  if defined? Metanorma::Registry
10
- require_relative 'metanorma/csa'
10
+ require_relative "metanorma/csa"
11
11
  Metanorma::Registry.instance.register(Metanorma::Csa::Processor)
12
12
  end
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
29
29
  spec.require_paths = ["lib"]
30
30
  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
31
31
 
32
- spec.add_dependency "metanorma-generic", "~> 2.6.2"
32
+ spec.add_dependency "metanorma-generic", "~> 2.7.0"
33
33
 
34
34
  spec.add_development_dependency "debug"
35
35
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
data/metanorma.yml CHANGED
@@ -26,6 +26,7 @@ header: lib/isodoc/csa/html/header.html
26
26
  wordcoverpage: lib/isodoc/csa/html/word_csa_titlepage.html
27
27
  wordintropage: lib/isodoc/csa/html/word_csa_intro.html
28
28
  wordstylesheet: lib/isodoc/csa/html/wordstyle.scss
29
+ pdf_stylesheet: lib/isodoc/csa/csa.standard.xsl
29
30
  boilerplate: lib/metanorma/csa/boilerplate.adoc
30
31
  webfont:
31
32
  - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
@@ -58,4 +59,7 @@ stage_abbreviations:
58
59
  published:
59
60
  withdrawn:
60
61
  logo_path: ""
61
-
62
+ fonts_manifest:
63
+ Lato:
64
+ STIX Two Math:
65
+ Source Code Pro:
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.12
4
+ version: 2.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-08-05 00:00:00.000000000 Z
11
+ date: 2024-09-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.6.2
19
+ version: 2.7.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.6.2
26
+ version: 2.7.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement