isodoc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5e9597107793ecac111d5706640c399dcdec0411fdf49489c7058cf342bac2
-  data.tar.gz: 0b488bc57ff9c36a418f0012a49d68111a2e5f519a0a5d6191d201db99356526
+  metadata.gz: 0fe7dc7a4c361573ce166000c4b747853185889ed1385f6219da5ecd9bf33b73
+  data.tar.gz: 2da4bf7a5c8a282bdfee95b96b99322c246712405b429404d5accf3385f9b360
 SHA512:
-  metadata.gz: 26660b7ac5d08b63f0846c5d8a3caea1f58eed0491c1fcfe83ee3d3b9b3d73da9eaf57636fc48ed84370f12a1dd25e6043b5372750b03d6fc20547be0c6f22f0
-  data.tar.gz: 99fe284cd22c1c19dc3f4528ae057857194b0354f55cf31414b1dbc1d54f9c564b1b45101faaad426c69fb2fb15dd3ae2186d0532a95a1675f5b92f7658d7546
+  metadata.gz: 62e7510c6f20ac7d8773d112bc25957c543097164e3b794dcc05d9b241be70317ea37295e9da8d3fcf61aec5597471091af2912277977db1fa266dd3f5351cae
+  data.tar.gz: 6c09ae0a60b767cd4d3dd4ce22a6df2609ea8d1a21f29863a5c5ca27283ebe5897f0d530bf89212dc7b8cd4788641f66d04d646a04189f9c3c379e058d3c50c7

data/.github/workflows/macos.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
@@ -27,22 +29,14 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer@3.0.1
       - name: Install Inkscape
         run: |
           brew cask install inkscape
           inkscape --version
+      - name: Update gems
+        run: |
+          sudo gem install bundler --force
+          bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,8 +1,12 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
+    tags:
+      - '*'
   pull_request:
     paths-ignore:
       - .github/workflows/macos.yml
@@ -27,38 +31,32 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          sudo apt-get update
-          sudo apt-get install libgbm1
-          npm install -g puppeteer@3.0.1
       - name: Install Inkscape
         run: |
           sudo add-apt-repository ppa:inkscape.dev/stable
           sudo apt update
           sudo apt install inkscape
           inkscape --version
+      - name: Update gems
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
           bundle exec rake
-      - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
+      - name: Trigger repositories
+        if: matrix.ruby == '2.6'
         env:
-          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
-          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+          GH_USERNAME: metanorma-ci
+          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
         run: |
           curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          for repo in $DEPENDENT_REPOS
+          CLIENT_PAYLOAD=$(cat <<EOF
+          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
+          EOF
+          )
+          for repo in $REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
           done

data/.github/workflows/windows.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
@@ -27,24 +29,16 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
+      - name: Install Inkscape
+        run: |
+          choco install --no-progress -y inkscape
+          inkscape --version
       - name: Update gems
         shell: pwsh
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer@3.0.1
-      - name: Install Inkscape
-        run: |
-          choco install --no-progress -y inkscape
-          inkscape --version
       - name: Run specs
         run: |
           bundle exec rake

data/lib/isodoc/function/references.rb

@@ -16,22 +16,24 @@ module IsoDoc::Function
         identifiers = render_identifier(ids)
         if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
         else
-          ref << "#{identifiers[0] || identifiers[1]}, "
-          ref << "#{identifiers[1]}, " if identifiers[0] && identifiers[1]
+          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
+        ref << ", " unless biblio && !identifiers[1]
         reference_format(b, ref)
       end
     end
 
     def std_bibitem_entry(list, b, ordinal, biblio)
       list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        ids = bibitem_ref_code(b)
-        identifiers = render_identifier(ids)
-        prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
-        ref << "#{identifiers[0] || identifiers[1]}"
-        ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
+        identifiers = render_identifier(bibitem_ref_code(b))
+        if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
+        else
+          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
+        end
         date_note_process(b, ref)
-        ref << ", "
+        ref << ", " unless biblio && !identifiers[1]
         reference_format(b, ref)
       end
     end
@@ -40,9 +42,7 @@ module IsoDoc::Function
     # else, use both ordinal, as prefix, and t
     def ref_entry_code(r, ordinal, t, id)
       prefix_bracketed_ref(r, t[0] || "[#{ordinal}]")
-      if t[1]
-        r << "#{t[1]}, "
-      end
+      t[1] and r << "#{t[1]}"
     end
 
     def pref_ref_code(b)
@@ -153,22 +153,33 @@ module IsoDoc::Function
       end
     end
 
+    def norm_ref_xpath
+      "//bibliography/references[@normative = 'true'] | "\
+      "//bibliography/clause[.//references[@normative = 'true']]"
+    end
+
     def norm_ref(isoxml, out, num)
-      q = "//bibliography/references[@normative = 'true']"
-      f = isoxml.at(ns(q)) or return num
+      f = isoxml.at(ns(norm_ref_xpath)) or return num
       out.div do |div|
         num = num + 1
         clause_name(num, @normref_lbl, div, nil)
-        biblio_list(f, div, false)
+        if f.name == "clause"
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        else
+          biblio_list(f, div, false)
+        end
       end
       num
     end
 
-    BIBLIOGRAPHY_XPATH = "//bibliography/clause[.//references[@normative = 'false']] | "\
-      "//bibliography/references[@normative = 'false']".freeze
+    def bibliography_xpath 
+      "//bibliography/clause[.//references]"\
+      "[not(.//references[@normative = 'true'])] | "\
+      "//bibliography/references[@normative = 'false']"
+    end
 
     def bibliography(isoxml, out)
-      f = isoxml.at(ns(BIBLIOGRAPHY_XPATH)) || return
+      f = isoxml.at(ns(bibliography_xpath)) || return
       page_break(out)
       out.div do |div|
         div.h1 @bibliography_lbl, **{ class: "Section3" }

data/lib/isodoc/function/to_word_html.rb

@@ -18,7 +18,7 @@ module IsoDoc::Function
 
     def init_file(filename, debug)
       filepath = Pathname.new(filename)
-      filename = filepath.sub_ext('').to_s
+      filename = filepath.sub_ext('').sub(/\.presentation$/, "").to_s
       dir = "#{filename}_files"
       unless debug
         Dir.mkdir(dir, 0777) unless File.exists?(dir)
@@ -45,7 +45,7 @@ module IsoDoc::Function
         head.style do |style|
           @standardstylesheet.open
           stylesheet = @standardstylesheet.read.
-            gsub("FILENAME", File.basename(filename))
+            gsub("FILENAME", File.basename(filename).sub(/\.presentation$/, ""))
           style.comment "\n#{stylesheet}\n"
         end
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -5,9 +5,7 @@ module IsoDoc::XrefGen
         annex_names(c, (65 + i).chr.to_s)
       end
       docxml.xpath(
-        ns("//bibliography/clause[.//references[@normative = 'false']] | "\
-           "//bibliography/references[@normative = 'false']"
-          )).each do |b|
+           ns(@klass.bibliography_xpath)).each do |b|
             preface_names(b)
           end
           docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
@@ -20,9 +18,7 @@ module IsoDoc::XrefGen
       # potentially overridden in middle_section_asset_names()
       sequential_asset_names(d.xpath(ns("//preface/*")))
       n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
-      n = section_names(d.at(ns(
-        "//bibliography/clause[.//references[@normative = 'true']] | "\
-        "//bibliography/references[@normative = 'true']")), n, 1)
+      n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
       n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -65,7 +61,7 @@ module IsoDoc::XrefGen
 
     def middle_section_asset_names(d)
       middle_sections = "//clause[title = 'Scope'] | "\
-        "//references[@normative = 'true'] | "\
+        "#{@klass.norm_ref_xpath} | "\
         "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))

data/spec/isodoc/ref_spec.rb

@@ -231,7 +231,7 @@ RSpec.describe IsoDoc do
           <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
         </p>
         <p id='ref12' class='Biblio'>
-          [6]&#160; Citn, IETF RFC 20, CitationWorks. 2019.
+          Citn&#160; IETF RFC 20, CitationWorks. 2019.
           <i>How to cite a reference</i>
           .
         </p>

data/spec/isodoc/section_spec.rb

@@ -1109,5 +1109,57 @@ OUTPUT
 OUTPUT
     end
 
+        it "processes clauses containing normative references" do
+            expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <bibliography>
+        <clause id="D" obligation="informative">
+         <title>Bibliography</title>
+         <references id="E" obligation="informative" normative="false">
+         <title>Bibliography Subsection 1</title>
+       </references>
+         <references id="F" obligation="informative" normative="false">
+         <title>Bibliography Subsection 2</title>
+       </references>
+       </clause>
+       <clause id="A" obligation="informative"><title>First References</title>
+        <references id="B" obligation="informative" normative="true">
+         <title>Normative References 1</title>
+       </references>
+        <references id="C" obligation="informative" normative="false">
+         <title>Normative References 2</title>
+       </references>
+        </clause>
+
+       </bibliography>
+INPUT
+    #{HTML_HDR}
+      <p class='zzSTDTitle1'/>
+      <div>
+        <h1>1.&#160; Normative references</h1>
+        <div>
+          <h2>1.1.&#160; Normative References 1</h2>
+        </div>
+        <div>
+          <h2>1.2.&#160; Normative References 2</h2>
+        </div>
+      </div>
+      <br/>
+      <div>
+        <h1 class='Section3'>Bibliography</h1>
+        <div>
+          <h2 class='Section3'>Bibliography Subsection 1</h2>
+        </div>
+        <div>
+          <h2 class='Section3'>Bibliography Subsection 2</h2>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
+OUTPUT
+            end
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath