metanorma-nist 1.2.3 → 1.2.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +62 -0
  3. data/.github/workflows/release.yml +36 -0
  4. data/README.adoc +3 -4
  5. data/lib/asciidoctor/nist/basicdoc.rng +4 -11
  6. data/lib/asciidoctor/nist/cleanup.rb +1 -0
  7. data/lib/asciidoctor/nist/converter.rb +2 -0
  8. data/lib/asciidoctor/nist/isodoc.rng +27 -50
  9. data/lib/asciidoctor/nist/nist.rng +9 -1
  10. data/lib/isodoc/nist/base_convert.rb +0 -1
  11. data/lib/isodoc/nist/fonts_manifest.yaml +4 -0
  12. data/lib/isodoc/nist/html/htmlstyle.css +226 -222
  13. data/lib/isodoc/nist/html/htmlstyle.scss +5 -6
  14. data/lib/isodoc/nist/html/nist.css +49 -50
  15. data/lib/isodoc/nist/html/nist.scss +49 -50
  16. data/lib/isodoc/nist/html/nist_cswp.css +48 -49
  17. data/lib/isodoc/nist/html/nist_cswp.scss +48 -49
  18. data/lib/isodoc/nist/html/wordstyle.css +42 -42
  19. data/lib/isodoc/nist/html/wordstyle.scss +42 -42
  20. data/lib/isodoc/nist/html/wordstyle_cswp.css +52 -52
  21. data/lib/isodoc/nist/html/wordstyle_cswp.scss +52 -52
  22. data/lib/isodoc/nist/html_convert.rb +12 -1
  23. data/lib/isodoc/nist/metadata.rb +1 -0
  24. data/lib/isodoc/nist/metadata_id.rb +2 -0
  25. data/lib/isodoc/nist/nist.cswp.xsl +546 -88
  26. data/lib/isodoc/nist/nist.sp.xsl +578 -93
  27. data/lib/isodoc/nist/refs.rb +2 -0
  28. data/lib/isodoc/nist/render.rb +0 -4
  29. data/lib/isodoc/nist/word_convert.rb +6 -1
  30. data/lib/metanorma/nist/fonts_manifest.yaml +6 -0
  31. data/lib/metanorma/nist/processor.rb +0 -8
  32. data/lib/metanorma/nist/version.rb +1 -1
  33. data/metanorma-nist.gemspec +2 -2
  34. metadata +10 -9
  35. data/.github/workflows/macos.yml +0 -38
  36. data/.github/workflows/ubuntu.yml +0 -56
  37. data/.github/workflows/windows.yml +0 -40
@@ -63,6 +63,7 @@ module IsoDoc
63
63
  end
64
64
 
65
65
  def bibliography_parse(node, out)
66
+ return if node["hidden"] == "true"
66
67
  title = node&.at(ns("./title"))&.text || ""
67
68
  out.div do |div|
68
69
  unless suppress_biblio_title(node)
@@ -76,6 +77,7 @@ module IsoDoc
76
77
  f = isoxml.at(ns("//bibliography/clause | //bibliography/references")) || return
77
78
  page_break(out)
78
79
  isoxml.xpath(ns("//bibliography/clause | //bibliography/references")).each do |f|
80
+ next if f["hidden"] == "true"
79
81
  out.div do |div|
80
82
  div.h1 **{ class: "Section3" } do |h1|
81
83
  f&.at(ns("./title"))&.children.each { |n| parse(n, h1) }
@@ -4,10 +4,6 @@ require_relative "render_contributors"
4
4
  require_relative "render_dates"
5
5
 
6
6
  module Iso690Render
7
- =begin
8
- Out of scope: Provenance (differentiating elements by @source in rendering)
9
- =end
10
-
11
7
  def self.render(bib, embedded = false)
12
8
  docxml = Nokogiri::XML(bib)
13
9
  docxml.remove_namespaces!
@@ -40,7 +40,12 @@ module IsoDoc
40
40
  '"Times New Roman",serif'),
41
41
  headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
42
42
  '"Arial",sans-serif'),
43
- monospacefont: '"Courier New",monospace' }
43
+ monospacefont: '"Courier New",monospace',
44
+ normalfontsize: "12.0pt",
45
+ footnotefontsize: "10.0pt",
46
+ monospacefontsize: "10.0pt",
47
+ smallerfontsize: "10.0pt",
48
+ }
44
49
  end
45
50
 
46
51
  def default_file_locations(_options)
@@ -0,0 +1,6 @@
1
+ ---
2
+ SimSun:
3
+ Cambria:
4
+ SimHei:
5
+ Calibri:
6
+ Courier New:
@@ -3,14 +3,6 @@ require "metanorma/processor"
3
3
  module Metanorma
4
4
  module NIST
5
5
  class Processor < Metanorma::Processor
6
- def self.fonts_used
7
- {
8
- html: ["Times New Roman", "Arial", "Courier New"],
9
- doc: ["Times New Roman", "Arial", "Courier New"],
10
- pdf: ["Times New Roman", "Arial", "Courier New"],
11
- }
12
- end
13
-
14
6
  def initialize
15
7
  @short = :nist
16
8
  @input_format = :asciidoc
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "1.2.3"
3
+ VERSION = "1.2.8"
4
4
  end
5
5
  end
@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
30
30
  spec.add_dependency "iso-639"
31
31
  spec.add_dependency "tzinfo-data" # we need this for windows only
32
32
 
33
- spec.add_dependency "metanorma-standoc", "~> 1.5.0"
34
- spec.add_dependency "isodoc", "~> 1.2.0"
33
+ spec.add_dependency "metanorma-standoc", "~> 1.6.0"
34
+ spec.add_dependency "isodoc", "~> 1.3.0"
35
35
  #spec.add_dependency "relaton-nist", "~> 0.3.0"
36
36
 
37
37
  spec.add_development_dependency "byebug", "~> 9.1"
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.2.3
4
+ version: 1.2.8
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-09-11 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -86,28 +86,28 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.5.0
89
+ version: 1.6.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.5.0
96
+ version: 1.6.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: isodoc
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.2.0
103
+ version: 1.3.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.2.0
110
+ version: 1.3.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: byebug
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -257,9 +257,8 @@ executables: []
257
257
  extensions: []
258
258
  extra_rdoc_files: []
259
259
  files:
260
- - ".github/workflows/macos.yml"
261
- - ".github/workflows/ubuntu.yml"
262
- - ".github/workflows/windows.yml"
260
+ - ".github/workflows/rake.yml"
261
+ - ".github/workflows/release.yml"
263
262
  - ".hound.yml"
264
263
  - ".rubocop.yml"
265
264
  - CODE_OF_CONDUCT.md
@@ -286,6 +285,7 @@ files:
286
285
  - lib/asciidoctor/nist/validate.rb
287
286
  - lib/isodoc/nist/base_convert.rb
288
287
  - lib/isodoc/nist/common.xsl
288
+ - lib/isodoc/nist/fonts_manifest.yaml
289
289
  - lib/isodoc/nist/html/_coverpage.css
290
290
  - lib/isodoc/nist/html/_coverpage.scss
291
291
  - lib/isodoc/nist/html/commerce-logo-color.png
@@ -331,6 +331,7 @@ files:
331
331
  - lib/isodoc/nist/xref.rb
332
332
  - lib/metanorma-nist.rb
333
333
  - lib/metanorma/nist.rb
334
+ - lib/metanorma/nist/fonts_manifest.yaml
334
335
  - lib/metanorma/nist/processor.rb
335
336
  - lib/metanorma/nist/version.rb
336
337
  - metanorma-nist.gemspec
@@ -1,38 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: macos
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- paths-ignore:
10
- - .github/workflows/ubuntu.yml
11
- - .github/workflows/windows.yml
12
-
13
- jobs:
14
- test-macos:
15
- name: Test on Ruby ${{ matrix.ruby }} macOS
16
- runs-on: macos-latest
17
- continue-on-error: ${{ matrix.experimental }}
18
- strategy:
19
- fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.5', '2.4' ]
22
- experimental: [false]
23
- include:
24
- - ruby: '2.7'
25
- experimental: true
26
- steps:
27
- - uses: actions/checkout@master
28
- - name: Use Ruby
29
- uses: actions/setup-ruby@v1
30
- with:
31
- ruby-version: ${{ matrix.ruby }}
32
- - name: Update gems
33
- run: |
34
- sudo gem install bundler --force
35
- bundle install --jobs 4 --retry 3
36
- - name: Run specs
37
- run: |
38
- bundle exec rake
@@ -1,56 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: ubuntu
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- tags:
9
- - '*'
10
- pull_request:
11
- paths-ignore:
12
- - .github/workflows/macos.yml
13
- - .github/workflows/windows.yml
14
-
15
- jobs:
16
- test-linux:
17
- name: Test on Ruby ${{ matrix.ruby }} Ubuntu
18
- runs-on: ubuntu-latest
19
- continue-on-error: ${{ matrix.experimental }}
20
- strategy:
21
- fail-fast: false
22
- matrix:
23
- ruby: [ '2.6', '2.5', '2.4' ]
24
- experimental: [false]
25
- include:
26
- - ruby: '2.7'
27
- experimental: true
28
- steps:
29
- - uses: actions/checkout@master
30
- - name: Use Ruby
31
- uses: actions/setup-ruby@v1
32
- with:
33
- ruby-version: ${{ matrix.ruby }}
34
- - name: Update gems
35
- run: |
36
- gem install bundler
37
- bundle install --jobs 4 --retry 3
38
- - name: Run specs
39
- run: |
40
- bundle exec rake
41
- - name: Trigger repositories
42
- if: matrix.ruby == '2.6'
43
- env:
44
- GH_USERNAME: metanorma-ci
45
- GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
46
- run: |
47
- curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
48
- [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
49
- CLIENT_PAYLOAD=$(cat <<EOF
50
- "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
51
- EOF
52
- )
53
- for repo in $REPOS
54
- do
55
- sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
56
- done
@@ -1,40 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: windows
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- paths-ignore:
10
- - .github/workflows/macos.yml
11
- - .github/workflows/ubuntu.yml
12
-
13
- jobs:
14
- test-windows:
15
- name: Test on Ruby ${{ matrix.ruby }} Windows
16
- runs-on: windows-latest
17
- continue-on-error: ${{ matrix.experimental }}
18
- strategy:
19
- fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.5', '2.4' ]
22
- experimental: [false]
23
- include:
24
- - ruby: '2.7'
25
- experimental: true
26
- steps:
27
- - uses: actions/checkout@master
28
- - name: Use Ruby
29
- uses: actions/setup-ruby@v1
30
- with:
31
- ruby-version: ${{ matrix.ruby }}
32
- - name: Update gems
33
- shell: pwsh
34
- run: |
35
- gem install bundler
36
- bundle config --local path vendor/bundle
37
- bundle install --jobs 4 --retry 3
38
- - name: Run specs
39
- run: |
40
- bundle exec rake