paru 0.4.0 → 0.4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd7fc4981bbeea705d0508b939feff4a5d25db290ece4d07f55079286af2bfd
-  data.tar.gz: cce99e0d42ba67d9b96904a75bd94f879b22dd52a5ac0709672640d72ecd99b5
+  metadata.gz: cd33d3d1738034e8ffeb4edcf0430d51f8f0dc05f23511535a4ba3e33c923d23
+  data.tar.gz: c430452f484459c451088ad84db7b603748ed67b3397250c6ad0e1c1773fb89d
 SHA512:
-  metadata.gz: bb519fe72d960fd0802aea39cbe049471838c69f72edd8fc471af0c7e928da005e0562668146f4c058551fa79d243e02b73018aa2aeceb7a838c42bb5f8335f2
-  data.tar.gz: 44cacdd22f7159c69c6ab0eec5960a04f3ec223806451075b78be0921749512bff799d8a0262a63edc6b944186f778e9d3c0549b967b7870b95fab2b460cdab5
+  metadata.gz: 89f884fd65ffa81c1be750c5d5ad82d96805c81cfedd3d52c9481e817f9d3cdc47d4a4c79f8d396264d18e9ac4d5dc574e7e5a720ce288a38441eefbc32649e7
+  data.tar.gz: 3c12fd5b577195595dec08a398a01dcec4d1297b41a97768fa3077b13c224a385aa0eec624275b98c2db5a938a12efccdc6cfc984f968331ddaf1b6b98c9bf48

data/bin/do-pandoc.rb

@@ -16,7 +16,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-v", "--version", "Show version") do 
-    puts "do-pandoc.rb is part of paru version 0.2.3"
+      puts "do-pandoc.rb is part of paru version 0.4.1"
     exit
   end
 end

data/lib/paru.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017, 2018, 2019 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -18,5 +18,5 @@
 #++
 module Paru
     # Paru's current version
-    VERSION = [0, 4, 0, 0]
+    VERSION = [0, 4, 1, 2]
 end

data/lib/paru/filter.rb

@@ -39,6 +39,12 @@ module Paru
         "Header",
         "HorizontalRule",
         "Table",
+        "TableHead",
+        "TableFoot",
+        "TableBody",
+        "Row",
+        "Cell",
+        "Caption",
         "Div",
         "Null"
     ]
@@ -47,6 +53,7 @@ module Paru
     PANDOC_INLINE = [
         "Str",
         "Emph",
+        "Underline",
         "Strong",
         "Strikeout",
         "Superscript",

data/lib/paru/filter/caption.rb

@@ -0,0 +1,65 @@
+#--
+# 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 "./block.rb"
+require_relative "./short_caption.rb"
+
+module Paru
+    module PandocFilter
+        # A table's caption, can contain an optional short caption
+        class Caption < Block
+            attr_accessor :short  
+
+            # Create a new Caption based on the contents
+            #
+            # @param contents [Array]
+            def initialize(contents)
+                if contents[0].nil?
+                  @short = nil
+                else
+                  @short = ShortCaption.new contents[0]
+                end
+                super(contents[1])
+            end
+
+            # Does this Caption have a short caption?
+            #
+            # @return [Boolean]
+            def has_short?()
+                not @short.nil?
+            end
+
+            # Has this node a block?
+            #
+            # @return [Boolean] true
+            def has_block?
+                true
+            end
+
+            # The AST contents of this Caption node
+            #
+            # @return [Array]
+            def ast_contents()
+                [
+                  if has_short? then @short.to_ast else nil end,
+                  @children.map {|row| row.to_ast}
+                ]
+            end
+        end
+    end
+end

data/lib/paru/filter/cell.rb

@@ -0,0 +1,67 @@
+#--
+# 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 "./block.rb"
+require_relative "./value.rb"
+
+module Paru
+    module PandocFilter
+        # A Cell node represents a cell  in a table's head, body, or foot
+        #  
+        # @!attribute attr
+        #   @return Attr
+        #
+        # @!attribute alignment
+        #   @return Value containing a String, one of AlignRight, AlignLeft,
+        #   AlignCenter, or AlignDefault.
+        #
+        # @!attribute rowspan
+        #   @return Value containing an Integer
+        #
+        # @!attribute colspan
+        #   @return Value containing an Integer
+        class Cell < Block
+            attr_accessor :attr, :alignment, :rowspan, :colspan
+
+            # Create a new Cell based on the row_data
+            #
+            # @param contents [Array]
+            def initialize(contents)
+                @attr = Attr.new contents[0]
+                @alignment = Value.new contents[1]
+                @rowspan = Value.new contents[2]
+                @colspan = Value.new contents[3]
+
+                super contents[4]
+            end
+
+            # The AST contents of this Cell
+            #
+            # @return [Array]
+            def ast_contents
+                [
+                  @attr.to_ast,
+                  @alignment.to_ast,
+                  @rowspan.to_ast,
+                  @colspan.to_ast,
+                  @children.map {|child| child.to_ast}
+                ]
+            end
+        end
+    end
+end

data/lib/paru/filter/col_spec.rb

@@ -0,0 +1,84 @@
+#--
+# 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 "./value.rb"
+
+module Paru
+    module PandocFilter
+        # The allignment of a table column
+        ALIGNMENTS = ["AlignLeft", "AlignRight", "AlignCenter", "AlignDefault"]
+
+        # The default width of a column
+        COL_WIDTH_DEFAULT = "ColWidthDefault"
+
+        # Default value for a column specification: left aligned with default
+        # width
+        DEFAULT_COLSPEC = [{"t": "AlignLeft"}, {"t": COL_WIDTH_DEFAULT}]
+
+        # ColSpec represents a colspec definition for a table column. It contains an alignment and the column's width.
+        #
+        # @see https://hackage.haskell.org/package/pandoc-types-1.21/docs/Text-Pandoc-Definition.html#t:ColSpec
+        #
+        # @!attribute alignment
+        #   @return [String]
+        #
+        # @!attribute width
+        #   @return [Double|COL_WIDTH_DEFAULT]
+        class ColSpec
+            attr_accessor :alignment, :width
+
+            # Create a new ColSpec object
+            #
+            # @param contents [Array = DEFAULT_COLSPEC] the attributes as a pair of [alignment, width]
+            def initialize(contents = DEFAULT_COLSPEC)
+                @alignment = Value.new contents[0]
+                @width = Value.new contents[1]
+            end
+
+            # Set the width
+            #
+            # @param [String|Integer|Float] new_width the new width. If it is
+            # "ColWidthDefault", it uses the default value.
+            def width=(new_width)
+                if new_width == "ColWidthDefault" then
+                    @width = Value.new({"t": new_width})
+                else
+                    @width = Value.new({"t": "ColWidth", "c": new_width})
+                end
+            end
+
+            # Set the alignment
+            #
+            # @param [String] new_alignment the new alignment.
+            def alignment=(new_alignment)
+                @alignment.value = new_alignment
+            end
+
+            # Convert this attributes object to an AST representation
+            #
+            # @return [Array] Array containing id, class name list, and
+            #   key-value pair list
+            def to_ast
+                [
+                  @alignment.to_ast,
+                  @width.to_ast
+                ]
+            end
+        end
+    end
+end

data/lib/paru/filter/document.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -36,7 +36,7 @@ module Paru
 
         # The current pandoc type version
         # @see https://hackage.haskell.org/package/pandoc-types
-        CURRENT_PANDOC_VERSION = [1, 20]
+        CURRENT_PANDOC_VERSION = [1, 21]
 
         # 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/node.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -17,7 +17,6 @@
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require_relative "../pandoc.rb"
-
 require_relative './ast_manipulation.rb'
 
 module Paru
@@ -26,12 +25,12 @@ module Paru
         # A Paru::Pandoc converter from JSON to markdown
         AST2MARKDOWN = Paru::Pandoc.new do
             from "json"
-            to "markdown"
+            to "markdown-smart"
         end
 
         # A Paru::Pandoc converter from markdown to JSON
         MARKDOWN2JSON = Paru::Pandoc.new do
-            from "markdown"
+            from "markdown+smart"
             to "json"
         end
 
@@ -64,7 +63,11 @@ module Paru
             require_relative './plain.rb'
             require_relative './raw_block.rb'
             require_relative './table.rb'
-            require_relative './table_row.rb'
+            require_relative './caption.rb'
+            require_relative './table_head.rb'
+            require_relative './table_foot.rb'
+            require_relative './row.rb'
+            require_relative './cell.rb'
 
             # Inline level nodes
             require_relative './cite.rb'
@@ -88,6 +91,8 @@ module Paru
             require_relative './str.rb'
             require_relative './subscript.rb'
             require_relative './superscript.rb'
+            require_relative './short_caption.rb'
+            require_relative './underline.rb'
 
             # Metadata level nodes
             require_relative './meta_blocks.rb'

data/lib/paru/filter/{table_row.rb → row.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -17,32 +17,51 @@
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require_relative "./block.rb"
+require_relative "./cell.rb"
 
 module Paru
     module PandocFilter
-        # A TableRow node represents a row in a table's head or body
-        class TableRow < Block
-            # Create a new TableRow based on the row_data
+
+        # A Row node represents a row in a table's head or body
+        #  
+        # @!attribute attr
+        #   @return Attr
+        #
+        # @!attribute cells
+        #   @return [Block]
+        class Row < Block
+            attr_accessor :attr
+
+            # Create a new Row based on the row_data
             #
-            # @param row_data [Array]
-            def initialize(row_data)
-                super []
-                row_data.each do |cell|
-                    @children.push Block.new cell
-                end
+            # @param contents [Array = []] the contents of
+            #   this Row node
+            def initialize(contents = [])
+                @attr = Attr.new contents[0]
+                super contents[1]
+            end
+
+            # The cells of this row
+            #
+            # @return [Array<Cell>]
+            def cells()
+              @children
             end
 
-            # The AST contents of this TableRow
+            # The AST contents of this Row
             #
             # @return [Array]
             def ast_contents
-                @children.map {|child| child.ast_contents}
+                [
+                  @attr.to_ast,
+                  @children.map {|child| child.to_ast}
+                ]
             end
 
-            # Convert this TableRow to an array of markdown strings, one for
+            # Convert this Row to an array of markdown strings, one for
             # each cell
             #
-            # @return [String[]] An Array representation of this TableRow.
+            # @return [String[]] An Array representation of this Row.
             def to_array()
                 @children.map do |cell|
                     cell.children.map{|c| c.markdown.strip}.join("\n")

data/lib/paru/filter/short_caption.rb

@@ -0,0 +1,27 @@
+#--
+# 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 "./inline.rb"
+
+module Paru
+    module PandocFilter
+        # A ShortCaption used in a table's caption.
+        class ShortCaption < Inline
+        end
+    end
+end

data/lib/paru/filter/table.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -19,44 +19,46 @@
 require "csv"
 require_relative "./block.rb"
 require_relative "./inline.rb"
+require_relative "./caption.rb"
+require_relative "./col_spec.rb"
+require_relative "./row.rb"
+require_relative "./table_head.rb"
+require_relative "./table_foot.rb"
+require_relative "./table_body.rb"
     
 module Paru
     module PandocFilter
-        # The allignment of a table column
-        ALIGNMENTS = ["AlignLeft", "AlignRight", "AlignCenter", "AlignDefault"]
 
         # A Table node represents a table with an inline caption, column
         # definition, widths, headers, and rows.
         #
         # @!attribute caption
-        #   @return [Inline]
+        #   @return Caption
+        #  
+        # @!attribute attr
+        #   @return Attr
         #
-        # @!attribute alignment
-        #   @return [ALIGNMENTS]
+        # @!attribute colspec
+        #   @return [ColSpec]
         #
-        # @!attribute column_widths
-        #   @return [Float]
-        #
-        # @!attribute headers
-        #   @return [TableRow]
-        #
-        # @!attribute rows
-        #   @return [Array<TableRow>]
+        # @!attribute head
+        #   @return [TableHead]
+        #   
+        # @!attribute foot
+        #   @return [TableHead]
         class Table < Block
-            attr_accessor :caption, :alignment, :column_widths, :headers, :rows
+            attr_accessor :caption, :attr, :colspec, :head, :foot
 
             # Create a new Table based on the contents
             #
             # @param contents [Array]
             def initialize(contents)
-                @caption = Inline.new contents[0]
-                @alignment = contents[1]
-                @column_widths = contents[2]
-                @headers = TableRow.new contents[3]
-                @children = []
-                contents[4].each do |row_data|
-                    @children.push TableRow.new row_data
-                end
+                @attr = Attr.new contents[0]
+                @caption = Caption.new contents[1]["c"]
+                @colspec = contents[2].map {|p| ColSpec.new p}
+                @head = TableHead.new contents[3]["c"]
+                super contents[4]
+                @foot = TableFoot.new contents[5]["c"]
             end
 
             # The AST contents of this Table node
@@ -64,11 +66,12 @@ module Paru
             # @return [Array]
             def ast_contents()
                 [
-                    @caption.ast_contents,
-                    @alignment,
-                    @column_widths,
-                    @headers.ast_contents,
-                    @children.map {|row| row.ast_contents}
+                    @attr.to_ast,
+                    @caption.to_ast,
+                    @colspec.map {|c| c.to_ast},
+                    @head.to_ast,
+                    @children.map {|c| c.to_ast},
+                    @foot.to_ast,
                 ]
             end
 
@@ -82,14 +85,19 @@ module Paru
             # represented by their markdown strings.
             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
 
                 data = []
                 if headers then
-                    data.push @headers.to_array
+                    data.concat @head.to_array
                 end
 
                 @children.each do |row|
-                    data.push row.to_array
+                    data.concat row.to_array
+                end
+                
+                if footers then
+                    data.concat @foot.to_array
                 end
 
                 data
@@ -113,53 +121,53 @@ module Paru
             # @param config [Hash] configuration of the list.
             #   properties:
             #     :headers [Boolean] True if data includes headers on first
-            #     row
+            #     row. Defailts to false.
             #     :caption [String] The table's caption
-            #     :alignment [String[]] An array with alignments for each
-            #     column. Should have an alignment for all columns. Defaults
-            #     to "AlignLeft"
-            #     :widhts [Number[]] An array with column widths. Should have
-            #     a width for all columns. Use 0 for no set width. Defaults to
-            #     0
+            #     :footers [Boolean] True if data includes footers on last row,
+            #     default to false.
             #
             # @return [Table]
             def self.from_array(data, **config)
-                return Table.new [[],[],[],[],[]] if data.empty? 
-
-                headers = if config.has_key? :headers then 
-                              config[:headers] 
-                          else 
-                              false 
-                          end
-                caption = if config.has_key? :caption then 
-                              Block.from_markdown(config[:caption]).ast_contents 
-                          else 
-                              [] 
-                          end
-
-                alignment = if config.has_key? :alignment then 
-                                config[:alignment].map {|a| {"t" => "#{a}"}} 
-                            else
-                                data.first.map {|_| {"t"=>"AlignLeft"}}
-                            end
-
-                widths = if config.has_key? :widths then
-                            config[:widths] 
-                         else
-                             data.first.map {|_| 0}
-                         end
-
-                header = []
-                rows = data
-                if headers then
-                    header = data.first
-                    header = header.map {|cell| [Block.from_markdown(cell).to_ast]}
-                    rows = data.slice(1..-1)
+                # 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
+                # load that. I did remove setting alignments and column widths,
+                # though, because that is a bit of a hassle to get right.
+
+                markdown_table = ""
+                header = ""
+                footer = ""
+
+                if config.has_key? :headers and config[:headers] then
+                    head_row = data.first
+                    header += head_row.join(" \t") + "\n"
+                    header += head_row.map {|s| s.gsub(/./, "-") + "-"}.join("\t") + "\n"
+                    data = data.slice(1..-1)
                 end
-                
-                rows = rows.map {|row| row.map {|cell| [Block.from_markdown(cell).to_ast]}}
 
-                Table.new [caption, alignment, widths, header, rows]
+                if config.has_key? :footers and config[:footers] then
+                    foot_row = data.first
+                    footer += foot_row.join(" \t") + "\n"
+                    footer += foot_row.map {|s| s.gsub(/./, "-") + "-"}.join("\t") + "\n"
+                    data = data.slice(0, -2)
+                end
+
+                data.each do |row|
+                  markdown_table += row.join(" \t") + "\n"
+                end
+
+                markdown_table = header + markdown_table + footer
+
+                if config.has_key? :caption then
+                  markdown_table += "\n"
+                  markdown_table += ": #{config[:caption]}\n"
+                end
+
+                table = Block.new []
+                table.markdown = markdown_table
+                table = table.children.first
+
+                table              
             end
 
 

data/lib/paru/filter/table_body.rb

@@ -0,0 +1,87 @@
+#--
+# Copyright 2015, 2016, 2017, 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 "./block.rb"
+require_relative "./row.rb"
+require_relative "./value.rb"
+
+module Paru
+    module PandocFilter
+        # A TableBody node represents a row in a table's head or body
+        #  
+        # @!attribute attr
+        #   @return Attr
+        #
+        # @!attribute rowheadcolumns
+        #   @return Value containing an Integer indicating the number of head
+        #   columns.
+        #
+        # @!attribute rowheadercolums
+        #   @return [Row]
+        #
+        # @!attribute rows
+        #   @return [Row]
+        class TableBody < Block
+            attr_accessor :attr, :rowheadcolumnspec, :rowheadercolumns
+
+            # Create a new TableBody
+            #
+            # @param contents [Array] The contents of this TableBody
+            def initialize(contents)
+                @attr = Attr.new contents[0]
+                @rowheadcolumns = Value.new contents[1]
+                @rowheadercolumns = contents[2].map {|r| Row.new r}
+
+                super []
+                contents[3].each do |row|
+                    @children.push Row.new row["c"]
+                end
+            end
+
+            # The rows in this TableBody
+            #
+            # @return [Array<Row>]
+            def rows()
+                @children
+            end
+
+            # The AST contents of this TableBody
+            #
+            # @return [Array]
+            def ast_contents
+                [
+                  @attr.to_ast,
+                  @rowheadcolumns.to_ast,
+                  @rowheadercolumns.map {|r| r.to_ast},
+                  @children.map {|child| child.to_ast}
+                ]
+            end
+            
+            # Convert this table end to a 2D table of markdown strings for each
+            # cell
+            #
+            # @return [String[][]] This Table as a 2D array of cells
+            # represented by their markdown strings.
+            def to_array()
+                @children.map do |row|
+                    row.to_array
+                end
+            end
+        end
+    end
+end

data/lib/paru/filter/table_end.rb

@@ -0,0 +1,71 @@
+#--
+# 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 "csv"
+require_relative "./block.rb"
+    
+module Paru
+    module PandocFilter
+
+        # A TableEnd node is the base class for the TableHead and TableFoot
+        # nodes. It has attributes and one or more rows.
+        #  
+        # @!attribute attr
+        #   @return Attr
+        #
+        # @!attribute rows
+        #   @return [Row]
+        class TableEnd < Block
+            attr_accessor :attr
+
+            # Create a new TableEnd based on the contents
+            #
+            # @param contents [Array]
+            def initialize(contents)
+                @attr = Attr.new contents[0]
+                super contents[1]
+            end
+
+            def rows()
+              @children
+            end
+            
+            # The AST contents of this Table node
+            #
+            # @return [Array]
+            def ast_contents()
+                [
+                    @attr.to_ast,
+                    @children.map {|row| row.to_ast},
+                ]
+            end
+            
+            # Convert this table end to a 2D table of markdown strings for each
+            # cell
+            #
+            # @return [String[][]] This Table as a 2D array of cells
+            # represented by their markdown strings.
+            def to_array()
+                @children.map do |row|
+                    row.to_array
+                end
+            end
+
+        end
+    end
+end

data/lib/paru/filter/table_foot.rb

@@ -0,0 +1,28 @@
+#--
+# 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 "./table_end.rb"
+    
+module Paru
+    module PandocFilter
+
+        # A TableFoot node represents the heading of a table.
+        class TableFoot < TableEnd
+        end
+    end
+end

data/lib/paru/filter/table_head.rb

@@ -0,0 +1,28 @@
+#--
+# 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 "./table_end.rb"
+    
+module Paru
+    module PandocFilter
+
+        # A TableHead node represents the heading of a table.
+        class TableHead < TableEnd
+        end
+    end
+end

data/lib/paru/filter/underline.rb

@@ -0,0 +1,27 @@
+#--
+# 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 "./inline.rb"
+
+module Paru
+    module PandocFilter
+        # A Underline inline node
+        class Underline < Inline
+        end
+    end
+end

data/lib/paru/filter/value.rb

@@ -0,0 +1,108 @@
+#--
+# 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
+
+        # Values without value are encoded in their type name.
+        VALUE_ENCODED_IN_TYPE_NAME = :value_encoded_in_type_name
+
+        # A Value node that represents some sort of metadata about block or
+        # inline nodes
+        class Value < Node
+
+            # Create a new Value with contents. Also indicate if this node has
+            # inline children or block children.
+            #
+            # @param contents [Array<pandoc node in JSON> = []] the contents of
+            #   this node
+            def initialize(contents)
+                @type = contents["t"]
+
+                if contents.has_key? "c" then
+                  @value = contents["c"]
+                else
+                  @value = VALUE_ENCODED_IN_TYPE_NAME
+                end
+            end
+
+            # Get the encoded value
+            #
+            # @return [Any] 
+            def value()
+                if type_encodes_value? then
+                    @type
+                else
+                    @value
+                end
+            end
+
+            # Set the encoded value
+            #
+            # @param [Any] new_value
+            def value=(new_value)
+                if type_encodes_value? then
+                  @type = new_value
+                else
+                  @value = new_value
+                end
+            end
+
+            # Is this node a block?
+            #
+            # @return [Boolean] false
+            def is_block?
+                false
+            end
+
+            # Is this node an inline node?
+            #
+            # @return [Boolean] false
+            def is_inline?
+                false
+            end
+
+            # The AST type of this Node
+            #
+            # @return [String]
+            def ast_type()
+                @type
+            end
+
+            
+
+            # Create an AST representation of this Node
+            #
+            # @return [Hash]
+            def to_ast()
+                return {
+                    "t" => ast_type,
+                    "c" => if type_encodes_value? then nil else @value end
+                }
+            end
+
+            @private
+            def type_encodes_value?()
+                return @value == VALUE_ENCODED_IN_TYPE_NAME
+            end
+        end
+    end
+end

data/lib/paru/pandoc.rb

@@ -92,8 +92,8 @@ module Paru
         # directory. This method is typically used in scripts that use Paru to
         # automate the use of pandoc.
         #
-        # @return [Hash{:version => String, :data_dir => String}] Pandoc's
-        #   version, such as "1.17.0.4" and the data directory, such as "/home/huub/.pandoc".
+        # @return [Hash{:version => Array<Integer>, :data_dir => String}] Pandoc's
+        #   version, such as "[2.10.1]" and the data directory, such as "/home/huub/.pandoc".
         def self.info()
             @@info
         end
@@ -226,9 +226,13 @@ module Paru
             throw Error.new "Unable to run pandoc via command '#{@@pandoc_exec} --version': #{err.message}"
         end
 
-        version = version_string.match(/pandoc.* (\d+\.\d+.*)$/)[1]
+        version = version_string
+                    .match(/pandoc.* (\d+\.\d+.*)$/)[1]
+                    .split(".")
+                    .map {|s| s.to_i}
+        major_version, minor_version = version
 
-        if "2.7" <= version then
+        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 ")
@@ -254,8 +258,6 @@ module Paru
         }
 
         # Load the options for the appropriate major version of pandoc
-        major_version = @@info[:version].split(".").first.to_i
-
         if not [1, 2].include? major_version 
             throw Error.new "Unknown major pandoc version: '#{major_version}'. Expected the major version to be '1' or '2'. Please check the pandoc path: '#{@@pandoc_exec}'."
             # defaults to version 1

data/lib/paru/pandoc_options_version_2.yaml

@@ -50,7 +50,7 @@ file_scope:                 true
 filter:                     [""]
 lua_filter:                 [""]
 metadata:                   [""]
-metadata-file:              [""]
+metadata_file:              [""]
 preserve_tabs:              true
 tab_stop:                   4
 track_changes:              "accept"
@@ -68,20 +68,21 @@ eol:                        "native"
 dpi:                        96
 wrap:                       "auto"
 columns:                    78
-strip-comments:             true
+strip_comments:             true
 toc:                        true
 table_of_contents:          true
 toc_depth:                  3
 strip_comments:             true
 no_highlight:               true
 highlight_style:            ""
-print-highlight-style:      ""
+print_highlight_style:      ""
 syntax_definition:          ""
 include_in_header:          [""]
 include_before_body:        [""]
 include_after_body:         [""]
 resource_path:              ""
 request_header:             ""
+no_check_certificate:       false
 #####
 # Options affecting specific writers
 #####
@@ -109,7 +110,7 @@ epub_metadata:              ""
 epub_embed_font:            ""
 epub_chapter_level:         1
 epub_subdirectory:          ""
-ipynb-output:               "best"
+ipynb_output:               "best"
 pdf_engine:                 "pdflatex"
 pdf_engine_opt:             [""]
 #####

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1.2
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies: []
-description: Use Pandoc (http://www.pandoc.org) with ruby
+description: Control pandoc with Ruby and write pandoc filters in Ruby
 email: Huub@heerdebeer.org
 executables:
 - pandoc2yaml.rb
@@ -28,10 +28,13 @@ files:
 - lib/paru/filter/block.rb
 - lib/paru/filter/block_quote.rb
 - lib/paru/filter/bullet_list.rb
+- lib/paru/filter/caption.rb
+- lib/paru/filter/cell.rb
 - lib/paru/filter/citation.rb
 - lib/paru/filter/cite.rb
 - lib/paru/filter/code.rb
 - lib/paru/filter/code_block.rb
+- lib/paru/filter/col_spec.rb
 - lib/paru/filter/definition_list.rb
 - lib/paru/filter/definition_list_item.rb
 - lib/paru/filter/div.rb
@@ -68,6 +71,8 @@ files:
 - lib/paru/filter/quoted.rb
 - lib/paru/filter/raw_block.rb
 - lib/paru/filter/raw_inline.rb
+- lib/paru/filter/row.rb
+- lib/paru/filter/short_caption.rb
 - lib/paru/filter/small_caps.rb
 - lib/paru/filter/soft_break.rb
 - lib/paru/filter/space.rb
@@ -78,8 +83,13 @@ files:
 - lib/paru/filter/subscript.rb
 - lib/paru/filter/superscript.rb
 - lib/paru/filter/table.rb
-- lib/paru/filter/table_row.rb
+- lib/paru/filter/table_body.rb
+- lib/paru/filter/table_end.rb
+- lib/paru/filter/table_foot.rb
+- lib/paru/filter/table_head.rb
 - lib/paru/filter/target.rb
+- lib/paru/filter/underline.rb
+- lib/paru/filter/value.rb
 - lib/paru/filter/version.rb
 - lib/paru/filter_error.rb
 - lib/paru/pandoc.rb
@@ -99,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="