metanorma-iho 0.2.4 → 0.2.9
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/rake.yml +66 -0
- data/README.adoc +3 -1
- data/lib/asciidoctor/iho/basicdoc.rng +32 -0
- data/lib/asciidoctor/iho/isodoc.rng +29 -44
- data/lib/isodoc/iho/base_convert.rb +0 -1
- data/lib/isodoc/iho/html/htmlstyle.css +8 -4
- data/lib/isodoc/iho/html/htmlstyle.scss +2 -2
- data/lib/isodoc/iho/html/iho.css +71 -71
- data/lib/isodoc/iho/html/iho.scss +71 -71
- data/lib/isodoc/iho/html/wordstyle.css +55 -55
- data/lib/isodoc/iho/html/wordstyle.scss +55 -55
- data/lib/isodoc/iho/iho.specification.xsl +450 -87
- data/lib/isodoc/iho/iho.standard.xsl +450 -87
- data/lib/isodoc/iho/metadata.rb +0 -8
- data/lib/isodoc/iho/xref.rb +2 -2
- data/lib/metanorma/iho/fonts_manifest.yaml +8 -0
- data/lib/metanorma/iho/processor.rb +0 -8
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.gemspec +1 -2
- data/metanorma.yml +14 -6
- metadata +6 -21
- data/.github/workflows/macos.yml +0 -41
- data/.github/workflows/ubuntu.yml +0 -45
- data/.github/workflows/windows.yml +0 -43
data/lib/isodoc/iho/metadata.rb
CHANGED
@@ -8,14 +8,6 @@ module IsoDoc
|
|
8
8
|
Metanorma::IHO.configuration
|
9
9
|
end
|
10
10
|
|
11
|
-
def commentperiod(ixml, _out)
|
12
|
-
from = ixml.at(ns("//bibdata/ext/commentperiod/from"))&.text
|
13
|
-
to = ixml.at(ns("//bibdata/ext/commentperiod/to"))&.text
|
14
|
-
extended = ixml.at(ns("//bibdata/ext/commentperiod/extended"))&.text
|
15
|
-
set(:comment_from, from) if from
|
16
|
-
set(:comment_to, to) if to
|
17
|
-
end
|
18
|
-
|
19
11
|
def series(xml, _out)
|
20
12
|
set(:series, xml.at(ns("//bibdata/series[@type = 'main']/title"))&.text)
|
21
13
|
a = xml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text and
|
data/lib/isodoc/iho/xref.rb
CHANGED
@@ -15,7 +15,7 @@ module IsoDoc
|
|
15
15
|
@labels["appendix"] : @labels["annex"]
|
16
16
|
@anchors[clause["id"]] =
|
17
17
|
{ label: annex_name_lbl(clause, num), type: "clause",
|
18
|
-
xref: "#{lbl} #{num}", level: 1, value: lbl }
|
18
|
+
xref: l10n("#{lbl} #{num}"), level: 1, value: lbl }
|
19
19
|
if a = single_annex_special_section(clause)
|
20
20
|
annex_names1(a, "#{num}", 1)
|
21
21
|
else
|
@@ -43,7 +43,7 @@ module IsoDoc
|
|
43
43
|
lbl = clause.at("./ancestor::xmlns:annex/@obligation").
|
44
44
|
text == "informative" ? @labels["appendix"] : @labels["annex"]
|
45
45
|
@anchors[clause["id"]] =
|
46
|
-
{ label: num, xref: "#{lbl} #{num}",
|
46
|
+
{ label: num, xref: l10n("#{lbl} #{num}"),
|
47
47
|
level: level, type: "clause" }
|
48
48
|
clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
|
49
49
|
each_with_index do |c, i|
|
@@ -2,14 +2,6 @@ require "metanorma/processor"
|
|
2
2
|
|
3
3
|
module Metanorma
|
4
4
|
module IHO
|
5
|
-
def self.fonts_used
|
6
|
-
{
|
7
|
-
html: ["SourceSansPro-Light", "SourceSerifPro", "SourceCodePro-Light", "HanSans"],
|
8
|
-
doc: ["SourceSansPro-Light", "SourceSerifPro", "SourceCodePro-Light", "HanSans"],
|
9
|
-
pdf: ["SourceSansPro-Light", "SourceSerifPro", "SourceCodePro-Light", "HanSans"],
|
10
|
-
}
|
11
|
-
end
|
12
|
-
|
13
5
|
class Processor < Metanorma::Generic::Processor
|
14
6
|
def configuration
|
15
7
|
Metanorma::IHO.configuration
|
data/metanorma-iho.gemspec
CHANGED
@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
|
|
27
27
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
28
28
|
|
29
29
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
30
|
-
spec.add_dependency
|
31
|
-
spec.add_dependency 'metanorma-generic', '~> 1.7.0'
|
30
|
+
spec.add_dependency 'metanorma-generic', '~> 1.8.0'
|
32
31
|
|
33
32
|
spec.add_development_dependency "byebug", "~> 9.1"
|
34
33
|
spec.add_development_dependency "sassc", "2.4.0"
|
data/metanorma.yml
CHANGED
@@ -13,9 +13,13 @@ i18nyaml: lib/isodoc/iho/i18n-en.yaml
|
|
13
13
|
htmlcoverpage: lib/isodoc/iho/html/html_iho_titlepage.html
|
14
14
|
htmlintropage: lib/isodoc/iho/html/html_iho_intro.html
|
15
15
|
htmlstylesheet: lib/isodoc/iho/html/htmlstyle.scss
|
16
|
-
html_bodyfont: '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,
|
17
|
-
html_headerfont: '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,
|
18
|
-
html_monospacefont: '
|
16
|
+
html_bodyfont: '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"'
|
17
|
+
html_headerfont: '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"'
|
18
|
+
html_monospacefont: '"Fira Code",Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace'
|
19
|
+
html_normalfontsize: "15px"
|
20
|
+
html_footnotefontsize: "0.9em"
|
21
|
+
webfont:
|
22
|
+
- "https://fonts.googleapis.com/css2?family=Fira+Code&display=swap"
|
19
23
|
scripts: lib/isodoc/iho/html/scripts.html
|
20
24
|
scripts_pdf: lib/isodoc/iho/html/scripts.pdf.html
|
21
25
|
standardstylesheet: lib/isodoc/iho/html/iho.scss
|
@@ -23,9 +27,13 @@ header: lib/isodoc/iho/html/header.html
|
|
23
27
|
wordcoverpage: lib/isodoc/iho/html/word_iho_titlepage.html
|
24
28
|
wordintropage: lib/isodoc/iho/html/word_iho_intro.html
|
25
29
|
wordstylesheet: lib/isodoc/iho/html/wordstyle.scss
|
26
|
-
word_bodyfont: '
|
27
|
-
word_headerfont: '
|
28
|
-
word_monospacefont: '
|
30
|
+
word_bodyfont: 'Arial,sans-serif'
|
31
|
+
word_headerfont: 'Arial,sans-serif'
|
32
|
+
word_monospacefont: '"Fira Code",Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace'
|
33
|
+
word_normalfontsize: "12.0pt"
|
34
|
+
word_smallerfontsize: "11.0pt"
|
35
|
+
word_monospacefontsize: "10.0pt"
|
36
|
+
word_footnotefontsize: "10.0pt"
|
29
37
|
docid_template: "{% if seriesabbr %}{{seriesabbr}}{%else%}S{%endif%}-{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}"
|
30
38
|
published_stages:
|
31
39
|
- in-force
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iho
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.9
|
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-
|
11
|
+
date: 2020-12-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: htmlentities
|
@@ -24,34 +24,20 @@ dependencies:
|
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 4.3.4
|
27
|
-
- !ruby/object:Gem::Dependency
|
28
|
-
name: isodoc
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - "~>"
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: 1.2.0
|
34
|
-
type: :runtime
|
35
|
-
prerelease: false
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
37
|
-
requirements:
|
38
|
-
- - "~>"
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: 1.2.0
|
41
27
|
- !ruby/object:Gem::Dependency
|
42
28
|
name: metanorma-generic
|
43
29
|
requirement: !ruby/object:Gem::Requirement
|
44
30
|
requirements:
|
45
31
|
- - "~>"
|
46
32
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
33
|
+
version: 1.8.0
|
48
34
|
type: :runtime
|
49
35
|
prerelease: false
|
50
36
|
version_requirements: !ruby/object:Gem::Requirement
|
51
37
|
requirements:
|
52
38
|
- - "~>"
|
53
39
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
40
|
+
version: 1.8.0
|
55
41
|
- !ruby/object:Gem::Dependency
|
56
42
|
name: byebug
|
57
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -202,9 +188,7 @@ executables: []
|
|
202
188
|
extensions: []
|
203
189
|
extra_rdoc_files: []
|
204
190
|
files:
|
205
|
-
- ".github/workflows/
|
206
|
-
- ".github/workflows/ubuntu.yml"
|
207
|
-
- ".github/workflows/windows.yml"
|
191
|
+
- ".github/workflows/rake.yml"
|
208
192
|
- CODE_OF_CONDUCT.md
|
209
193
|
- Gemfile
|
210
194
|
- LICENSE
|
@@ -251,6 +235,7 @@ files:
|
|
251
235
|
- lib/isodoc/iho/xref.rb
|
252
236
|
- lib/metanorma-iho.rb
|
253
237
|
- lib/metanorma/iho.rb
|
238
|
+
- lib/metanorma/iho/fonts_manifest.yaml
|
254
239
|
- lib/metanorma/iho/processor.rb
|
255
240
|
- lib/metanorma/iho/version.rb
|
256
241
|
- metanorma-iho.gemspec
|
data/.github/workflows/macos.yml
DELETED
@@ -1,41 +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: Install PlantUML
|
37
|
-
run: |
|
38
|
-
brew install plantuml
|
39
|
-
- name: Run specs
|
40
|
-
run: |
|
41
|
-
bundle exec rake
|
@@ -1,45 +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
|
-
pull_request:
|
9
|
-
paths-ignore:
|
10
|
-
- .github/workflows/macos.yml
|
11
|
-
- .github/workflows/windows.yml
|
12
|
-
|
13
|
-
jobs:
|
14
|
-
test-linux:
|
15
|
-
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
16
|
-
runs-on: ubuntu-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
|
-
gem install bundler
|
35
|
-
bundle install --jobs 4 --retry 3
|
36
|
-
- name: Install PlantUML
|
37
|
-
uses: nick-invision/retry@v1
|
38
|
-
with:
|
39
|
-
polling_interval_seconds: 5
|
40
|
-
timeout_minutes: 5
|
41
|
-
max_attempts: 3
|
42
|
-
command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
|
43
|
-
- name: Run specs
|
44
|
-
run: |
|
45
|
-
bundle exec rake
|
@@ -1,43 +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: Install PlantUML
|
39
|
-
run: |
|
40
|
-
cinst -y plantuml
|
41
|
-
- name: Run specs
|
42
|
-
run: |
|
43
|
-
bundle exec rake
|