metanorma 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557db569d4700a9cf6ace8a14b05a889ce6f87cea027b778812903719dfd8e18
-  data.tar.gz: 0b8bd009747c7da6c111ead0ab76c77debc3262f03d97ade6564779312d90fa0
+  metadata.gz: f7c602f3a5c769d4a31270abc6185b3e04bfb5fcc801e8c17768775e6af5cf2b
+  data.tar.gz: b3d2420c9b8eb2c4893e60ec02a72527ec3d4bb730d2f415418fa97cc1c8652b
 SHA512:
-  metadata.gz: c430032f283fae4569805a7a0a539eadd393d1209f7e0ab00482e9a59ca2a3a84de5958b1d4bdd7fd96a5732941172d3d114443318a18e534ba3f8712d02cc00
-  data.tar.gz: e08907e2d2eb37b0938debf6233ceb3ac483fd10fc44e4c01e9eea36cb4a1a4f5edc56b0beb0804719332b0e6ad5e350c22c800855039e3e7862363f429f38ff
+  metadata.gz: d4e550a93798417d17184aae9e1ae85ac42f21a7e9f6df2c983a308304bc119b643fc889d2ca8614bd064057dbae59d26504cc564690ebaf3db76e9e22872645
+  data.tar.gz: 1c57ce431c760ef57dd41757bb8beb3f6e9518ce2548623f90f497b29128c40cfeda09e690398afa11e2c325022dfc3bf93e3995bf9f41ac3f69a632cd161c9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma (0.3.10)
+    metanorma (0.3.11)
       asciidoctor
       htmlentities
 
@@ -23,7 +23,7 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     gb-agencies (0.0.5)
-    gbbib (0.4.3)
+    gbbib (0.4.4)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.4.2)
@@ -43,14 +43,14 @@ GEM
       iso-bib-item (~> 0.4.2)
     ietfbib (0.4.5)
       iso-bib-item (~> 0.4.2)
-    iev (0.2.1)
+    iev (0.2.2)
       nokogiri
     image_size (2.0.0)
     iso-bib-item (0.4.4)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isobib (0.4.3)
+    isobib (0.4.4)
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
@@ -70,13 +70,13 @@ GEM
     isoics (0.1.7)
     json (2.2.0)
     liquid (4.0.3)
-    metanorma-iso (1.1.4)
+    metanorma-iso (1.1.5)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.8)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-standoc (1.1.5)
+    metanorma-standoc (1.1.6)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
@@ -88,7 +88,7 @@ GEM
       unicode2latex (~> 0.0.1)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     mini_portile2 (2.3.0)
     mixlib-shellout (2.4.4)
     nokogiri (1.8.5)
@@ -99,7 +99,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.3.2)
+    relaton (0.3.3)
       algoliasearch
       gbbib (~> 0.4.0)
       iecbib (~> 0.2.0)
@@ -131,7 +131,7 @@ GEM
       optout (>= 0.0.2)
     ruby-xslt (0.9.10)
     ruby_deep_clone (0.8.0)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)

data/appveyor.yml

@@ -12,33 +12,11 @@ matrix:
     - RUBY_VERSION: _trunk
 
 install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - gem install bundler -v 2.0.1
-  - npm install -g puppeteer
-  - npm install
-  # install libxml2 & libxslt
-  - ps: Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
   - refreshenv
-  - cinst --x86 xsltproc
-  - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
-  # RUBY_DLL_PATH looks broken in ruby23
-  - if "%RUBY_VERSION%" == "23" (
-      XCOPY /Y %XSLT_PROC%\bin\lib*.dll C:\Ruby%RUBY_VERSION%\bin\*
-    ) else (
-      XCOPY /Y %XSLT_PROC%\bin\libxml2*.dll %XSLT_PROC%\bin\libxml2.dll* &
-      XCOPY /Y %XSLT_PROC%\bin\libxslt*.dll %XSLT_PROC%\bin\libxslt.dll* &
-      XCOPY /Y %XSLT_PROC%\bin\libexslt*.dll %XSLT_PROC%\bin\libexslt.dll*
-    )
-  - echo @ECHO OFF > %ChocolateyInstall%\bin\xml2-config.bat
-  - echo @ECHO OFF > %ChocolateyInstall%\bin\xslt-config.bat
 
 build_script:
-  # RUBY_DLL_PATH looks broken in ruby23
-  - if NOT "%RUBY_VERSION%" == "23" setx /M RUBY_DLL_PATH "%ChocolateyInstall%\lib\xsltproc\dist\bin;%RUBY_DLL_PATH%"
-  - refreshenv
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
-  - 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
   - bundle update
   - bundle install
 
@@ -49,3 +27,4 @@ before_test:
 
 test_script:
   - bundle exec rake
+

data/lib/metanorma/compile.rb

@@ -94,9 +94,11 @@ module Metanorma
       when ".adoc"
         puts "[metanorma] Processing: Asciidoctor input."
         file = File.read(filename, encoding: "utf-8")
-        if options[:asciimath]
+        options[:asciimath] and
           file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
-        end
+        dir = File.dirname(filename)
+        dir != '.' and
+          file.gsub!(/^include::/, "include::#{dir}/")
         [file, @processor.input_to_isodoc(file, filename)]
       when ".xml"
         puts "[metanorma] Processing: Metanorma XML input."

data/lib/metanorma/input/asciidoc.rb

@@ -54,6 +54,8 @@ module Metanorma
         /\n:ulstyle: (?<ulstyle>[^\n]+)\n/ =~ headerextract
         /\n:olstyle: (?<olstyle>[^\n]+)\n/ =~ headerextract
         /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ headerextract
+        /\n:htmltoclevels: (?<htmltoclevels>[^\n]+)\n/ =~ headerextract
+        /\n:doctoclevels: (?<doctoclevels>[^\n]+)\n/ =~ headerextract
         {
           script: defined?(script) ? script : nil,
           bodyfont: defined?(bodyfont) ? bodyfont : nil,
@@ -74,6 +76,8 @@ module Metanorma
           ulstyle: defined?(ulstyle) ? ulstyle : nil,
           olstyle: defined?(olstyle) ? olstyle : nil,
           datauriimage: defined?(datauriimage) ? datauriimage != "false" : nil,
+          htmltoclevels: defined?(htmltoclevels) ? htmltoclevels : nil,
+          doctoclevels: defined?(doctoclevels) ? doctoclevels : nil,
         }.reject { |_, val| val.nil? }
       end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor