Changeset 1100

Timestamp:

2008-07-16 22:04:34 (6 months ago)

Author:

gaspard

Message:

Fixed bug preventing parse of zena images and links when text contains '['.

Files:

• trunk/lib/parser/lib/rules/zazen.rb (modified) (2 diffs)
• trunk/lib/parser/test/parser/zazen.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/zazen.yml (modified) (1 diff)

trunk/lib/parser/lib/rules/zazen.rb

@@ -250 +250 @@
-    
-    def scan_bracket
-
+ 
-      if @text =~ /\A\[(\w+)\](.*?)\[\/\1\]/m
-        if @parse_shortcuts
@@ -261 +261 @@
-      else
-        # nothing interesting
-
+ '['
-      end
-    end

trunk/lib/parser/test/parser/zazen.yml

@@ -30 +30 @@
-    end</code>
-  res: "/some text.*<pre>.*<code class='ruby'>.*keyword.*method.*&lt;&lt;/"
+
+  
+img_after_brackets:
+  src: |
+    Text updated in [July 2008].
+    
+    !30.full!
+  res: "<p>Text updated in [July 2008].</p>\n\n\n\t<p>[make_image id:|30| images:true mode:|full| style:||]</p>"
-
-code_params:

trunk/test/helpers/zena_parser/zazen.yml

@@ -67 +67 @@
-  tem: "<%= zazen('Look !{30,:lake+}!') %>"
-  res: "/docs.*image30_mini.*image24_mini.*/"
+  
+img_after_brackets:
+  tem: "<%= zazen('Text updated in [July 2008].\n\n!30.full!\n') %>"
+  res: "<p>Text updated in [July 2008].</p>\n\n\n\t<p><img src=\"/en/30.full\" alt=\"\" /></p>"
-
-line_break_between_paragraphs: