[DRE-commits] [ruby-org] 258/303: Slight changes in definition lists.

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-org.

commit f7c2f8d6df0e12195e5171a45af9bf6aa507e619
Author: vonavi <ivvl82 at gmail.com>
Date:   Fri Feb 1 01:38:30 2013 +0200

    Slight changes in definition lists.
---
 lib/org-ruby/html_output_buffer.rb |    4 ++--
 lib/org-ruby/line.rb               |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/org-ruby/html_output_buffer.rb b/lib/org-ruby/html_output_buffer.rb
index 5a4bd2c..da3892e 100644
--- a/lib/org-ruby/html_output_buffer.rb
+++ b/lib/org-ruby/html_output_buffer.rb
@@ -158,14 +158,14 @@ module Orgmode
 
         case current_mode
         when :definition_term
-          d = @buffer.rpartition(/\s+::(\s+|$)/)
+          d = @buffer.rpartition(/\s+::($|\s+)/)
           @output << inline_formatting(d[0].strip)
           indent = @list_indent_stack.last
           pop_mode
 
           @new_paragraph = :start
           push_mode(:definition_descr, indent)
-          @output << inline_formatting(d[2].strip)
+          @output << inline_formatting(d[2])
           @new_paragraph = nil
 
         when :horizontal_rule
diff --git a/lib/org-ruby/line.rb b/lib/org-ruby/line.rb
index 47b602b..96c376d 100644
--- a/lib/org-ruby/line.rb
+++ b/lib/org-ruby/line.rb
@@ -96,7 +96,7 @@ module Orgmode
       @line.sub(UnorderedListRegexp, "")
     end
 
-    DefinitionListRegexp = /^\s*(-|\+|\s+[*])\s+(.*?)\s+::(\s+|$)/
+    DefinitionListRegexp = /^\s*(-|\+|\s+[*])\s+(.*?)\s+::($|\s+)/
 
     def definition_list?
       check_assignment_or_regexp(:definition_list, DefinitionListRegexp)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-org.git