paru 0.1.0 → 0.2.0

data/lib/paru/filter/horizontal_rule.rb

@@ -1,11 +1,9 @@
+# HorizontalRule
 module Paru
-    module PandocFilter
-        require_relative "./block"
+  module PandocFilter
+    require_relative "./empty_block"
 
-        class HorizontalRule < Block
-            def initialize contents
-                super []
-            end
-        end
+    class HorizontalRule < EmptyBlock
     end
+  end
 end

data/lib/paru/filter/image.rb

@@ -1,9 +1,15 @@
+# Image Attr [Inline] Target
 module Paru
-    module PandocFilter
+  module PandocFilter
 
-        require_relative "./link"
+    require_relative "./link"
 
-        class Image < Link
-        end
+    class Image < Link
+      # Although Image is defined to be inline, probably because in HTML it
+      # can be an inline element, often it acts like a block element.
+      def can_act_as_both_block_and_inline?
+        true
+      end
     end
+  end
 end

data/lib/paru/filter/line_block.rb

@@ -0,0 +1,9 @@
+# LineBlock [[Inline]]
+module Paru
+  module PandocFilter
+    require_relative "./list.rb"
+
+    class LineBlock < List
+    end
+  end
+end

data/lib/paru/filter/line_break.rb

@@ -1,16 +1,9 @@
+# LineBreak
 module Paru
-    module PandocFilter
-        require_relative "./inline"
+  module PandocFilter
+    require_relative "./empty_inline"
 
-        class LineBreak < Inline
-            def initialize contents
-                super []
-            end
-
-            def has_inline?
-                false
-            end
-        end
+    class LineBreak < EmptyInline
     end
+  end
 end
-

data/lib/paru/filter/link.rb

@@ -1,27 +1,28 @@
+# Link Attr [Inline] Target
 module Paru
-    module PandocFilter
+  module PandocFilter
 
-        require_relative "./inline"
-        require_relative "./attr"
-        require_relative "./target"
+    require_relative "./inline"
+    require_relative "./attr"
+    require_relative "./target"
 
-        class Link < Inline
-            attr_accessor :attr, :target
-            
-            def initialize contents
-                @attr = Attr.new contents[0]
-                super contents[1]
-                @target = Target.new contents[2]
-            end
+    class Link < Inline
+      attr_accessor :attr, :target
 
-            def ast_contents
-                [
-                    @attr.to_ast,
-                    super,
-                    @target.to_ast
-                ]
-            end
+      def initialize contents
+        @attr = Attr.new contents[0]
+        super contents[1]
+        @target = Target.new contents[2]
+      end
+
+      def ast_contents
+        [
+          @attr.to_ast,
+          super,
+          @target.to_ast
+        ]
+      end
 
-        end
     end
+  end
 end

data/lib/paru/filter/list.rb

@@ -1,22 +1,22 @@
 module Paru
-    module PandocFilter
-        require_relative "./block"
+  module PandocFilter
+    require_relative "./block"
 
-        class List < Block
-            def initialize contents
-                super []
-                contents.each do |item|
-                    @children.push Block.new item
-                end
-            end
+    class List < Block
+      def initialize contents
+        super []
+        contents.each do |item|
+          @children.push Block.new item
+        end
+      end
 
-            def ast_contents
-                @children.map {|child| child.ast_contents}
-            end
+      def ast_contents
+        @children.map {|child| child.ast_contents}
+      end
 
-            def has_block?
-                true
-            end
-        end
+      def has_block?
+        true
+      end
     end
+  end
 end

data/lib/paru/filter/list_attributes.rb

@@ -1,24 +1,37 @@
 module Paru
-    module PandocFilter
-        class ListAttributes
+  module PandocFilter
+    class ListAttributes
 
-            STYLES = ["DefaultStyle", "Example", "Decimal", "LowerRoman", "UpperRoman", "LowerAlpha", "UpperAlpha"]
-            DELIMS = ["DefaultDelim", "Period", "OneParen", "TwoParens"]
+      STYLES = [
+        "DefaultStyle", 
+        "Example", 
+        "Decimal", 
+        "LowerRoman", 
+        "UpperRoman", 
+        "LowerAlpha", 
+        "UpperAlpha"
+      ]
+      DELIMS = [
+        "DefaultDelim", 
+        "Period", 
+        "OneParen", 
+        "TwoParens"
+      ]
 
-            attr_accessor :start, :number_style, :number_delim
-            def initialize attributes
-                @start = attributes[0]
-                @number_style = attributes[1]
-                @number_delim = attributes[2]
-            end
+      attr_accessor :start, :number_style, :number_delim
+      def initialize attributes
+        @start = attributes[0]
+        @number_style = attributes[1]
+        @number_delim = attributes[2]
+      end
 
-            def to_ast
-                [
-                    @start,
-                    @number_style,
-                    @number_delim
-                ]
-            end
-        end
+      def to_ast
+        [
+          @start,
+          @number_style,
+          @number_delim
+        ]
+      end
     end
+  end
 end

data/lib/paru/filter/markdown.rb

@@ -1,52 +1,72 @@
 module Paru
-    module PandocFilter
-        module Markdown
+  module PandocFilter
+    module Markdown
 
-            require_relative "../pandoc"
-            require_relative "./document"
+      require_relative "../pandoc"
+      require_relative "./document"
 
-            AST2MARKDOWN = Paru::Pandoc.new do
-                from "json"
-                to "markdown"
-            end
-                
-            MARKDOWN2JSON = Paru::Pandoc.new do
-                from "markdown"
-                to "json"
-            end
+      AST2MARKDOWN = Paru::Pandoc.new do
+        from "json"
+        to "markdown"
+      end
 
-            def outer_markdown 
-                temp_doc = PandocFilter::Document.fragment [self]
-                AST2MARKDOWN << temp_doc.to_json
-            end
+      MARKDOWN2JSON = Paru::Pandoc.new do
+        from "markdown"
+        to "json"
+      end
 
-            def inner_markdown
-                temp_doc = PandocFilter::Document.fragment @children
-                AST2MARKDOWN << temp_doc.to_json
-            end
+      def outer_markdown 
+        temp_doc = PandocFilter::Document.fragment [self]
+        AST2MARKDOWN << temp_doc.to_json
+      end
+
+      def outer_markdown= markdown
+        json = MARKDOWN2JSON << markdown
+        temp_doc = PandocFilter::Document.from_JSON json
+
+        if not has_parent? or is_root?
+          @children = temp_doc.children
+        else
+          # replace current node by new nodes
+          # There is a difference between inline and block nodes
+          current_index = parent.find_index self
+          index = current_index
+          temp_doc.each do |child|
+            index += 1
+            parent.insert index, child
+          end
+          # Remove the original node
+          parent.remove_at current_index
+        end
+
+      end
+
+      def inner_markdown
+        temp_doc = PandocFilter::Document.fragment @children
+        AST2MARKDOWN << temp_doc.to_json
+      end
+
+      def inner_markdown= markdown
+        if has_string?
+          @string = markdown
+        else
+          if markdown.empty?
+            @children = []
+          else 
+            json = MARKDOWN2JSON << markdown
+            temp_doc = PandocFilter::Document.from_JSON json
+            temp_doc.children.each {|c| c.parent = @parent}
 
-            def inner_markdown= markdown
-                if has_string?
-                    @string = markdown
-                else
-                    if markdown.empty?
-                        @children = []
-                    else 
-                        json = MARKDOWN2JSON << markdown
-                        meta, contents = JSON.parse json
-                        temp_doc = PandocFilter::Document.new meta, contents
-                        temp_doc.children.each {|c| c.parent = @parent}
-
-                        if has_inline?
-                            @children = temp_doc.children[0].children
-                        elsif has_block?
-                            @children = temp_doc.children
-                        else
-                            # Unknown; what to do here?
-                        end
-                    end
-                end
+            if has_inline?
+              @children = temp_doc.children[0].children
+            elsif has_block?
+              @children = temp_doc.children
+            else
+              # Unknown; what to do here?
             end
+          end
         end
+      end
     end
+  end
 end

data/lib/paru/filter/math.rb

@@ -1,51 +1,49 @@
+# Math MathType String
 module Paru
-    module PandocFilter
-        require_relative "./inline"
-
-        class Math < Inline
-            attr_accessor :math_type, :string
-
-            def initialize contents
-                @math_type = contents[0]
-                @string = contents[1]
-            end
-
-            def inline?
-                "InlineMath" == @math_type[t]
-            end
-
-            def inline!
-                @math_type = {
-                    "t" => "InlineMath",
-                    "c" => []
-                }
-            end
-
-            def display?
-                "DisplayMath" == @math_type[t]
-            end
-
-            def display!
-                @math_type = {
-                    "t" => "DisplayMath",
-                    "c" => []
-                }
-            end
-            
-            def ast_contents
-                [
-                    @math_type,
-                    @string
-                ]
-            end
-            
-            def has_string?
-                true
-            end
-
-            def has_inline?
-                false
-            end
-        end
+  module PandocFilter
+    require_relative "./inline"
+
+    class Math < Inline
+      attr_accessor :math_type, :string
+
+      def initialize contents
+        @math_type, @string = contents
+      end
+
+      def inline?
+        "InlineMath" == @math_type[t]
+      end
+
+      def inline!
+        @math_type = {
+          "t" => "InlineMath"
+        }
+      end
+
+      def display?
+        "DisplayMath" == @math_type[t]
+      end
+
+      def display!
+        @math_type = {
+          "t" => "DisplayMath"
+        }
+      end
+
+      def ast_contents
+        [
+          @math_type,
+          @string
+        ]
+      end
+
+      def has_string?
+        true
+      end
+
+      def has_inline?
+        false
+      end
     end
+  end
 end

data/lib/paru/filter/meta.rb

@@ -1,24 +1,23 @@
+# Meta is a MetaMap
 module Paru
-    module PandocFilter
-        require_relative "./meta_map"
+  module PandocFilter
+    require_relative "./meta_map"
 
-        class Meta < MetaMap
-            include Enumerable
+    class Meta < MetaMap
+      include Enumerable
 
-            def initialize contents
-                super contents["unMeta"]
-            end
+      def initialize contents
+        super contents
+      end
 
-            def ast_type
-                "unMeta"
-            end
+      def ast_type
+        "meta"
+      end
 
-            def to_ast
-                {
-                    "unMeta" => ast_contents
-                }
-            end
+      def to_ast
+        ast_contents
+      end
 
-        end
     end
+  end
 end