metanorma-standoc 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa63066d27fa7a5628e8f79ea3bfeae64b380c18b3d9612a1cba84c6effb0a89
-  data.tar.gz: 60881ce80c1914265eaab8b478a22512c058415ee7f491c14df3aae6bb5b047c
+  metadata.gz: 6807d9e3f4a2d83494b51c3e0ba76d84e994a85034eec07d4e4d2fea5d21d3c0
+  data.tar.gz: b668b765fe2a7e2fabac30ec68ed8aef3da144f2e0748ddc8cc94f58307510fc
 SHA512:
-  metadata.gz: '0888338634c163d1736d76b1c3710554fcef64f653755110b632c4d6c074850f787cf788c106540f827774385a8848dff110bcde888f47440980259585f83fcc'
-  data.tar.gz: bb9c4a5fb8534f4ecee4331c2657330cb4ac0670cb1b592b3c731b7eb5fcee44ed02d5339e82ae16a937ae03e2573f4242ab51a18b0918363e9cea3fe2057b58
+  metadata.gz: df993bce7e1e3030c0c8d0ba83197c777c6cb94d1ce66c17c2dc064eae49b8d1616d6e357da733f6276bbfb6702229ac92eee79315f9cd8c0c59d7695260b62c
+  data.tar.gz: e75ee46b9bccc422672cd681ef7512317453ee6d36cfcf76aa7e73091cc8731b103de29b87024c28e67b00d4c9bd1e9ab03e28bbc558bf5b53359f198f524aca

data/.tex

@@ -0,0 +1 @@
+M = \begin{bmatrix} -\sin \lambda_0 & \cos \lambda_0 & 0 \\ -\sin \varphi_0 \cos \lambda_0 & -\sin \varphi_0 \sin \lambda_0 & \cos \varphi_0 \\ \cos \varphi_0 \cos \lambda_0 & \cos \varphi_0 \sin \lambda_0 & \sin \varphi_0 \end{bmatrix}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.1.5)
+    metanorma-standoc (1.1.6)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
@@ -36,7 +36,7 @@ GEM
     ffi (1.9.25)
     formatador (0.2.5)
     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)
@@ -71,18 +71,18 @@ 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)
-    isodoc (0.9.19)
+    isodoc (0.9.20)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -91,7 +91,6 @@ GEM
       nokogiri (>= 1)
       rake (~> 12.0)
       roman-numerals
-      ruby-xslt
       sassc (~> 1.12.1)
       thread_safe
       uuidtools
@@ -103,13 +102,13 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.9)
+    metanorma (0.3.10)
       asciidoctor
       htmlentities
     method_source (0.9.2)
     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)
     nenv (0.3.0)
     nokogiri (1.8.5)
@@ -118,7 +117,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     optout (0.0.2)
-    parallel (1.14.0)
+    parallel (1.17.0)
     parser (2.6.2.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -131,7 +130,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)
@@ -166,7 +165,7 @@ GEM
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    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/README.adoc

@@ -3,6 +3,7 @@
 image:https://img.shields.io/gem/v/metanorma-standoc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-standoc"]
 image:https://img.shields.io/travis/metanorma/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.org/metanorma/metanorma-standoc"]
 image:https://codeclimate.com/github/metanorma/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-standoc"]
+image:https://ci.appveyor.com/api/projects/status/qdadxv7rqfy33p66?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-standoc"]
 
 WARNING: This gem is still under development.
 
@@ -57,4 +58,3 @@ The metanorma-cli gem is the command-line interface for the Metanorma tool suite
 
 See http://metanorma.com[]
 
-bump

data/appveyor.yml

@@ -0,0 +1,34 @@
+version: '{build}'
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - choco install latexml
+  - refreshenv
+  - set PATH=C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;%PATH%
+  - where latexmlmath
+  - chcp 65001
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake
+

data/lib/asciidoctor/standoc/base.rb

@@ -47,6 +47,8 @@ module Asciidoctor
           scripts: node.attr("scripts"),
           scripts_pdf: node.attr("scripts-pdf"),
           datauriimage: node.attr("data-uri-image"),
+          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
+          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
         }
       end
 
@@ -69,6 +71,8 @@ module Asciidoctor
           wordintropage: node.attr("wordintropage"),
           ulstyle: node.attr("ulstyle"),
           olstyle: node.attr("olstyle"),
+          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
+          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
         }
       end
 

data/lib/asciidoctor/standoc/biblio.rng

@@ -837,26 +837,29 @@
       <ref name="ContributorInfo"/>
     </element>
   </define>
+  <define name="DocRelationType">
+    <choice>
+      <value>obsoletes</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>complements</value>
+      <value>derivedFrom</value>
+      <value>translatedFrom</value>
+      <value>adoptedFrom</value>
+      <value>equivalent</value>
+      <value>identical</value>
+      <value>nonequivalent</value>
+      <value>includedIn</value>
+      <value>includes</value>
+      <value>instance</value>
+      <value>partOf</value>
+      <value>hasDraft</value>
+    </choice>
+  </define>
   <define name="docrelation">
     <element name="relation">
       <attribute name="type">
-        <choice>
-          <value>obsoletes</value>
-          <value>updates</value>
-          <value>updatedBy</value>
-          <value>complements</value>
-          <value>derivedFrom</value>
-          <value>translatedFrom</value>
-          <value>adoptedFrom</value>
-          <value>equivalent</value>
-          <value>identical</value>
-          <value>nonequivalent</value>
-          <value>includedIn</value>
-          <value>includes</value>
-          <value>instance</value>
-          <value>partOf</value>
-          <value>hasDraft</value>
-        </choice>
+        <ref name="DocRelationType"/>
       </attribute>
       <element name="bibitem">
         <ref name="BibliographicItem"/>

data/lib/asciidoctor/standoc/cleanup.rb

@@ -27,6 +27,7 @@ module Asciidoctor
       end
 
       def cleanup(xmldoc)
+        element_name_cleanup(xmldoc)
         termdef_cleanup(xmldoc)
         sections_cleanup(xmldoc)
         obligations_cleanup(xmldoc)
@@ -41,11 +42,11 @@ module Asciidoctor
         xref_cleanup(xmldoc)
         origin_cleanup(xmldoc)
         iev_cleanup(xmldoc)
+        element_name_cleanup(xmldoc) # cleanup IEV
         bpart_cleanup(xmldoc)
         quotesource_cleanup(xmldoc)
         para_cleanup(xmldoc)
         callout_cleanup(xmldoc)
-        element_name_cleanup(xmldoc)
         footnote_cleanup(xmldoc)
         empty_element_cleanup(xmldoc)
         mathml_cleanup(xmldoc)

data/lib/asciidoctor/standoc/inline.rb

@@ -106,9 +106,12 @@ module Asciidoctor
           math = xml_encode(text)
           xml.stem math, **{ type: "MathML" }
         elsif style == :latexmath
-          out = Unicode2LaTeX::unicode2latex(text).gsub(/'/, '\\').gsub(/\n/, " ")
-          File.open(".tex", "w") { |file| file.write(out) }
-          latex = `cat .tex | latexmlmath --preload=amsmath  -- -`
+          latexmlmath_input = Unicode2LaTeX::unicode2latex(text).gsub(/'/, '\\').gsub(/\n/, " ")
+          latex = IO.popen('latexmlmath --preload=amsmath  -- -', 'r+') do |io|
+            io.write(latexmlmath_input)
+            io.close_write
+            io.read
+          end
           xml.stem **{ type: "MathML" } do |s|
             s << latex.sub(/<\?[^>]+>/, "")
           end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.5".freeze
+    VERSION = "1.1.6".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -387,6 +387,13 @@ RSpec.describe Asciidoctor::Standoc do
       :htmlcoverpage: spec/assets/htmlcover.html
       :htmlintropage: spec/assets/htmlintro.html
       :scripts: spec/assets/scripts.html
+      :htmltoclevels: 3
+
+      == Level 1
+
+      === Level 2
+
+      ==== Level 3
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[pre[^{]+\{[^{]+font-family: Andale Mono;]m)
@@ -412,6 +419,13 @@ RSpec.describe Asciidoctor::Standoc do
       :wordcoverpage: spec/assets/wordcover.html
       :wordintropage: spec/assets/wordintro.html
       :header: spec/assets/header.html
+      :doctoclevels: 3
+
+      == Level 1
+
+      === Level 2
+
+      ==== Level 3
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
     expect(html).to match(%r[pre[^{]+\{[^{]+font-family: Andale Mono;]m)
@@ -419,6 +433,7 @@ RSpec.describe Asciidoctor::Standoc do
     expect(html).to match(%r[h1[^{]+\{[^{]+font-family: Comic Sans;]m)
     expect(html).to match(%r[an empty word cover page])
     expect(html).to match(%r[an empty word intro page])
+    expect(html).to include('\o "1-3"')
     expect(html).to include(%[Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 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
@@ -335,6 +335,7 @@ files:
 - ".rubocop.ribose.yml"
 - ".rubocop.tb.yml"
 - ".rubocop.yml"
+- ".tex"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -343,6 +344,7 @@ files:
 - Makefile
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/rspec
 - docs/customisation.adoc
 - docs/guidance.adoc