metanorma-cc 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.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +222 -199
- data/lib/metanorma/cc/biblio.rng +1 -1
- data/lib/metanorma/cc/isodoc.rng +35 -10
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4662f3f4ff7fd19ca9150317a73031cbb093c447f03b567969e482f8833e7152
|
|
4
|
+
data.tar.gz: f0e2648e3d1687b5b5ceeba1dadbb10bf4114bd4fc9fc2d2e25c1fb2ef895620
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bf2d8066850d5520f259936ce4ddc650baec6d4c1284dfa021b647b4a1193e3c521b2650c8c7a9742d70de28aa159c9695a2c26c6ce863db852e40dfd7eff5f5
|
|
7
|
+
data.tar.gz: aa919eac7f006ab1afbb18734a1ab12c687161ee941c1b81072fca6615084430c9778f8296ecb1c7f258713ac92b00c7c779104d5d2377f3def87dda1963f90f
|
|
@@ -175,13 +175,34 @@
|
|
|
175
175
|
<xsl:call-template name="updateXML"/>
|
|
176
176
|
</xsl:variable>
|
|
177
177
|
|
|
178
|
+
<xsl:if test="$debug = 'true'">
|
|
179
|
+
<redirect:write file="updated_xml.xml">
|
|
180
|
+
<xsl:copy-of select="$updated_xml"/>
|
|
181
|
+
</redirect:write>
|
|
182
|
+
</xsl:if>
|
|
183
|
+
|
|
178
184
|
<xsl:for-each select="xalan:nodeset($updated_xml)/*">
|
|
179
185
|
|
|
180
186
|
<xsl:variable name="updated_xml_with_pages">
|
|
181
187
|
<xsl:call-template name="processPrefaceAndMainSectionsDefault_items"/>
|
|
182
188
|
</xsl:variable>
|
|
183
189
|
|
|
190
|
+
<xsl:if test="$debug = 'true'">
|
|
191
|
+
<redirect:write file="updated_xml_with_pages.xml">
|
|
192
|
+
<xsl:copy-of select="$updated_xml_with_pages"/>
|
|
193
|
+
</redirect:write>
|
|
194
|
+
</xsl:if>
|
|
195
|
+
|
|
196
|
+
<xsl:if test="$debug = 'true'">
|
|
197
|
+
<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
|
|
198
|
+
<xsl:copy-of select="$contents"/>
|
|
199
|
+
</redirect:write>
|
|
200
|
+
</xsl:if>
|
|
201
|
+
|
|
184
202
|
<xsl:for-each select="xalan:nodeset($updated_xml_with_pages)"> <!-- set context to preface/sections -->
|
|
203
|
+
|
|
204
|
+
<xsl:call-template name="inner-cover-page"/>
|
|
205
|
+
|
|
185
206
|
<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
|
|
186
207
|
|
|
187
208
|
<!-- Copyright, Content, Foreword, etc. pages -->
|
|
@@ -192,9 +213,6 @@
|
|
|
192
213
|
<xsl:call-template name="getPageSequenceOrientation"/>
|
|
193
214
|
</xsl:attribute>
|
|
194
215
|
|
|
195
|
-
<xsl:if test="position() = 1">
|
|
196
|
-
<xsl:attribute name="initial-page-number">2</xsl:attribute>
|
|
197
|
-
</xsl:if>
|
|
198
216
|
<xsl:if test="position() = last()">
|
|
199
217
|
<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
|
|
200
218
|
</xsl:if>
|
|
@@ -203,35 +221,6 @@
|
|
|
203
221
|
<xsl:call-template name="insertHeaderFooter"/>
|
|
204
222
|
<fo:flow flow-name="xsl-region-body">
|
|
205
223
|
|
|
206
|
-
<xsl:if test="$debug = 'true'">
|
|
207
|
-
<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
|
|
208
|
-
<xsl:copy-of select="$contents"/>
|
|
209
|
-
</redirect:write>
|
|
210
|
-
</xsl:if>
|
|
211
|
-
|
|
212
|
-
<xsl:if test="position() = 1">
|
|
213
|
-
<fo:block margin-bottom="15pt"> </fo:block>
|
|
214
|
-
<fo:block margin-bottom="14pt">
|
|
215
|
-
<xsl:text>© </xsl:text>
|
|
216
|
-
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
|
|
217
|
-
<xsl:text> </xsl:text>
|
|
218
|
-
<fo:inline>
|
|
219
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
|
220
|
-
</fo:inline>
|
|
221
|
-
</fo:block>
|
|
222
|
-
<fo:block margin-bottom="12pt">
|
|
223
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
|
|
224
|
-
</fo:block>
|
|
225
|
-
<fo:block margin-bottom="12pt">
|
|
226
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
|
227
|
-
</fo:block>
|
|
228
|
-
<fo:block>
|
|
229
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
|
|
230
|
-
</fo:block>
|
|
231
|
-
|
|
232
|
-
<fo:block break-after="page"/>
|
|
233
|
-
</xsl:if> <!-- for 1st page_sequence only -->
|
|
234
|
-
|
|
235
224
|
<!-- Table of contents, Foreword, Introduction -->
|
|
236
225
|
<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
|
|
237
226
|
<xsl:apply-templates/>
|
|
@@ -274,75 +263,114 @@
|
|
|
274
263
|
|
|
275
264
|
</xsl:for-each>
|
|
276
265
|
|
|
266
|
+
<xsl:call-template name="back-page"/>
|
|
267
|
+
|
|
277
268
|
</fo:root>
|
|
278
269
|
</xsl:template>
|
|
279
270
|
|
|
280
271
|
<xsl:template name="cover-page">
|
|
281
272
|
<!-- Cover Page -->
|
|
282
|
-
<
|
|
283
|
-
<xsl:
|
|
273
|
+
<xsl:choose>
|
|
274
|
+
<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'">
|
|
275
|
+
<xsl:call-template name="insertCoverPageFullImage"/>
|
|
276
|
+
</xsl:when>
|
|
277
|
+
<xsl:otherwise>
|
|
278
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
|
|
279
|
+
<xsl:call-template name="insertFootnoteSeparatorCommon"/>
|
|
284
280
|
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
281
|
+
<fo:static-content flow-name="cover-page-header" font-size="10pt">
|
|
282
|
+
<fo:block-container height="23.5mm" display-align="before">
|
|
283
|
+
<fo:block padding-top="12.5mm">
|
|
284
|
+
<xsl:value-of select="$copyright"/>
|
|
285
|
+
</fo:block>
|
|
286
|
+
</fo:block-container>
|
|
287
|
+
</fo:static-content>
|
|
292
288
|
|
|
293
|
-
|
|
289
|
+
<fo:flow flow-name="xsl-region-body">
|
|
294
290
|
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
</fo:block>
|
|
308
|
-
<fo:block font-size="24pt" font-weight="bold" text-align="center" role="H1">
|
|
309
|
-
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:title[@language = 'en']"/>
|
|
310
|
-
<xsl:value-of select="$linebreak"/>
|
|
311
|
-
</fo:block>
|
|
312
|
-
<fo:block> </fo:block>
|
|
313
|
-
<fo:block margin-bottom="12pt"> </fo:block>
|
|
314
|
-
<fo:block-container font-size="16pt" text-align="center" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
|
|
315
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
316
|
-
<fo:block padding-top="1mm">
|
|
317
|
-
<xsl:call-template name="capitalizeWords">
|
|
318
|
-
<!-- ex: final-draft -->
|
|
319
|
-
<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:status/mn:stage"/>
|
|
320
|
-
</xsl:call-template>
|
|
321
|
-
<xsl:text> </xsl:text>
|
|
322
|
-
<xsl:call-template name="capitalizeWords">
|
|
323
|
-
<!-- ex: standard -->
|
|
324
|
-
<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
|
|
325
|
-
</xsl:call-template>
|
|
291
|
+
<fo:block text-align="right">
|
|
292
|
+
<!-- CC/FDS 18011:2018 -->
|
|
293
|
+
<fo:block font-size="14pt" font-weight="bold" margin-bottom="10pt">
|
|
294
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'csd']"/><xsl:text> </xsl:text>
|
|
295
|
+
</fo:block>
|
|
296
|
+
<fo:block margin-bottom="12pt">
|
|
297
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization/mn:name"/>
|
|
298
|
+
<xsl:text> TC </xsl:text>
|
|
299
|
+
<!-- <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:technical-committee"/> -->
|
|
300
|
+
<xsl:value-of select="//mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Technical committee']/mn:name"/>
|
|
301
|
+
<xsl:text> </xsl:text>
|
|
302
|
+
</fo:block>
|
|
326
303
|
</fo:block>
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
<fo:block-container font-size="10pt" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
|
|
331
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
332
|
-
<fo:block text-align="center" font-weight="bold" padding-top="1mm" margin-bottom="6pt">Warning for drafts</fo:block>
|
|
333
|
-
<fo:block margin-left="2mm" margin-right="2mm">
|
|
334
|
-
<fo:block margin-bottom="6pt">This document is not a CalConnect Standard. It is distributed for review and comment, and is subject to change without notice and may not be referred to as a Standard. Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</fo:block>
|
|
335
|
-
<fo:block margin-bottom="10pt">Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</fo:block>
|
|
304
|
+
<fo:block font-size="24pt" font-weight="bold" text-align="center" role="H1">
|
|
305
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:title[@language = 'en']"/>
|
|
306
|
+
<xsl:value-of select="$linebreak"/>
|
|
336
307
|
</fo:block>
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
308
|
+
<fo:block> </fo:block>
|
|
309
|
+
<fo:block margin-bottom="12pt"> </fo:block>
|
|
310
|
+
<fo:block-container font-size="16pt" text-align="center" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
|
|
311
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
312
|
+
<fo:block padding-top="1mm">
|
|
313
|
+
<xsl:call-template name="capitalizeWords">
|
|
314
|
+
<!-- ex: final-draft -->
|
|
315
|
+
<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:status/mn:stage"/>
|
|
316
|
+
</xsl:call-template>
|
|
317
|
+
<xsl:text> </xsl:text>
|
|
318
|
+
<xsl:call-template name="capitalizeWords">
|
|
319
|
+
<!-- ex: standard -->
|
|
320
|
+
<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
|
|
321
|
+
</xsl:call-template>
|
|
322
|
+
</fo:block>
|
|
323
|
+
</fo:block-container>
|
|
324
|
+
</fo:block-container>
|
|
325
|
+
<fo:block margin-bottom="10pt"> </fo:block>
|
|
326
|
+
<fo:block-container font-size="10pt" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
|
|
327
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
328
|
+
<fo:block text-align="center" font-weight="bold" padding-top="1mm" margin-bottom="6pt">Warning for drafts</fo:block>
|
|
329
|
+
<fo:block margin-left="2mm" margin-right="2mm">
|
|
330
|
+
<fo:block margin-bottom="6pt">This document is not a CalConnect Standard. It is distributed for review and comment, and is subject to change without notice and may not be referred to as a Standard. Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</fo:block>
|
|
331
|
+
<fo:block margin-bottom="10pt">Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</fo:block>
|
|
332
|
+
</fo:block>
|
|
333
|
+
</fo:block-container>
|
|
334
|
+
</fo:block-container>
|
|
335
|
+
<fo:block text-align="center">
|
|
336
|
+
<xsl:text>The Calendaring and Scheduling Consortium, Inc. </xsl:text>
|
|
337
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
|
|
338
|
+
</fo:block>
|
|
339
|
+
</fo:flow>
|
|
340
|
+
</fo:page-sequence>
|
|
341
|
+
</xsl:otherwise>
|
|
342
|
+
</xsl:choose>
|
|
343
|
+
</xsl:template> <!-- END: cover-page -->
|
|
344
|
+
|
|
345
|
+
<xsl:template name="inner-cover-page">
|
|
346
|
+
<fo:page-sequence master-reference="preface" format="i" initial-page-number="2">
|
|
347
|
+
<xsl:call-template name="insertFootnoteSeparatorCommon"/>
|
|
348
|
+
<xsl:call-template name="insertHeaderFooter"/>
|
|
349
|
+
<fo:flow flow-name="xsl-region-body">
|
|
350
|
+
<fo:block margin-bottom="15pt"> </fo:block>
|
|
351
|
+
<fo:block margin-bottom="14pt">
|
|
352
|
+
<xsl:text>© </xsl:text>
|
|
341
353
|
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:copyright/mn:from"/>
|
|
354
|
+
<xsl:text> </xsl:text>
|
|
355
|
+
<fo:inline>
|
|
356
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
|
357
|
+
</fo:inline>
|
|
358
|
+
</fo:block>
|
|
359
|
+
<fo:block margin-bottom="12pt">
|
|
360
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
|
|
361
|
+
</fo:block>
|
|
362
|
+
<fo:block margin-bottom="12pt">
|
|
363
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-name']"/>
|
|
364
|
+
</fo:block>
|
|
365
|
+
<fo:block>
|
|
366
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement/mn:clause/mn:p[@id = 'boilerplate-address']"/>
|
|
342
367
|
</fo:block>
|
|
343
368
|
</fo:flow>
|
|
344
369
|
</fo:page-sequence>
|
|
345
|
-
</xsl:template> <!--
|
|
370
|
+
</xsl:template> <!-- inner-cover-page -->
|
|
371
|
+
|
|
372
|
+
<xsl:template name="back-page">
|
|
373
|
+
</xsl:template>
|
|
346
374
|
|
|
347
375
|
<xsl:template name="insertListOf_Title">
|
|
348
376
|
<xsl:param name="title"/>
|
|
@@ -612,6 +640,11 @@
|
|
|
612
640
|
</xsl:template>
|
|
613
641
|
|
|
614
642
|
<xsl:template name="insertHeaderFooter">
|
|
643
|
+
<xsl:call-template name="insertHeader"/>
|
|
644
|
+
<xsl:call-template name="insertFooter"/>
|
|
645
|
+
</xsl:template>
|
|
646
|
+
|
|
647
|
+
<xsl:template name="insertHeader">
|
|
615
648
|
<fo:static-content flow-name="header-even" role="artifact">
|
|
616
649
|
<fo:block-container height="17mm" display-align="before">
|
|
617
650
|
<fo:block padding-top="12.5mm">
|
|
@@ -619,6 +652,16 @@
|
|
|
619
652
|
</fo:block>
|
|
620
653
|
</fo:block-container>
|
|
621
654
|
</fo:static-content>
|
|
655
|
+
<fo:static-content flow-name="header-odd" role="artifact">
|
|
656
|
+
<fo:block-container height="17mm" display-align="before">
|
|
657
|
+
<fo:block text-align="right" padding-top="12.5mm">
|
|
658
|
+
<xsl:value-of select="$header"/>
|
|
659
|
+
</fo:block>
|
|
660
|
+
</fo:block-container>
|
|
661
|
+
</fo:static-content>
|
|
662
|
+
</xsl:template>
|
|
663
|
+
|
|
664
|
+
<xsl:template name="insertFooter">
|
|
622
665
|
<fo:static-content flow-name="footer-even" role="artifact">
|
|
623
666
|
<fo:block-container font-size="10pt" height="100%" display-align="after">
|
|
624
667
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -637,13 +680,6 @@
|
|
|
637
680
|
</fo:table>
|
|
638
681
|
</fo:block-container>
|
|
639
682
|
</fo:static-content>
|
|
640
|
-
<fo:static-content flow-name="header-odd" role="artifact">
|
|
641
|
-
<fo:block-container height="17mm" display-align="before">
|
|
642
|
-
<fo:block text-align="right" padding-top="12.5mm">
|
|
643
|
-
<xsl:value-of select="$header"/>
|
|
644
|
-
</fo:block>
|
|
645
|
-
</fo:block-container>
|
|
646
|
-
</fo:static-content>
|
|
647
683
|
<fo:static-content flow-name="footer-odd" role="artifact">
|
|
648
684
|
<fo:block-container font-size="10pt" height="100%" display-align="after">
|
|
649
685
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -2282,7 +2318,6 @@
|
|
|
2282
2318
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
|
2283
2319
|
|
|
2284
2320
|
<xsl:template name="refine_feedback-statement-title-style">
|
|
2285
|
-
|
|
2286
2321
|
</xsl:template>
|
|
2287
2322
|
|
|
2288
2323
|
<xsl:attribute-set name="feedback-statement-p-style">
|
|
@@ -3921,87 +3956,81 @@
|
|
|
3921
3956
|
<xsl:template name="refine_term-style">
|
|
3922
3957
|
</xsl:template>
|
|
3923
3958
|
|
|
3924
|
-
<xsl:attribute-set name="term-
|
|
3959
|
+
<xsl:attribute-set name="term-number-style">
|
|
3925
3960
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
3926
3961
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
3927
3962
|
</xsl:attribute-set> <!-- term-name-style -->
|
|
3928
3963
|
|
|
3929
|
-
<xsl:template name="refine_term-
|
|
3964
|
+
<xsl:template name="refine_term-number-style">
|
|
3930
3965
|
</xsl:template>
|
|
3931
3966
|
|
|
3932
|
-
<xsl:attribute-set name="preferred-style">
|
|
3933
|
-
</xsl:attribute-set> <!-- preferred-style -->
|
|
3934
|
-
|
|
3935
|
-
<xsl:template name="refine_preferred-style">
|
|
3936
|
-
</xsl:template>
|
|
3937
|
-
|
|
3938
|
-
<xsl:attribute-set name="preferred-block-style">
|
|
3967
|
+
<xsl:attribute-set name="term-preferred-block-style">
|
|
3939
3968
|
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
|
3940
3969
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
3941
3970
|
|
|
3942
|
-
<xsl:template name="
|
|
3971
|
+
<xsl:template name="refine_term-preferred-block-style">
|
|
3943
3972
|
</xsl:template>
|
|
3944
3973
|
|
|
3945
|
-
<xsl:attribute-set name="preferred-
|
|
3974
|
+
<xsl:attribute-set name="term-preferred-style">
|
|
3946
3975
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
3947
3976
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
3948
3977
|
</xsl:attribute-set> <!-- preferred-term-style -->
|
|
3949
3978
|
|
|
3950
|
-
<xsl:template name="
|
|
3979
|
+
<xsl:template name="refine_term-preferred-style">
|
|
3951
3980
|
<xsl:if test="mn:strong">
|
|
3952
3981
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
3953
3982
|
</xsl:if>
|
|
3954
3983
|
</xsl:template>
|
|
3955
3984
|
|
|
3956
|
-
<xsl:attribute-set name="domain-style">
|
|
3957
|
-
</xsl:attribute-set> <!-- domain-style -->
|
|
3985
|
+
<xsl:attribute-set name="term-domain-style">
|
|
3986
|
+
</xsl:attribute-set> <!-- term-domain-style -->
|
|
3958
3987
|
|
|
3959
|
-
<xsl:template name="
|
|
3988
|
+
<xsl:template name="refine_term-domain-style">
|
|
3960
3989
|
</xsl:template>
|
|
3961
3990
|
|
|
3962
|
-
<xsl:attribute-set name="admitted-style">
|
|
3963
|
-
</xsl:attribute-set> <!-- admitted-style -->
|
|
3991
|
+
<xsl:attribute-set name="term-admitted-style">
|
|
3992
|
+
</xsl:attribute-set> <!-- term-admitted-style -->
|
|
3964
3993
|
|
|
3965
|
-
<xsl:template name="
|
|
3994
|
+
<xsl:template name="refine_term-admitted-style">
|
|
3966
3995
|
</xsl:template>
|
|
3967
3996
|
|
|
3968
|
-
<xsl:attribute-set name="deprecates-style">
|
|
3969
|
-
</xsl:attribute-set> <!-- deprecates-style -->
|
|
3997
|
+
<xsl:attribute-set name="term-deprecates-style">
|
|
3998
|
+
</xsl:attribute-set> <!-- term-deprecates-style -->
|
|
3970
3999
|
|
|
3971
|
-
<xsl:template name="
|
|
4000
|
+
<xsl:template name="refine_term-deprecates-style">
|
|
3972
4001
|
</xsl:template>
|
|
3973
4002
|
|
|
3974
|
-
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
|
4003
|
+
<xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
|
|
3975
4004
|
</xsl:attribute-set>
|
|
3976
4005
|
|
|
3977
|
-
<xsl:template name="
|
|
4006
|
+
<xsl:template name="refine_term-related-block-style">
|
|
3978
4007
|
</xsl:template>
|
|
3979
4008
|
|
|
3980
|
-
<xsl:attribute-set name="definition-style">
|
|
4009
|
+
<xsl:attribute-set name="term-definition-style">
|
|
3981
4010
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
3982
|
-
</xsl:attribute-set> <!-- definition-style -->
|
|
4011
|
+
</xsl:attribute-set> <!-- term-definition-style -->
|
|
3983
4012
|
|
|
3984
|
-
<xsl:template name="
|
|
4013
|
+
<xsl:template name="refine_term-definition-style">
|
|
3985
4014
|
</xsl:template>
|
|
3986
4015
|
|
|
3987
|
-
<xsl:attribute-set name="termsource-style">
|
|
4016
|
+
<xsl:attribute-set name="term-termsource-style">
|
|
3988
4017
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
3989
4018
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
|
3990
|
-
</xsl:attribute-set> <!-- termsource-style -->
|
|
4019
|
+
</xsl:attribute-set> <!-- term-termsource-style -->
|
|
3991
4020
|
|
|
3992
|
-
<xsl:template name="
|
|
3993
|
-
</xsl:template> <!--
|
|
4021
|
+
<xsl:template name="refine_term-termsource-style">
|
|
4022
|
+
</xsl:template> <!-- refine_term-termsource-style -->
|
|
3994
4023
|
|
|
3995
|
-
<xsl:attribute-set name="termsource-text-style">
|
|
3996
|
-
</xsl:attribute-set> <!-- termsource-text-style -->
|
|
4024
|
+
<xsl:attribute-set name="term-termsource-text-style">
|
|
4025
|
+
</xsl:attribute-set> <!-- term-termsource-text-style -->
|
|
3997
4026
|
|
|
3998
|
-
<xsl:template name="
|
|
4027
|
+
<xsl:template name="refine_term-termsource-text-style">
|
|
3999
4028
|
</xsl:template>
|
|
4000
4029
|
|
|
4001
|
-
<xsl:attribute-set name="origin-style">
|
|
4002
|
-
</xsl:attribute-set> <!-- origin-style -->
|
|
4030
|
+
<xsl:attribute-set name="term-origin-style">
|
|
4031
|
+
</xsl:attribute-set> <!-- term-origin-style -->
|
|
4003
4032
|
|
|
4004
|
-
<xsl:template name="
|
|
4033
|
+
<xsl:template name="refine_term-origin-style">
|
|
4005
4034
|
</xsl:template>
|
|
4006
4035
|
|
|
4007
4036
|
<!-- ====== -->
|
|
@@ -4045,9 +4074,9 @@
|
|
|
4045
4074
|
<!-- modification -->
|
|
4046
4075
|
<!-- ====== -->
|
|
4047
4076
|
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
4048
|
-
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4077
|
+
<fo:block xsl:use-attribute-sets="term-termsource-style">
|
|
4049
4078
|
|
|
4050
|
-
<xsl:call-template name="
|
|
4079
|
+
<xsl:call-template name="refine_term-termsource-style"/>
|
|
4051
4080
|
|
|
4052
4081
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4053
4082
|
<xsl:variable name="termsource_text">
|
|
@@ -4095,8 +4124,8 @@
|
|
|
4095
4124
|
|
|
4096
4125
|
<!-- text SOURCE: -->
|
|
4097
4126
|
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
4098
|
-
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
4099
|
-
<xsl:call-template name="
|
|
4127
|
+
<fo:inline xsl:use-attribute-sets="term-termsource-text-style">
|
|
4128
|
+
<xsl:call-template name="refine_term-termsource-text-style"/>
|
|
4100
4129
|
<xsl:value-of select="."/>
|
|
4101
4130
|
</fo:inline>
|
|
4102
4131
|
</xsl:template>
|
|
@@ -4108,8 +4137,8 @@
|
|
|
4108
4137
|
<xsl:if test="normalize-space(@citeas) = ''">
|
|
4109
4138
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
|
|
4110
4139
|
</xsl:if>
|
|
4111
|
-
<fo:inline xsl:use-attribute-sets="origin-style">
|
|
4112
|
-
<xsl:call-template name="
|
|
4140
|
+
<fo:inline xsl:use-attribute-sets="term-origin-style">
|
|
4141
|
+
<xsl:call-template name="refine_term-origin-style"/>
|
|
4113
4142
|
<xsl:apply-templates/>
|
|
4114
4143
|
</fo:inline>
|
|
4115
4144
|
</fo:basic-link>
|
|
@@ -4162,14 +4191,14 @@
|
|
|
4162
4191
|
<xsl:variable name="levelTerm">
|
|
4163
4192
|
<xsl:call-template name="getLevelTermName"/>
|
|
4164
4193
|
</xsl:variable>
|
|
4165
|
-
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
4194
|
+
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
|
|
4166
4195
|
|
|
4167
|
-
<xsl:call-template name="
|
|
4196
|
+
<xsl:call-template name="refine_term-preferred-block-style"/>
|
|
4168
4197
|
|
|
4169
4198
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
4170
4199
|
|
|
4171
|
-
<fo:block xsl:use-attribute-sets="term-
|
|
4172
|
-
<xsl:call-template name="refine_term-
|
|
4200
|
+
<fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
|
|
4201
|
+
<xsl:call-template name="refine_term-number-style"/>
|
|
4173
4202
|
|
|
4174
4203
|
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
4175
4204
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
@@ -4179,8 +4208,8 @@
|
|
|
4179
4208
|
</fo:block>
|
|
4180
4209
|
</xsl:if>
|
|
4181
4210
|
|
|
4182
|
-
<fo:block xsl:use-attribute-sets="preferred-
|
|
4183
|
-
<xsl:call-template name="
|
|
4211
|
+
<fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
|
|
4212
|
+
<xsl:call-template name="refine_term-preferred-style"/>
|
|
4184
4213
|
|
|
4185
4214
|
<xsl:apply-templates/>
|
|
4186
4215
|
</fo:block>
|
|
@@ -4200,15 +4229,15 @@
|
|
|
4200
4229
|
<xsl:template match="mn:domain"/>
|
|
4201
4230
|
|
|
4202
4231
|
<xsl:template match="mn:fmt-admitted">
|
|
4203
|
-
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
4204
|
-
<xsl:call-template name="
|
|
4232
|
+
<fo:block xsl:use-attribute-sets="term-admitted-style">
|
|
4233
|
+
<xsl:call-template name="refine_term-admitted-style"/>
|
|
4205
4234
|
<xsl:apply-templates/>
|
|
4206
4235
|
</fo:block>
|
|
4207
4236
|
</xsl:template>
|
|
4208
4237
|
|
|
4209
4238
|
<xsl:template match="mn:fmt-deprecates">
|
|
4210
|
-
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
4211
|
-
<xsl:call-template name="
|
|
4239
|
+
<fo:block xsl:use-attribute-sets="term-deprecates-style">
|
|
4240
|
+
<xsl:call-template name="refine_term-deprecates-style"/>
|
|
4212
4241
|
<xsl:apply-templates/>
|
|
4213
4242
|
</fo:block>
|
|
4214
4243
|
</xsl:template>
|
|
@@ -4221,8 +4250,8 @@
|
|
|
4221
4250
|
<!-- End Preferred, admitted, deprecated -->
|
|
4222
4251
|
|
|
4223
4252
|
<xsl:template match="mn:fmt-related">
|
|
4224
|
-
<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
|
|
4225
|
-
<xsl:call-template name="
|
|
4253
|
+
<fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
|
|
4254
|
+
<xsl:call-template name="refine_term-related-block-style"/>
|
|
4226
4255
|
<xsl:apply-templates/>
|
|
4227
4256
|
</fo:block>
|
|
4228
4257
|
</xsl:template>
|
|
@@ -4236,8 +4265,8 @@
|
|
|
4236
4265
|
<!-- definition -->
|
|
4237
4266
|
<!-- ========== -->
|
|
4238
4267
|
<xsl:template match="mn:fmt-definition">
|
|
4239
|
-
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
4240
|
-
<xsl:call-template name="
|
|
4268
|
+
<fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
|
|
4269
|
+
<xsl:call-template name="refine_term-definition-style"/>
|
|
4241
4270
|
<xsl:apply-templates/>
|
|
4242
4271
|
</fo:block>
|
|
4243
4272
|
</xsl:template>
|
|
@@ -8054,15 +8083,22 @@
|
|
|
8054
8083
|
</xsl:attribute-set> <!-- quote-style -->
|
|
8055
8084
|
|
|
8056
8085
|
<xsl:template name="refine_quote-style">
|
|
8057
|
-
</xsl:template>
|
|
8086
|
+
</xsl:template> <!-- refine_quote-style -->
|
|
8058
8087
|
|
|
8059
8088
|
<xsl:attribute-set name="quote-source-style">
|
|
8060
8089
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
8061
|
-
</xsl:attribute-set>
|
|
8090
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
|
8062
8091
|
|
|
8063
8092
|
<xsl:template name="refine_quote-source-style">
|
|
8064
8093
|
</xsl:template>
|
|
8065
8094
|
|
|
8095
|
+
<xsl:attribute-set name="source-style">
|
|
8096
|
+
</xsl:attribute-set> <!-- source-style -->
|
|
8097
|
+
|
|
8098
|
+
<xsl:template name="refine_source-style">
|
|
8099
|
+
|
|
8100
|
+
</xsl:template> <!-- refine_source-style -->
|
|
8101
|
+
|
|
8066
8102
|
<!-- ====== -->
|
|
8067
8103
|
<!-- quote -->
|
|
8068
8104
|
<!-- source -->
|
|
@@ -8110,7 +8146,9 @@
|
|
|
8110
8146
|
</xsl:if>
|
|
8111
8147
|
<xsl:choose>
|
|
8112
8148
|
<xsl:when test="not(parent::quote)">
|
|
8113
|
-
<fo:block>
|
|
8149
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
|
8150
|
+
<xsl:call-template name="refine_source-style"/>
|
|
8151
|
+
|
|
8114
8152
|
<xsl:call-template name="insert_basic_link">
|
|
8115
8153
|
<xsl:with-param name="element">
|
|
8116
8154
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -10203,7 +10241,7 @@
|
|
|
10203
10241
|
|
|
10204
10242
|
<xsl:template name="refine_fn-reference-style">
|
|
10205
10243
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
10206
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
10244
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
|
|
10207
10245
|
</xsl:template> <!-- refine_fn-reference-style -->
|
|
10208
10246
|
|
|
10209
10247
|
<xsl:attribute-set name="fn-style">
|
|
@@ -10214,6 +10252,7 @@
|
|
|
10214
10252
|
</xsl:template>
|
|
10215
10253
|
|
|
10216
10254
|
<xsl:attribute-set name="fn-num-style">
|
|
10255
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
|
10217
10256
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
10218
10257
|
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
10219
10258
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
@@ -10287,33 +10326,16 @@
|
|
|
10287
10326
|
<xsl:variable name="ref_id" select="@target"/>
|
|
10288
10327
|
|
|
10289
10328
|
<xsl:variable name="footnote_inline">
|
|
10290
|
-
<fo:inline
|
|
10329
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
|
10291
10330
|
|
|
10292
|
-
<xsl:
|
|
10293
|
-
<xsl:choose>
|
|
10294
|
-
<xsl:when test="ancestor::mn:bibitem">
|
|
10295
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
|
10296
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
|
10297
|
-
</fn_styles>
|
|
10298
|
-
</xsl:when>
|
|
10299
|
-
<xsl:otherwise>
|
|
10300
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
|
10301
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
|
10302
|
-
</fn_styles>
|
|
10303
|
-
</xsl:otherwise>
|
|
10304
|
-
</xsl:choose>
|
|
10305
|
-
</xsl:variable>
|
|
10306
|
-
|
|
10307
|
-
<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
|
|
10308
|
-
<xsl:copy-of select="."/>
|
|
10309
|
-
</xsl:for-each>
|
|
10331
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
|
10310
10332
|
|
|
10311
10333
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
10312
10334
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
|
10313
10335
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
10314
10336
|
</xsl:if> -->
|
|
10315
10337
|
|
|
10316
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
10338
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
|
|
10317
10339
|
|
|
10318
10340
|
<xsl:call-template name="insert_basic_link">
|
|
10319
10341
|
<xsl:with-param name="element">
|
|
@@ -10610,30 +10632,6 @@
|
|
|
10610
10632
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
|
10611
10633
|
</xsl:template>
|
|
10612
10634
|
|
|
10613
|
-
<!-- footnote reference number for bibitem, in the text -->
|
|
10614
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
|
10615
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
10616
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
10617
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
10618
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
|
10619
|
-
|
|
10620
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
|
10621
|
-
</xsl:template>
|
|
10622
|
-
|
|
10623
|
-
<!-- footnote number on the page bottom -->
|
|
10624
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
|
10625
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
10626
|
-
<xsl:attribute name="font-size">60%</xsl:attribute>
|
|
10627
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
10628
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
|
10629
|
-
|
|
10630
|
-
<!-- footnote body (text) on the page bottom -->
|
|
10631
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
|
10632
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
10633
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
10634
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
|
10635
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
|
10636
|
-
|
|
10637
10635
|
<xsl:attribute-set name="references-non-normative-style">
|
|
10638
10636
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
|
10639
10637
|
|
|
@@ -12996,6 +12994,17 @@
|
|
|
12996
12994
|
</xsl:attribute-set>
|
|
12997
12995
|
|
|
12998
12996
|
<xsl:template name="refine_clause-style">
|
|
12997
|
+
<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
|
|
12998
|
+
<!-- <xsl:if test="$namespace = 'rsd'">
|
|
12999
|
+
<xsl:variable name="level">
|
|
13000
|
+
<xsl:call-template name="getLevel">
|
|
13001
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
|
13002
|
+
</xsl:call-template>
|
|
13003
|
+
</xsl:variable>
|
|
13004
|
+
<xsl:if test="$level >= 4">
|
|
13005
|
+
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
|
13006
|
+
</xsl:if>
|
|
13007
|
+
</xsl:if> -->
|
|
12999
13008
|
</xsl:template>
|
|
13000
13009
|
|
|
13001
13010
|
<!-- main sections -->
|
|
@@ -14058,6 +14067,20 @@
|
|
|
14058
14067
|
</fo:block-container>
|
|
14059
14068
|
</xsl:template>
|
|
14060
14069
|
|
|
14070
|
+
<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
|
|
14071
|
+
<xsl:template name="insertCoverPageFullImage">
|
|
14072
|
+
<xsl:param name="name">coverpage-image</xsl:param>
|
|
14073
|
+
<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
|
|
14074
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
|
|
14075
|
+
<fo:flow flow-name="xsl-region-body">
|
|
14076
|
+
<xsl:call-template name="insertBackgroundPageImage">
|
|
14077
|
+
<xsl:with-param name="number" select="position()"/>
|
|
14078
|
+
</xsl:call-template>
|
|
14079
|
+
</fo:flow>
|
|
14080
|
+
</fo:page-sequence>
|
|
14081
|
+
</xsl:for-each>
|
|
14082
|
+
</xsl:template>
|
|
14083
|
+
|
|
14061
14084
|
<xsl:template name="insertPageImage">
|
|
14062
14085
|
<xsl:param name="svg_content_height" select="$pageHeight"/>
|
|
14063
14086
|
<xsl:param name="bitmap_width" select="$pageWidth"/>
|
data/lib/metanorma/cc/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"
|
|
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/cc/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/cc/version.rb
CHANGED
data/metanorma-cc.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
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-cc
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.7.
|
|
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-
|
|
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:
|
|
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:
|
|
194
|
+
version: 0.1.3
|
|
195
195
|
description: |
|
|
196
196
|
metanorma-cc lets you write CalConnect standards in AsciiDoc syntax.
|
|
197
197
|
|