metanorma 0.3.10 → 0.3.11

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +9 -9
  3. data/appveyor.yml +2 -23
  4. data/lib/metanorma/compile.rb +4 -2
  5. data/lib/metanorma/input/asciidoc.rb +4 -0
  6. data/lib/metanorma/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 557db569d4700a9cf6ace8a14b05a889ce6f87cea027b778812903719dfd8e18
4
- data.tar.gz: 0b8bd009747c7da6c111ead0ab76c77debc3262f03d97ade6564779312d90fa0
3
+ metadata.gz: f7c602f3a5c769d4a31270abc6185b3e04bfb5fcc801e8c17768775e6af5cf2b
4
+ data.tar.gz: b3d2420c9b8eb2c4893e60ec02a72527ec3d4bb730d2f415418fa97cc1c8652b
5
5
  SHA512:
6
- metadata.gz: c430032f283fae4569805a7a0a539eadd393d1209f7e0ab00482e9a59ca2a3a84de5958b1d4bdd7fd96a5732941172d3d114443318a18e534ba3f8712d02cc00
7
- data.tar.gz: e08907e2d2eb37b0938debf6233ceb3ac483fd10fc44e4c01e9eea36cb4a1a4f5edc56b0beb0804719332b0e6ad5e350c22c800855039e3e7862363f429f38ff
6
+ metadata.gz: d4e550a93798417d17184aae9e1ae85ac42f21a7e9f6df2c983a308304bc119b643fc889d2ca8614bd064057dbae59d26504cc564690ebaf3db76e9e22872645
7
+ data.tar.gz: 1c57ce431c760ef57dd41757bb8beb3f6e9518ce2548623f90f497b29128c40cfeda09e690398afa11e2c325022dfc3bf93e3995bf9f41ac3f69a632cd161c9b
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- metanorma (0.3.10)
4
+ metanorma (0.3.11)
5
5
  asciidoctor
6
6
  htmlentities
7
7
 
@@ -23,7 +23,7 @@ GEM
23
23
  nokogiri (>= 1.4.3)
24
24
  ffi (1.9.25)
25
25
  gb-agencies (0.0.5)
26
- gbbib (0.4.3)
26
+ gbbib (0.4.4)
27
27
  cnccs (~> 0.1.1)
28
28
  gb-agencies (~> 0.0.1)
29
29
  iso-bib-item (~> 0.4.2)
@@ -43,14 +43,14 @@ GEM
43
43
  iso-bib-item (~> 0.4.2)
44
44
  ietfbib (0.4.5)
45
45
  iso-bib-item (~> 0.4.2)
46
- iev (0.2.1)
46
+ iev (0.2.2)
47
47
  nokogiri
48
48
  image_size (2.0.0)
49
49
  iso-bib-item (0.4.4)
50
50
  isoics (~> 0.1.6)
51
51
  nokogiri (~> 1.8.4)
52
52
  ruby_deep_clone (~> 0.8.0)
53
- isobib (0.4.3)
53
+ isobib (0.4.4)
54
54
  algoliasearch
55
55
  iecbib (~> 0.2.1)
56
56
  iso-bib-item (~> 0.4.2)
@@ -70,13 +70,13 @@ GEM
70
70
  isoics (0.1.7)
71
71
  json (2.2.0)
72
72
  liquid (4.0.3)
73
- metanorma-iso (1.1.4)
73
+ metanorma-iso (1.1.5)
74
74
  asciidoctor (~> 1.5.7)
75
75
  iev (~> 0.2.0)
76
76
  isodoc (~> 0.9.8)
77
77
  metanorma-standoc (~> 1.1.0)
78
78
  ruby-jing
79
- metanorma-standoc (1.1.5)
79
+ metanorma-standoc (1.1.6)
80
80
  asciidoctor (~> 1.5.7)
81
81
  concurrent-ruby
82
82
  html2doc (~> 0.8.0)
@@ -88,7 +88,7 @@ GEM
88
88
  unicode2latex (~> 0.0.1)
89
89
  mime-types (3.2.2)
90
90
  mime-types-data (~> 3.2015)
91
- mime-types-data (3.2018.0812)
91
+ mime-types-data (3.2019.0331)
92
92
  mini_portile2 (2.3.0)
93
93
  mixlib-shellout (2.4.4)
94
94
  nokogiri (1.8.5)
@@ -99,7 +99,7 @@ GEM
99
99
  rb-fsevent (0.10.3)
100
100
  rb-inotify (0.10.0)
101
101
  ffi (~> 1.0)
102
- relaton (0.3.2)
102
+ relaton (0.3.3)
103
103
  algoliasearch
104
104
  gbbib (~> 0.4.0)
105
105
  iecbib (~> 0.2.0)
@@ -131,7 +131,7 @@ GEM
131
131
  optout (>= 0.0.2)
132
132
  ruby-xslt (0.9.10)
133
133
  ruby_deep_clone (0.8.0)
134
- sass (3.7.3)
134
+ sass (3.7.4)
135
135
  sass-listen (~> 4.0.0)
136
136
  sass-listen (4.0.0)
137
137
  rb-fsevent (~> 0.9, >= 0.9.4)
data/appveyor.yml CHANGED
@@ -12,33 +12,11 @@ matrix:
12
12
  - RUBY_VERSION: _trunk
13
13
 
14
14
  install:
15
- - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
16
- - gem install bundler -v 2.0.1
17
- - npm install -g puppeteer
18
- - npm install
19
- # install libxml2 & libxslt
20
- - ps: Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
15
+ - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
21
16
  - refreshenv
22
- - cinst --x86 xsltproc
23
- - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
24
- # RUBY_DLL_PATH looks broken in ruby23
25
- - if "%RUBY_VERSION%" == "23" (
26
- XCOPY /Y %XSLT_PROC%\bin\lib*.dll C:\Ruby%RUBY_VERSION%\bin\*
27
- ) else (
28
- XCOPY /Y %XSLT_PROC%\bin\libxml2*.dll %XSLT_PROC%\bin\libxml2.dll* &
29
- XCOPY /Y %XSLT_PROC%\bin\libxslt*.dll %XSLT_PROC%\bin\libxslt.dll* &
30
- XCOPY /Y %XSLT_PROC%\bin\libexslt*.dll %XSLT_PROC%\bin\libexslt.dll*
31
- )
32
- - echo @ECHO OFF > %ChocolateyInstall%\bin\xml2-config.bat
33
- - echo @ECHO OFF > %ChocolateyInstall%\bin\xslt-config.bat
34
17
 
35
18
  build_script:
36
- # RUBY_DLL_PATH looks broken in ruby23
37
- - if NOT "%RUBY_VERSION%" == "23" setx /M RUBY_DLL_PATH "%ChocolateyInstall%\lib\xsltproc\dist\bin;%RUBY_DLL_PATH%"
38
- - refreshenv
39
19
  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
40
- - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
41
- - bundle config build.ruby-xslt --with-xml2-include=%XSLT_PROC%\include\libxml2 --with-xslt-include=%XSLT_PROC%\include --with-xml2-lib=%XSLT_PROC%\lib --with-xslt-lib=%XSLT_PROC%\lib
42
20
  - bundle update
43
21
  - bundle install
44
22
 
@@ -49,3 +27,4 @@ before_test:
49
27
 
50
28
  test_script:
51
29
  - bundle exec rake
30
+
data/lib/metanorma/compile.rb CHANGED
@@ -94,9 +94,11 @@ module Metanorma
94
94
  when ".adoc"
95
95
  puts "[metanorma] Processing: Asciidoctor input."
96
96
  file = File.read(filename, encoding: "utf-8")
97
- if options[:asciimath]
97
+ options[:asciimath] and
98
98
  file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
99
- end
99
+ dir = File.dirname(filename)
100
+ dir != '.' and
101
+ file.gsub!(/^include::/, "include::#{dir}/")
100
102
  [file, @processor.input_to_isodoc(file, filename)]
101
103
  when ".xml"
102
104
  puts "[metanorma] Processing: Metanorma XML input."
data/lib/metanorma/input/asciidoc.rb CHANGED
@@ -54,6 +54,8 @@ module Metanorma
54
54
  /\n:ulstyle: (?<ulstyle>[^\n]+)\n/ =~ headerextract
55
55
  /\n:olstyle: (?<olstyle>[^\n]+)\n/ =~ headerextract
56
56
  /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ headerextract
57
+ /\n:htmltoclevels: (?<htmltoclevels>[^\n]+)\n/ =~ headerextract
58
+ /\n:doctoclevels: (?<doctoclevels>[^\n]+)\n/ =~ headerextract
57
59
  {
58
60
  script: defined?(script) ? script : nil,
59
61
  bodyfont: defined?(bodyfont) ? bodyfont : nil,
@@ -74,6 +76,8 @@ module Metanorma
74
76
  ulstyle: defined?(ulstyle) ? ulstyle : nil,
75
77
  olstyle: defined?(olstyle) ? olstyle : nil,
76
78
  datauriimage: defined?(datauriimage) ? datauriimage != "false" : nil,
79
+ htmltoclevels: defined?(htmltoclevels) ? htmltoclevels : nil,
80
+ doctoclevels: defined?(doctoclevels) ? doctoclevels : nil,
77
81
  }.reject { |_, val| val.nil? }
78
82
  end
79
83
 
data/lib/metanorma/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Metanorma
2
- VERSION = "0.3.10"
2
+ VERSION = "0.3.11"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.10
4
+ version: 0.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-23 00:00:00.000000000 Z
11
+ date: 2019-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor