metanorma-rsd 1.4.3 → 1.4.8
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/.github/workflows/macos.yml +10 -10
- data/.github/workflows/ubuntu.yml +11 -11
- data/.github/workflows/windows.yml +11 -12
- data/README.adoc +5 -5
- data/lib/asciidoctor/rsd/biblio.rng +144 -49
- data/lib/asciidoctor/rsd/converter.rb +40 -7
- data/lib/asciidoctor/rsd/isodoc.rng +49 -5
- data/lib/isodoc/rsd/base_convert.rb +56 -0
- data/lib/isodoc/rsd/html/header.html +15 -15
- data/lib/isodoc/rsd/html/html_rsd_titlepage.html +1 -1
- data/lib/isodoc/rsd/html/htmlstyle.scss +6 -7
- data/lib/isodoc/rsd/html/logo.png +0 -0
- data/lib/isodoc/rsd/html/rsd.scss +57 -60
- data/lib/isodoc/rsd/html/scripts.html +14 -27
- data/lib/isodoc/rsd/html/word_rsd_intro.html +5 -5
- data/lib/isodoc/rsd/html/word_rsd_titlepage.html +69 -14
- data/lib/isodoc/rsd/html/wordstyle.scss +43 -30
- data/lib/isodoc/rsd/html_convert.rb +16 -8
- data/lib/isodoc/rsd/metadata.rb +2 -28
- data/lib/isodoc/rsd/pdf_convert.rb +16 -11
- data/lib/isodoc/rsd/rsd.standard.xsl +6642 -0
- data/lib/isodoc/rsd/word_convert.rb +15 -8
- data/lib/metanorma-rsd.rb +1 -0
- data/lib/metanorma/rsd.rb +2 -2
- data/lib/metanorma/rsd/processor.rb +3 -6
- data/lib/metanorma/rsd/version.rb +1 -1
- data/metanorma-rsd.gemspec +2 -2
- data/metanorma.yml +14 -1
- metadata +8 -7
- data/lib/asciidoctor/rsd/validate.rb +0 -22
- data/lib/isodoc/rsd/html/scripts.pdf.html +0 -72
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA256:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: 997591e5cfad77bcee7531385c1aff655ce796d206235543dcdb693768db2a71
         | 
| 4 | 
            +
              data.tar.gz: d646c08f95be210686c828212a9fecdf788f0760fa272575cde8939baa6765b8
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: aa056708f9db2c13bd46538ebaf35ae65581dee94fd08c5d2c9e985b40d19d7a2cdfb5ac92eca2f1960d287568b2e2f9f88ce3490a2c5bf0eecb301bdfea8ff0
         | 
| 7 | 
            +
              data.tar.gz: 99fb7cbccce51537d1e35f4914fee9f08bf3fe1b68152c8c7342e6ccc1b68ec5d2530688e5a9954229ebf0592853c231cb848942003e38363f912e10f8b7f6f7
         | 
    
        data/.github/workflows/macos.yml
    CHANGED
    
    | @@ -1,21 +1,28 @@ | |
| 1 | 
            -
            # Auto-generated  | 
| 2 | 
            -
            #  | 
| 1 | 
            +
            # Auto-generated by Cimas: Do not edit it manually!
         | 
| 2 | 
            +
            # See https://github.com/metanorma/cimas
         | 
| 3 3 | 
             
            name: macos
         | 
| 4 4 |  | 
| 5 5 | 
             
            on:
         | 
| 6 6 | 
             
              push:
         | 
| 7 7 | 
             
                branches: [ master ]
         | 
| 8 8 | 
             
              pull_request:
         | 
| 9 | 
            -
                 | 
| 9 | 
            +
                paths-ignore:
         | 
| 10 | 
            +
                  - .github/workflows/ubuntu.yml
         | 
| 11 | 
            +
                  - .github/workflows/windows.yml
         | 
| 10 12 |  | 
| 11 13 | 
             
            jobs:
         | 
| 12 14 | 
             
              test-macos:
         | 
| 13 15 | 
             
                name: Test on Ruby ${{ matrix.ruby }} macOS
         | 
| 14 16 | 
             
                runs-on: macos-latest
         | 
| 17 | 
            +
                continue-on-error: ${{ matrix.experimental }}
         | 
| 15 18 | 
             
                strategy:
         | 
| 16 19 | 
             
                  fail-fast: false
         | 
| 17 20 | 
             
                  matrix:
         | 
| 18 21 | 
             
                    ruby: [ '2.6', '2.5', '2.4' ]
         | 
| 22 | 
            +
                    experimental: [false]
         | 
| 23 | 
            +
                    include:
         | 
| 24 | 
            +
                      - ruby: '2.7'
         | 
| 25 | 
            +
                        experimental: true
         | 
| 19 26 | 
             
                steps:
         | 
| 20 27 | 
             
                  - uses: actions/checkout@master
         | 
| 21 28 | 
             
                  - name: Use Ruby
         | 
| @@ -27,13 +34,6 @@ jobs: | |
| 27 34 | 
             
                    run: |
         | 
| 28 35 | 
             
                      sudo gem install bundler --force
         | 
| 29 36 | 
             
                      bundle install --jobs 4 --retry 3
         | 
| 30 | 
            -
                  - name: Use Node
         | 
| 31 | 
            -
                    uses: actions/setup-node@v1
         | 
| 32 | 
            -
                    with:
         | 
| 33 | 
            -
                      node-version: '8'
         | 
| 34 | 
            -
                  - name: Install Puppeteer
         | 
| 35 | 
            -
                    run: |
         | 
| 36 | 
            -
                      npm install -g puppeteer
         | 
| 37 37 | 
             
                  - name: Install PlantUML
         | 
| 38 38 | 
             
                    run: |
         | 
| 39 39 | 
             
                      brew install plantuml
         | 
| @@ -1,21 +1,28 @@ | |
| 1 | 
            -
            # Auto-generated  | 
| 2 | 
            -
            #  | 
| 1 | 
            +
            # Auto-generated by Cimas: Do not edit it manually!
         | 
| 2 | 
            +
            # See https://github.com/metanorma/cimas
         | 
| 3 3 | 
             
            name: ubuntu
         | 
| 4 4 |  | 
| 5 5 | 
             
            on:
         | 
| 6 6 | 
             
              push:
         | 
| 7 7 | 
             
                branches: [ master ]
         | 
| 8 8 | 
             
              pull_request:
         | 
| 9 | 
            -
                 | 
| 9 | 
            +
                paths-ignore:
         | 
| 10 | 
            +
                  - .github/workflows/macos.yml
         | 
| 11 | 
            +
                  - .github/workflows/windows.yml
         | 
| 10 12 |  | 
| 11 13 | 
             
            jobs:
         | 
| 12 14 | 
             
              test-linux:
         | 
| 13 15 | 
             
                name: Test on Ruby ${{ matrix.ruby }} Ubuntu
         | 
| 14 16 | 
             
                runs-on: ubuntu-latest
         | 
| 17 | 
            +
                continue-on-error: ${{ matrix.experimental }}
         | 
| 15 18 | 
             
                strategy:
         | 
| 16 19 | 
             
                  fail-fast: false
         | 
| 17 20 | 
             
                  matrix:
         | 
| 18 21 | 
             
                    ruby: [ '2.6', '2.5', '2.4' ]
         | 
| 22 | 
            +
                    experimental: [false]
         | 
| 23 | 
            +
                    include:
         | 
| 24 | 
            +
                      - ruby: '2.7'
         | 
| 25 | 
            +
                        experimental: true
         | 
| 19 26 | 
             
                steps:
         | 
| 20 27 | 
             
                  - uses: actions/checkout@master
         | 
| 21 28 | 
             
                  - name: Use Ruby
         | 
| @@ -25,15 +32,8 @@ jobs: | |
| 25 32 | 
             
                      architecture: 'x64'
         | 
| 26 33 | 
             
                  - name: Update gems
         | 
| 27 34 | 
             
                    run: |
         | 
| 28 | 
            -
                      gem install bundler | 
| 35 | 
            +
                      gem install bundler
         | 
| 29 36 | 
             
                      bundle install --jobs 4 --retry 3
         | 
| 30 | 
            -
                  - name: Use Node
         | 
| 31 | 
            -
                    uses: actions/setup-node@v1
         | 
| 32 | 
            -
                    with:
         | 
| 33 | 
            -
                      node-version: '8'
         | 
| 34 | 
            -
                  - name: Install Puppeteer
         | 
| 35 | 
            -
                    run: |
         | 
| 36 | 
            -
                      npm install -g puppeteer
         | 
| 37 37 | 
             
                  - name: Install PlantUML
         | 
| 38 38 | 
             
                    run: |
         | 
| 39 39 | 
             
                      sudo bash -c "curl -L https://github.com/riboseinc/plantuml-install/raw/master/ubuntu.sh | bash"
         | 
| @@ -1,21 +1,28 @@ | |
| 1 | 
            -
            # Auto-generated  | 
| 2 | 
            -
            #  | 
| 1 | 
            +
            # Auto-generated by Cimas: Do not edit it manually!
         | 
| 2 | 
            +
            # See https://github.com/metanorma/cimas
         | 
| 3 3 | 
             
            name: windows
         | 
| 4 4 |  | 
| 5 5 | 
             
            on:
         | 
| 6 6 | 
             
              push:
         | 
| 7 7 | 
             
                branches: [ master ]
         | 
| 8 8 | 
             
              pull_request:
         | 
| 9 | 
            -
                 | 
| 9 | 
            +
                paths-ignore:
         | 
| 10 | 
            +
                  - .github/workflows/macos.yml
         | 
| 11 | 
            +
                  - .github/workflows/ubuntu.yml
         | 
| 10 12 |  | 
| 11 13 | 
             
            jobs:
         | 
| 12 14 | 
             
              test-windows:
         | 
| 13 15 | 
             
                name: Test on Ruby ${{ matrix.ruby }} Windows
         | 
| 14 16 | 
             
                runs-on: windows-latest
         | 
| 17 | 
            +
                continue-on-error: ${{ matrix.experimental }}
         | 
| 15 18 | 
             
                strategy:
         | 
| 16 19 | 
             
                  fail-fast: false
         | 
| 17 20 | 
             
                  matrix:
         | 
| 18 21 | 
             
                    ruby: [ '2.6', '2.5', '2.4' ]
         | 
| 22 | 
            +
                    experimental: [false]
         | 
| 23 | 
            +
                    include:
         | 
| 24 | 
            +
                      - ruby: '2.7'
         | 
| 25 | 
            +
                        experimental: true
         | 
| 19 26 | 
             
                steps:
         | 
| 20 27 | 
             
                  - uses: actions/checkout@master
         | 
| 21 28 | 
             
                  - name: Use Ruby
         | 
| @@ -26,17 +33,9 @@ jobs: | |
| 26 33 | 
             
                  - name: Update gems
         | 
| 27 34 | 
             
                    shell: pwsh
         | 
| 28 35 | 
             
                    run: |
         | 
| 29 | 
            -
                      gem install bundler | 
| 36 | 
            +
                      gem install bundler
         | 
| 30 37 | 
             
                      bundle config --local path vendor/bundle
         | 
| 31 | 
            -
                      bundle update
         | 
| 32 38 | 
             
                      bundle install --jobs 4 --retry 3
         | 
| 33 | 
            -
                  - name: Use Node
         | 
| 34 | 
            -
                    uses: actions/setup-node@v1
         | 
| 35 | 
            -
                    with:
         | 
| 36 | 
            -
                      node-version: '8'
         | 
| 37 | 
            -
                  - name: Install Puppeteer
         | 
| 38 | 
            -
                    run: |
         | 
| 39 | 
            -
                      npm install -g puppeteer
         | 
| 40 39 | 
             
                  - name: Install PlantUML
         | 
| 41 40 | 
             
                    run: |
         | 
| 42 41 | 
             
                      cinst -y plantuml
         | 
    
        data/README.adoc
    CHANGED
    
    | @@ -1,8 +1,9 @@ | |
| 1 1 | 
             
            = AsciiRSD: Asciidoctor processor for Ribose Standard Documents (RSD)
         | 
| 2 2 |  | 
| 3 3 | 
             
            image:https://img.shields.io/gem/v/metanorma-rsd.svg["Gem Version", link="https://rubygems.org/gems/metanorma-rsd"]
         | 
| 4 | 
            -
            image:https:// | 
| 5 | 
            -
            image:https:// | 
| 4 | 
            +
            image:https://github.com/metanorma/metanorma-rsd/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=macos"]
         | 
| 5 | 
            +
            image:https://github.com/metanorma/metanorma-rsd/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=ubuntu"]
         | 
| 6 | 
            +
            image:https://github.com/metanorma/metanorma-rsd/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-rsd/actions?workflow=windows"]
         | 
| 6 7 | 
             
            image:https://codeclimate.com/github/metanorma/metanorma-rsd/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-rsd"]
         | 
| 7 8 | 
             
            image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-rsd.svg["Pull Requests", link="https://github.com/metanorma/metanorma-rsd/pulls"]
         | 
| 8 9 | 
             
            image:https://img.shields.io/github/commits-since/metanorma/metanorma-rsd/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-rsd/releases"]
         | 
| @@ -87,8 +88,7 @@ this general model can be found on its page. Details of the RSD modifications | |
| 87 88 | 
             
            to this general model can be found on the https://github.com/metanorma/metanorma-model-rsd[RSD model]
         | 
| 88 89 | 
             
            repository.
         | 
| 89 90 |  | 
| 91 | 
            +
            ////
         | 
| 90 92 | 
             
            == Examples
         | 
| 93 | 
            +
            ////
         | 
| 91 94 |  | 
| 92 | 
            -
            * link:spec/examples/rfc6350.adoc[] is an AsciiRSD version of https://tools.ietf.org/html/rfc6350[RFC 6350].
         | 
| 93 | 
            -
            * link:spec/examples/rfc6350.html[] is an HTML file generated from the AsciiRSD.
         | 
| 94 | 
            -
            * link:spec/examples/rfc6350.doc[] is a Word document generated from the AsciiRSD.
         | 
| @@ -49,11 +49,17 @@ | |
| 49 49 | 
             
              </define>
         | 
| 50 50 | 
             
              <define name="stage">
         | 
| 51 51 | 
             
                <element name="stage">
         | 
| 52 | 
            +
                  <optional>
         | 
| 53 | 
            +
                    <attribute name="abbreviation"/>
         | 
| 54 | 
            +
                  </optional>
         | 
| 52 55 | 
             
                  <text/>
         | 
| 53 56 | 
             
                </element>
         | 
| 54 57 | 
             
              </define>
         | 
| 55 58 | 
             
              <define name="substage">
         | 
| 56 59 | 
             
                <element name="substage">
         | 
| 60 | 
            +
                  <optional>
         | 
| 61 | 
            +
                    <attribute name="abbreviation"/>
         | 
| 62 | 
            +
                  </optional>
         | 
| 57 63 | 
             
                  <text/>
         | 
| 58 64 | 
             
                </element>
         | 
| 59 65 | 
             
              </define>
         | 
| @@ -82,7 +88,7 @@ | |
| 82 88 | 
             
                  <text/>
         | 
| 83 89 | 
             
                </element>
         | 
| 84 90 | 
             
              </define>
         | 
| 85 | 
            -
              <define name=" | 
| 91 | 
            +
              <define name="LocalizedString1">
         | 
| 86 92 | 
             
                <optional>
         | 
| 87 93 | 
             
                  <!-- multiple languages and scripts possible: comma delimit them if so -->
         | 
| 88 94 | 
             
                  <attribute name="language"/>
         | 
| @@ -92,6 +98,16 @@ | |
| 92 98 | 
             
                </optional>
         | 
| 93 99 | 
             
                <text/>
         | 
| 94 100 | 
             
              </define>
         | 
| 101 | 
            +
              <define name="LocalizedString">
         | 
| 102 | 
            +
                <choice>
         | 
| 103 | 
            +
                  <ref name="LocalizedString1"/>
         | 
| 104 | 
            +
                  <oneOrMore>
         | 
| 105 | 
            +
                    <element name="variant">
         | 
| 106 | 
            +
                      <ref name="LocalizedString1"/>
         | 
| 107 | 
            +
                    </element>
         | 
| 108 | 
            +
                  </oneOrMore>
         | 
| 109 | 
            +
                </choice>
         | 
| 110 | 
            +
              </define>
         | 
| 95 111 | 
             
              <!--
         | 
| 96 112 | 
             
                Unlike UML, change type to format: type is overloaded
         | 
| 97 113 | 
             
                Would be need if plain were default value and could omit the attribute
         | 
| @@ -115,7 +131,7 @@ | |
| 115 131 | 
             
                </optional>
         | 
| 116 132 | 
             
                <ref name="LocalizedStringOrXsAny"/>
         | 
| 117 133 | 
             
              </define>
         | 
| 118 | 
            -
              <define name=" | 
| 134 | 
            +
              <define name="LocalizedStringOrXsAny1">
         | 
| 119 135 | 
             
                <optional>
         | 
| 120 136 | 
             
                  <!-- multiple languages and scripts possible: comma delimit them if so -->
         | 
| 121 137 | 
             
                  <attribute name="language"/>
         | 
| @@ -130,6 +146,16 @@ | |
| 130 146 | 
             
                  </choice>
         | 
| 131 147 | 
             
                </oneOrMore>
         | 
| 132 148 | 
             
              </define>
         | 
| 149 | 
            +
              <define name="LocalizedStringOrXsAny">
         | 
| 150 | 
            +
                <choice>
         | 
| 151 | 
            +
                  <ref name="LocalizedStringOrXsAny1"/>
         | 
| 152 | 
            +
                  <oneOrMore>
         | 
| 153 | 
            +
                    <element name="variant">
         | 
| 154 | 
            +
                      <ref name="LocalizedStringOrXsAny1"/>
         | 
| 155 | 
            +
                    </element>
         | 
| 156 | 
            +
                  </oneOrMore>
         | 
| 157 | 
            +
                </choice>
         | 
| 158 | 
            +
              </define>
         | 
| 133 159 | 
             
              <define name="contributor">
         | 
| 134 160 | 
             
                <element name="contributor">
         | 
| 135 161 | 
             
                  <zeroOrMore>
         | 
| @@ -452,9 +478,14 @@ | |
| 452 478 | 
             
                <attribute name="bibitemid">
         | 
| 453 479 | 
             
                  <data type="IDREF"/>
         | 
| 454 480 | 
             
                </attribute>
         | 
| 455 | 
            -
                < | 
| 456 | 
            -
                  < | 
| 457 | 
            -
             | 
| 481 | 
            +
                <choice>
         | 
| 482 | 
            +
                  <zeroOrMore>
         | 
| 483 | 
            +
                    <ref name="locality"/>
         | 
| 484 | 
            +
                  </zeroOrMore>
         | 
| 485 | 
            +
                  <zeroOrMore>
         | 
| 486 | 
            +
                    <ref name="localityStack"/>
         | 
| 487 | 
            +
                  </zeroOrMore>
         | 
| 488 | 
            +
                </choice>
         | 
| 458 489 | 
             
                <optional>
         | 
| 459 490 | 
             
                  <ref name="date"/>
         | 
| 460 491 | 
             
                </optional>
         | 
| @@ -469,6 +500,25 @@ | |
| 469 500 | 
             
                  <ref name="BibItemLocality"/>
         | 
| 470 501 | 
             
                </element>
         | 
| 471 502 | 
             
              </define>
         | 
| 503 | 
            +
              <define name="localityStack">
         | 
| 504 | 
            +
                <element name="localityStack">
         | 
| 505 | 
            +
                  <zeroOrMore>
         | 
| 506 | 
            +
                    <ref name="locality"/>
         | 
| 507 | 
            +
                  </zeroOrMore>
         | 
| 508 | 
            +
                </element>
         | 
| 509 | 
            +
              </define>
         | 
| 510 | 
            +
              <define name="sourceLocality">
         | 
| 511 | 
            +
                <element name="sourceLocality">
         | 
| 512 | 
            +
                  <ref name="BibItemLocality"/>
         | 
| 513 | 
            +
                </element>
         | 
| 514 | 
            +
              </define>
         | 
| 515 | 
            +
              <define name="sourceLocalityStack">
         | 
| 516 | 
            +
                <element name="sourceLocalityStack">
         | 
| 517 | 
            +
                  <zeroOrMore>
         | 
| 518 | 
            +
                    <ref name="sourceLocality"/>
         | 
| 519 | 
            +
                  </zeroOrMore>
         | 
| 520 | 
            +
                </element>
         | 
| 521 | 
            +
              </define>
         | 
| 472 522 | 
             
              <define name="BibItemLocality">
         | 
| 473 523 | 
             
                <attribute name="type">
         | 
| 474 524 | 
             
                  <ref name="LocalityType"/>
         | 
| @@ -611,9 +661,9 @@ | |
| 611 661 | 
             
                <optional>
         | 
| 612 662 | 
             
                  <ref name="status"/>
         | 
| 613 663 | 
             
                </optional>
         | 
| 614 | 
            -
                < | 
| 664 | 
            +
                <zeroOrMore>
         | 
| 615 665 | 
             
                  <ref name="copyright"/>
         | 
| 616 | 
            -
                </ | 
| 666 | 
            +
                </zeroOrMore>
         | 
| 617 667 | 
             
                <zeroOrMore>
         | 
| 618 668 | 
             
                  <ref name="docrelation"/>
         | 
| 619 669 | 
             
                </zeroOrMore>
         | 
| @@ -703,21 +753,11 @@ | |
| 703 753 | 
             
              </define>
         | 
| 704 754 | 
             
              <define name="TypedTitleString">
         | 
| 705 755 | 
             
                <optional>
         | 
| 706 | 
            -
                  <attribute name="type" | 
| 707 | 
            -
                    <ref name="TitleType"/>
         | 
| 708 | 
            -
                  </attribute>
         | 
| 756 | 
            +
                  <attribute name="type"/>
         | 
| 709 757 | 
             
                </optional>
         | 
| 710 758 | 
             
                <ref name="FormattedString"/>
         | 
| 711 759 | 
             
              </define>
         | 
| 712 | 
            -
               | 
| 713 | 
            -
                <choice>
         | 
| 714 | 
            -
                  <value>alternative</value>
         | 
| 715 | 
            -
                  <value>original</value>
         | 
| 716 | 
            -
                  <value>unofficial</value>
         | 
| 717 | 
            -
                  <value>subtitle</value>
         | 
| 718 | 
            -
                  <value>main</value>
         | 
| 719 | 
            -
                </choice>
         | 
| 720 | 
            -
              </define>
         | 
| 760 | 
            +
              <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
         | 
| 721 761 | 
             
              <define name="TypedUri">
         | 
| 722 762 | 
             
                <optional>
         | 
| 723 763 | 
             
                  <attribute name="type"/>
         | 
| @@ -747,6 +787,8 @@ | |
| 747 787 | 
             
                  <value>unchanged</value>
         | 
| 748 788 | 
             
                  <value>circulated</value>
         | 
| 749 789 | 
             
                  <value>adapted</value>
         | 
| 790 | 
            +
                  <value>vote-started</value>
         | 
| 791 | 
            +
                  <value>vote-ended</value>
         | 
| 750 792 | 
             
                </choice>
         | 
| 751 793 | 
             
              </define>
         | 
| 752 794 | 
             
              <define name="bdate">
         | 
| @@ -979,7 +1021,17 @@ | |
| 979 1021 | 
             
                  <optional>
         | 
| 980 1022 | 
             
                    <ref name="to"/>
         | 
| 981 1023 | 
             
                  </optional>
         | 
| 982 | 
            -
                  < | 
| 1024 | 
            +
                  <oneOrMore>
         | 
| 1025 | 
            +
                    <ref name="owner"/>
         | 
| 1026 | 
            +
                  </oneOrMore>
         | 
| 1027 | 
            +
                  <optional>
         | 
| 1028 | 
            +
                    <ref name="copyright_scope"/>
         | 
| 1029 | 
            +
                  </optional>
         | 
| 1030 | 
            +
                </element>
         | 
| 1031 | 
            +
              </define>
         | 
| 1032 | 
            +
              <define name="copyright_scope">
         | 
| 1033 | 
            +
                <element name="scope">
         | 
| 1034 | 
            +
                  <text/>
         | 
| 983 1035 | 
             
                </element>
         | 
| 984 1036 | 
             
              </define>
         | 
| 985 1037 | 
             
              <define name="from">
         | 
| @@ -999,38 +1051,63 @@ | |
| 999 1051 | 
             
              </define>
         | 
| 1000 1052 | 
             
              <define name="DocRelationType">
         | 
| 1001 1053 | 
             
                <choice>
         | 
| 1002 | 
            -
                  <value>obsoletes</value>
         | 
| 1003 | 
            -
                  <value>obsoletedBy</value>
         | 
| 1004 | 
            -
                  <value>supersedes</value>
         | 
| 1005 | 
            -
                  <value>supersededBy</value>
         | 
| 1006 | 
            -
                  <value>updates</value>
         | 
| 1007 | 
            -
                  <value>updatedBy</value>
         | 
| 1008 | 
            -
                  <value>complements</value>
         | 
| 1009 | 
            -
                  <value>derivedFrom</value>
         | 
| 1010 | 
            -
                  <value>translatedFrom</value>
         | 
| 1011 | 
            -
                  <value>hasTranslation</value>
         | 
| 1012 | 
            -
                  <value>adoptedFrom</value>
         | 
| 1013 | 
            -
                  <value>equivalent</value>
         | 
| 1014 | 
            -
                  <value>identical</value>
         | 
| 1015 | 
            -
                  <value>nonequivalent</value>
         | 
| 1016 | 
            -
                  <value>includedIn</value>
         | 
| 1017 1054 | 
             
                  <value>includes</value>
         | 
| 1018 | 
            -
                  <value> | 
| 1019 | 
            -
                  <value>instanceOf</value>
         | 
| 1020 | 
            -
                  <value>partOf</value>
         | 
| 1055 | 
            +
                  <value>includedIn</value>
         | 
| 1021 1056 | 
             
                  <value>hasPart</value>
         | 
| 1022 | 
            -
                  <value> | 
| 1023 | 
            -
                  <value>draftOf</value>
         | 
| 1057 | 
            +
                  <value>partOf</value>
         | 
| 1024 1058 | 
             
                  <value>merges</value>
         | 
| 1059 | 
            +
                  <value>mergedInto</value>
         | 
| 1025 1060 | 
             
                  <value>splits</value>
         | 
| 1026 | 
            -
                  <value> | 
| 1027 | 
            -
                  <value> | 
| 1028 | 
            -
                  <value> | 
| 1029 | 
            -
                  <value> | 
| 1030 | 
            -
                  <value> | 
| 1031 | 
            -
                  <value> | 
| 1061 | 
            +
                  <value>splitInto</value>
         | 
| 1062 | 
            +
                  <value>instance</value>
         | 
| 1063 | 
            +
                  <value>hasInstance</value>
         | 
| 1064 | 
            +
                  <value>exemplarOf</value>
         | 
| 1065 | 
            +
                  <value>hasExemplar</value>
         | 
| 1066 | 
            +
                  <value>manifestationOf</value>
         | 
| 1067 | 
            +
                  <value>hasManifestation</value>
         | 
| 1068 | 
            +
                  <value>reproductionOf</value>
         | 
| 1069 | 
            +
                  <value>hasReproduction</value>
         | 
| 1070 | 
            +
                  <value>reprintOf</value>
         | 
| 1071 | 
            +
                  <value>hasReprint</value>
         | 
| 1072 | 
            +
                  <value>expressionOf</value>
         | 
| 1073 | 
            +
                  <value>hasExpression</value>
         | 
| 1074 | 
            +
                  <value>translatedFrom</value>
         | 
| 1075 | 
            +
                  <value>hasTranslation</value>
         | 
| 1076 | 
            +
                  <value>arrangementOf</value>
         | 
| 1077 | 
            +
                  <value>hasArrangement</value>
         | 
| 1078 | 
            +
                  <value>abridgementOf</value>
         | 
| 1079 | 
            +
                  <value>hasAbridgement</value>
         | 
| 1080 | 
            +
                  <value>annotationOf</value>
         | 
| 1081 | 
            +
                  <value>hasAnnotation</value>
         | 
| 1082 | 
            +
                  <value>draftOf</value>
         | 
| 1083 | 
            +
                  <value>hasDraft</value>
         | 
| 1084 | 
            +
                  <value>editionOf</value>
         | 
| 1085 | 
            +
                  <value>hasEdition</value>
         | 
| 1086 | 
            +
                  <value>updates</value>
         | 
| 1087 | 
            +
                  <value>updatedBy</value>
         | 
| 1088 | 
            +
                  <value>derivedFrom</value>
         | 
| 1089 | 
            +
                  <value>derives</value>
         | 
| 1032 1090 | 
             
                  <value>describes</value>
         | 
| 1033 1091 | 
             
                  <value>describedBy</value>
         | 
| 1092 | 
            +
                  <value>catalogues</value>
         | 
| 1093 | 
            +
                  <value>cataloguedBy</value>
         | 
| 1094 | 
            +
                  <value>hasSuccessor</value>
         | 
| 1095 | 
            +
                  <value>successorOf</value>
         | 
| 1096 | 
            +
                  <value>adaptedFrom</value>
         | 
| 1097 | 
            +
                  <value>hasAdaptation</value>
         | 
| 1098 | 
            +
                  <value>adoptedFrom</value>
         | 
| 1099 | 
            +
                  <value>adoptedAs</value>
         | 
| 1100 | 
            +
                  <value>reviewOf</value>
         | 
| 1101 | 
            +
                  <value>hasReview</value>
         | 
| 1102 | 
            +
                  <value>commentaryOf</value>
         | 
| 1103 | 
            +
                  <value>hasCommentary</value>
         | 
| 1104 | 
            +
                  <value>related</value>
         | 
| 1105 | 
            +
                  <value>complements</value>
         | 
| 1106 | 
            +
                  <value>complementOf</value>
         | 
| 1107 | 
            +
                  <value>obsoletes</value>
         | 
| 1108 | 
            +
                  <value>obsoletedBy</value>
         | 
| 1109 | 
            +
                  <value>cited</value>
         | 
| 1110 | 
            +
                  <value>isCitedIn</value>
         | 
| 1034 1111 | 
             
                </choice>
         | 
| 1035 1112 | 
             
              </define>
         | 
| 1036 1113 | 
             
              <define name="docrelation">
         | 
| @@ -1038,12 +1115,30 @@ | |
| 1038 1115 | 
             
                  <attribute name="type">
         | 
| 1039 1116 | 
             
                    <ref name="DocRelationType"/>
         | 
| 1040 1117 | 
             
                  </attribute>
         | 
| 1118 | 
            +
                  <optional>
         | 
| 1119 | 
            +
                    <element name="description">
         | 
| 1120 | 
            +
                      <ref name="FormattedString"/>
         | 
| 1121 | 
            +
                    </element>
         | 
| 1122 | 
            +
                  </optional>
         | 
| 1041 1123 | 
             
                  <element name="bibitem">
         | 
| 1042 1124 | 
             
                    <ref name="BibliographicItem"/>
         | 
| 1043 1125 | 
             
                  </element>
         | 
| 1044 | 
            -
                  < | 
| 1045 | 
            -
                    < | 
| 1046 | 
            -
             | 
| 1126 | 
            +
                  <choice>
         | 
| 1127 | 
            +
                    <zeroOrMore>
         | 
| 1128 | 
            +
                      <ref name="locality"/>
         | 
| 1129 | 
            +
                    </zeroOrMore>
         | 
| 1130 | 
            +
                    <zeroOrMore>
         | 
| 1131 | 
            +
                      <ref name="localityStack"/>
         | 
| 1132 | 
            +
                    </zeroOrMore>
         | 
| 1133 | 
            +
                  </choice>
         | 
| 1134 | 
            +
                  <choice>
         | 
| 1135 | 
            +
                    <zeroOrMore>
         | 
| 1136 | 
            +
                      <ref name="sourceLocality"/>
         | 
| 1137 | 
            +
                    </zeroOrMore>
         | 
| 1138 | 
            +
                    <zeroOrMore>
         | 
| 1139 | 
            +
                      <ref name="sourceLocalityStack"/>
         | 
| 1140 | 
            +
                    </zeroOrMore>
         | 
| 1141 | 
            +
                  </choice>
         | 
| 1047 1142 | 
             
                </element>
         | 
| 1048 1143 | 
             
              </define>
         | 
| 1049 1144 | 
             
              <define name="version">
         |