metanorma-un 0.5.14 → 0.5.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 997e32d62408a400c460928ca9d8b61c5b8e7f799562799985028341c09c525a
4
- data.tar.gz: 27a477d4e7af4124210c02c26407acadec6c49ad08f502e1914c609868bda623
3
+ metadata.gz: c75ce0d3ca8611cf187a1e7775468a26a071af7b6ce64a5c1a056a140be234ec
4
+ data.tar.gz: 58e3518b84f467e8d4f0c138d23a6a9980a186cb45875eee1dba85d24c0e66ec
5
5
  SHA512:
6
- metadata.gz: 6be576a6dc69daeca1591a135c350dc6c513767deec5dd4584e267deeb3e0c63916bc099a1d1828bc0c8912a98e8ade9df4d43833d06ce29a397cb6ce0be9e56
7
- data.tar.gz: c59bc4e8299b2e4164489e9f9add65e8e078dc58a53b196d2cd77aba4b037fa0b71456e976285d2298db08e780cb0dd39749bb985183d436e5746b414d641972
6
+ metadata.gz: 713c1a9ffc75aee2461401d8af1770e74fb1667b54883e15f60cfb1329d857bab5ba471e4e3ca40e2fff585546eb2ab13414ad9b4b9da41d428ba8f04ba68a59
7
+ data.tar.gz: c9c7bbd9521cd6d9854e847addcf9a2b78f5a49a148ee020a9da733d78af0f332de4b27fffea2927ed44aaef6496010b8fc8097b6d1a5b2bb51c01c36d0205f9
@@ -4,7 +4,7 @@ name: rake
4
4
 
5
5
  on:
6
6
  push:
7
- branches: [ master, main ]
7
+ branches: [ master, main ]
8
8
  tags: [ v* ]
9
9
  pull_request:
10
10
 
@@ -16,50 +16,27 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [ '2.6', '2.5', '2.4' ]
19
+ ruby: [ '2.7', '2.6', '2.5', '2.4' ]
20
20
  os: [ ubuntu-latest, windows-latest, macos-latest ]
21
21
  experimental: [ false ]
22
22
  include:
23
- - ruby: '2.7'
23
+ - ruby: '3.0'
24
24
  os: 'ubuntu-latest'
25
25
  experimental: true
26
- - ruby: '2.7'
26
+ - ruby: '3.0'
27
27
  os: 'windows-latest'
28
28
  experimental: true
29
- - ruby: '2.7'
29
+ - ruby: '3.0'
30
30
  os: 'macos-latest'
31
31
  experimental: true
32
32
  steps:
33
- - uses: actions/checkout@master
33
+ - uses: actions/checkout@v2
34
+ with:
35
+ submodules: true
34
36
 
35
37
  - uses: ruby/setup-ruby@v1
36
38
  with:
37
39
  ruby-version: ${{ matrix.ruby }}
38
-
39
- - if: matrix.os == 'macos-latest'
40
- run: brew install autoconf automake libtool
41
-
42
- - uses: actions/cache@v2
43
- with:
44
- path: vendor/bundle
45
- key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
46
- restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
47
-
48
- - run: bundle config set path 'vendor/bundle'
49
-
50
- - run: bundle install --jobs 4 --retry 3
40
+ bundler-cache: true
51
41
 
52
42
  - run: bundle exec rake
53
-
54
- tests-passed:
55
- needs: rake
56
- runs-on: ubuntu-latest
57
- steps:
58
- - name: Trigger tests passed event
59
- uses: Sibz/github-status-action@v1
60
- with:
61
- authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
62
- context: 'tests-passed-successfully'
63
- description: 'Tests passed successfully'
64
- state: 'success'
65
- sha: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -102,7 +102,7 @@
102
102
  </attribute>
103
103
  </optional>
104
104
  <oneOrMore>
105
- <ref name="li"/>
105
+ <ref name="ul_li"/>
106
106
  </oneOrMore>
107
107
  <zeroOrMore>
108
108
  <ref name="note"/>
@@ -1716,4 +1716,26 @@
1716
1716
  </zeroOrMore>
1717
1717
  </element>
1718
1718
  </define>
1719
+ <define name="ul_li">
1720
+ <element name="li">
1721
+ <optional>
1722
+ <attribute name="id">
1723
+ <data type="ID"/>
1724
+ </attribute>
1725
+ </optional>
1726
+ <optional>
1727
+ <attribute name="uncheckedcheckbox">
1728
+ <data type="boolean"/>
1729
+ </attribute>
1730
+ </optional>
1731
+ <optional>
1732
+ <attribute name="checkedcheckbox">
1733
+ <data type="boolean"/>
1734
+ </attribute>
1735
+ </optional>
1736
+ <oneOrMore>
1737
+ <ref name="BasicBlock"/>
1738
+ </oneOrMore>
1739
+ </element>
1740
+ </define>
1719
1741
  </grammar>
@@ -3,6 +3,7 @@
3
3
  <xsl:output version="1.0" method="xml" encoding="UTF-8" indent="no"/>
4
4
 
5
5
  <xsl:param name="svg_images"/>
6
+ <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
6
7
  <xsl:variable name="images" select="document($svg_images)"/>
7
8
 
8
9
 
@@ -72,7 +73,9 @@
72
73
  </fo:page-sequence-master>
73
74
  </fo:layout-master-set>
74
75
 
75
- <xsl:call-template name="addPDFUAmeta"/>
76
+ <fo:declarations>
77
+ <xsl:call-template name="addPDFUAmeta"/>
78
+ </fo:declarations>
76
79
 
77
80
  <xsl:call-template name="addBookmarks">
78
81
  <xsl:with-param name="contents" select="$contents"/>
@@ -1448,6 +1451,7 @@
1448
1451
 
1449
1452
 
1450
1453
 
1454
+
1451
1455
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1452
1456
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1453
1457
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -2047,7 +2051,15 @@
2047
2051
  </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
2048
2052
  <xsl:value-of select="@target"/>
2049
2053
  </xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
2050
- <xsl:variable name="math_text" select="normalize-space(.)"/>
2054
+ <xsl:variable name="mathml">
2055
+ <xsl:for-each select="*">
2056
+ <xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'">
2057
+ <xsl:copy-of select="."/>
2058
+ </xsl:if>
2059
+ </xsl:for-each>
2060
+ </xsl:variable>
2061
+
2062
+ <xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
2051
2063
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
2052
2064
  </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
2053
2065
  <xsl:param name="cols-count"/>
@@ -3026,6 +3038,10 @@
3026
3038
  <fo:inline font-size="10pt" color="red" text-decoration="line-through">
3027
3039
  <xsl:apply-templates/>
3028
3040
  </fo:inline>
3041
+ </xsl:template><xsl:template match="*[local-name()='hi']">
3042
+ <fo:inline background-color="yellow">
3043
+ <xsl:apply-templates/>
3044
+ </fo:inline>
3029
3045
  </xsl:template><xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
3030
3046
  <xsl:variable name="text" select="normalize-space(.)"/>
3031
3047
  <fo:inline font-size="75%">
@@ -3366,6 +3382,7 @@
3366
3382
  <xsl:apply-templates select="." mode="mathml"/>
3367
3383
  </xsl:variable>
3368
3384
  <fo:instream-foreign-object fox:alt-text="Math">
3385
+
3369
3386
  <!-- <xsl:copy-of select="."/> -->
3370
3387
  <xsl:copy-of select="xalan:nodeset($mathml)"/>
3371
3388
  </fo:instream-foreign-object>
@@ -3384,7 +3401,7 @@
3384
3401
  <xsl:apply-templates select="@*|node()" mode="mathml"/>
3385
3402
  </xsl:copy>
3386
3403
  <mathml:mspace width="0.5ex"/>
3387
- </xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3404
+ </xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
3388
3405
  <xsl:variable name="target">
3389
3406
  <xsl:choose>
3390
3407
  <xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -3418,8 +3435,6 @@
3418
3435
  </xsl:otherwise>
3419
3436
  </xsl:choose>
3420
3437
  </fo:inline>
3421
- </xsl:template><xsl:template match="*[local-name()='bookmark']">
3422
- <fo:inline id="{@id}"/>
3423
3438
  </xsl:template><xsl:template match="*[local-name()='appendix']">
3424
3439
  <fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
3425
3440
  <xsl:apply-templates select="*[local-name()='title']" mode="process"/>
@@ -3639,6 +3654,7 @@
3639
3654
  <fo:block id="{@id}">
3640
3655
  <xsl:apply-templates/>
3641
3656
  </fo:block>
3657
+ <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3642
3658
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
3643
3659
  <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
3644
3660
  <xsl:apply-templates/>
@@ -4222,10 +4238,11 @@
4222
4238
  </xsl:choose>
4223
4239
 
4224
4240
  </xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
4225
-
4241
+ <xsl:variable name="num"><xsl:number/></xsl:variable>
4226
4242
  <xsl:variable name="element">
4227
4243
  block
4228
4244
 
4245
+
4229
4246
  </xsl:variable>
4230
4247
  <xsl:choose>
4231
4248
  <xsl:when test="normalize-space($element) = 'block'">
@@ -4321,31 +4338,49 @@
4321
4338
  <xsl:text>— </xsl:text>
4322
4339
  <xsl:apply-templates/>
4323
4340
  </xsl:template><xsl:template match="*[local-name() = 'eref']">
4324
- <fo:inline xsl:use-attribute-sets="eref-style">
4325
- <xsl:if test="@type = 'footnote'">
4326
-
4327
- <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
4328
- <xsl:attribute name="font-size">80%</xsl:attribute>
4329
- <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
4330
- <xsl:attribute name="vertical-align">super</xsl:attribute>
4331
-
4332
-
4333
- </xsl:if>
4334
-
4335
- <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
4336
-
4337
- <xsl:if test="@type = 'inline'">
4338
-
4339
-
4340
-
4341
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
4342
-
4343
- </xsl:if>
4344
-
4345
-
4346
- <xsl:apply-templates/>
4347
- </fo:basic-link>
4348
- </fo:inline>
4341
+
4342
+ <xsl:variable name="bibitemid">
4343
+ <xsl:choose>
4344
+ <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4345
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4346
+ <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4347
+ </xsl:choose>
4348
+ </xsl:variable>
4349
+
4350
+ <xsl:choose>
4351
+ <xsl:when test="normalize-space($bibitemid) != ''">
4352
+ <fo:inline xsl:use-attribute-sets="eref-style">
4353
+ <xsl:if test="@type = 'footnote'">
4354
+
4355
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
4356
+ <xsl:attribute name="font-size">80%</xsl:attribute>
4357
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
4358
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
4359
+
4360
+
4361
+ </xsl:if>
4362
+
4363
+ <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
4364
+ <xsl:if test="normalize-space(@citeas) = ''">
4365
+ <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
4366
+ </xsl:if>
4367
+ <xsl:if test="@type = 'inline'">
4368
+
4369
+
4370
+
4371
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4372
+
4373
+ </xsl:if>
4374
+
4375
+ <xsl:apply-templates/>
4376
+ </fo:basic-link>
4377
+
4378
+ </fo:inline>
4379
+ </xsl:when>
4380
+ <xsl:otherwise>
4381
+ <fo:inline><xsl:apply-templates/></fo:inline>
4382
+ </xsl:otherwise>
4383
+ </xsl:choose>
4349
4384
  </xsl:template><xsl:template match="*[local-name() = 'tab']">
4350
4385
  <!-- zero-space char -->
4351
4386
  <xsl:variable name="depth">
@@ -4533,6 +4568,153 @@
4533
4568
  </fo:block>
4534
4569
  </xsl:otherwise>
4535
4570
  </xsl:choose>
4571
+ </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
4572
+ <xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
4573
+ <bookmark><xsl:value-of select="@id"/></bookmark>
4574
+ </xsl:for-each>
4575
+ </xsl:variable><xsl:template match="@*|node()" mode="index_add_id">
4576
+ <xsl:copy>
4577
+ <xsl:apply-templates select="@*|node()" mode="index_add_id"/>
4578
+ </xsl:copy>
4579
+ </xsl:template><xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
4580
+ <xsl:variable name="id">
4581
+ <xsl:call-template name="generateIndexXrefId"/>
4582
+ </xsl:variable>
4583
+ <xsl:copy> <!-- add id to xref -->
4584
+ <xsl:apply-templates select="@*" mode="index_add_id"/>
4585
+ <xsl:attribute name="id">
4586
+ <xsl:value-of select="$id"/>
4587
+ </xsl:attribute>
4588
+ <xsl:apply-templates mode="index_add_id"/>
4589
+ </xsl:copy>
4590
+ <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
4591
+ <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
4592
+ <xsl:if test="@to">
4593
+ <xsl:value-of select="$dash"/>
4594
+ <xsl:copy>
4595
+ <xsl:copy-of select="@*"/>
4596
+ <xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
4597
+ <xsl:attribute name="id">
4598
+ <xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
4599
+ </xsl:attribute>
4600
+ <xsl:apply-templates mode="index_add_id"/>
4601
+ </xsl:copy>
4602
+ </xsl:if>
4603
+ </xsl:template><xsl:template match="@*|node()" mode="index_update">
4604
+ <xsl:copy>
4605
+ <xsl:apply-templates select="@*|node()" mode="index_update"/>
4606
+ </xsl:copy>
4607
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" mode="index_update">
4608
+ <xsl:copy>
4609
+ <xsl:apply-templates select="@*" mode="index_update"/>
4610
+ <xsl:apply-templates select="node()[1]" mode="process_li_element"/>
4611
+ </xsl:copy>
4612
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/node()" mode="process_li_element" priority="2">
4613
+ <xsl:param name="element"/>
4614
+ <xsl:param name="remove" select="'false'"/>
4615
+ <xsl:param name="target"/>
4616
+ <!-- <node></node> -->
4617
+ <xsl:choose>
4618
+ <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
4619
+ <!-- skip text (i.e. remove it) and process next element -->
4620
+ <!-- [removed_<xsl:value-of select="."/>] -->
4621
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
4622
+ <xsl:with-param name="target"><xsl:value-of select="$target"/></xsl:with-param>
4623
+ </xsl:apply-templates>
4624
+ </xsl:when>
4625
+ <xsl:when test="self::text()">
4626
+ <xsl:value-of select="."/>
4627
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
4628
+ </xsl:when>
4629
+ <xsl:when test="self::* and local-name(.) = 'xref'">
4630
+ <xsl:variable name="id" select="@id"/>
4631
+ <xsl:variable name="page" select="$index//item[@id = $id]"/>
4632
+ <xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
4633
+ <xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
4634
+
4635
+ <xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
4636
+ <xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
4637
+
4638
+ <xsl:choose>
4639
+ <!-- 2nd pass -->
4640
+ <!-- if page is equal to page for next and page is not the end of range -->
4641
+ <xsl:when test="$page != '' and $page_next != '' and $page = $page_next and not(contains($page, '_to'))"> <!-- case: 12, 12-14 -->
4642
+ <!-- skip element (i.e. remove it) and remove next text ',' -->
4643
+ <!-- [removed_xref] -->
4644
+
4645
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
4646
+ <xsl:with-param name="remove">true</xsl:with-param>
4647
+ <xsl:with-param name="target">
4648
+ <xsl:choose>
4649
+ <xsl:when test="$target != ''"><xsl:value-of select="$target"/></xsl:when>
4650
+ <xsl:otherwise><xsl:value-of select="@target"/></xsl:otherwise>
4651
+ </xsl:choose>
4652
+ </xsl:with-param>
4653
+ </xsl:apply-templates>
4654
+ </xsl:when>
4655
+
4656
+ <xsl:when test="$page != '' and $page_prev != '' and $page = $page_prev and contains($page_prev, '_to')"> <!-- case: 12-14, 14, ... -->
4657
+ <!-- remove xref -->
4658
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
4659
+ <xsl:with-param name="remove">true</xsl:with-param>
4660
+ </xsl:apply-templates>
4661
+ </xsl:when>
4662
+
4663
+ <xsl:otherwise>
4664
+ <xsl:apply-templates select="." mode="xref_copy">
4665
+ <xsl:with-param name="target" select="$target"/>
4666
+ </xsl:apply-templates>
4667
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
4668
+ </xsl:otherwise>
4669
+ </xsl:choose>
4670
+ </xsl:when>
4671
+ <xsl:when test="self::* and local-name(.) = 'ul'">
4672
+ <!-- ul -->
4673
+ <xsl:apply-templates select="." mode="index_update"/>
4674
+ </xsl:when>
4675
+ <xsl:otherwise>
4676
+ <xsl:apply-templates select="." mode="xref_copy">
4677
+ <xsl:with-param name="target" select="$target"/>
4678
+ </xsl:apply-templates>
4679
+ <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
4680
+ </xsl:otherwise>
4681
+ </xsl:choose>
4682
+ </xsl:template><xsl:template match="@*|node()" mode="xref_copy">
4683
+ <xsl:param name="target"/>
4684
+ <xsl:copy>
4685
+ <xsl:apply-templates select="@*" mode="xref_copy"/>
4686
+ <xsl:if test="$target != '' and not(xalan:nodeset($bookmark_in_fn)//bookmark[. = $target])">
4687
+ <xsl:attribute name="target"><xsl:value-of select="$target"/></xsl:attribute>
4688
+ </xsl:if>
4689
+ <xsl:apply-templates select="node()" mode="xref_copy"/>
4690
+ </xsl:copy>
4691
+ </xsl:template><xsl:template name="generateIndexXrefId">
4692
+ <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
4693
+
4694
+ <xsl:variable name="docid">
4695
+ <xsl:call-template name="getDocumentId"/>
4696
+ </xsl:variable>
4697
+ <xsl:variable name="item_number">
4698
+ <xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
4699
+ </xsl:variable>
4700
+ <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
4701
+ <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
4702
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
4703
+ <xsl:apply-templates/>
4704
+ <fo:block>
4705
+ <xsl:if test="following-sibling::*[local-name() = 'clause']">
4706
+ <fo:block> </fo:block>
4707
+ </xsl:if>
4708
+ </fo:block>
4709
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
4710
+ <xsl:apply-templates/>
4711
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
4712
+ <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
4713
+ <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
4714
+ <xsl:apply-templates/>
4715
+ </fo:block>
4716
+ </xsl:template><xsl:template match="*[local-name() = 'bookmark']">
4717
+ <fo:inline id="{@id}"/>
4536
4718
  </xsl:template><xsl:template match="*[local-name() = 'errata']">
4537
4719
  <!-- <row>
4538
4720
  <date>05-07-2013</date>
@@ -4749,70 +4931,68 @@
4749
4931
  <xsl:variable name="lang">
4750
4932
  <xsl:call-template name="getLang"/>
4751
4933
  </xsl:variable>
4752
- <fo:declarations>
4753
- <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
4754
- <pdf:dictionary type="normal" key="ViewerPreferences">
4755
- <pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
4756
- </pdf:dictionary>
4757
- </pdf:catalog>
4758
- <x:xmpmeta xmlns:x="adobe:ns:meta/">
4759
- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
4760
- <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
4761
- <!-- Dublin Core properties go here -->
4762
- <dc:title>
4763
- <xsl:variable name="title">
4764
- <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
4765
-
4766
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
4767
-
4768
-
4769
-
4770
-
4771
-
4772
-
4773
- </xsl:for-each>
4774
- </xsl:variable>
4775
- <xsl:choose>
4776
- <xsl:when test="normalize-space($title) != ''">
4777
- <xsl:value-of select="$title"/>
4778
- </xsl:when>
4779
- <xsl:otherwise>
4780
- <xsl:text> </xsl:text>
4781
- </xsl:otherwise>
4782
- </xsl:choose>
4783
- </dc:title>
4784
- <dc:creator>
4934
+ <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
4935
+ <pdf:dictionary type="normal" key="ViewerPreferences">
4936
+ <pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
4937
+ </pdf:dictionary>
4938
+ </pdf:catalog>
4939
+ <x:xmpmeta xmlns:x="adobe:ns:meta/">
4940
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
4941
+ <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
4942
+ <!-- Dublin Core properties go here -->
4943
+ <dc:title>
4944
+ <xsl:variable name="title">
4785
4945
  <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
4786
4946
 
4787
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
4788
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
4789
- <xsl:if test="position() != last()">; </xsl:if>
4790
- </xsl:for-each>
4791
-
4947
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
4792
4948
 
4793
4949
 
4794
- </xsl:for-each>
4795
- </dc:creator>
4796
- <dc:description>
4797
- <xsl:variable name="abstract">
4798
4950
 
4799
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
4800
4951
 
4801
4952
 
4802
- </xsl:variable>
4803
- <xsl:value-of select="normalize-space($abstract)"/>
4804
- </dc:description>
4805
- <pdf:Keywords>
4806
- <xsl:call-template name="insertKeywords"/>
4807
- </pdf:Keywords>
4808
- </rdf:Description>
4809
- <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
4810
- <!-- XMP properties go here -->
4811
- <xmp:CreatorTool/>
4812
- </rdf:Description>
4813
- </rdf:RDF>
4814
- </x:xmpmeta>
4815
- </fo:declarations>
4953
+
4954
+ </xsl:for-each>
4955
+ </xsl:variable>
4956
+ <xsl:choose>
4957
+ <xsl:when test="normalize-space($title) != ''">
4958
+ <xsl:value-of select="$title"/>
4959
+ </xsl:when>
4960
+ <xsl:otherwise>
4961
+ <xsl:text> </xsl:text>
4962
+ </xsl:otherwise>
4963
+ </xsl:choose>
4964
+ </dc:title>
4965
+ <dc:creator>
4966
+ <xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
4967
+
4968
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
4969
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
4970
+ <xsl:if test="position() != last()">; </xsl:if>
4971
+ </xsl:for-each>
4972
+
4973
+
4974
+
4975
+ </xsl:for-each>
4976
+ </dc:creator>
4977
+ <dc:description>
4978
+ <xsl:variable name="abstract">
4979
+
4980
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
4981
+
4982
+
4983
+ </xsl:variable>
4984
+ <xsl:value-of select="normalize-space($abstract)"/>
4985
+ </dc:description>
4986
+ <pdf:Keywords>
4987
+ <xsl:call-template name="insertKeywords"/>
4988
+ </pdf:Keywords>
4989
+ </rdf:Description>
4990
+ <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
4991
+ <!-- XMP properties go here -->
4992
+ <xmp:CreatorTool/>
4993
+ </rdf:Description>
4994
+ </rdf:RDF>
4995
+ </x:xmpmeta>
4816
4996
  </xsl:template><xsl:template name="getId">
4817
4997
  <xsl:choose>
4818
4998
  <xsl:when test="../@id">