metanorma-nist 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +0 -1
  3. data/.github/workflows/ubuntu.yml +10 -7
  4. data/.github/workflows/windows.yml +0 -1
  5. data/lib/isodoc/nist/html/_coverpage.scss +1 -1
  6. data/lib/isodoc/nist/html/html_nist_titlepage.html +1 -1
  7. data/lib/isodoc/nist/html_convert.rb +2 -5
  8. data/lib/isodoc/nist/refs.rb +6 -2
  9. data/lib/isodoc/nist/section.rb +1 -0
  10. data/lib/isodoc/nist/word_convert_toc.rb +2 -2
  11. data/lib/metanorma/nist/processor.rb +0 -4
  12. data/lib/metanorma/nist/version.rb +1 -1
  13. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '05109623d4ab89934b15717692765c6c29015007695efad9ea8258b81d1e956c'
4
- data.tar.gz: f848bb3f40e50382a2bfeca5f2bd89a78d06d7808bbb3aa4e01d3ce88a8cb87e
3
+ metadata.gz: 9fd53abb651e6ed6f607f8cd697e00819b5db05c5e4540df273348c2bc61a85f
4
+ data.tar.gz: c76ec958d5ebae5b2fb3f9b24db5186645022e48745fcf3f4382c93d2634a046
5
5
  SHA512:
6
- metadata.gz: 5b3e0c43ab7a515b8dcba5a6c988254d361934a87091dca35a9134b3d51833c463126695bc2ebee8a3c1430b309210fd08adc8efec6e1ddce727dd2a9c96ad28
7
- data.tar.gz: edc0d9b4b5aa9b8fe2c98a7369cfec29a44a93a3b4808dfb95b8eb618aa6ff7ada7e0110190bb84cf35355fbcb4497c84827ddbd0eb540aeba2a3389525fd20d
6
+ metadata.gz: a96a9016064a2ab39601cb0d500e77625d550f1175c84a1bcc4f4858d2a46c3661507797ed627e059500242a9a7fd78dc37f3f74592eee9ea66dad0e5e70257d
7
+ data.tar.gz: 61ea2bf1cb04e1840010e0f7af70b08987fd7d957584ed44862d3eaf1adc74d7bb9f6d0f0bab83635c0b63825d1f3580201c0981e0462bc7ce82a96fb1dd3069
data/.github/workflows/macos.yml CHANGED
@@ -29,7 +29,6 @@ jobs:
29
29
  uses: actions/setup-ruby@v1
30
30
  with:
31
31
  ruby-version: ${{ matrix.ruby }}
32
- architecture: 'x64'
33
32
  - name: Update gems
34
33
  run: |
35
34
  sudo gem install bundler --force
data/.github/workflows/ubuntu.yml CHANGED
@@ -31,7 +31,6 @@ jobs:
31
31
  uses: actions/setup-ruby@v1
32
32
  with:
33
33
  ruby-version: ${{ matrix.ruby }}
34
- architecture: 'x64'
35
34
  - name: Update gems
36
35
  run: |
37
36
  gem install bundler
@@ -39,15 +38,19 @@ jobs:
39
38
  - name: Run specs
40
39
  run: |
41
40
  bundle exec rake
42
- - name: Trigger dependent repositories
43
- if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
41
+ - name: Trigger repositories
42
+ if: matrix.ruby == '2.6'
44
43
  env:
45
- GH_USERNAME: ${{ secrets.PAT_USERNAME }}
46
- GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
44
+ GH_USERNAME: metanorma-ci
45
+ GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
47
46
  run: |
48
47
  curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
49
48
  [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
50
- for repo in $DEPENDENT_REPOS
49
+ CLIENT_PAYLOAD=$(cat <<EOF
50
+ "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
51
+ EOF
52
+ )
53
+ for repo in $REPOS
51
54
  do
52
- sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
55
+ sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
53
56
  done
data/.github/workflows/windows.yml CHANGED
@@ -29,7 +29,6 @@ jobs:
29
29
  uses: actions/setup-ruby@v1
30
30
  with:
31
31
  ruby-version: ${{ matrix.ruby }}
32
- architecture: 'x64'
33
32
  - name: Update gems
34
33
  shell: pwsh
35
34
  run: |
data/lib/isodoc/nist/html/_coverpage.scss CHANGED
@@ -66,7 +66,7 @@ img#NIST-logo {
66
66
  height: auto;
67
67
  }
68
68
 
69
- .authors-container {
69
+ .authors-container, .currency {
70
70
  margin-top: 2em;
71
71
  }
72
72
 
data/lib/isodoc/nist/html/html_nist_titlepage.html CHANGED
@@ -163,7 +163,7 @@
163
163
 
164
164
 
165
165
  {% unless unpublished %}
166
- <div class="coverpage-logo">
166
+ <div class="currency">
167
167
  <span>{{ issueddate_monthyear }}</span>
168
168
  {%if confirmeddate and confirmeddate != "XXX" %}
169
169
  <br/>Publication is current as of {{ confirmeddate_MMMddyyyy }}
data/lib/isodoc/nist/html_convert.rb CHANGED
@@ -60,7 +60,7 @@ module IsoDoc
60
60
  toc = "<ul>"
61
61
  path = toclevel_classes.map do |l|
62
62
  "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
63
- "[not(text())][not(@class = 'AbstractTitle')]"\
63
+ "[text()][not(@class = 'AbstractTitle')]"\
64
64
  "[not(@class = 'IntroTitle')][not(@class = 'ForewordTitle')]"
65
65
  end
66
66
  docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
@@ -81,10 +81,6 @@ module IsoDoc
81
81
  end
82
82
  end
83
83
 
84
- def html_toc(docxml)
85
- docxml
86
- end
87
-
88
84
  def authority_cleanup(docxml)
89
85
  dest = docxml.at("//div[@id = 'authority']") || return
90
86
  auth = docxml.at("//div[@class = 'authority']") || return
@@ -106,6 +102,7 @@ module IsoDoc
106
102
  super
107
103
  term_cleanup(docxml)
108
104
  requirement_cleanup(docxml)
105
+ docxml
109
106
  end
110
107
 
111
108
  def make_body3(body, docxml)
data/lib/isodoc/nist/refs.rb CHANGED
@@ -21,8 +21,7 @@ module IsoDoc
21
21
  end
22
22
 
23
23
  def reference_format(b, r)
24
- id = bibitem_ref_code(b)
25
- code = render_identifier(id)
24
+ code = render_identifier(bibitem_ref_code(b))
26
25
  if code[0]
27
26
  r << "#{code[0]} "
28
27
  insert_tab(r, 1)
@@ -54,6 +53,11 @@ module IsoDoc
54
53
  end
55
54
 
56
55
  def nist_reference_format(b, r)
56
+ code = render_identifier(bibitem_ref_code(b))
57
+ if code[0]
58
+ r << "#{code[0]} "
59
+ insert_tab(r, 1)
60
+ end
57
61
  bibitem = b.dup.to_xml
58
62
  r.parent.add_child ::Iso690Render.render(bibitem, true)
59
63
  end
data/lib/isodoc/nist/section.rb CHANGED
@@ -36,6 +36,7 @@ module IsoDoc
36
36
 
37
37
  def middle(isoxml, out)
38
38
  clause isoxml, out
39
+ require "byebug"; byebug
39
40
  bibliography isoxml, out
40
41
  annex isoxml, out
41
42
  end
data/lib/isodoc/nist/word_convert_toc.rb CHANGED
@@ -35,7 +35,7 @@ module IsoDoc
35
35
  <span lang="EN-GB"><span
36
36
  style='mso-element:field-begin'></span><span
37
37
  style='mso-spacerun:yes'>&#xA0;</span>TOC
38
- \\h \\z \\t &quot;TableTitle,1&quot; <span
38
+ \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
39
39
  style='mso-element:field-separator'></span></span>
40
40
  TOC
41
41
 
@@ -43,7 +43,7 @@ module IsoDoc
43
43
  <span lang="EN-GB"><span
44
44
  style='mso-element:field-begin'></span><span
45
45
  style='mso-spacerun:yes'>&#xA0;</span>TOC
46
- \\h \\z \\t &quot;FigureTitle,1&quot; <span
46
+ \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
47
47
  style='mso-element:field-separator'></span></span>
48
48
  TOC
49
49
 
data/lib/metanorma/nist/processor.rb CHANGED
@@ -29,10 +29,6 @@ module Metanorma
29
29
  "Metanorma::NIST #{Metanorma::NIST::VERSION}"
30
30
  end
31
31
 
32
- def input_to_isodoc(file, filename)
33
- Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
34
- end
35
-
36
32
  def output(isodoc_node, inname, outname, format, options={})
37
33
  case format
38
34
  when :html
data/lib/metanorma/nist/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "1.1.0"
3
+ VERSION = "1.1.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-nist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-26 00:00:00.000000000 Z
11
+ date: 2020-07-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities