paru 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5fdb8848444eeca6165736f3f0aa78109097a49153e8fe397d2587098f4d2db
-  data.tar.gz: a013d3f067c34eefc32438cba227cef3e8aa086326c0a28c64aa90e4ef83778f
+  metadata.gz: c5c453f6e4cb23977b77bb04faa0a9d72b1d7f9569529e5ba3995083f51bf514
+  data.tar.gz: af94f1496e2a1df4cf0b5cc842f95887c0000a5d2b4c2e85dc19d39054c40b27
 SHA512:
-  metadata.gz: 1d24f3c3675ffeb08ecbdce00469cee0f28f5d9f006d28bbb4094aa1ea7b1d66f50de432126c4cb57217e2ad399de3ba8f3973d2eb3578b3edfe06fa0e971bb3
-  data.tar.gz: 1f8b3b165bb57273d56b916b6070159771a6873deee11e63379bd5fdfb91a90c8bc08d31be5d4f6c2e30fe9863bfd457f7be79b089ae8c1b113187149fb3e5ee
+  metadata.gz: 733a600fc35387fcb8e381fa03099247d2719acbe09f5841d2d53f3703e6d7df28be92608f0bf7d2c180ba27e2bb86cf679ed4ef53d1f08c28a8aa96d13beb20
+  data.tar.gz: 817c37dfdc57802e94c70035a03c89c4e631f8c4cac34e92816d17dcb4512791cdd23cce40d2ff113024901aab288da1a18b4a6ab92719b3c57f1060953b78c9

data/lib/paru/filter/cell.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2020 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2020, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -22,7 +22,7 @@ require_relative "./int_value.rb"
 
 module Paru
     module PandocFilter
-        # A Cell node represents a cell  in a table's head, body, or foot
+        # A Cell node represents a cell in a table's head, body, or foot.
         #  
         # @!attribute attr
         #   @return Attr

data/lib/paru/filter/node.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -26,12 +26,14 @@ module Paru
         AST2MARKDOWN = Paru::Pandoc.new do
             from "json"
             to "markdown-smart"
+            preserve_tabs true
         end
 
         # A Paru::Pandoc converter from markdown to JSON
         MARKDOWN2JSON = Paru::Pandoc.new do
             from "markdown+smart"
             to "json"
+            preserve_tabs true
         end
 
         # Every node in a Pandoc AST is mapped to Node. Filters are all about

data/lib/paru/filter/table.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017, 2020 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2020, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -131,46 +131,39 @@ module Paru
             #
             # @return [Table]
             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
-                # 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
+                table_attribute = create_attr
 
-                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)
+                caption = []
+                if config.has_key? :caption
+                  caption = create_caption config[:caption]
                 end
 
-                data.each do |row|
-                  markdown_table += row.join(" \t") + "\n"
-                end
+                col_spec = data[0].map {|c| ColSpec.new.to_ast }
 
-                markdown_table = header + markdown_table + footer
+                head = create_endrow []
+                if config.has_key? :headers and config[:headers]
+                  head = create_endrow data.first
+                  data = data[1..-1]
+                end
 
-                if config.has_key? :caption then
-                  markdown_table += "\n"
-                  markdown_table += ": #{config[:caption]}\n"
+                foot = create_endrow []
+                if config.has_key? :footers and config[:footers]
+                  foot = create_endrow data.last
+                  data = data[0...-1]
                 end
 
-                table = Block.new []
-                table.markdown = markdown_table
-                table = table.children.first
+                body = create_body data
+                
+                table = [
+                  table_attribute, 
+                  caption, 
+                  col_spec, 
+                  head, 
+                  body, 
+                  foot
+                ]
 
-                table              
+                Table.new table
             end
 
 
@@ -188,6 +181,53 @@ module Paru
 
                 return self.from_array(data, config) 
             end
+
+            private
+
+            def self.create_caption(contents)
+              [
+                nil,
+                [Node.from_markdown(contents).to_ast]
+              ]
+            end
+
+            def self.create_body(data) 
+              [[
+                create_attr,
+                0,
+                [],
+                data.map {|r| create_row(r)}
+              ]]
+            end
+            
+            def self.create_endrow(data)
+              [
+                create_attr,
+                if data.empty? then [] else [create_row(data)] end
+              ]
+            end
+
+            def self.create_row(data)
+              [
+                  create_attr, 
+                  data.map {|c| create_cell(c)}
+              ]
+            end
+
+            def self.create_cell(contents)
+              [
+                create_attr,
+                {"t" => "AlignDefault", "c" => nil},
+                1,
+                1,
+                [Node.from_markdown(contents).to_ast]
+              ]
+            end
+
+            def self.create_attr()
+              ["", [], []]
+            end
+
         end
     end
 end

data/lib/paru/filter/value.rb

@@ -87,8 +87,6 @@ module Paru
                 @type
             end
 
-            
-
             # Create an AST representation of this Node
             #
             # @return [Hash]

data/lib/paru.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Huub de Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies: []
 description: Control pandoc with Ruby and write pandoc filters in Ruby
 email: Huub@heerdebeer.org
@@ -103,7 +103,7 @@ homepage: https://heerdebeer.org/Software/markdown/paru/
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc
 test_files: []