paru 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24975da849bee7997a85776e257d620b13ed93d6b389841eaebe5946c0e2db0d
-  data.tar.gz: 861159dc635fdbea547993a479010890b2183cb37b72e20a44b507efd44bcc00
+  metadata.gz: 8c755de6d48a630fc826d7fb2f41474c38e4026fb8767b06f64130fbff071ec4
+  data.tar.gz: 78b2ebba41c1061afb0cd39c891338dfcd0d56d8dd61de3c1fcb0c8a05dfd4ea
 SHA512:
-  metadata.gz: 014d9483bd9a25af560d615f2af241febd6578df578d0635215ea4368cb6e132e00f07ddf105597c60df5b381ac3934bc3d33e1309ac102212eb47ce929313e7
-  data.tar.gz: 826338759e77839a66968c0105c3a7e90ed08023e0d3dd9b031d62142024686b80642a8a503eef700ad46b22d936277d45e8b5c7d4d046c29f380edac4ed3f68
+  metadata.gz: a16c55e12ae8c05503257228f859d2eea710493ef6161b760182cc98a9e8f7901927856c2ab7e0488257d8cae16649c8a1360d5d4e015a3a22dd21b84ab3c34d
+  data.tar.gz: 62b9b722c6d1ea351c5cc5a7ef07e5591be7d4be30917d3b0b940a6e8ae728c574a30b1ad35b9a3ac701a7ac81276b4ae059f44b96357a40325d1784bb31f01e

data/lib/paru/filter/caption.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
 #
@@ -17,12 +17,15 @@
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require_relative "./block.rb"
+require_relative "./inner_markdown.rb"
 require_relative "./short_caption.rb"
 
 module Paru
     module PandocFilter
-        # A table's caption, can contain an optional short caption
+        # A table or figure's caption, can contain an optional short caption
         class Caption < Block
+            include InnerMarkdown
+
             attr_accessor :short  
 
             # Create a new Caption based on the contents

data/lib/paru/filter/document.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
 #
@@ -36,7 +36,7 @@ module Paru
 
         # The current pandoc type version
         # @see https://hackage.haskell.org/package/pandoc-types
-        CURRENT_PANDOC_VERSION = [1, 22]
+        CURRENT_PANDOC_VERSION = [1, 23]
 
         # 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/figure.rb

@@ -0,0 +1,65 @@
+#--
+# Copyright 2023 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 "./attr.rb"
+require_relative "./caption.rb"
+require_relative "./inner_markdown.rb"
+
+module Paru
+    module PandocFilter
+        # A Figure node consisting of an attribute object, a caption, and a list of Block nodes.
+        class Figure < Block
+            include InnerMarkdown
+
+            # A Figure node has an attribute object
+            #
+            # @!attribute attr
+            #   @return [Attr]
+            #
+            # @!attribute caption
+            #   @return Caption
+            attr_accessor :attr, :caption
+
+            # Create a new Figure node based on the contents
+            #
+            # @param contents [Array] 
+            def initialize(contents)
+                @attr = Attr.new contents[0]
+                @caption = Caption.new contents[1]
+                super contents[2]
+            end
+
+            # Create an AST representation of this Figure node.
+            def ast_contents()
+                [
+                    @attr.to_ast,
+                    @caption.to_ast,
+                    super
+                ]
+            end
+
+            # Has this Figure node Blocks as children?
+            #
+            # @return [Boolean] true
+            def has_block?
+                true
+            end
+        end
+    end
+end

data/lib/paru/filter/node.rb

@@ -68,6 +68,7 @@ module Paru
             require_relative './table_foot.rb'
             require_relative './row.rb'
             require_relative './cell.rb'
+            require_relative './figure.rb'
 
             # Inline level nodes
             require_relative './cite.rb'
@@ -386,7 +387,7 @@ module Paru
                     # Only using first block node (paragraph?)
                     if is_inline?
                         temp_doc = temp_doc.children.first
-                        
+
                         if not temp_doc.children.all? {|node| node.is_inline?}
                             raise Error.new "Cannot replace the inline level node represented by '#{self.markdown}' with markdown that converts to block level nodes: '#{markdown}'."
                         end

data/lib/paru/filter.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017, 2022 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2022, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -22,7 +22,7 @@ require_relative "./filter/metadata.rb"
 
 module Paru
     # Paru filter is a wrapper around pandoc's JSON api, which is based on
-    # {pandoc-types}[https://hackage.haskell.org/package/pandoc-types-1.17.0.4/docs/Text-Pandoc-Definition.html].
+    # {pandoc-types}[https://hackage.haskell.org/package/pandoc-types-1.23/docs/Text-Pandoc-Definition.html].
     # Pandoc treats block elements and inline elements differently. 
     #
     # Pandoc's block elements are:
@@ -44,6 +44,7 @@ module Paru
         "TableBody",
         "Row",
         "Cell",
+        "Figure",
         "Caption",
         "Div",
         "Null"
@@ -284,13 +285,13 @@ module Paru
                 end
             end
 
+            @current_node = @document
+
             @ran_before = false
             @ran_after = false
             instance_eval(&block) # run filter with before block
             @ran_before = true
 
-            @current_node = @document
-
             nodes_to_filter.each do |node|
                 if @current_node.has_been_replaced?
                     @current_node = @current_node.get_replacement

data/lib/paru/pandoc_options.yaml

@@ -1,5 +1,5 @@
 #--
-# Copyright 2015, 2016, 2017, 2022 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015, 2016, 2017, 2022, 2023 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -17,7 +17,7 @@
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 # See http://pandoc.org/README.html for an overview of all options
 #++
-# In order as listed on http://pandoc.org/MANUAL.html (version 2)
+# In order as listed on http://pandoc.org/MANUAL.html (version 3)
 #####
 # General options:
 ##### 
@@ -96,6 +96,7 @@ ascii:                      true
 reference_links:            true
 reference_location:         "block"
 markdown_headings:          "atx"
+list_tables:                true
 atx_headers:                true
 top_level_division:         "section"
 number_sections:            true
@@ -109,7 +110,10 @@ id_prefix:                  ""
 title_prefix:               ""
 css:                        [""]
 reference_doc:              ""
+split_level:                1
+chunk_template:             ""
 epub_cover_image:           ""
+epub_title_page:            true
 epub_metadata:              ""
 epub_embed_font:            ""
 epub_chapter_level:         1

data/lib/paru.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Huub de Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies: []
 description: Control pandoc with Ruby and write pandoc filters in Ruby
 email: Huub@heerdebeer.org
@@ -42,6 +42,7 @@ files:
 - lib/paru/filter/emph.rb
 - lib/paru/filter/empty_block.rb
 - lib/paru/filter/empty_inline.rb
+- lib/paru/filter/figure.rb
 - lib/paru/filter/header.rb
 - lib/paru/filter/horizontal_rule.rb
 - lib/paru/filter/image.rb
@@ -102,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
@@ -117,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc
 test_files: []