metanorma 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537c8c191cf1d55b37090f34b5cabd7f5332c0fc38f0378ef38499a2973d2666
-  data.tar.gz: 2bcb82454d81c2bae64dd41e77bd6800f8557974cffa607a3cd709a6e15785c5
+  metadata.gz: 8162aba3ac1d75ae0feca29816f033aa318b6ea07198414dca00faf7e1ab0ae2
+  data.tar.gz: 8ffcb1addda80439b364d9c8b502cec40e0ffa3a113b3fb744bc7354b915f5e0
 SHA512:
-  metadata.gz: 200991c8752ba12ba868a570f86254372e5a4ba35ce0b02c00102d25145ae91cc1e93c6bd81e62836129b8b537d058f67ce52e51b177e3c474366d03080b928a
-  data.tar.gz: 8a94fee5cd05b87190ebecd89b387e63a773f7e6f0c6619d6dddb1fe800b8b05471ea3ec36f286971bc4b19c347aed05aa6a7feacf689ee079168dfea6755744
+  metadata.gz: cfcf0e8e9eab44f5838aa487fa1e0bcfc0551b3c2601ce40c8a4886a4946ac404e6fe62853939919fcc4c9003458e62014f3cbb9dc8d3ed205b18b984ed0072d
+  data.tar.gz: d4b10d194fd843cf1238442524e6cf41e0ad1486443bdb7e6706899badd835b5f571774db7f4376d0c49b9d75e4ab8f369e1eef80f55c6b6db6dace41fd7f331

data/Gemfile.lock

@@ -3,13 +3,14 @@ PATH
   specs:
     metanorma (0.3.8)
       asciidoctor
+      htmlentities
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    algoliasearch (1.25.2)
+    algoliasearch (1.26.0)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     asciidoctor (1.5.8)
@@ -67,15 +68,15 @@ GEM
       thread_safe
       uuidtools
     isoics (0.1.7)
-    json (2.1.0)
+    json (2.2.0)
     liquid (4.0.1)
-    metanorma-iso (1.1.1)
+    metanorma-iso (1.1.2)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.8)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-standoc (1.1.2)
+    metanorma-standoc (1.1.3)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)

data/README.adoc

@@ -144,6 +144,7 @@ Usage: metanorma [options] <file>
   -a, --asciimath                  Preserve AsciiMath in Metanorma XML, instead of transforming it into MathML
   -R, --relaton FILENAME           Export Relaton XML (bibdata) for this document to FILENAME
       (Also triggered through -x rxl)
+  -S, --sourcecode DIR             Export sourcecode fragments from this document to directory DIR
   -h, --help                       Show this message
 ----
 

data/lib/metanorma/compile.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "nokogiri"
+require "htmlentities"
 
 module Metanorma
   class Compile
@@ -15,6 +16,7 @@ module Metanorma
       extensions = get_extensions(options) or return nil
       (file, isodoc = process_input(filename, options)) or return nil
       relaton_export(isodoc, options)
+      sourcecode_export(isodoc, options[:sourcecode])
       process_extensions(extensions, file, isodoc, options)
     end
 
@@ -31,6 +33,7 @@ module Metanorma
       options[:type] ||= o[:type]&.to_sym
       dir = filename.sub(%r(/[^/]+$), "/")
       options[:relaton] ||= "#{dir}/#{o[:relaton]}" if o[:relaton]
+      options[:sourcecode] ||= "#{dir}/#{o[:sourcecode]}" if o[:sourcecode]
       options[:extension_keys] ||= o[:extensions]&.split(/,[ ]*/)&.map(&:to_sym)
       options[:extension_keys] = nil if options[:extension_keys] == [:all]
       options[:format] ||= :asciidoc
@@ -115,6 +118,24 @@ module Metanorma
       File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
     end
 
+    def clean_sourcecode(xml)
+      xml.xpath(".//callout | .//annotation | .//xmlns:callout | .//xmlns:annotation").each do |x|
+        x.remove
+      end
+      xml.xpath(".//br | .//xmlns:br").each { |x| x.replace("\n") }
+      HTMLEntities.new.decode(xml.children.to_xml)
+    end
+
+    def sourcecode_export(isodoc, dirname)
+      return unless dirname
+      xml = Nokogiri::XML(isodoc)
+      FileUtils.rm_rf dirname
+      FileUtils.mkdir_p dirname
+      xml.xpath("//sourcecode | //xmlns:sourcecode").each_with_index do |s, i|
+        File.open("#{dirname}/#{i}", "w:UTF-8") { |f| f.write clean_sourcecode(s.dup) }
+      end
+    end
+
     def process_extensions(extensions, file, isodoc, options)
       extensions.each do |ext|
         isodoc_options = @processor.extract_options(file)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/metanorma.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'asciidoctor'
+  spec.add_runtime_dependency 'htmlentities'
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement