metanorma-jis 0.6.0 → 0.6.1
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/jis/i18n.rb +1 -1
- data/lib/isodoc/jis/jis.international-standard.xsl +100 -28
- data/lib/isodoc/jis/table.rb +19 -11
- data/lib/metanorma/jis/basicdoc.rng +5 -5
- data/lib/metanorma/jis/isodoc.rng +7 -1
- data/lib/metanorma/jis/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3ae16550b824fa8a0e98d33676ab83e93c32e3de519ef3c52e86347e49c29600
|
4
|
+
data.tar.gz: 806341c51894e499f46055434f1d2130fe7d2b502c9e6673c5c8cb85e43aa671
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: becd76f3e3b7260b8fdb012d8e1c56c419de280a63c054f8ff63d3dd7048cd657dc66a96c153e0e3f553d61bc9890586496ce0ada3edf8c015a477f3aea6a0d5
|
7
|
+
data.tar.gz: 27c9e90f4a68fcd56fd423ada507489a401ef74c707674f0dbc964a614018aefeb0f6f7d3895d42b7536978dbf7ef132b5cde09ea371d7e9ad2f86e28430fbdf
|
data/lib/isodoc/jis/i18n.rb
CHANGED
@@ -86,7 +86,7 @@
|
|
86
86
|
<fo:region-end region-name="right-region" extent="22mm"/>
|
87
87
|
</fo:simple-page-master>
|
88
88
|
|
89
|
-
<fo:simple-page-master master-name="cover-
|
89
|
+
<fo:simple-page-master master-name="cover-page_vertical_layout" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
|
90
90
|
<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
|
91
91
|
fo:region-body/@margin-top = left margin
|
92
92
|
fo:region-body/@margin-bottom = right margin
|
@@ -170,7 +170,7 @@
|
|
170
170
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
171
171
|
</fo:simple-page-master>
|
172
172
|
|
173
|
-
<fo:page-sequence-master master-name="
|
173
|
+
<fo:page-sequence-master master-name="toc">
|
174
174
|
<fo:repeatable-page-master-alternatives>
|
175
175
|
<fo:conditional-page-master-reference page-position="first" master-reference="first_page_toc"/>
|
176
176
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
|
@@ -179,7 +179,7 @@
|
|
179
179
|
</fo:page-sequence-master>
|
180
180
|
|
181
181
|
<xsl:if test="1 = 3">
|
182
|
-
<fo:simple-page-master master-name="
|
182
|
+
<fo:simple-page-master master-name="toc_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
183
183
|
<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
|
184
184
|
fo:region-body/@margin-top = left margin
|
185
185
|
fo:region-body/@margin-bottom = right margin
|
@@ -195,7 +195,7 @@
|
|
195
195
|
</fo:simple-page-master>
|
196
196
|
</xsl:if>
|
197
197
|
|
198
|
-
<fo:simple-page-master master-name="
|
198
|
+
<fo:simple-page-master master-name="toc_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
199
199
|
<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
|
200
200
|
fo:region-body/@margin-top = left margin
|
201
201
|
fo:region-body/@margin-bottom = right margin
|
@@ -210,7 +210,7 @@
|
|
210
210
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!-- background-color="red" -->
|
211
211
|
</fo:simple-page-master>
|
212
212
|
|
213
|
-
<fo:page-sequence-master master-name="
|
213
|
+
<fo:page-sequence-master master-name="preface">
|
214
214
|
<fo:repeatable-page-master-alternatives>
|
215
215
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
|
216
216
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
|
@@ -232,7 +232,7 @@
|
|
232
232
|
</fo:repeatable-page-master-alternatives>
|
233
233
|
</fo:page-sequence-master>
|
234
234
|
|
235
|
-
<fo:simple-page-master master-name="
|
235
|
+
<fo:simple-page-master master-name="document_vertical_layout" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
236
236
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
237
237
|
<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
|
238
238
|
<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
|
@@ -255,7 +255,7 @@
|
|
255
255
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!-- background-color="red" -->
|
256
256
|
</fo:simple-page-master>
|
257
257
|
|
258
|
-
<fo:simple-page-master master-name="
|
258
|
+
<fo:simple-page-master master-name="document_vertical_layout_page" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
259
259
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
260
260
|
<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
|
261
261
|
<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
|
@@ -277,7 +277,7 @@
|
|
277
277
|
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/> <!-- background-color="blue" -->
|
278
278
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!-- background-color="red" -->
|
279
279
|
</fo:simple-page-master>
|
280
|
-
<fo:simple-page-master master-name="
|
280
|
+
<fo:simple-page-master master-name="document_vertical_layout_last" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
281
281
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
282
282
|
<xsl:attribute name="page-width"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
|
283
283
|
<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
|
@@ -307,10 +307,10 @@
|
|
307
307
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/> <!-- background-color="red" -->
|
308
308
|
</fo:simple-page-master>
|
309
309
|
|
310
|
-
<fo:page-sequence-master master-name="
|
310
|
+
<fo:page-sequence-master master-name="document_vertical_layout_with_last">
|
311
311
|
<fo:repeatable-page-master-alternatives>
|
312
|
-
<fo:conditional-page-master-reference page-position="last" master-reference="
|
313
|
-
<fo:conditional-page-master-reference page-position="any" master-reference="
|
312
|
+
<fo:conditional-page-master-reference page-position="last" master-reference="document_vertical_layout_last"/>
|
313
|
+
<fo:conditional-page-master-reference page-position="any" master-reference="document_vertical_layout_page"/>
|
314
314
|
</fo:repeatable-page-master-alternatives>
|
315
315
|
</fo:page-sequence-master>
|
316
316
|
|
@@ -377,7 +377,7 @@
|
|
377
377
|
</fo:repeatable-page-master-alternatives>
|
378
378
|
</fo:page-sequence-master>
|
379
379
|
|
380
|
-
<fo:simple-page-master master-name="back-
|
380
|
+
<fo:simple-page-master master-name="back-page" page-width="{$pageWidthA5}mm" page-height="{$pageHeightA5}mm">
|
381
381
|
<!-- Note (for writing-mode="tb-rl", may be due the update for support 'tb-rl' mode):
|
382
382
|
fo:region-body/@margin-top = left margin
|
383
383
|
fo:region-body/@margin-bottom = right margin
|
@@ -547,10 +547,10 @@
|
|
547
547
|
|
548
548
|
<xsl:choose>
|
549
549
|
<xsl:when test="self::mn:clause and @type = 'toc'">
|
550
|
-
<fo:page-sequence master-reference="
|
550
|
+
<fo:page-sequence master-reference="toc" force-page-count="no-force">
|
551
551
|
|
552
552
|
<xsl:if test="$vertical_layout = 'true'">
|
553
|
-
<xsl:attribute name="master-reference">
|
553
|
+
<xsl:attribute name="master-reference">toc_vertical_layout</xsl:attribute>
|
554
554
|
<xsl:attribute name="format">一</xsl:attribute>
|
555
555
|
</xsl:if>
|
556
556
|
|
@@ -617,10 +617,10 @@
|
|
617
617
|
|
618
618
|
<xsl:if test="$paged_xml_preface/mn:page and count($paged_xml_preface/mn:page/*) != 0">
|
619
619
|
<!-- Preface pages -->
|
620
|
-
<fo:page-sequence master-reference="
|
620
|
+
<fo:page-sequence master-reference="preface" force-page-count="no-force">
|
621
621
|
|
622
622
|
<xsl:if test="$vertical_layout = 'true'">
|
623
|
-
<xsl:attribute name="master-reference">
|
623
|
+
<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
|
624
624
|
<xsl:attribute name="format">一</xsl:attribute>
|
625
625
|
</xsl:if>
|
626
626
|
|
@@ -679,7 +679,7 @@
|
|
679
679
|
<xsl:if test="not($vertical_layout = 'true') and not($doctype = 'technical-specification')">
|
680
680
|
|
681
681
|
<!-- Document type rendering -->
|
682
|
-
<fo:page-sequence master-reference="
|
682
|
+
<fo:page-sequence master-reference="preface" force-page-count="no-force">
|
683
683
|
<xsl:call-template name="insertHeaderFooter">
|
684
684
|
<xsl:with-param name="docidentifier" select="$docidentifier"/>
|
685
685
|
<xsl:with-param name="copyrightText" select="$copyrightText"/>
|
@@ -779,9 +779,9 @@
|
|
779
779
|
|
780
780
|
<xsl:choose>
|
781
781
|
<xsl:when test="$vertical_layout = 'true'">
|
782
|
-
<xsl:attribute name="master-reference">
|
782
|
+
<xsl:attribute name="master-reference">document_vertical_layout</xsl:attribute>
|
783
783
|
<xsl:if test="position() = last()">
|
784
|
-
<xsl:attribute name="master-reference">
|
784
|
+
<xsl:attribute name="master-reference">document_vertical_layout_with_last</xsl:attribute>
|
785
785
|
</xsl:if>
|
786
786
|
|
787
787
|
<xsl:attribute name="format">一</xsl:attribute>
|
@@ -996,7 +996,7 @@
|
|
996
996
|
<xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
|
997
997
|
<xsl:choose>
|
998
998
|
<xsl:when test="$vertical_layout = 'true'">
|
999
|
-
<xsl:call-template name="
|
999
|
+
<xsl:call-template name="insertCoverPageVerticalLayout">
|
1000
1000
|
<xsl:with-param name="num" select="$num"/>
|
1001
1001
|
<xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
|
1002
1002
|
</xsl:call-template>
|
@@ -1319,7 +1319,7 @@
|
|
1319
1319
|
</xsl:variable>
|
1320
1320
|
<xsl:variable name="i18n_JIS" select="normalize-space($i18n_JIS_)"/>
|
1321
1321
|
|
1322
|
-
<xsl:template name="
|
1322
|
+
<xsl:template name="insertCoverPageVerticalLayout">
|
1323
1323
|
<xsl:param name="num"/>
|
1324
1324
|
<xsl:param name="docidentifier_jis"/>
|
1325
1325
|
|
@@ -1327,7 +1327,7 @@
|
|
1327
1327
|
<xsl:variable name="docidentifier_number" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$1')"/>
|
1328
1328
|
<xsl:variable name="docidentifier_year" select="java:replaceAll(java:java.lang.String.new($docidentifier_jis), '^(.*)(:)(.*)$', '$3')"/>
|
1329
1329
|
|
1330
|
-
<fo:page-sequence master-reference="cover-
|
1330
|
+
<fo:page-sequence master-reference="cover-page_vertical_layout" force-page-count="no-force">
|
1331
1331
|
|
1332
1332
|
<!-- <xsl:variable name="cover_page_background_1_value" select="normalize-space(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:color-cover-page-background-1)"/>
|
1333
1333
|
<xsl:variable name="cover_page_background_1_">
|
@@ -1501,7 +1501,7 @@
|
|
1501
1501
|
|
1502
1502
|
</fo:flow>
|
1503
1503
|
</fo:page-sequence>
|
1504
|
-
</xsl:template> <!--
|
1504
|
+
</xsl:template> <!-- insertCoverPageVerticalLayout -->
|
1505
1505
|
|
1506
1506
|
<xsl:template name="back-page">
|
1507
1507
|
<xsl:param name="num"/>
|
@@ -1509,7 +1509,7 @@
|
|
1509
1509
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
1510
1510
|
<xsl:if test="$vertical_layout = 'true'">
|
1511
1511
|
|
1512
|
-
<fo:page-sequence master-reference="back-
|
1512
|
+
<fo:page-sequence master-reference="back-page" force-page-count="no-force" font-family="Noto Serif JP" font-weight="500">
|
1513
1513
|
|
1514
1514
|
<fo:static-content flow-name="header">
|
1515
1515
|
<xsl:variable name="presentation_metadata_image_name">
|
@@ -10703,6 +10703,16 @@
|
|
10703
10703
|
</xsl:variable>
|
10704
10704
|
<xsl:variable name="quot">"</xsl:variable>
|
10705
10705
|
<xsl:variable name="styles_">
|
10706
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
10707
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
10708
|
+
<style name="border-top">none</style>
|
10709
|
+
<style name="border-right">none</style>
|
10710
|
+
<style name="border-left">none</style>
|
10711
|
+
<style name="border-bottom">none</style>
|
10712
|
+
<style name="color">inherit</style>
|
10713
|
+
<style name="background-color">transparent</style>
|
10714
|
+
</xsl:if>
|
10715
|
+
|
10706
10716
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
10707
10717
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
10708
10718
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
@@ -12745,7 +12755,10 @@
|
|
12745
12755
|
|
12746
12756
|
<xsl:template match="mn:note" name="note">
|
12747
12757
|
<xsl:call-template name="setNamedDestination"/>
|
12748
|
-
<fo:block
|
12758
|
+
<fo:block xsl:use-attribute-sets="note-style" role="SKIP">
|
12759
|
+
<xsl:if test="not(parent::mn:references)">
|
12760
|
+
<xsl:copy-of select="@id"/>
|
12761
|
+
</xsl:if>
|
12749
12762
|
<xsl:call-template name="setBlockSpanAll"/>
|
12750
12763
|
|
12751
12764
|
<xsl:call-template name="refine_note-style"/>
|
@@ -15628,8 +15641,8 @@
|
|
15628
15641
|
</xsl:template> <!-- bibitem -->
|
15629
15642
|
|
15630
15643
|
<!-- Bibliography (non-normative references) -->
|
15631
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
15632
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
15644
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
15645
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
15633
15646
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
15634
15647
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
15635
15648
|
<xsl:call-template name="setNamedDestination"/>
|
@@ -15681,7 +15694,7 @@
|
|
15681
15694
|
</fo:list-item>
|
15682
15695
|
</xsl:otherwise>
|
15683
15696
|
</xsl:choose>
|
15684
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
15697
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
15685
15698
|
<xsl:with-param name="skip">false</xsl:with-param>
|
15686
15699
|
</xsl:apply-templates>
|
15687
15700
|
</xsl:template>
|
@@ -15701,8 +15714,25 @@
|
|
15701
15714
|
</fo:inline>
|
15702
15715
|
<xsl:apply-templates select="mn:formattedref"/>
|
15703
15716
|
|
15717
|
+
<xsl:call-template name="processBibliographyNote"/>
|
15704
15718
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
15705
15719
|
|
15720
|
+
<xsl:template name="processBibliographyNote">
|
15721
|
+
<xsl:if test="self::mn:note">
|
15722
|
+
<xsl:variable name="note_node">
|
15723
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
15724
|
+
<xsl:copy> <!-- skip @id -->
|
15725
|
+
<xsl:copy-of select="node()"/>
|
15726
|
+
</xsl:copy>
|
15727
|
+
</xsl:element>
|
15728
|
+
</xsl:variable>
|
15729
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
15730
|
+
<xsl:call-template name="note"/>
|
15731
|
+
</xsl:for-each> -->
|
15732
|
+
<xsl:call-template name="note"/>
|
15733
|
+
</xsl:if>
|
15734
|
+
</xsl:template>
|
15735
|
+
|
15706
15736
|
<xsl:template match="mn:title" mode="title">
|
15707
15737
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
15708
15738
|
</xsl:template>
|
@@ -16248,6 +16278,48 @@
|
|
16248
16278
|
<!-- End Form's elements processing -->
|
16249
16279
|
<!-- =================== -->
|
16250
16280
|
|
16281
|
+
<xsl:attribute-set name="toc-style">
|
16282
|
+
</xsl:attribute-set>
|
16283
|
+
|
16284
|
+
<xsl:template name="refine_toc-style">
|
16285
|
+
</xsl:template>
|
16286
|
+
|
16287
|
+
<xsl:attribute-set name="toc-title-style">
|
16288
|
+
</xsl:attribute-set>
|
16289
|
+
|
16290
|
+
<xsl:attribute-set name="toc-title-page-style">
|
16291
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
16292
|
+
|
16293
|
+
<xsl:attribute-set name="toc-item-block-style">
|
16294
|
+
</xsl:attribute-set>
|
16295
|
+
|
16296
|
+
<xsl:template name="refine_toc-item-block-style">
|
16297
|
+
</xsl:template>
|
16298
|
+
|
16299
|
+
<xsl:attribute-set name="toc-item-style">
|
16300
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
16301
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
16302
|
+
|
16303
|
+
<xsl:template name="refine_toc-item-style">
|
16304
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
16305
|
+
|
16306
|
+
<xsl:attribute-set name="toc-leader-style">
|
16307
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
16308
|
+
|
16309
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
16310
|
+
</xsl:attribute-set>
|
16311
|
+
|
16312
|
+
<!-- List of Figures, Tables -->
|
16313
|
+
<xsl:attribute-set name="toc-listof-title-style">
|
16314
|
+
</xsl:attribute-set>
|
16315
|
+
|
16316
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
16317
|
+
</xsl:attribute-set>
|
16318
|
+
|
16319
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
16320
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
16321
|
+
</xsl:attribute-set>
|
16322
|
+
|
16251
16323
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
16252
16324
|
<xsl:variable name="nodes_preface_">
|
16253
16325
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
data/lib/isodoc/jis/table.rb
CHANGED
@@ -4,18 +4,26 @@ module IsoDoc
|
|
4
4
|
def table_title_parse(node, out); end
|
5
5
|
|
6
6
|
def table_attrs(node)
|
7
|
-
style = node["
|
8
|
-
|
9
|
-
|
10
|
-
"0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
|
11
|
-
"mso-border-insidev:none;"
|
7
|
+
style = table_attrs_style(node, node["class"])
|
8
|
+
klass = node.text.length > 4000 ? "MsoTableGridBig" : "MsoTableGrid"
|
9
|
+
node["plain"] == "true" and klass = nil
|
12
10
|
{ id: node["id"], title: node["alt"],
|
13
11
|
summary: node["summary"], width: node["width"],
|
14
|
-
class:
|
12
|
+
class: klass,
|
15
13
|
style: style,
|
16
14
|
border: 0, cellspacing: 0, cellpadding: 0 }
|
17
15
|
end
|
18
16
|
|
17
|
+
def table_attrs_style(node, _klass)
|
18
|
+
style = node["style"]
|
19
|
+
node["plain"] == "true" or style ||= "border-collapse:collapse;" \
|
20
|
+
"mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
|
21
|
+
"border:none;mso-padding-alt: " \
|
22
|
+
"0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;" \
|
23
|
+
"mso-border-insidev:none;"
|
24
|
+
style
|
25
|
+
end
|
26
|
+
|
19
27
|
def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
|
20
28
|
top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
|
21
29
|
bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
|
@@ -31,16 +39,16 @@ module IsoDoc
|
|
31
39
|
end
|
32
40
|
|
33
41
|
def new_fullcolspan_row(table, tfoot)
|
34
|
-
# how many columns in the table?
|
35
|
-
cols = 0
|
42
|
+
cols = 0 # how many columns in the table?
|
36
43
|
table.at(".//tr").xpath("./td | ./th").each do |td|
|
37
44
|
cols += (td["colspan"] ? td["colspan"].to_i : 1)
|
38
45
|
end
|
39
|
-
|
46
|
+
table["class"].nil? or # plain table
|
47
|
+
style = "style='border-top:0pt;mso-border-top-alt:0pt;" \
|
40
48
|
"border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;" \
|
41
49
|
"border-left:#{SW1} 1.5pt;mso-border-left-alt:#{SW1} 1.5pt;" \
|
42
|
-
"border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;"
|
43
|
-
tfoot.add_child("<tr><td colspan='#{cols}'
|
50
|
+
"border-right:#{SW1} 1.5pt;mso-border-right-alt:#{SW1} 1.5pt;'"
|
51
|
+
tfoot.add_child("<tr><td colspan='#{cols}' #{style}/></tr>")
|
44
52
|
tfoot.xpath(".//td").last
|
45
53
|
end
|
46
54
|
end
|
@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
|
|
198
198
|
</zeroOrMore>
|
199
199
|
</element>
|
200
200
|
</optional>
|
201
|
-
<
|
201
|
+
<zeroOrMore>
|
202
202
|
<element name="description">
|
203
|
-
<a:documentation>Description of the change described in this block</a:documentation>
|
204
|
-
<
|
203
|
+
<a:documentation>Description(s) of the change described in this block</a:documentation>
|
204
|
+
<oneOrMore>
|
205
205
|
<ref name="BasicBlock"/>
|
206
|
-
</
|
206
|
+
</oneOrMore>
|
207
207
|
</element>
|
208
|
-
</
|
208
|
+
</zeroOrMore>
|
209
209
|
<optional>
|
210
210
|
<element name="newcontent">
|
211
211
|
<a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
2
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
3
|
-
<!-- VERSION v2.0
|
3
|
+
<!-- VERSION v2.1.0 -->
|
4
4
|
|
5
5
|
<!--
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
@@ -735,6 +735,12 @@ titlecase, or lowercase</a:documentation>
|
|
735
735
|
<ref name="BlockAttributes"/>
|
736
736
|
</define>
|
737
737
|
<define name="TableAttributes" combine="interleave">
|
738
|
+
<optional>
|
739
|
+
<attribute name="plain">
|
740
|
+
<a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
|
741
|
+
<data type="boolean"/>
|
742
|
+
</attribute>
|
743
|
+
</optional>
|
738
744
|
<optional>
|
739
745
|
<attribute name="width">
|
740
746
|
<a:documentation>Width of the table block in rendering</a:documentation>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-jis
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-07-
|
11
|
+
date: 2025-07-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: japanese_calendar
|