paru 0.4.1.2 → 0.4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd33d3d1738034e8ffeb4edcf0430d51f8f0dc05f23511535a4ba3e33c923d23
-  data.tar.gz: c430452f484459c451088ad84db7b603748ed67b3397250c6ad0e1c1773fb89d
+  metadata.gz: 4922ee36a90c757e70a7b386cd25496c748a441191f1ea61160ab949aaa3672f
+  data.tar.gz: '0882bda88d548eb798bc526d76c38b85c3e64a2308a77a167146a6a6656fd6b6'
 SHA512:
-  metadata.gz: 89f884fd65ffa81c1be750c5d5ad82d96805c81cfedd3d52c9481e817f9d3cdc47d4a4c79f8d396264d18e9ac4d5dc574e7e5a720ce288a38441eefbc32649e7
-  data.tar.gz: 3c12fd5b577195595dec08a398a01dcec4d1297b41a97768fa3077b13c224a385aa0eec624275b98c2db5a938a12efccdc6cfc984f968331ddaf1b6b98c9bf48
+  metadata.gz: e20858edc2f613c76592e4f4ef8daba573298d3d843234e64aa2f06fb5d94890ebf125000a287efff2395decf1d25907b1cb09fd023a31578b5866ac3651f142
+  data.tar.gz: 66181db17a164acfb7776e2cf4f06f56cf6b757122da039dacbfd8b032f2b5e4b3f296fa1752013d6b343652ce961a4efab200d8b05a983b32fc08b6a816aaa1

data/lib/paru/filter/caption.rb

@@ -60,6 +60,10 @@ module Paru
                   @children.map {|row| row.to_ast}
                 ]
             end
+
+            def to_ast()
+              ast_contents()
+            end
         end
     end
 end

data/lib/paru/filter/cell.rb

@@ -18,6 +18,7 @@
 #++
 require_relative "./block.rb"
 require_relative "./value.rb"
+require_relative "./int_value.rb"
 
 module Paru
     module PandocFilter
@@ -44,8 +45,8 @@ module Paru
             def initialize(contents)
                 @attr = Attr.new contents[0]
                 @alignment = Value.new contents[1]
-                @rowspan = Value.new contents[2]
-                @colspan = Value.new contents[3]
+                @rowspan = IntValue.new contents[2]
+                @colspan = IntValue.new contents[3]
 
                 super contents[4]
             end
@@ -62,6 +63,10 @@ module Paru
                   @children.map {|child| child.to_ast}
                 ]
             end
+
+            def to_ast()
+              ast_contents()
+            end
         end
     end
 end

data/lib/paru/filter/document.rb

@@ -36,7 +36,7 @@ module Paru
 
         # The current pandoc type version
         # @see https://hackage.haskell.org/package/pandoc-types
-        CURRENT_PANDOC_VERSION = [1, 21]
+        CURRENT_PANDOC_VERSION = [1, 22]
 
         # Each file that is being filtered by pandoc is represented by a root
         # Document. It is the root node of the AST of the document in the file.

data/lib/paru/filter/int_value.rb

@@ -0,0 +1,39 @@
+#--
+# Copyright 2020 Huub de Beer <Huub@heerdebeer.org>
+#
+# This file is part of Paru
+#
+# Paru is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Paru is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Paru.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require_relative "./node.rb"
+require_relative "../filter_error.rb"
+
+module Paru
+    module PandocFilter
+
+        # An IntValue represents some sort of integer metadata about block or
+        # inline nodes
+        class IntValue
+          attr_accessor :value
+
+          def initialize(value)
+            @value = value
+          end
+
+          def to_ast()
+            @value
+          end
+        end
+    end
+end

data/lib/paru/filter/row.rb

@@ -38,7 +38,10 @@ module Paru
             #   this Row node
             def initialize(contents = [])
                 @attr = Attr.new contents[0]
-                super contents[1]
+                super []
+                contents[1].each do |cell|
+                    @children.push Cell.new cell
+                end
             end
 
             # The cells of this row
@@ -58,6 +61,10 @@ module Paru
                 ]
             end
 
+            def to_ast()
+              ast_contents()
+            end
+
             # Convert this Row to an array of markdown strings, one for
             # each cell
             #

data/lib/paru/filter/table.rb

@@ -54,11 +54,14 @@ module Paru
             # @param contents [Array]
             def initialize(contents)
                 @attr = Attr.new contents[0]
-                @caption = Caption.new contents[1]["c"]
+                @caption = Caption.new contents[1]
                 @colspec = contents[2].map {|p| ColSpec.new p}
-                @head = TableHead.new contents[3]["c"]
-                super contents[4]
-                @foot = TableFoot.new contents[5]["c"]
+                @head = TableHead.new contents[3]
+                super []
+                contents[4].each do |table_body|
+                    @children.push TableBody.new table_body
+                end
+                @foot = TableFoot.new contents[5]
             end
 
             # The AST contents of this Table node
@@ -83,7 +86,7 @@ module Paru
             #
             # @return [String[][]] This Table as a 2D array of cells
             # represented by their markdown strings.
-            def to_array(**config)
+            def to_array(config = {})
                 headers = if config.has_key? :headers then config[:headers] else false end
                 footers = if config.has_key? :footers then config[:footers] else false end
 
@@ -108,9 +111,9 @@ module Paru
             #
             # @param filename [String] filename to write to
             # @param config [Hash] See #to_array for config options
-            def to_file(filename, **config)
+            def to_file(filename, config = {})
                 CSV.open(filename, "wb") do |csv|
-                    to_array(config).each {|row| csv << row}
+                    to_array(**config).each {|row| csv << row}
                 end
             end
 
@@ -127,7 +130,7 @@ module Paru
             #     default to false.
             #
             # @return [Table]
-            def self.from_array(data, **config)
+            def self.from_array(data, config = {})
                 # With the updated Table definition, it has become complicated
                 # to construct a table manually. It has gotten easier to just
                 # construct a string containing a table in Pandoc's markdown and
@@ -177,7 +180,7 @@ module Paru
             # @param config [Hash] See #from_file for details
             #
             # @return [Table]
-            def self.from_file(filename, **config) 
+            def self.from_file(filename, config = {}) 
                 data = []
                 CSV.foreach(filename) do |row|
                     data << row

data/lib/paru/filter/table_body.rb

@@ -44,12 +44,12 @@ module Paru
             # @param contents [Array] The contents of this TableBody
             def initialize(contents)
                 @attr = Attr.new contents[0]
-                @rowheadcolumns = Value.new contents[1]
+                @rowheadcolumns = IntValue.new contents[1]
                 @rowheadercolumns = contents[2].map {|r| Row.new r}
 
                 super []
                 contents[3].each do |row|
-                    @children.push Row.new row["c"]
+                    @children.push Row.new row
                 end
             end
 
@@ -71,6 +71,10 @@ module Paru
                   @children.map {|child| child.to_ast}
                 ]
             end
+
+            def to_ast()
+              ast_contents()
+            end
             
             # Convert this table end to a 2D table of markdown strings for each
             # cell

data/lib/paru/filter/table_end.rb

@@ -38,7 +38,10 @@ module Paru
             # @param contents [Array]
             def initialize(contents)
                 @attr = Attr.new contents[0]
-                super contents[1]
+                super []
+                contents[1].each do |row|
+                    @children.push Row.new row
+                end
             end
 
             def rows()
@@ -54,6 +57,10 @@ module Paru
                     @children.map {|row| row.to_ast},
                 ]
             end
+
+            def to_ast()
+              ast_contents()
+            end
             
             # Convert this table end to a 2D table of markdown strings for each
             # cell

data/lib/paru/pandoc.rb

@@ -230,26 +230,23 @@ module Paru
                     .match(/pandoc.* (\d+\.\d+.*)$/)[1]
                     .split(".")
                     .map {|s| s.to_i}
-        major_version, minor_version = version
-
-        if major_version >= 2 and minor_version >= 7 then
-            # Pandoc version 2.7 introduced a new default data dir to comply
-            # with XDG Base Directory Specification
-            xdg_data_dir, old_data_dir = version_string.match(/Default user data directory: (.+)$/)[1].split(" or ")
-
-            if File.directory? xdg_data_dir then
-                data_dir = xdg_data_dir
-            elsif not old_data_dir.nil? and File.directory? old_data_dir then
-                # The new-style data directory does not exist, but the
-                # old-style does, so use the old-style data directory for
-                # backwards compatibility
-                data_dir = old_data_dir
-            else
-                # Neither data directory exists, default to the new default
-                data_dir = xdg_data_dir
-            end
+        major_version = version[0]
+
+        # Pandoc version 2.7 introduced a new default data dir to comply
+        # with XDG Base Directory Specification
+
+        xdg_data_dir, old_data_dir = version_string.match(/User data directory: (.+)$/)[1].split(" or ")
+
+        if File.directory? xdg_data_dir then
+            data_dir = xdg_data_dir
+        elsif not old_data_dir.nil? and File.directory? old_data_dir then
+            # The new-style data directory does not exist, but the
+            # old-style does, so use the old-style data directory for
+            # backwards compatibility
+            data_dir = old_data_dir
         else
-            data_dir = version_string.match(/Default user data directory: (.+)$/)[1]
+            # Neither data directory exists, default to the new default
+            data_dir = xdg_data_dir
         end
 
         @@info = {

data/lib/paru/pandoc_options_version_2.yaml

@@ -44,8 +44,10 @@ help:                       true
 # General reader options:
 #####
 shift_heading_level_by:     1
+base_header_level:          1
+strip_empty_paragraphs:     true
 indented_code_classes:      ""
-default_image_extension:    ""
+default_image_extension:    "png"
 file_scope:                 true
 filter:                     [""]
 lua_filter:                 [""]
@@ -59,6 +61,7 @@ abbreviations:              ""
 #####
 # General writing options:
 #####
+sandbox:                    false
 standalone:                 true
 template:                   ""
 variable:                   [""]
@@ -68,7 +71,6 @@ eol:                        "native"
 dpi:                        96
 wrap:                       "auto"
 columns:                    78
-strip_comments:             true
 toc:                        true
 table_of_contents:          true
 toc_depth:                  3
@@ -91,7 +93,8 @@ html_q_tags:                true
 ascii:                      true
 reference_links:            true
 reference_location:         "block"
-atx_headers:                ""
+markdown_headings:          "atx"
+atx_headers:                false
 top_level_division:         "section"
 number_sections:            true
 number_offset:              2
@@ -99,7 +102,6 @@ listings:                   true
 incremental:                true
 slide_level:                1
 section_divs:               true
-default_image_extension:    "png"
 email_obfuscation:          "none"
 id_prefix:                  ""
 title_prefix:               ""
@@ -116,9 +118,10 @@ pdf_engine_opt:             [""]
 #####
 # Citation rendering
 #####
+citeproc:                   true
 bibliography:               ""
 csl:                        ""
-citation_abbreviations:      ""
+citation_abbreviations:     ""
 natbib:                     true
 biblatex:                   true
 #####

data/lib/paru.rb

@@ -18,5 +18,5 @@
 #++
 module Paru
     # Paru's current version
-    VERSION = [0, 4, 1, 2]
+    VERSION = [0, 4, 2, 3]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.4.1.2
+  version: 0.4.2.3
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies: []
 description: Control pandoc with Ruby and write pandoc filters in Ruby
 email: Huub@heerdebeer.org
@@ -47,6 +47,7 @@ files:
 - lib/paru/filter/image.rb
 - lib/paru/filter/inline.rb
 - lib/paru/filter/inner_markdown.rb
+- lib/paru/filter/int_value.rb
 - lib/paru/filter/line_block.rb
 - lib/paru/filter/line_break.rb
 - lib/paru/filter/link.rb
@@ -109,15 +110,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.6.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc