paru 1.5.0 → 1.5.1

data/lib/paru/filter/col_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright 2020, 2032 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2020--2025 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -16,69 +18,69 @@
 # 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"
+require_relative 'value'
 
 module Paru
-    module PandocFilter
-        # The allignment of a table column
-        ALIGNMENTS = ["AlignLeft", "AlignRight", "AlignCenter", "AlignDefault"]
+  module PandocFilter
+    # The allignment of a table column
+    ALIGNMENTS = %w[AlignLeft AlignRight AlignCenter AlignDefault].freeze
 
-        # The default width of a column
-        COL_WIDTH_DEFAULT = "ColWidthDefault"
+    # 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}]
+    # Default value for a column specification: left aligned with default
+    # width
+    DEFAULT_COLSPEC = [{ 't' => 'AlignLeft' }, { 't' => COL_WIDTH_DEFAULT }].freeze
 
-        # 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_reader :alignment, :width
+    # 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_reader :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
+      # 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 width
+      #
+      # @param [String|Integer|Float] new_width the new width. If it is
+      # "ColWidthDefault", it uses the default value.
+      def width=(new_width)
+        @width = if new_width == 'ColWidthDefault'
+                   Value.new({ 't' => new_width })
+                 else
+                   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
+      # 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
+      # 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/definition_list.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015--2025 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -16,65 +18,62 @@
 # 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 "./list.rb"
-require_relative "./para.rb"
+require_relative 'block'
+require_relative 'list'
+require_relative 'para'
 
 module Paru
-    module PandocFilter
-        # A DefinitionList is a list of term-definition pairs, respecitively an Inline list and a Block list.
-        class DefinitionList < Block
-            # Create a new DefinitionList node
-            #
-            # @param contents [Array] the contents of this definition list.
-            def initialize(contents)
-                super []
-                contents.each do |item|
-                    child = DefinitionListItem.new item
-                    child.parent = self
-
-                    @children.push child
-                end
-            end
-
-            # Create an AST representation of this DefinitionList node
-            def ast_contents
-                @children.map {|child| child.to_ast}
-            end
+  module PandocFilter
+    # A DefinitionList is a list of term-definition pairs, respecitively an Inline list and a Block list.
+    class DefinitionList < Block
+      # Create a new DefinitionList node
+      #
+      # @param contents [Array] the contents of this definition list.
+      def initialize(contents)
+        super([])
+        contents.each do |item|
+          child = DefinitionListItem.new item
+          child.parent = self
 
-            # Convert this DefinitionList to a hash of term => definitions
-            #
-            # @return [Array]
-            def to_array()
-                @children.map do |def_item|
-                    def_item.to_array 
-                end
-            end
+          @children.push child
+        end
+      end
 
-            # Create a new DefinitionList based on a hash of term =>
-            # definitions
-            #
-            # @param definitions [Array] Array of arrays with terms and their definitions
-            # @return [DefinitionList] 
-            def self.from_array(definitions)
-                ast_items = definitions.map do |definition| 
-                    term = Block.from_markdown(definition[0]).ast_contents
-                    defin = List.from_markdown(definition[1])
+      # Create an AST representation of this DefinitionList node
+      def ast_contents
+        @children.map(&:to_ast)
+      end
 
-                    if not defin.has_block?
-                        para = Para.new []
-                        para.inner_markdown = definition[1]
-                        defin = [para.to_ast]
-                    else
-                        defin = defin.children.map{|c| c.to_ast}
-                    end
+      # Convert this DefinitionList to a hash of term => definitions
+      #
+      # @return [Array]
+      def to_array
+        @children.map(&:to_array)
+      end
 
-                    [term, [defin]]
-                end
+      # Create a new DefinitionList based on a hash of term =>
+      # definitions
+      #
+      # @param definitions [Array] Array of arrays with terms and their definitions
+      # @return [DefinitionList]
+      def self.from_array(definitions)
+        ast_items = definitions.map do |definition|
+          term = Block.from_markdown(definition[0]).ast_contents
+          defin = List.from_markdown(definition[1])
 
-                DefinitionList.new ast_items
-            end
+          if defin.has_block?
+            defin = defin.children.map(&:to_ast)
+          else
+            para = Para.new []
+            para.inner_markdown = definition[1]
+            defin = [para.to_ast]
+          end
 
+          [term, [defin]]
         end
+
+        DefinitionList.new ast_items
+      end
     end
+  end
 end

data/lib/paru/filter/definition_list_item.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright 2015, 2016 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015--2025 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -16,54 +18,54 @@
 # 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 "./list.rb"
-require_relative "./inline.rb"
+require_relative 'block'
+require_relative 'list'
+require_relative 'inline'
 
 module Paru
-    module PandocFilter
-        # A DefinitionListItem is a helper node to represent the pair of a term
-        # and its definition in a DefinitionList
-        #
-        # @!attribute term
-        #   @return [Block]
-        #
-        # @!attribute definition
-        #   @return [List]
-        class DefinitionListItem < Block
-            attr_accessor :term, :definition
+  module PandocFilter
+    # A DefinitionListItem is a helper node to represent the pair of a term
+    # and its definition in a DefinitionList
+    #
+    # @!attribute term
+    #   @return [Block]
+    #
+    # @!attribute definition
+    #   @return [List]
+    class DefinitionListItem < Block
+      attr_accessor :term, :definition
 
-            # Create a new DefinitionListItem 
-            #
-            # @param item [Array] the [term, definition]
-            def initialize(item)
-                super []
+      # Create a new DefinitionListItem
+      #
+      # @param item [Array] the [term, definition]
+      def initialize(item)
+        super([])
 
-                @term = Block.new item[0]
-                @term.parent = self
-                @children << @term
+        @term = Block.new item[0]
+        @term.parent = self
+        @children << @term
 
-                @definition = List.new item[1]
-                @definition.parent = self
-                @children << @definition
-            end
+        @definition = List.new item[1]
+        @definition.parent = self
+        @children << @definition
+      end
 
-            # Create an AST representation of this DefinitionListItem
-            def to_ast
-                [
-                    @term.ast_contents,
-                    @definition.ast_contents
-                ]
-            end
+      # Create an AST representation of this DefinitionListItem
+      def to_ast
+        [
+          @term.ast_contents,
+          @definition.ast_contents
+        ]
+      end
 
-            # Convert this DefinitionListItem to a pair of term and definition
-            #
-            # @return [Array]
-            def to_array
-                term = @term.children.map{|c| c.markdown.strip}.select{|c| !c.empty?}.join(" ").strip
-                definition = @definition.children.map{|c| c.children.map{|d| d.markdown}}.join("\n").strip
-                [term, definition]
-            end
-        end
+      # Convert this DefinitionListItem to a pair of term and definition
+      #
+      # @return [Array]
+      def to_array
+        term = @term.children.map { |c| c.markdown.strip }.reject(&:empty?).join(' ').strip
+        definition = @definition.children.map { |c| c.children.map(&:markdown) }.join("\n").strip
+        [term, definition]
+      end
     end
+  end
 end

data/lib/paru/filter/div.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 #--
-# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2015--2025 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of Paru
 #
@@ -16,45 +18,45 @@
 # 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 "./inner_markdown.rb"
+require_relative 'block'
+require_relative 'attr'
+require_relative 'inner_markdown'
 
 module Paru
-    module PandocFilter
-        # A Div node consisting of an attribute object and a list of Block nodes.
-        class Div < Block
-            include InnerMarkdown
+  module PandocFilter
+    # A Div node consisting of an attribute object and a list of Block nodes.
+    class Div < Block
+      include InnerMarkdown
 
-            # A Div node has an attribute object
-            #
-            # @!attribute attr
-            #   @return [Attr]
-            attr_accessor :attr
+      # A Div node has an attribute object
+      #
+      # @!attribute attr
+      #   @return [Attr]
+      attr_accessor :attr
 
-            # Create a new Div node based on the contents
-            #
-            # @param contents [Array] an array containing the attribute object
-            #   and the contents of this div.
-            def initialize(contents)
-                @attr = Attr.new contents[0]
-                super contents[1]
-            end
+      # Create a new Div node based on the contents
+      #
+      # @param contents [Array] an array containing the attribute object
+      #   and the contents of this div.
+      def initialize(contents)
+        @attr = Attr.new contents[0]
+        super(contents[1])
+      end
 
-            # Create an AST representation of this Div node.
-            def ast_contents()
-                [
-                    @attr.to_ast,
-                    super
-                ]
-            end
+      # Create an AST representation of this Div node.
+      def ast_contents
+        [
+          @attr.to_ast,
+          super
+        ]
+      end
 
-            # Has this Div node Blocks as children?
-            #
-            # @return [Boolean] true
-            def has_block?
-                true
-            end
-        end
+      # Has this Div node Blocks as children?
+      #
+      # @return [Boolean] true
+      def has_block?
+        true
+      end
     end
+  end
 end