paru 0.4.1.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd33d3d1738034e8ffeb4edcf0430d51f8f0dc05f23511535a4ba3e33c923d23
-  data.tar.gz: c430452f484459c451088ad84db7b603748ed67b3397250c6ad0e1c1773fb89d
+  metadata.gz: 4a9b46dce7962abd98b1fc68f3d47fdb3cb9043ed2b739a65089909985382bc5
+  data.tar.gz: 54b67bdf000ef4334c00fa4a784a3d380b86622b0aead7eb5d44e10b66df1465
 SHA512:
-  metadata.gz: 89f884fd65ffa81c1be750c5d5ad82d96805c81cfedd3d52c9481e817f9d3cdc47d4a4c79f8d396264d18e9ac4d5dc574e7e5a720ce288a38441eefbc32649e7
-  data.tar.gz: 3c12fd5b577195595dec08a398a01dcec4d1297b41a97768fa3077b13c224a385aa0eec624275b98c2db5a938a12efccdc6cfc984f968331ddaf1b6b98c9bf48
+  metadata.gz: 5bd0c91bc0ca5b8bb5557d9c5ef318bb0406a5d29c6f23bb99d4ff8b381b3068649ed129ea1e2da148dcde12261966af6e83cfc7fc26d74c686ab305c439033a
+  data.tar.gz: 278cad1486d341cdba097051ee325e28f21b447fa005cb883d5acd3ed44a6509f8715e308a3f671d189d423568f0e81eafe2d38624ccbe2550657ed7ed920207

data/lib/paru.rb

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

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

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_options_version_2.yaml

@@ -116,6 +116,7 @@ pdf_engine_opt:             [""]
 #####
 # Citation rendering
 #####
+citeproc:                   true
 bibliography:               ""
 csl:                        ""
 citation_abbreviations:      ""

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
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-10-12 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
@@ -116,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc