metanorma-ogc 2.8.6 → 2.8.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.
@@ -246,85 +246,92 @@
246
246
 
247
247
  <xsl:template name="cover-page">
248
248
  <!-- Cover Page -->
249
- <fo:page-sequence master-reference="document" force-page-count="no-force">
249
+ <xsl:choose>
250
+ <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'">
251
+ <xsl:call-template name="insertCoverPageFullImage"/>
252
+ </xsl:when>
253
+ <xsl:otherwise>
254
+ <fo:page-sequence master-reference="document" force-page-count="no-force">
250
255
 
251
- <xsl:call-template name="insertFootnoteSeparatorCommon"/>
256
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
252
257
 
253
- <xsl:call-template name="insertHeaderFooter"/>
258
+ <xsl:call-template name="insertHeaderFooter"/>
254
259
 
255
- <fo:flow flow-name="xsl-region-body">
260
+ <fo:flow flow-name="xsl-region-body">
256
261
 
257
- <fo:block-container margin-left="-12mm" margin-right="-9mm">
258
- <fo:block-container margin-left="0mm" margin-right="0mm">
259
- <fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm" role="H1">
260
- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title/node()"/>
261
- </fo:block>
262
- </fo:block-container>
263
- </fo:block-container>
264
-
265
- <!-- <fo:block font-family="Lato" font-weight="300" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
266
- <xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
267
- </fo:block> -->
262
+ <fo:block-container margin-left="-12mm" margin-right="-9mm">
263
+ <fo:block-container margin-left="0mm" margin-right="0mm">
264
+ <fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm" role="H1">
265
+ <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title/node()"/>
266
+ </fo:block>
267
+ </fo:block-container>
268
+ </fo:block-container>
268
269
 
269
- <fo:block text-align="right" font-size="10pt" margin-top="12pt" margin-bottom="24pt">
270
- <fo:block margin-top="6pt">Submission Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'received']/mn:on"/></fo:block>
271
- <fo:block margin-top="6pt">Approval Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'issued']/mn:on"/></fo:block>
272
- <fo:block margin-top="6pt">Publication Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/></fo:block>
273
- <fo:block margin-top="6pt">External identifier of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'ogc-external']"/></fo:block>
274
- <fo:block margin-top="6pt">Internal reference number of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docnumber"/></fo:block>
270
+ <!-- <fo:block font-family="Lato" font-weight="300" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
271
+ <xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
272
+ </fo:block> -->
275
273
 
276
- <xsl:variable name="url" select="/mn:metanorma/mn:bibdata/mn:uri"/>
277
- <xsl:if test="normalize-space($url) != ''">
278
- <fo:block margin-top="6pt">URL for this OGC® document: <xsl:value-of select="$url"/></fo:block>
279
- </xsl:if>
274
+ <fo:block text-align="right" font-size="10pt" margin-top="12pt" margin-bottom="24pt">
275
+ <fo:block margin-top="6pt">Submission Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'received']/mn:on"/></fo:block>
276
+ <fo:block margin-top="6pt">Approval Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'issued']/mn:on"/></fo:block>
277
+ <fo:block margin-top="6pt">Publication Date: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'published']/mn:on"/></fo:block>
278
+ <fo:block margin-top="6pt">External identifier of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'ogc-external']"/></fo:block>
279
+ <fo:block margin-top="6pt">Internal reference number of this OGC® document: <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docnumber"/></fo:block>
280
280
 
281
- <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = '']"/>
281
+ <xsl:variable name="url" select="/mn:metanorma/mn:bibdata/mn:uri"/>
282
+ <xsl:if test="normalize-space($url) != ''">
283
+ <fo:block margin-top="6pt">URL for this OGC® document: <xsl:value-of select="$url"/></fo:block>
284
+ </xsl:if>
282
285
 
283
- <fo:block margin-top="6pt"><xsl:text>Category: </xsl:text>
284
- <xsl:call-template name="capitalizeWords">
285
- <xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
286
- </xsl:call-template>
287
- </fo:block>
286
+ <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = '']"/>
288
287
 
289
- <xsl:variable name="editors">
290
- <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='editor']/mn:person/mn:name/mn:completename">
291
- <xsl:value-of select="."/>
292
- <xsl:if test="position() != last()">, </xsl:if>
293
- </xsl:for-each>
294
- </xsl:variable>
295
- <xsl:if test="normalize-space($editors) != ''">
296
- <fo:block margin-top="6pt">
297
- <!-- Editor: -->
298
- <xsl:call-template name="getLocalizedString">
299
- <xsl:with-param name="key">editor_full</xsl:with-param>
300
- </xsl:call-template><xsl:text>: </xsl:text><xsl:value-of select="$editors"/>
301
- </fo:block>
302
- </xsl:if>
303
- </fo:block>
288
+ <fo:block margin-top="6pt"><xsl:text>Category: </xsl:text>
289
+ <xsl:call-template name="capitalizeWords">
290
+ <xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
291
+ </xsl:call-template>
292
+ </fo:block>
304
293
 
305
- <!-- absolute-position="fixed" left="20mm" top="91mm" width="175mm" -->
306
- <fo:block-container font-size="9pt" margin-left="-5mm" margin-right="-5mm">
307
- <fo:block-container margin-left="0mm" margin-right="0mm">
308
- <fo:block margin-top="8pt">
309
- <xsl:variable name="copyright_statement">
310
- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement" mode="update_xml_step1"/>
311
- </xsl:variable>
312
- <xsl:apply-templates select="xalan:nodeset($copyright_statement)/*"/>
313
- </fo:block>
314
- <fo:block margin-top="8pt"> </fo:block>
315
- <fo:block margin-top="8pt">
316
- <xsl:variable name="legal_statement">
317
- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement" mode="update_xml_step1"/>
294
+ <xsl:variable name="editors">
295
+ <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type='editor']/mn:person/mn:name/mn:completename">
296
+ <xsl:value-of select="."/>
297
+ <xsl:if test="position() != last()">, </xsl:if>
298
+ </xsl:for-each>
318
299
  </xsl:variable>
319
- <xsl:apply-templates select="xalan:nodeset($legal_statement)/*"/>
300
+ <xsl:if test="normalize-space($editors) != ''">
301
+ <fo:block margin-top="6pt">
302
+ <!-- Editor: -->
303
+ <xsl:call-template name="getLocalizedString">
304
+ <xsl:with-param name="key">editor_full</xsl:with-param>
305
+ </xsl:call-template><xsl:text>: </xsl:text><xsl:value-of select="$editors"/>
306
+ </fo:block>
307
+ </xsl:if>
320
308
  </fo:block>
321
- </fo:block-container>
322
- </fo:block-container>
323
309
 
324
- <xsl:call-template name="insertLogo"/>
310
+ <!-- absolute-position="fixed" left="20mm" top="91mm" width="175mm" -->
311
+ <fo:block-container font-size="9pt" margin-left="-5mm" margin-right="-5mm">
312
+ <fo:block-container margin-left="0mm" margin-right="0mm">
313
+ <fo:block margin-top="8pt">
314
+ <xsl:variable name="copyright_statement">
315
+ <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement" mode="update_xml_step1"/>
316
+ </xsl:variable>
317
+ <xsl:apply-templates select="xalan:nodeset($copyright_statement)/*"/>
318
+ </fo:block>
319
+ <fo:block margin-top="8pt"> </fo:block>
320
+ <fo:block margin-top="8pt">
321
+ <xsl:variable name="legal_statement">
322
+ <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement" mode="update_xml_step1"/>
323
+ </xsl:variable>
324
+ <xsl:apply-templates select="xalan:nodeset($legal_statement)/*"/>
325
+ </fo:block>
326
+ </fo:block-container>
327
+ </fo:block-container>
328
+
329
+ <xsl:call-template name="insertLogo"/>
325
330
 
326
- </fo:flow>
327
- </fo:page-sequence>
331
+ </fo:flow>
332
+ </fo:page-sequence>
333
+ </xsl:otherwise>
334
+ </xsl:choose>
328
335
  <!-- End Cover Page -->
329
336
  </xsl:template> <!-- END: cover-page -->
330
337
 
@@ -4156,90 +4163,84 @@
4156
4163
  <xsl:template name="refine_term-style">
4157
4164
  </xsl:template>
4158
4165
 
4159
- <xsl:attribute-set name="term-name-style">
4166
+ <xsl:attribute-set name="term-number-style">
4160
4167
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4161
4168
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4162
4169
  </xsl:attribute-set> <!-- term-name-style -->
4163
4170
 
4164
- <xsl:template name="refine_term-name-style">
4165
- </xsl:template>
4166
-
4167
- <xsl:attribute-set name="preferred-style">
4168
- </xsl:attribute-set> <!-- preferred-style -->
4169
-
4170
- <xsl:template name="refine_preferred-style">
4171
+ <xsl:template name="refine_term-number-style">
4171
4172
  </xsl:template>
4172
4173
 
4173
- <xsl:attribute-set name="preferred-block-style">
4174
+ <xsl:attribute-set name="term-preferred-block-style">
4174
4175
  </xsl:attribute-set> <!-- preferred-block-style -->
4175
4176
 
4176
- <xsl:template name="refine_preferred-block-style">
4177
+ <xsl:template name="refine_term-preferred-block-style">
4177
4178
  </xsl:template>
4178
4179
 
4179
- <xsl:attribute-set name="preferred-term-style">
4180
+ <xsl:attribute-set name="term-preferred-style">
4180
4181
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4181
4182
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4182
4183
  <xsl:attribute name="line-height">1</xsl:attribute>
4183
4184
  </xsl:attribute-set> <!-- preferred-term-style -->
4184
4185
 
4185
- <xsl:template name="refine_preferred-term-style">
4186
+ <xsl:template name="refine_term-preferred-style">
4186
4187
  <xsl:if test="mn:strong">
4187
4188
  <xsl:attribute name="font-weight">normal</xsl:attribute>
4188
4189
  </xsl:if>
4189
4190
  </xsl:template>
4190
4191
 
4191
- <xsl:attribute-set name="domain-style">
4192
- </xsl:attribute-set> <!-- domain-style -->
4192
+ <xsl:attribute-set name="term-domain-style">
4193
+ </xsl:attribute-set> <!-- term-domain-style -->
4193
4194
 
4194
- <xsl:template name="refine_domain-style">
4195
+ <xsl:template name="refine_term-domain-style">
4195
4196
  </xsl:template>
4196
4197
 
4197
- <xsl:attribute-set name="admitted-style">
4198
+ <xsl:attribute-set name="term-admitted-style">
4198
4199
  <xsl:attribute name="font-size">11pt</xsl:attribute>
4199
- </xsl:attribute-set> <!-- admitted-style -->
4200
+ </xsl:attribute-set> <!-- term-admitted-style -->
4200
4201
 
4201
- <xsl:template name="refine_admitted-style">
4202
+ <xsl:template name="refine_term-admitted-style">
4202
4203
  </xsl:template>
4203
4204
 
4204
- <xsl:attribute-set name="deprecates-style">
4205
- </xsl:attribute-set> <!-- deprecates-style -->
4205
+ <xsl:attribute-set name="term-deprecates-style">
4206
+ </xsl:attribute-set> <!-- term-deprecates-style -->
4206
4207
 
4207
- <xsl:template name="refine_deprecates-style">
4208
+ <xsl:template name="refine_term-deprecates-style">
4208
4209
  </xsl:template>
4209
4210
 
4210
- <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
4211
+ <xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
4211
4212
  </xsl:attribute-set>
4212
4213
 
4213
- <xsl:template name="refine_related-block-style">
4214
+ <xsl:template name="refine_term-related-block-style">
4214
4215
  </xsl:template>
4215
4216
 
4216
- <xsl:attribute-set name="definition-style">
4217
+ <xsl:attribute-set name="term-definition-style">
4217
4218
  <xsl:attribute name="space-after">6pt</xsl:attribute>
4218
- </xsl:attribute-set> <!-- definition-style -->
4219
+ </xsl:attribute-set> <!-- term-definition-style -->
4219
4220
 
4220
- <xsl:template name="refine_definition-style">
4221
+ <xsl:template name="refine_term-definition-style">
4221
4222
  </xsl:template>
4222
4223
 
4223
- <xsl:attribute-set name="termsource-style">
4224
+ <xsl:attribute-set name="term-termsource-style">
4224
4225
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4225
4226
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
4226
- </xsl:attribute-set> <!-- termsource-style -->
4227
+ </xsl:attribute-set> <!-- term-termsource-style -->
4227
4228
 
4228
- <xsl:template name="refine_termsource-style">
4229
- </xsl:template> <!-- refine_termsource-style -->
4229
+ <xsl:template name="refine_term-termsource-style">
4230
+ </xsl:template> <!-- refine_term-termsource-style -->
4230
4231
 
4231
- <xsl:attribute-set name="termsource-text-style">
4232
- </xsl:attribute-set> <!-- termsource-text-style -->
4232
+ <xsl:attribute-set name="term-termsource-text-style">
4233
+ </xsl:attribute-set> <!-- term-termsource-text-style -->
4233
4234
 
4234
- <xsl:template name="refine_termsource-text-style">
4235
+ <xsl:template name="refine_term-termsource-text-style">
4235
4236
  </xsl:template>
4236
4237
 
4237
- <xsl:attribute-set name="origin-style">
4238
+ <xsl:attribute-set name="term-origin-style">
4238
4239
  <xsl:attribute name="color">blue</xsl:attribute>
4239
4240
  <xsl:attribute name="text-decoration">underline</xsl:attribute>
4240
- </xsl:attribute-set> <!-- origin-style -->
4241
+ </xsl:attribute-set> <!-- term-origin-style -->
4241
4242
 
4242
- <xsl:template name="refine_origin-style">
4243
+ <xsl:template name="refine_term-origin-style">
4243
4244
  </xsl:template>
4244
4245
 
4245
4246
  <!-- ====== -->
@@ -4283,9 +4284,9 @@
4283
4284
  <!-- modification -->
4284
4285
  <!-- ====== -->
4285
4286
  <xsl:template match="mn:fmt-termsource" name="termsource">
4286
- <fo:block xsl:use-attribute-sets="termsource-style">
4287
+ <fo:block xsl:use-attribute-sets="term-termsource-style">
4287
4288
 
4288
- <xsl:call-template name="refine_termsource-style"/>
4289
+ <xsl:call-template name="refine_term-termsource-style"/>
4289
4290
 
4290
4291
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
4291
4292
  <xsl:variable name="termsource_text">
@@ -4333,8 +4334,8 @@
4333
4334
 
4334
4335
  <!-- text SOURCE: -->
4335
4336
  <xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
4336
- <fo:inline xsl:use-attribute-sets="termsource-text-style">
4337
- <xsl:call-template name="refine_termsource-text-style"/>
4337
+ <fo:inline xsl:use-attribute-sets="term-termsource-text-style">
4338
+ <xsl:call-template name="refine_term-termsource-text-style"/>
4338
4339
  <xsl:value-of select="."/>
4339
4340
  </fo:inline>
4340
4341
  </xsl:template>
@@ -4346,8 +4347,8 @@
4346
4347
  <xsl:if test="normalize-space(@citeas) = ''">
4347
4348
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
4348
4349
  </xsl:if>
4349
- <fo:inline xsl:use-attribute-sets="origin-style">
4350
- <xsl:call-template name="refine_origin-style"/>
4350
+ <fo:inline xsl:use-attribute-sets="term-origin-style">
4351
+ <xsl:call-template name="refine_term-origin-style"/>
4351
4352
  <xsl:apply-templates/>
4352
4353
  </fo:inline>
4353
4354
  </fo:basic-link>
@@ -4400,14 +4401,14 @@
4400
4401
  <xsl:variable name="levelTerm">
4401
4402
  <xsl:call-template name="getLevelTermName"/>
4402
4403
  </xsl:variable>
4403
- <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
4404
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
4404
4405
 
4405
- <xsl:call-template name="refine_preferred-block-style"/>
4406
+ <xsl:call-template name="refine_term-preferred-block-style"/>
4406
4407
 
4407
4408
  <xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
4408
4409
 
4409
- <fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
4410
- <xsl:call-template name="refine_term-name-style"/>
4410
+ <fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
4411
+ <xsl:call-template name="refine_term-number-style"/>
4411
4412
 
4412
4413
  <xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
4413
4414
  <xsl:call-template name="setIDforNamedDestination"/>
@@ -4417,8 +4418,8 @@
4417
4418
  </fo:block>
4418
4419
  </xsl:if>
4419
4420
 
4420
- <fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
4421
- <xsl:call-template name="refine_preferred-term-style"/>
4421
+ <fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
4422
+ <xsl:call-template name="refine_term-preferred-style"/>
4422
4423
 
4423
4424
  <xsl:apply-templates/>
4424
4425
  </fo:block>
@@ -4438,15 +4439,15 @@
4438
4439
  <xsl:template match="mn:domain"/>
4439
4440
 
4440
4441
  <xsl:template match="mn:fmt-admitted">
4441
- <fo:block xsl:use-attribute-sets="admitted-style">
4442
- <xsl:call-template name="refine_admitted-style"/>
4442
+ <fo:block xsl:use-attribute-sets="term-admitted-style">
4443
+ <xsl:call-template name="refine_term-admitted-style"/>
4443
4444
  <xsl:apply-templates/>
4444
4445
  </fo:block>
4445
4446
  </xsl:template>
4446
4447
 
4447
4448
  <xsl:template match="mn:fmt-deprecates">
4448
- <fo:block xsl:use-attribute-sets="deprecates-style">
4449
- <xsl:call-template name="refine_deprecates-style"/>
4449
+ <fo:block xsl:use-attribute-sets="term-deprecates-style">
4450
+ <xsl:call-template name="refine_term-deprecates-style"/>
4450
4451
  <xsl:apply-templates/>
4451
4452
  </fo:block>
4452
4453
  </xsl:template>
@@ -4459,8 +4460,8 @@
4459
4460
  <!-- End Preferred, admitted, deprecated -->
4460
4461
 
4461
4462
  <xsl:template match="mn:fmt-related">
4462
- <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
4463
- <xsl:call-template name="refine_related-block-style"/>
4463
+ <fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
4464
+ <xsl:call-template name="refine_term-related-block-style"/>
4464
4465
  <xsl:apply-templates/>
4465
4466
  </fo:block>
4466
4467
  </xsl:template>
@@ -4474,8 +4475,8 @@
4474
4475
  <!-- definition -->
4475
4476
  <!-- ========== -->
4476
4477
  <xsl:template match="mn:fmt-definition">
4477
- <fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
4478
- <xsl:call-template name="refine_definition-style"/>
4478
+ <fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
4479
+ <xsl:call-template name="refine_term-definition-style"/>
4479
4480
  <xsl:apply-templates/>
4480
4481
  </fo:block>
4481
4482
  </xsl:template>
@@ -14297,6 +14298,20 @@
14297
14298
  </fo:block-container>
14298
14299
  </xsl:template>
14299
14300
 
14301
+ <!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
14302
+ <xsl:template name="insertCoverPageFullImage">
14303
+ <xsl:param name="name">coverpage-image</xsl:param>
14304
+ <xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
14305
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
14306
+ <fo:flow flow-name="xsl-region-body">
14307
+ <xsl:call-template name="insertBackgroundPageImage">
14308
+ <xsl:with-param name="number" select="position()"/>
14309
+ </xsl:call-template>
14310
+ </fo:flow>
14311
+ </fo:page-sequence>
14312
+ </xsl:for-each>
14313
+ </xsl:template>
14314
+
14300
14315
  <xsl:template name="insertPageImage">
14301
14316
  <xsl:param name="svg_content_height" select="$pageHeight"/>
14302
14317
  <xsl:param name="bitmap_width" select="$pageWidth"/>
@@ -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,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.8.6".freeze
3
+ VERSION = "2.8.7".freeze
4
4
  end
5
5
  end
@@ -40,5 +40,5 @@ spec.add_development_dependency "rubocop-performance"
40
40
  spec.add_development_dependency "simplecov", "~> 0.15"
41
41
  spec.add_development_dependency "timecop", "~> 0.9"
42
42
  spec.add_development_dependency "webmock"
43
- spec.add_development_dependency "canon"
43
+ spec.add_development_dependency "canon", "= 0.1.3"
44
44
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.8.6
4
+ version: 2.8.7
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-09-30 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: iso-639
@@ -210,16 +210,16 @@ dependencies:
210
210
  name: canon
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - '='
214
214
  - !ruby/object:Gem::Version
215
- version: '0'
215
+ version: 0.1.3
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - '='
221
221
  - !ruby/object:Gem::Version
222
- version: '0'
222
+ version: 0.1.3
223
223
  description: 'Metanorma for the Open Geospatial Consortium.
224
224
 
225
225
  '