Defect #5199

diff code coloring using coderay

Added by Patrick Okui over 7 years ago. Updated over 7 years ago.

Status:ClosedStart date:2010-03-28
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:Time tracking
Target version:1.0.0 (RC)
Resolution:Fixed Affected version:0.9.3

Description

This seems not to work when I do pre and code style=diff. CodeRay however can highlight diffs.

As an example:

--- 2010-03-28.gp_invprint    2010-03-28 03:21:46.000000000 +0300
+++ gp_invprint    2010-03-28 03:23:08.000000000 +0300
@@ -535,7 +535,9 @@
     $p->text({align=> 'centre'}, 300, 120, "TAX INVOICE");

     $p->setfont("Arial", "8");
-    $p->text({align=> 'right'}, 580, 120, "TIN:nnnn VAT: mmm");
+    # old style tin. changed due to request.
+    #$p->text({align=> 'right'}, 580, 120, "TIN:nnnn VAT: mmm");
+    $p->text({align=> 'right'}, 580, 120, "e-TIN xxx VAT: rrr");

     $p->setfont($font{"name"}, 10);
     $p->text({align=> 'right'}, 100, 190, "Name: ");

Associated revisions

Revision 3619
Added by Jean-Philippe Lang over 7 years ago

Fixes diff highlighting (#5199).

History

#1 Updated by Jean-Philippe Lang over 7 years ago

  • Category set to Time tracking
  • Status changed from New to Closed
  • Target version set to 1.0.0 (RC)
  • Resolution set to Fixed

This is fixed in r3619.
Note that you have to use class="diff" instead of style="diff". Your example was fixed.

#2 Updated by Holger Just over 7 years ago

  • Status changed from Closed to Reopened

The fix in r3619 breaks the test suite. Specifically test_syntax_highlight(ApplicationHelperTest)

See http://ci.finn.de/builds/1-8-7_redmine-trunk_mysql/3621

#3 Updated by Jean-Philippe Lang over 7 years ago

  • Status changed from Reopened to Closed

Test fixed in r3622.

#4 Updated by Kornelius Kalnbach over 7 years ago

It doesn't look like it's supposed to look. :wrap => :span is not the right way to go, as it doesn't support the new line tokens that diff code needs.

I recommend using .div instead of .html.

Also available in: Atom PDF