koara 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7029d454ab5f3cd266894cc965ec575751d685
-  data.tar.gz: 0af2a51f42a06a469092d3a854059c5d0f1fdb0b
+  metadata.gz: 4c58d57f95058907d29851f8e0cdbd2e736418c1
+  data.tar.gz: 315116868c81768d2d777a6c9ff01a3ef7450f5a
 SHA512:
-  metadata.gz: 1dd105c745b2370d83042539a2504ae50840782f8ea5a587ad3d2192b64960e7bd461ba2889eecc9bf9b6028d96d5c9fdb9471bf4d19e4d333928a260335c124
-  data.tar.gz: ec73b2f2047e1944cfb9a8c63dea64206f13657035e305e451c79560db98f65da9c42eef3cbc292b6b96884357e16e57b58d9a4c623c53ecf355e164392c5090
+  metadata.gz: 8a8dfd90f7e5224aaa85b2186c2b9e719f180b9ed9899eb85c1d21aaf0473b8ea145ee2ca0b37b5648180f2af60a4ed7d6ad039358e4d1cd8b3ba48973933192
+  data.tar.gz: 053703bd36809158b94ef4c08301186808cca512dffc6295e0a9b71098064bc062f6fdb12e4b4e9b4880a8563c4aa30f79ab9a6da34a7f0a6a330e7716f88bf7

data/lib/koara/ast/linebreak.rb

@@ -4,6 +4,8 @@ require_relative 'linebreak'
 module Koara
   module Ast
     class LineBreak < Node
+      attr_accessor :explicit
+      
       def accept(renderer)
         renderer.visit_linebreak(self)
       end

data/lib/koara/koararenderer.rb

@@ -10,6 +10,7 @@ module Koara
     def visit_document(node)
       @left = Array.new
       @out = StringIO.new
+      @hard_wrap = false
       node.children_accept(self)
     end
 
@@ -176,6 +177,9 @@ module Koara
     end
 
     def visit_linebreak(node)
+      if @hard_wrap || node.explicit
+        @out << '  '
+      end
       @out << "\n"
       indent
     end

data/lib/koara/parser.rb

@@ -612,7 +612,8 @@ module Koara
       while get_next_token_kind == TokenManager::SPACE || get_next_token_kind == TokenManager::TAB
         consume_token(get_next_token_kind)
       end
-      consume_token(TokenManager::EOL)
+      token = consume_token(TokenManager::EOL)
+      linebreak.explicit = token.image.start_with?("  ");
       @tree.close_scope(linebreak)
     end
 

data/lib/koara/version.rb

@@ -1,4 +1,4 @@
 module Koara
   # Koara version number.
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/test/html5renderer.rb

@@ -6,6 +6,7 @@ class Html5Renderer
     @level = 0
     @list_sequence = Array.new
     @out = StringIO.new
+    @hard_wrap = false
     node.children_accept(self)
   end
 
@@ -140,7 +141,6 @@ class Html5Renderer
     @out << escape(node.value.to_s)
   end
 
-  #
   def escape(text)
     return text.gsub(/&/, '&amp;')
                .gsub(/</, '&lt;')
@@ -149,7 +149,10 @@ class Html5Renderer
   end
 
   def visit_linebreak(node)
-    @out << "<br>\n" + indent
+    if @hard_wrap || node.explicit
+      @out << "<br>"
+    end
+    @out << "\n" + indent
     node.children_accept(self)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koara
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Andy Van Den Heuvel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler