[DRE-commits] [ruby-org] 283/303: Fix for 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 d0e03218960a95d412edf0630070c9d9fa6639b6
Author: vonavi <ivvl82 at gmail.com>
Date:   Wed Feb 6 19:46:31 2013 +0200

    Fix for definition lists.
---
 lib/org-ruby/html_output_buffer.rb |   11 ++++++++---
 lib/org-ruby/line.rb               |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/org-ruby/html_output_buffer.rb b/lib/org-ruby/html_output_buffer.rb
index 37557d6..e706a86 100644
--- a/lib/org-ruby/html_output_buffer.rb
+++ b/lib/org-ruby/html_output_buffer.rb
@@ -156,14 +156,19 @@ module Orgmode
 
         case current_mode
         when :definition_term
-          d = @buffer.rpartition(/\s+::($|\s+)/)
-          @output << inline_formatting(d[0].strip)
+          d = @buffer.split(/\A(.*[ \t]+|)::(|[ \t]+.*?)$/, 4)
+          d[1] = d[1].strip
+          unless d[1].empty?
+            @output << inline_formatting(d[1])
+          else
+            @output << "???"
+          end
           indent = @list_indent_stack.last
           pop_mode
 
           @new_paragraph = :start
           push_mode(:definition_descr, indent)
-          @output << inline_formatting(d[2])
+          @output << inline_formatting(d[2].strip + d[3])
           @new_paragraph = nil
 
         when :horizontal_rule
diff --git a/lib/org-ruby/line.rb b/lib/org-ruby/line.rb
index a257303..c035e46 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