metanorma-ieee 1.5.7 → 1.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/ieee/i18n-en.yaml +3 -1
- data/lib/isodoc/ieee/ieee.amendment.xsl +240 -196
- data/lib/isodoc/ieee/ieee.standard.xsl +240 -196
- data/lib/isodoc/ieee/presentation_bibdata.rb +17 -0
- data/lib/isodoc/ieee/presentation_bibitem.rb +2 -2
- data/lib/isodoc/ieee/presentation_ref.rb +7 -15
- data/lib/isodoc/ieee/presentation_terms.rb +5 -0
- data/lib/metanorma/ieee/biblio.rng +4 -4
- data/lib/metanorma/ieee/converter.rb +2 -0
- data/lib/metanorma/ieee/front.rb +45 -23
- data/lib/metanorma/ieee/isodoc.rng +27 -10
- data/lib/metanorma/ieee/log.rb +100 -0
- data/lib/metanorma/ieee/validate.rb +22 -45
- data/lib/metanorma/ieee/validate_section.rb +15 -16
- data/lib/metanorma/ieee/validate_style.rb +4 -8
- data/lib/metanorma/ieee/version.rb +1 -1
- data/lib/relaton/render/config.yml +6 -6
- data/metanorma-ieee.gemspec +2 -1
- metadata +19 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 981de660026400309643f712f0472336c1d318c07bff099eb3f79919359d41ae
|
|
4
|
+
data.tar.gz: bb78f47367fec5a7862ef9a3a56cbf21d5e18110c4115e470552e3066d1e0be0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ec4df0967a7721bca9e26755e5a9d43719a14f02e48abb2fd0a4065bfca35f1d1cba1382048b76c5ceca03d805651edfeab250de49b33b57b4fd691bf0669020
|
|
7
|
+
data.tar.gz: f534d6ec8797629482c4bde760a08eb7c58505c3408d64ce20b924f31208fd6a24ec8294812344ff5fc0f7511aabd840e0ad7a4853900d8543b692b74daec572
|
|
@@ -457,7 +457,7 @@
|
|
|
457
457
|
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
458
458
|
</xsl:call-template>
|
|
459
459
|
</xsl:variable> -->
|
|
460
|
-
<xsl:variable name="approved_date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'ieee-sasb-approved' and @format = 'ddMMMyyyy'])"/>
|
|
460
|
+
<xsl:variable name="approved_date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'ieee-sasb-approved' and (@format = 'ddMMMyyyy' or @format = 'text')])"/>
|
|
461
461
|
|
|
462
462
|
<!-- Example: Revision of IEEE Std 802.1X™-2010
|
|
463
463
|
Incorporating IEEE Std 802.1Xbx™-2014
|
|
@@ -640,7 +640,7 @@
|
|
|
640
640
|
|
|
641
641
|
<fo:block-container margin-left="47mm" margin-top="10mm"> <!-- margin-top="27mm" -->
|
|
642
642
|
|
|
643
|
-
<fo:block-container
|
|
643
|
+
<fo:block-container xsl:use-attribute-sets="reset-margins-style">
|
|
644
644
|
|
|
645
645
|
<xsl:apply-templates select="/*/mn:preface/mn:clause[@type = 'toc']">
|
|
646
646
|
<xsl:with-param name="num" select="$num"/>
|
|
@@ -2272,31 +2272,12 @@
|
|
|
2272
2272
|
<!-- title -->
|
|
2273
2273
|
<!-- ====== -->
|
|
2274
2274
|
|
|
2275
|
-
<!-- <xsl:template match="mn:annex/mn:title">
|
|
2276
|
-
<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always">
|
|
2277
|
-
<xsl:apply-templates />
|
|
2278
|
-
</fo:block>
|
|
2279
|
-
</xsl:template> -->
|
|
2280
|
-
|
|
2281
|
-
<!-- Bibliography -->
|
|
2282
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2283
|
-
<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
|
|
2284
|
-
|
|
2285
|
-
<xsl:call-template name="refine_references-non-normative-title-style"/>
|
|
2286
|
-
|
|
2287
|
-
<xsl:apply-templates/>
|
|
2288
|
-
</fo:block>
|
|
2289
|
-
</xsl:template>
|
|
2290
|
-
|
|
2291
2275
|
<!-- <xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3"> -->
|
|
2292
2276
|
<xsl:template match="mn:fmt-title[../@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
|
|
2293
2277
|
<fo:block>
|
|
2294
|
-
<xsl:attribute name="
|
|
2295
|
-
|
|
2296
|
-
|
|
2297
|
-
<xsl:attribute name="margin-bottom">
|
|
2298
|
-
<xsl:call-template name="getTitleMarginBottom"/>
|
|
2299
|
-
</xsl:attribute>
|
|
2278
|
+
<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles></xsl:variable>
|
|
2279
|
+
<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'space-before' or local-name() = 'margin-bottom']"/>
|
|
2280
|
+
|
|
2300
2281
|
<xsl:call-template name="title"/>
|
|
2301
2282
|
<xsl:apply-templates select="following-sibling::*[1][self::mn:p]">
|
|
2302
2283
|
<xsl:with-param name="inline-header">true</xsl:with-param>
|
|
@@ -2345,90 +2326,8 @@
|
|
|
2345
2326
|
</xsl:choose>
|
|
2346
2327
|
</xsl:template>
|
|
2347
2328
|
|
|
2348
|
-
<xsl:template name="getTitleMarginBottom">
|
|
2349
|
-
<xsl:variable name="level">
|
|
2350
|
-
<xsl:call-template name="getLevel"/>
|
|
2351
|
-
</xsl:variable>
|
|
2352
|
-
<xsl:choose>
|
|
2353
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
2354
|
-
<xsl:choose>
|
|
2355
|
-
<xsl:when test="ancestor::mn:abstract">6pt</xsl:when>
|
|
2356
|
-
<xsl:otherwise>12pt</xsl:otherwise>
|
|
2357
|
-
</xsl:choose>
|
|
2358
|
-
</xsl:when>
|
|
2359
|
-
<xsl:otherwise>
|
|
2360
|
-
<xsl:choose>
|
|
2361
|
-
<xsl:when test="$level = 1 and (ancestor::mn:preface or ancestor::mn:introduction or ancestor::mn:acknowledgements)">12pt</xsl:when>
|
|
2362
|
-
<xsl:when test="$level = 1 and not(following-sibling::*[1][self::mn:clause])">12pt</xsl:when>
|
|
2363
|
-
<xsl:when test="$level = 1">24pt</xsl:when>
|
|
2364
|
-
<xsl:otherwise>12pt</xsl:otherwise>
|
|
2365
|
-
</xsl:choose>
|
|
2366
|
-
</xsl:otherwise>
|
|
2367
|
-
</xsl:choose>
|
|
2368
|
-
</xsl:template>
|
|
2369
|
-
|
|
2370
2329
|
<xsl:template match="mn:fmt-title" priority="2" name="title">
|
|
2371
2330
|
|
|
2372
|
-
<xsl:variable name="level">
|
|
2373
|
-
<xsl:call-template name="getLevel"/>
|
|
2374
|
-
</xsl:variable>
|
|
2375
|
-
|
|
2376
|
-
<xsl:variable name="font-family">
|
|
2377
|
-
<xsl:choose>
|
|
2378
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">Arial Black</xsl:when>
|
|
2379
|
-
<xsl:otherwise>Arial</xsl:otherwise>
|
|
2380
|
-
</xsl:choose>
|
|
2381
|
-
</xsl:variable>
|
|
2382
|
-
|
|
2383
|
-
<xsl:variable name="font-size">
|
|
2384
|
-
<xsl:choose>
|
|
2385
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
2386
|
-
<xsl:choose>
|
|
2387
|
-
<xsl:when test="ancestor::mn:abstract">13pt</xsl:when>
|
|
2388
|
-
<xsl:when test="$level = 1">20pt</xsl:when>
|
|
2389
|
-
<xsl:when test="$level = 2">16pt</xsl:when>
|
|
2390
|
-
<xsl:when test="$level = 3">13pt</xsl:when>
|
|
2391
|
-
<xsl:otherwise>11pt</xsl:otherwise> <!-- 4th, ... levels -->
|
|
2392
|
-
</xsl:choose>
|
|
2393
|
-
</xsl:when>
|
|
2394
|
-
<xsl:otherwise>
|
|
2395
|
-
<xsl:choose>
|
|
2396
|
-
<xsl:when test="@type = 'section-title'">12pt</xsl:when>
|
|
2397
|
-
<xsl:when test="$level = 1 and ancestor::mn:acknowledgements">11pt</xsl:when>
|
|
2398
|
-
<xsl:when test="$level = 1">12pt</xsl:when>
|
|
2399
|
-
<xsl:when test="$level = 2">11pt</xsl:when>
|
|
2400
|
-
<xsl:otherwise>10pt</xsl:otherwise> <!-- 3rd, 4th, ... levels -->
|
|
2401
|
-
</xsl:choose>
|
|
2402
|
-
</xsl:otherwise>
|
|
2403
|
-
</xsl:choose>
|
|
2404
|
-
</xsl:variable>
|
|
2405
|
-
|
|
2406
|
-
<xsl:variable name="font-weight">
|
|
2407
|
-
<xsl:choose>
|
|
2408
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">normal</xsl:when>
|
|
2409
|
-
<xsl:otherwise>
|
|
2410
|
-
<xsl:choose>
|
|
2411
|
-
<!-- <xsl:when test="@ancestor = 'annex' and $level = 1">normal</xsl:when> -->
|
|
2412
|
-
<xsl:when test="ancestor::mn:annex and $level = 1">normal</xsl:when>
|
|
2413
|
-
<xsl:otherwise>bold</xsl:otherwise>
|
|
2414
|
-
</xsl:choose>
|
|
2415
|
-
</xsl:otherwise>
|
|
2416
|
-
</xsl:choose>
|
|
2417
|
-
</xsl:variable>
|
|
2418
|
-
|
|
2419
|
-
<xsl:variable name="margin-top">
|
|
2420
|
-
<xsl:call-template name="getTitleMarginTop"/>
|
|
2421
|
-
</xsl:variable>
|
|
2422
|
-
|
|
2423
|
-
<xsl:variable name="margin-bottom">
|
|
2424
|
-
<xsl:call-template name="getTitleMarginBottom"/>
|
|
2425
|
-
</xsl:variable>
|
|
2426
|
-
<!-- <xsl:choose>
|
|
2427
|
-
<xsl:when test="$level = 1">12pt</xsl:when>
|
|
2428
|
-
<xsl:otherwise>12pt</xsl:otherwise>
|
|
2429
|
-
</xsl:choose>
|
|
2430
|
-
</xsl:variable> -->
|
|
2431
|
-
|
|
2432
2331
|
<xsl:variable name="element-name">
|
|
2433
2332
|
<xsl:choose>
|
|
2434
2333
|
<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
|
|
@@ -2436,53 +2335,23 @@
|
|
|
2436
2335
|
</xsl:choose>
|
|
2437
2336
|
</xsl:variable>
|
|
2438
2337
|
|
|
2439
|
-
<xsl:variable name="
|
|
2440
|
-
<attributes>
|
|
2441
|
-
<xsl:attribute name="font-family"><xsl:value-of select="$font-family"/></xsl:attribute>
|
|
2442
|
-
<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
|
|
2443
|
-
<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
|
|
2444
|
-
<xsl:attribute name="space-before"><xsl:value-of select="$margin-top"/></xsl:attribute>
|
|
2445
|
-
<!-- <xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute> -->
|
|
2446
|
-
<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$margin-top"/></xsl:attribute></xsl:if>
|
|
2447
|
-
<xsl:attribute name="margin-bottom"><xsl:value-of select="$margin-bottom"/></xsl:attribute>
|
|
2448
|
-
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
2449
|
-
<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
|
|
2450
|
-
|
|
2451
|
-
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
2452
|
-
|
|
2453
|
-
<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
|
|
2454
|
-
<xsl:copy-of select="@id"/>
|
|
2455
|
-
</xsl:if>
|
|
2456
|
-
</attributes>
|
|
2457
|
-
</xsl:variable>
|
|
2458
|
-
<xsl:variable name="attributes" select="xalan:nodeset($attributes_)"/>
|
|
2338
|
+
<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template></styles></xsl:variable>
|
|
2459
2339
|
|
|
2460
2340
|
<xsl:variable name="section">
|
|
2461
2341
|
<xsl:call-template name="extractSection"/>
|
|
2462
2342
|
</xsl:variable>
|
|
2463
2343
|
|
|
2464
2344
|
<xsl:choose>
|
|
2465
|
-
<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
|
|
2466
|
-
|
|
2467
|
-
|
|
2468
|
-
<xsl:choose>
|
|
2469
|
-
<xsl:when test="$level = 1 and string-length($section) = 2">8.5mm</xsl:when>
|
|
2470
|
-
<xsl:when test="$level = 1 and string-length($section) = 3">13mm</xsl:when>
|
|
2471
|
-
<xsl:when test="$level >= 2">17.8mm</xsl:when>
|
|
2472
|
-
<xsl:otherwise>10mm</xsl:otherwise>
|
|
2473
|
-
</xsl:choose>
|
|
2474
|
-
</xsl:variable>
|
|
2475
|
-
<fo:list-block provisional-distance-between-starts="{$provisional-distance-between-starts}">
|
|
2476
|
-
|
|
2477
|
-
<xsl:copy-of select="$attributes/attributes/@*"/>
|
|
2478
|
-
|
|
2479
|
-
<xsl:if test="$level = 1">
|
|
2480
|
-
<xsl:attribute name="line-height">20pt</xsl:attribute>
|
|
2481
|
-
</xsl:if>
|
|
2345
|
+
<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and not(parent::mn:references[not(@normative='true')])">
|
|
2346
|
+
<fo:list-block>
|
|
2347
|
+
<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
|
|
2482
2348
|
|
|
2483
2349
|
<fo:list-item>
|
|
2484
2350
|
<fo:list-item-label end-indent="label-end()">
|
|
2485
2351
|
<fo:block id="__internal_layout__toc_section_{generate-id()}">
|
|
2352
|
+
<xsl:variable name="level">
|
|
2353
|
+
<xsl:call-template name="getLevel"/>
|
|
2354
|
+
</xsl:variable>
|
|
2486
2355
|
<xsl:if test="$level = 1">
|
|
2487
2356
|
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
2488
2357
|
</xsl:if>
|
|
@@ -2510,8 +2379,7 @@
|
|
|
2510
2379
|
</xsl:when>
|
|
2511
2380
|
<xsl:otherwise>
|
|
2512
2381
|
<xsl:element name="{$element-name}">
|
|
2513
|
-
|
|
2514
|
-
<xsl:copy-of select="$attributes/attributes/@*"/>
|
|
2382
|
+
<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
|
|
2515
2383
|
|
|
2516
2384
|
<!-- if first and last childs are `add` ace-tag, then move start ace-tag before title -->
|
|
2517
2385
|
<xsl:if test="mn:tab[1]/following-sibling::node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
@@ -2658,50 +2526,15 @@
|
|
|
2658
2526
|
<!-- <xsl:otherwise>fo:block</xsl:otherwise>
|
|
2659
2527
|
</xsl:choose>
|
|
2660
2528
|
</xsl:variable> -->
|
|
2661
|
-
<xsl:element name="{$element-name}">
|
|
2662
|
-
<xsl:call-template name="setBlockAttributes">
|
|
2663
|
-
<xsl:with-param name="text_align_default">justify</xsl:with-param>
|
|
2664
|
-
</xsl:call-template>
|
|
2665
|
-
|
|
2666
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute><!-- 8pt -->
|
|
2667
|
-
<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and (ancestor::mn:sections or ancestor::mn:annex)">
|
|
2668
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
2669
|
-
</xsl:if>
|
|
2670
|
-
<xsl:if test="../following-sibling::*[1][self::mn:note or self::mn:termnote or self::mn:ul or self::mn:ol] or following-sibling::*[1][self::mn:ul or self::mn:ol]">
|
|
2671
|
-
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
2672
|
-
</xsl:if>
|
|
2673
|
-
<xsl:if test="parent::mn:li">
|
|
2674
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
2675
|
-
<xsl:if test="ancestor::mn:feedback-statement">
|
|
2676
|
-
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
2677
|
-
</xsl:if>
|
|
2678
|
-
</xsl:if>
|
|
2679
|
-
<xsl:if test="parent::mn:li and (ancestor::mn:note or ancestor::mn:termnote)">
|
|
2680
|
-
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
2681
|
-
</xsl:if>
|
|
2682
|
-
<xsl:if test="(following-sibling::*[1][self::mn:clause or self::mn:terms or self::mn:references])">
|
|
2683
|
-
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
2684
|
-
</xsl:if>
|
|
2685
|
-
<xsl:if test="@id">
|
|
2686
|
-
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
2687
|
-
</xsl:if>
|
|
2688
|
-
<xsl:attribute name="line-height">1.2</xsl:attribute>
|
|
2689
|
-
<!-- bookmarks only in paragraph -->
|
|
2690
|
-
<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
|
|
2691
|
-
<xsl:attribute name="font-size">0</xsl:attribute>
|
|
2692
|
-
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
2693
|
-
<xsl:attribute name="line-height">0</xsl:attribute>
|
|
2694
|
-
</xsl:if>
|
|
2695
2529
|
|
|
2696
|
-
|
|
2697
|
-
|
|
2698
|
-
<xsl:
|
|
2699
|
-
</
|
|
2530
|
+
<xsl:variable name="p_styles">
|
|
2531
|
+
<styles xsl:use-attribute-sets="p-style">
|
|
2532
|
+
<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
|
|
2533
|
+
</styles>
|
|
2534
|
+
</xsl:variable>
|
|
2700
2535
|
|
|
2701
|
-
|
|
2702
|
-
|
|
2703
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
2704
|
-
</xsl:if>
|
|
2536
|
+
<xsl:element name="{$element-name}">
|
|
2537
|
+
<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
|
|
2705
2538
|
|
|
2706
2539
|
<xsl:apply-templates>
|
|
2707
2540
|
<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
|
|
@@ -5985,6 +5818,10 @@
|
|
|
5985
5818
|
</xsl:element>
|
|
5986
5819
|
</xsl:template>
|
|
5987
5820
|
|
|
5821
|
+
<!-- show sourcecode's name 'before' or 'after' source code -->
|
|
5822
|
+
<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
|
|
5823
|
+
</xsl:variable>
|
|
5824
|
+
|
|
5988
5825
|
<xsl:template match="mn:sourcecode" name="sourcecode">
|
|
5989
5826
|
|
|
5990
5827
|
<xsl:variable name="sourcecode_attributes">
|
|
@@ -6008,7 +5845,12 @@
|
|
|
6008
5845
|
|
|
6009
5846
|
<xsl:call-template name="refine_sourcecode-container-style"/>
|
|
6010
5847
|
|
|
6011
|
-
<fo:block-container margin-left="0mm" role="SKIP">
|
|
5848
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
5849
|
+
|
|
5850
|
+
<!-- <xsl:if test="$namespace = 'rsd'"> -->
|
|
5851
|
+
<xsl:if test="$sourcecode-name-position = 'before'">
|
|
5852
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
|
|
5853
|
+
</xsl:if>
|
|
6012
5854
|
|
|
6013
5855
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
6014
5856
|
|
|
@@ -6030,7 +5872,16 @@
|
|
|
6030
5872
|
</fo:block>
|
|
6031
5873
|
|
|
6032
5874
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
6033
|
-
|
|
5875
|
+
|
|
5876
|
+
<!-- <xsl:choose>
|
|
5877
|
+
<xsl:when test="$namespace = 'rsd'"></xsl:when>
|
|
5878
|
+
<xsl:otherwise>
|
|
5879
|
+
<xsl:apply-templates select="mn:fmt-name" /> --><!-- show sourcecode's name AFTER content -->
|
|
5880
|
+
<!-- </xsl:otherwise>
|
|
5881
|
+
</xsl:choose> -->
|
|
5882
|
+
<xsl:if test="$sourcecode-name-position = 'after'">
|
|
5883
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
5884
|
+
</xsl:if>
|
|
6034
5885
|
|
|
6035
5886
|
</fo:block-container>
|
|
6036
5887
|
</fo:block-container>
|
|
@@ -11852,6 +11703,10 @@
|
|
|
11852
11703
|
<!-- image -->
|
|
11853
11704
|
<!-- ====== -->
|
|
11854
11705
|
|
|
11706
|
+
<!-- show figure's name 'before' or 'after' image -->
|
|
11707
|
+
<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
|
|
11708
|
+
</xsl:variable>
|
|
11709
|
+
|
|
11855
11710
|
<xsl:template match="mn:figure" name="figure">
|
|
11856
11711
|
<xsl:variable name="isAdded" select="@added"/>
|
|
11857
11712
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
@@ -11864,6 +11719,10 @@
|
|
|
11864
11719
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
11865
11720
|
</xsl:call-template>
|
|
11866
11721
|
|
|
11722
|
+
<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
|
|
11723
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11724
|
+
</xsl:if>
|
|
11725
|
+
|
|
11867
11726
|
<!-- Example: Dimensions in millimeters -->
|
|
11868
11727
|
<xsl:apply-templates select="mn:note[@type = 'units']"/>
|
|
11869
11728
|
|
|
@@ -11884,7 +11743,16 @@
|
|
|
11884
11743
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11885
11744
|
<xsl:call-template name="showFigureKey"/>
|
|
11886
11745
|
</xsl:if>
|
|
11887
|
-
|
|
11746
|
+
|
|
11747
|
+
<!-- <xsl:choose>
|
|
11748
|
+
<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
|
|
11749
|
+
<xsl:otherwise>
|
|
11750
|
+
<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
|
|
11751
|
+
<!-- </xsl:otherwise>
|
|
11752
|
+
</xsl:choose> -->
|
|
11753
|
+
<xsl:if test="$figure-name-position = 'after'">
|
|
11754
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
11755
|
+
</xsl:if>
|
|
11888
11756
|
|
|
11889
11757
|
</fo:block-container>
|
|
11890
11758
|
</xsl:template>
|
|
@@ -14053,17 +13921,17 @@
|
|
|
14053
13921
|
<!-- END Admonition -->
|
|
14054
13922
|
<!-- ================ -->
|
|
14055
13923
|
|
|
14056
|
-
<xsl:attribute-set name="
|
|
13924
|
+
<xsl:attribute-set name="bibliography-title-style">
|
|
14057
13925
|
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
14058
13926
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14059
13927
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
13928
|
+
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
14060
13929
|
<xsl:attribute name="margin-bottom">36pt</xsl:attribute>
|
|
14061
13930
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
14062
13931
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
14063
13932
|
</xsl:attribute-set>
|
|
14064
13933
|
|
|
14065
|
-
<xsl:template name="
|
|
14066
|
-
|
|
13934
|
+
<xsl:template name="refine_bibliography-title-style">
|
|
14067
13935
|
</xsl:template>
|
|
14068
13936
|
|
|
14069
13937
|
<!-- bibitem in Normative References (references/@normative="true") -->
|
|
@@ -16144,7 +16012,10 @@
|
|
|
16144
16012
|
<!-- ===================================== -->
|
|
16145
16013
|
|
|
16146
16014
|
<xsl:attribute-set name="annex-title-style">
|
|
16147
|
-
|
|
16015
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
16016
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
16017
|
+
<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
|
|
16018
|
+
</xsl:attribute-set> <!-- annex-title-style -->
|
|
16148
16019
|
|
|
16149
16020
|
<xsl:template name="refine_annex-title-style">
|
|
16150
16021
|
</xsl:template>
|
|
@@ -16164,6 +16035,166 @@
|
|
|
16164
16035
|
</xsl:if>
|
|
16165
16036
|
</xsl:template>
|
|
16166
16037
|
|
|
16038
|
+
<xsl:attribute-set name="p-style">
|
|
16039
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute><!-- 8pt -->
|
|
16040
|
+
<xsl:attribute name="line-height">1.2</xsl:attribute>
|
|
16041
|
+
</xsl:attribute-set> <!-- p-style -->
|
|
16042
|
+
|
|
16043
|
+
<xsl:template name="refine_p-style">
|
|
16044
|
+
<xsl:param name="element-name"/>
|
|
16045
|
+
<xsl:param name="margin"/>
|
|
16046
|
+
<xsl:call-template name="setBlockAttributes">
|
|
16047
|
+
<xsl:with-param name="text_align_default">justify</xsl:with-param>
|
|
16048
|
+
</xsl:call-template>
|
|
16049
|
+
|
|
16050
|
+
<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and (ancestor::mn:sections or ancestor::mn:annex)">
|
|
16051
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16052
|
+
</xsl:if>
|
|
16053
|
+
<xsl:if test="../following-sibling::*[1][self::mn:note or self::mn:termnote or self::mn:ul or self::mn:ol] or following-sibling::*[1][self::mn:ul or self::mn:ol]">
|
|
16054
|
+
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
16055
|
+
</xsl:if>
|
|
16056
|
+
<xsl:if test="parent::mn:li">
|
|
16057
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
16058
|
+
<xsl:if test="ancestor::mn:feedback-statement">
|
|
16059
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
16060
|
+
</xsl:if>
|
|
16061
|
+
</xsl:if>
|
|
16062
|
+
<xsl:if test="parent::mn:li and (ancestor::mn:note or ancestor::mn:termnote)">
|
|
16063
|
+
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
16064
|
+
</xsl:if>
|
|
16065
|
+
<xsl:if test="(following-sibling::*[1][self::mn:clause or self::mn:terms or self::mn:references])">
|
|
16066
|
+
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
16067
|
+
</xsl:if>
|
|
16068
|
+
<xsl:copy-of select="@id"/>
|
|
16069
|
+
|
|
16070
|
+
<!-- bookmarks only in paragraph -->
|
|
16071
|
+
<xsl:if test="count(mn:bookmark) != 0 and count(*) = count(mn:bookmark) and normalize-space() = ''">
|
|
16072
|
+
<xsl:attribute name="font-size">0</xsl:attribute>
|
|
16073
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
16074
|
+
<xsl:attribute name="line-height">0</xsl:attribute>
|
|
16075
|
+
</xsl:if>
|
|
16076
|
+
|
|
16077
|
+
<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and not(parent::mn:li)">
|
|
16078
|
+
<xsl:attribute name="line-height"><xsl:value-of select="$line-height"/></xsl:attribute>
|
|
16079
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16080
|
+
</xsl:if>
|
|
16081
|
+
|
|
16082
|
+
<xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and parent::mn:li">
|
|
16083
|
+
<xsl:attribute name="line-height">inherit</xsl:attribute>
|
|
16084
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
16085
|
+
</xsl:if>
|
|
16086
|
+
<!-- $namespace = 'ieee' -->
|
|
16087
|
+
|
|
16088
|
+
</xsl:template> <!-- refine_p-style -->
|
|
16089
|
+
|
|
16090
|
+
<xsl:attribute-set name="title-style">
|
|
16091
|
+
<!-- Note: font-size for level 1 title -->
|
|
16092
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
16093
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
16094
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
16095
|
+
<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
|
|
16096
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
16097
|
+
<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
|
|
16098
|
+
</xsl:attribute-set> <!-- title-style -->
|
|
16099
|
+
|
|
16100
|
+
<xsl:template name="refine_title-style">
|
|
16101
|
+
<xsl:param name="element-name"/>
|
|
16102
|
+
<xsl:variable name="level">
|
|
16103
|
+
<xsl:call-template name="getLevel"/>
|
|
16104
|
+
</xsl:variable>
|
|
16105
|
+
<xsl:variable name="space_before">
|
|
16106
|
+
<xsl:call-template name="getTitleMarginTop"/>
|
|
16107
|
+
</xsl:variable>
|
|
16108
|
+
|
|
16109
|
+
<xsl:choose>
|
|
16110
|
+
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
16111
|
+
<xsl:attribute name="font-family">Arial Black</xsl:attribute>
|
|
16112
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
16113
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16114
|
+
<xsl:if test="ancestor::mn:abstract">
|
|
16115
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
16116
|
+
</xsl:if>
|
|
16117
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16118
|
+
<xsl:variable name="section">
|
|
16119
|
+
<xsl:call-template name="extractSection"/>
|
|
16120
|
+
</xsl:variable>
|
|
16121
|
+
<xsl:if test="string-length($section) != 0 and $element-name = 'fo:block'">
|
|
16122
|
+
<xsl:attribute name="provisional-distance-between-starts">
|
|
16123
|
+
<xsl:choose>
|
|
16124
|
+
<xsl:when test="$level = 1 and string-length($section) = 2">8.5mm</xsl:when>
|
|
16125
|
+
<xsl:when test="$level = 1 and string-length($section) = 3">13mm</xsl:when>
|
|
16126
|
+
<xsl:when test="$level >= 2">17.8mm</xsl:when>
|
|
16127
|
+
<xsl:otherwise>10mm</xsl:otherwise>
|
|
16128
|
+
</xsl:choose>
|
|
16129
|
+
</xsl:attribute>
|
|
16130
|
+
<xsl:if test="$level = 1">
|
|
16131
|
+
<xsl:attribute name="font-size">20pt</xsl:attribute>
|
|
16132
|
+
<xsl:attribute name="line-height">20pt</xsl:attribute>
|
|
16133
|
+
</xsl:if>
|
|
16134
|
+
<xsl:if test="$level = 2">
|
|
16135
|
+
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
16136
|
+
</xsl:if>
|
|
16137
|
+
<xsl:if test="$level = 3">
|
|
16138
|
+
<xsl:attribute name="font-size">13pt</xsl:attribute>
|
|
16139
|
+
</xsl:if>
|
|
16140
|
+
<xsl:if test="$level >= 4">
|
|
16141
|
+
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
16142
|
+
</xsl:if>
|
|
16143
|
+
<xsl:if test="ancestor::mn:abstract">
|
|
16144
|
+
<xsl:attribute name="font-size">13pt</xsl:attribute>
|
|
16145
|
+
</xsl:if>
|
|
16146
|
+
</xsl:if>
|
|
16147
|
+
</xsl:when>
|
|
16148
|
+
<xsl:otherwise>
|
|
16149
|
+
<xsl:if test="$level = 1">
|
|
16150
|
+
<xsl:if test="ancestor::mn:acknowledgements">
|
|
16151
|
+
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
16152
|
+
</xsl:if>
|
|
16153
|
+
<xsl:if test="not(following-sibling::*[1][self::mn:clause])">
|
|
16154
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16155
|
+
</xsl:if>
|
|
16156
|
+
<xsl:if test="ancestor::mn:preface or ancestor::mn:introduction or ancestor::mn:acknowledgements">
|
|
16157
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16158
|
+
</xsl:if>
|
|
16159
|
+
</xsl:if>
|
|
16160
|
+
<xsl:if test="parent::mn:annex"><!-- Annex title -->
|
|
16161
|
+
<xsl:variable name="annex_title_styles">
|
|
16162
|
+
<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
|
|
16163
|
+
</xsl:variable>
|
|
16164
|
+
<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
|
|
16165
|
+
</xsl:if>
|
|
16166
|
+
<xsl:if test="$level >= 2">
|
|
16167
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
16168
|
+
</xsl:if>
|
|
16169
|
+
<xsl:if test="$level = 2">
|
|
16170
|
+
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
16171
|
+
</xsl:if>
|
|
16172
|
+
<xsl:if test="$level >= 3">
|
|
16173
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
16174
|
+
</xsl:if>
|
|
16175
|
+
<xsl:if test="@type = 'section-title'">
|
|
16176
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
16177
|
+
</xsl:if>
|
|
16178
|
+
</xsl:otherwise>
|
|
16179
|
+
</xsl:choose>
|
|
16180
|
+
|
|
16181
|
+
<xsl:attribute name="space-before"><xsl:value-of select="$space_before"/></xsl:attribute>
|
|
16182
|
+
<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$space_before"/></xsl:attribute></xsl:if>
|
|
16183
|
+
|
|
16184
|
+
<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
|
|
16185
|
+
<xsl:variable name="bibliography_title_styles">
|
|
16186
|
+
<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
|
|
16187
|
+
</xsl:variable>
|
|
16188
|
+
<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
|
|
16189
|
+
</xsl:if>
|
|
16190
|
+
|
|
16191
|
+
<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
|
|
16192
|
+
<xsl:copy-of select="@id"/>
|
|
16193
|
+
</xsl:if>
|
|
16194
|
+
<!-- $namespace = 'ieee' -->
|
|
16195
|
+
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
16196
|
+
</xsl:template> <!-- refine_title-style -->
|
|
16197
|
+
|
|
16167
16198
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
16168
16199
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
|
|
16169
16200
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
@@ -16502,6 +16533,12 @@
|
|
|
16502
16533
|
</xsl:choose>
|
|
16503
16534
|
</xsl:template>
|
|
16504
16535
|
|
|
16536
|
+
<xsl:attribute-set name="reset-margins-style">
|
|
16537
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
16538
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
16539
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
16540
|
+
</xsl:attribute-set>
|
|
16541
|
+
|
|
16505
16542
|
<xsl:attribute-set name="clause-style">
|
|
16506
16543
|
|
|
16507
16544
|
</xsl:attribute-set>
|
|
@@ -17521,8 +17558,9 @@
|
|
|
17521
17558
|
|
|
17522
17559
|
<xsl:template name="setTextAlignment">
|
|
17523
17560
|
<xsl:param name="default">left</xsl:param>
|
|
17561
|
+
<xsl:param name="skip_default">false</xsl:param>
|
|
17524
17562
|
<xsl:variable name="align" select="normalize-space(@align)"/>
|
|
17525
|
-
<xsl:
|
|
17563
|
+
<xsl:variable name="text_align">
|
|
17526
17564
|
<xsl:choose>
|
|
17527
17565
|
<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
|
|
17528
17566
|
<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
|
|
@@ -17530,9 +17568,13 @@
|
|
|
17530
17568
|
<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
|
|
17531
17569
|
<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
|
|
17532
17570
|
<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
|
|
17571
|
+
<xsl:when test="$skip_default = 'true'"/>
|
|
17533
17572
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
17534
17573
|
</xsl:choose>
|
|
17535
|
-
</xsl:
|
|
17574
|
+
</xsl:variable>
|
|
17575
|
+
<xsl:if test="normalize-space($text_align) != ''">
|
|
17576
|
+
<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
|
|
17577
|
+
</xsl:if>
|
|
17536
17578
|
<xsl:if test="$align = 'indent'">
|
|
17537
17579
|
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
17538
17580
|
</xsl:if>
|
|
@@ -17540,8 +17582,10 @@
|
|
|
17540
17582
|
|
|
17541
17583
|
<xsl:template name="setBlockAttributes">
|
|
17542
17584
|
<xsl:param name="text_align_default">left</xsl:param>
|
|
17585
|
+
<xsl:param name="skip_text_align_default">false</xsl:param>
|
|
17543
17586
|
<xsl:call-template name="setTextAlignment">
|
|
17544
17587
|
<xsl:with-param name="default" select="$text_align_default"/>
|
|
17588
|
+
<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
|
|
17545
17589
|
</xsl:call-template>
|
|
17546
17590
|
<xsl:call-template name="setKeepAttributes"/>
|
|
17547
17591
|
<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
|