metanorma-jis 0.6.6 → 0.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5ab0b01630fb8d1bfe5b00f02e1a2b5bdec5d25747bdb0cff159637bf113aca4
4
- data.tar.gz: f6c399abfa6e0eb718c699442c94c0bf697ed62860320b4c4cd998192e1676af
3
+ metadata.gz: cc35660a3519ecd96fc405bb9b779a5faa4e0beec0c5c8e9f3d10b097ec59383
4
+ data.tar.gz: 338cc7fa6625b69488b162d8d9d859c4def0715213b6bbe6d8312df083b5c6cf
5
5
  SHA512:
6
- metadata.gz: ca03cf008a8456cb07057dd40ff491a2354f8b46c4f85b9b2debf1a3305301d10419155296821ae154707c52e4ca66e858d0e07d5380f4cd64366b1466773646
7
- data.tar.gz: 06c7813d7204d9257c8eb3da0666b2196b1a22d979d839411961b5a5cc7a441d781b5173e55b632834bf9981b151c8c77ae8db9f1f0372bc95650ef2f4bd32c4
6
+ metadata.gz: 940badc26918dc33e357b8d7e3ae290f5f4ba9f4ac2adc21893d6e4af347125171ceeb498c72ecb045a1d4ef620d1efac8adf1f45f25c11a81a8d344e26ba68c
7
+ data.tar.gz: 04fb252ad1bab143b1c08be8121e4859ef26e33d79d97515aadb149e023b2c0c3f7a89ae8a487dbd7c4e5de19177fafeaacf1ce432224fec21724284d270b226
@@ -989,41 +989,48 @@
989
989
  <xsl:template name="cover-page">
990
990
  <xsl:param name="num"/>
991
991
  <xsl:param name="docidentifier"/>
992
- <xsl:if test="$isGenerateTableIF = 'false'">
993
- <xsl:variable name="doctype"><xsl:call-template name="get_doctype"/></xsl:variable>
994
- <xsl:variable name="docidentifier_JIS"><xsl:call-template name="get_docidentifier_JIS"/></xsl:variable>
995
- <xsl:variable name="doclang"><xsl:call-template name="getLang"/></xsl:variable>
996
- <xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
997
- <xsl:choose>
998
- <xsl:when test="$vertical_layout = 'true'">
999
- <xsl:call-template name="insertCoverPageVerticalLayout">
1000
- <xsl:with-param name="num" select="$num"/>
1001
- <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1002
- </xsl:call-template>
1003
- </xsl:when>
1004
- <xsl:when test="$doctype = 'technical-specification'">
1005
- <xsl:call-template name="insertCoverPageJSA">
1006
- <xsl:with-param name="num" select="$num"/>
1007
- <xsl:with-param name="doclang" select="$doclang"/>
1008
- <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1009
- </xsl:call-template>
1010
- </xsl:when>
1011
- <xsl:otherwise>
1012
- <xsl:call-template name="insertCoverPage">
1013
- <xsl:with-param name="num" select="$num"/>
1014
- <xsl:with-param name="copyrightText" select="$copyrightText"/>
1015
- <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1016
- </xsl:call-template>
1017
- </xsl:otherwise>
1018
- </xsl:choose>
992
+ <xsl:choose>
993
+ <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'">
994
+ <xsl:call-template name="insertCoverPageFullImage"/>
995
+ </xsl:when>
996
+ <xsl:otherwise>
997
+ <xsl:if test="$isGenerateTableIF = 'false'">
998
+ <xsl:variable name="doctype"><xsl:call-template name="get_doctype"/></xsl:variable>
999
+ <xsl:variable name="docidentifier_JIS"><xsl:call-template name="get_docidentifier_JIS"/></xsl:variable>
1000
+ <xsl:variable name="doclang"><xsl:call-template name="getLang"/></xsl:variable>
1001
+ <xsl:variable name="copyrightText"><xsl:call-template name="get_copyrightText"/></xsl:variable>
1002
+ <xsl:choose>
1003
+ <xsl:when test="$vertical_layout = 'true'">
1004
+ <xsl:call-template name="insertCoverPageVerticalLayout">
1005
+ <xsl:with-param name="num" select="$num"/>
1006
+ <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1007
+ </xsl:call-template>
1008
+ </xsl:when>
1009
+ <xsl:when test="$doctype = 'technical-specification'">
1010
+ <xsl:call-template name="insertCoverPageJSA">
1011
+ <xsl:with-param name="num" select="$num"/>
1012
+ <xsl:with-param name="doclang" select="$doclang"/>
1013
+ <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1014
+ </xsl:call-template>
1015
+ </xsl:when>
1016
+ <xsl:otherwise>
1017
+ <xsl:call-template name="insertCoverPage">
1018
+ <xsl:with-param name="num" select="$num"/>
1019
+ <xsl:with-param name="copyrightText" select="$copyrightText"/>
1020
+ <xsl:with-param name="docidentifier_jis" select="$docidentifier_JIS"/>
1021
+ </xsl:call-template>
1022
+ </xsl:otherwise>
1023
+ </xsl:choose>
1019
1024
 
1020
- <xsl:if test="not($vertical_layout = 'true')">
1021
- <xsl:call-template name="insertInnerCoverPage">
1022
- <xsl:with-param name="docidentifier" select="$docidentifier"/>
1023
- <xsl:with-param name="copyrightText" select="$copyrightText"/>
1024
- </xsl:call-template>
1025
- </xsl:if>
1026
- </xsl:if>
1025
+ <xsl:if test="not($vertical_layout = 'true')">
1026
+ <xsl:call-template name="insertInnerCoverPage">
1027
+ <xsl:with-param name="docidentifier" select="$docidentifier"/>
1028
+ <xsl:with-param name="copyrightText" select="$copyrightText"/>
1029
+ </xsl:call-template>
1030
+ </xsl:if>
1031
+ </xsl:if>
1032
+ </xsl:otherwise>
1033
+ </xsl:choose>
1027
1034
  </xsl:template>
1028
1035
 
1029
1036
  <xsl:template name="inner-cover-page">
@@ -3260,6 +3267,23 @@
3260
3267
  <xsl:param name="section"/>
3261
3268
  <xsl:param name="copyrightText"/>
3262
3269
  <xsl:param name="section_title"/>
3270
+
3271
+ <xsl:call-template name="insertHeader">
3272
+ <xsl:with-param name="docidentifier" select="$docidentifier"/>
3273
+ <xsl:with-param name="section" select="$section"/>
3274
+ <xsl:with-param name="section_title" select="$section_title"/>
3275
+ </xsl:call-template>
3276
+
3277
+ <xsl:call-template name="insertFooter">
3278
+ <xsl:with-param name="section" select="$section"/>
3279
+ <xsl:with-param name="copyrightText" select="$copyrightText"/>
3280
+ </xsl:call-template>
3281
+ </xsl:template>
3282
+
3283
+ <xsl:template name="insertHeader">
3284
+ <xsl:param name="docidentifier"/>
3285
+ <xsl:param name="section"/>
3286
+ <xsl:param name="section_title"/>
3263
3287
  <fo:static-content flow-name="header-odd-first" role="artifact">
3264
3288
  <fo:block-container font-family="Arial" font-size="9pt" height="26mm" display-align="after" text-align="right">
3265
3289
  <xsl:if test="$vertical_layout = 'true'">
@@ -3315,11 +3339,6 @@
3315
3339
  <fo:block> </fo:block>
3316
3340
  </fo:block-container>
3317
3341
  </fo:static-content>
3318
-
3319
- <xsl:call-template name="insertFooter">
3320
- <xsl:with-param name="section" select="$section"/>
3321
- <xsl:with-param name="copyrightText" select="$copyrightText"/>
3322
- </xsl:call-template>
3323
3342
  </xsl:template>
3324
3343
 
3325
3344
  <xsl:template name="insertFooter">
@@ -3327,9 +3346,9 @@
3327
3346
  <xsl:param name="copyrightText"/>
3328
3347
  <fo:static-content flow-name="footer">
3329
3348
  <fo:block-container height="24mm" display-align="after">
3330
- <xsl:if test="$section = 'commentary'">
3331
- <xsl:attribute name="height">24.5mm</xsl:attribute>
3332
- </xsl:if>
3349
+ <xsl:if test="$section = 'commentary'">
3350
+ <xsl:attribute name="height">24.5mm</xsl:attribute>
3351
+ </xsl:if>
3333
3352
  <xsl:if test="$section = 'preface'">
3334
3353
  <fo:block font-size="9pt" text-align="center" space-after="10pt">(<fo:inline font-family="Times New Roman"><fo:page-number/></fo:inline>)</fo:block>
3335
3354
  </xsl:if>
@@ -8972,95 +8991,89 @@
8972
8991
  <xsl:template name="refine_term-style">
8973
8992
  </xsl:template>
8974
8993
 
8975
- <xsl:attribute-set name="term-name-style">
8994
+ <xsl:attribute-set name="term-number-style">
8976
8995
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
8977
8996
  <xsl:attribute name="font-weight">bold</xsl:attribute>
8978
8997
  <xsl:attribute name="space-after">2pt</xsl:attribute>
8979
8998
  </xsl:attribute-set> <!-- term-name-style -->
8980
8999
 
8981
- <xsl:template name="refine_term-name-style">
9000
+ <xsl:template name="refine_term-number-style">
8982
9001
  <xsl:if test="not($vertical_layout = 'true')">
8983
9002
  <xsl:attribute name="font-family">Times New Roman</xsl:attribute>
8984
9003
  </xsl:if>
8985
9004
  </xsl:template>
8986
9005
 
8987
- <xsl:attribute-set name="preferred-style">
8988
- </xsl:attribute-set> <!-- preferred-style -->
8989
-
8990
- <xsl:template name="refine_preferred-style">
8991
- </xsl:template>
8992
-
8993
- <xsl:attribute-set name="preferred-block-style">
9006
+ <xsl:attribute-set name="term-preferred-block-style">
8994
9007
  </xsl:attribute-set> <!-- preferred-block-style -->
8995
9008
 
8996
- <xsl:template name="refine_preferred-block-style">
9009
+ <xsl:template name="refine_term-preferred-block-style">
8997
9010
  <xsl:if test="$vertical_layout = 'true'">
8998
9011
  <xsl:attribute name="letter-spacing">1mm</xsl:attribute>
8999
9012
  <xsl:attribute name="margin-left">-6mm</xsl:attribute>
9000
9013
  </xsl:if>
9001
9014
  </xsl:template>
9002
9015
 
9003
- <xsl:attribute-set name="preferred-term-style">
9016
+ <xsl:attribute-set name="term-preferred-style">
9004
9017
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
9005
9018
  <xsl:attribute name="font-weight">bold</xsl:attribute>
9006
9019
  <xsl:attribute name="font-weight">normal</xsl:attribute>
9007
9020
  </xsl:attribute-set> <!-- preferred-term-style -->
9008
9021
 
9009
- <xsl:template name="refine_preferred-term-style">
9022
+ <xsl:template name="refine_term-preferred-style">
9010
9023
  <xsl:if test="mn:strong">
9011
9024
  <xsl:attribute name="font-weight">normal</xsl:attribute>
9012
9025
  </xsl:if>
9013
9026
  </xsl:template>
9014
9027
 
9015
- <xsl:attribute-set name="domain-style">
9016
- </xsl:attribute-set> <!-- domain-style -->
9028
+ <xsl:attribute-set name="term-domain-style">
9029
+ </xsl:attribute-set> <!-- term-domain-style -->
9017
9030
 
9018
- <xsl:template name="refine_domain-style">
9031
+ <xsl:template name="refine_term-domain-style">
9019
9032
  </xsl:template>
9020
9033
 
9021
- <xsl:attribute-set name="admitted-style">
9022
- </xsl:attribute-set> <!-- admitted-style -->
9034
+ <xsl:attribute-set name="term-admitted-style">
9035
+ </xsl:attribute-set> <!-- term-admitted-style -->
9023
9036
 
9024
- <xsl:template name="refine_admitted-style">
9037
+ <xsl:template name="refine_term-admitted-style">
9025
9038
  </xsl:template>
9026
9039
 
9027
- <xsl:attribute-set name="deprecates-style">
9028
- </xsl:attribute-set> <!-- deprecates-style -->
9040
+ <xsl:attribute-set name="term-deprecates-style">
9041
+ </xsl:attribute-set> <!-- term-deprecates-style -->
9029
9042
 
9030
- <xsl:template name="refine_deprecates-style">
9043
+ <xsl:template name="refine_term-deprecates-style">
9031
9044
  </xsl:template>
9032
9045
 
9033
- <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
9046
+ <xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
9034
9047
  </xsl:attribute-set>
9035
9048
 
9036
- <xsl:template name="refine_related-block-style">
9049
+ <xsl:template name="refine_term-related-block-style">
9037
9050
  </xsl:template>
9038
9051
 
9039
- <xsl:attribute-set name="definition-style">
9052
+ <xsl:attribute-set name="term-definition-style">
9040
9053
  <xsl:attribute name="space-before">2pt</xsl:attribute>
9041
9054
  <xsl:attribute name="space-after">2pt</xsl:attribute>
9042
- </xsl:attribute-set> <!-- definition-style -->
9055
+ </xsl:attribute-set> <!-- term-definition-style -->
9043
9056
 
9044
- <xsl:template name="refine_definition-style">
9057
+ <xsl:template name="refine_term-definition-style">
9045
9058
  </xsl:template>
9046
9059
 
9047
- <xsl:attribute-set name="termsource-style">
9060
+ <xsl:attribute-set name="term-termsource-style">
9048
9061
  <xsl:attribute name="margin-left">6mm</xsl:attribute>
9049
- </xsl:attribute-set> <!-- termsource-style -->
9062
+ </xsl:attribute-set> <!-- term-termsource-style -->
9050
9063
 
9051
- <xsl:template name="refine_termsource-style">
9052
- </xsl:template> <!-- refine_termsource-style -->
9064
+ <xsl:template name="refine_term-termsource-style">
9065
+ </xsl:template> <!-- refine_term-termsource-style -->
9053
9066
 
9054
- <xsl:attribute-set name="termsource-text-style">
9055
- </xsl:attribute-set> <!-- termsource-text-style -->
9067
+ <xsl:attribute-set name="term-termsource-text-style">
9068
+ </xsl:attribute-set> <!-- term-termsource-text-style -->
9056
9069
 
9057
- <xsl:template name="refine_termsource-text-style">
9070
+ <xsl:template name="refine_term-termsource-text-style">
9058
9071
  </xsl:template>
9059
9072
 
9060
- <xsl:attribute-set name="origin-style">
9061
- </xsl:attribute-set> <!-- origin-style -->
9073
+ <xsl:attribute-set name="term-origin-style">
9074
+ </xsl:attribute-set> <!-- term-origin-style -->
9062
9075
 
9063
- <xsl:template name="refine_origin-style">
9076
+ <xsl:template name="refine_term-origin-style">
9064
9077
  </xsl:template>
9065
9078
 
9066
9079
  <!-- ====== -->
@@ -9104,9 +9117,9 @@
9104
9117
  <!-- modification -->
9105
9118
  <!-- ====== -->
9106
9119
  <xsl:template match="mn:fmt-termsource" name="termsource">
9107
- <fo:block xsl:use-attribute-sets="termsource-style">
9120
+ <fo:block xsl:use-attribute-sets="term-termsource-style">
9108
9121
 
9109
- <xsl:call-template name="refine_termsource-style"/>
9122
+ <xsl:call-template name="refine_term-termsource-style"/>
9110
9123
 
9111
9124
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
9112
9125
  <xsl:variable name="termsource_text">
@@ -9154,8 +9167,8 @@
9154
9167
 
9155
9168
  <!-- text SOURCE: -->
9156
9169
  <xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
9157
- <fo:inline xsl:use-attribute-sets="termsource-text-style">
9158
- <xsl:call-template name="refine_termsource-text-style"/>
9170
+ <fo:inline xsl:use-attribute-sets="term-termsource-text-style">
9171
+ <xsl:call-template name="refine_term-termsource-text-style"/>
9159
9172
  <xsl:value-of select="."/>
9160
9173
  </fo:inline>
9161
9174
  </xsl:template>
@@ -9167,8 +9180,8 @@
9167
9180
  <xsl:if test="normalize-space(@citeas) = ''">
9168
9181
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
9169
9182
  </xsl:if>
9170
- <fo:inline xsl:use-attribute-sets="origin-style">
9171
- <xsl:call-template name="refine_origin-style"/>
9183
+ <fo:inline xsl:use-attribute-sets="term-origin-style">
9184
+ <xsl:call-template name="refine_term-origin-style"/>
9172
9185
  <xsl:apply-templates/>
9173
9186
  </fo:inline>
9174
9187
  </fo:basic-link>
@@ -9216,14 +9229,14 @@
9216
9229
  <xsl:variable name="levelTerm">
9217
9230
  <xsl:call-template name="getLevelTermName"/>
9218
9231
  </xsl:variable>
9219
- <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
9232
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
9220
9233
 
9221
- <xsl:call-template name="refine_preferred-block-style"/>
9234
+ <xsl:call-template name="refine_term-preferred-block-style"/>
9222
9235
 
9223
9236
  <xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
9224
9237
 
9225
- <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
9226
- <xsl:call-template name="refine_term-name-style"/>
9238
+ <fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
9239
+ <xsl:call-template name="refine_term-number-style"/>
9227
9240
 
9228
9241
  <xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
9229
9242
  <xsl:call-template name="setIDforNamedDestination"/>
@@ -9233,8 +9246,8 @@
9233
9246
  </fo:block>
9234
9247
  </xsl:if>
9235
9248
 
9236
- <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
9237
- <xsl:call-template name="refine_preferred-term-style"/>
9249
+ <fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
9250
+ <xsl:call-template name="refine_term-preferred-style"/>
9238
9251
  <xsl:if test="$vertical_layout = 'true'">
9239
9252
  <xsl:attribute name="margin-left">6mm</xsl:attribute>
9240
9253
  <xsl:attribute name="font-family">Noto Sans JP</xsl:attribute>
@@ -9262,15 +9275,15 @@
9262
9275
  <xsl:template match="mn:domain"/>
9263
9276
 
9264
9277
  <xsl:template match="mn:fmt-admitted">
9265
- <fo:block xsl:use-attribute-sets="admitted-style">
9266
- <xsl:call-template name="refine_admitted-style"/>
9278
+ <fo:block xsl:use-attribute-sets="term-admitted-style">
9279
+ <xsl:call-template name="refine_term-admitted-style"/>
9267
9280
  <xsl:apply-templates/>
9268
9281
  </fo:block>
9269
9282
  </xsl:template>
9270
9283
 
9271
9284
  <xsl:template match="mn:fmt-deprecates">
9272
- <fo:block xsl:use-attribute-sets="deprecates-style">
9273
- <xsl:call-template name="refine_deprecates-style"/>
9285
+ <fo:block xsl:use-attribute-sets="term-deprecates-style">
9286
+ <xsl:call-template name="refine_term-deprecates-style"/>
9274
9287
  <xsl:apply-templates/>
9275
9288
  </fo:block>
9276
9289
  </xsl:template>
@@ -9283,8 +9296,8 @@
9283
9296
  <!-- End Preferred, admitted, deprecated -->
9284
9297
 
9285
9298
  <xsl:template match="mn:fmt-related">
9286
- <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
9287
- <xsl:call-template name="refine_related-block-style"/>
9299
+ <fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
9300
+ <xsl:call-template name="refine_term-related-block-style"/>
9288
9301
  <xsl:apply-templates/>
9289
9302
  </fo:block>
9290
9303
  </xsl:template>
@@ -9298,8 +9311,8 @@
9298
9311
  <!-- definition -->
9299
9312
  <!-- ========== -->
9300
9313
  <xsl:template match="mn:fmt-definition">
9301
- <fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
9302
- <xsl:call-template name="refine_definition-style"/>
9314
+ <fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
9315
+ <xsl:call-template name="refine_term-definition-style"/>
9303
9316
  <xsl:apply-templates/>
9304
9317
  </fo:block>
9305
9318
  </xsl:template>
@@ -19380,6 +19393,20 @@
19380
19393
  </fo:block-container>
19381
19394
  </xsl:template>
19382
19395
 
19396
+ <!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
19397
+ <xsl:template name="insertCoverPageFullImage">
19398
+ <xsl:param name="name">coverpage-image</xsl:param>
19399
+ <xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
19400
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
19401
+ <fo:flow flow-name="xsl-region-body">
19402
+ <xsl:call-template name="insertBackgroundPageImage">
19403
+ <xsl:with-param name="number" select="position()"/>
19404
+ </xsl:call-template>
19405
+ </fo:flow>
19406
+ </fo:page-sequence>
19407
+ </xsl:for-each>
19408
+ </xsl:template>
19409
+
19383
19410
  <xsl:template name="insertPageImage">
19384
19411
  <xsl:param name="svg_content_height" select="$pageHeight"/>
19385
19412
  <xsl:param name="bitmap_width" select="$pageWidth"/>
@@ -69,8 +69,9 @@ module IsoDoc
69
69
  )
70
70
  if elem["unnumbered"] != "true"
71
71
  x = semx(elem, sublabel)
72
+ p = elem.at("./ancestor::xmlns:figure")
72
73
  @anchors[elem["id"]][:label] = x
73
- @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] +
74
+ @anchors[elem["id"]][:xref] = @anchors[p["id"]][:xref] +
74
75
  subfigure_separator(markup: true) + x + delim_wrap(subfigure_delim)
75
76
  end
76
77
  end
@@ -171,12 +172,23 @@ module IsoDoc
171
172
  label = counter.increment(entry).listlabel(entry.parent, depth)
172
173
  s = semx(entry, label)
173
174
  base = @c.decode(opts[:prev_label].gsub(%r{<[^>]+>}, "")).split(/\)\s*/) # List a) 1.1.1
174
- label = "#{base[-1].sub(/^の/,'')}#{clausesep}#{label}"
175
+ label = "#{base[-1].sub(/^の/,'')}<esc>#{clausesep}</esc>#{label}"
175
176
  [label, opts[:prev_label] + delim_wrap(clausesep) + s]
176
177
  else
177
178
  super
178
179
  end
179
180
  end
181
+
182
+ def hierarchical_figure_names(clause, num)
183
+ #require "debug"; binding.b
184
+ super
185
+ end
186
+
187
+ def localise_anchors(type = nil)
188
+ #require "debug"; binding.b
189
+ super
190
+ end
191
+
180
192
  end
181
193
  end
182
194
  end
@@ -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" combine="choice">
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
@@ -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>
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Jis
3
- VERSION = "0.6.6".freeze
3
+ VERSION = "0.6.7".freeze
4
4
  end
5
5
  end
6
6
 
@@ -47,5 +47,5 @@ Gem::Specification.new do |spec|
47
47
  spec.add_development_dependency "simplecov", "~> 0.15"
48
48
  spec.add_development_dependency "timecop", "~> 0.9"
49
49
  spec.add_development_dependency "webmock"
50
- spec.add_development_dependency "canon"
50
+ spec.add_development_dependency "canon", "= 0.1.3"
51
51
  end
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.6
4
+ version: 0.6.7
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-09-29 00:00:00.000000000 Z
11
+ date: 2025-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: japanese_calendar
@@ -238,16 +238,16 @@ dependencies:
238
238
  name: canon
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - ">="
241
+ - - '='
242
242
  - !ruby/object:Gem::Version
243
- version: '0'
243
+ version: 0.1.3
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ">="
248
+ - - '='
249
249
  - !ruby/object:Gem::Version
250
- version: '0'
250
+ version: 0.1.3
251
251
  description: |
252
252
  metanorma-jis lets you write JIS standards in AsciiDoc syntax.
253
253