Project

General

Profile

Actions

Patch #20288

closed

Finalize CodeRay 1.1.0 upgrade

Added by Mischa The Evil over 8 years ago. Updated over 8 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
Third-party libraries
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:

Description

The current CodeRay CSS styles are still based on CodeRay 1.0.6 (included since Redmine 1.4.0) with the custom changes from r10132 (included since Redmine 2.1.0). Redmine 2.3.2 till 2.3.4 came with CodeRay 1.0.9, an upgrade that didn't needed changes in the CSS styles. Starting with 2.4.0 Redmine comes with CodeRay 1.1.0, a minor upgrade that came with new/changed token_kinds and lots of changes in the alpha stylesheet, that in turn is used as a base for Redmine's own CodeRay CSS styles. As such, this upgrade needed CSS stylesheet changes like done before in r7618 and r7623 (for 1.0.0 upgrade) and r9389 (for 1.0.6 upgrade). But these changes, plus an update of the Redmine core documentation that is shipped along the core (wiki_syntax_detailed_[markdown|textile].html), aren't integrated up until today.

This patch serial, made against source:/trunk@14420, fixes these issues and can be applied using "patch -p1 < 0001-...". It is produced using git format-patch, so the patches include all info (including extensive commit messages) from the commits I made on a local branch.

Note: these issues are affecting 2.6-stable, 3.0-stable, 3.1-stable and current trunk. This patch serial only provides fixes for current trunk. If backport-patches are needed (in case this patch serial doesn't merge cleanly on stable branches), let me know.


Files


Related issues

Has duplicate Redmine - Defect #17577: <code> blocks have no numbers, help shows line numbers for <code> blocks thoughClosed

Actions
Actions #1

Updated by Mischa The Evil over 8 years ago

  • File deleted (0007-Update-the-CodeRay-Ruby-syntax-highlight-example.patch)
Actions #2

Updated by Mischa The Evil over 8 years ago

  • File deleted (0006-Make-clear-that-syntax-highlighting-cannot-only-be-u.patch)
Actions #3

Updated by Mischa The Evil over 8 years ago

  • File deleted (0005-Add-a-note-about-case-insensitivity-of-CodeRay-langu.patch)
Actions #4

Updated by Mischa The Evil over 8 years ago

  • File deleted (0004-Update-the-i18n-ed-core-doc-to-match-CodeRay-1.1.0-c.patch)
Actions #5

Updated by Mischa The Evil over 8 years ago

I did a rebase on my local branch to update the second part1 of this patch serial to fix an ugly spelling mistake (parenthesis -> parentheses). So here is an update of the respective patch files.

1 patch files 0001-0003 changes public/stylesheets/application.css (and were locally done on one branch) whereas patch files 0004-0007 changes public/help/xx[-xx]/wiki_syntax_detailed_[markdown||textile].html files (which were locally done on another branch).

Actions #6

Updated by Toshi MARUYAMA over 8 years ago

  • Target version set to 3.2.0
Actions #7

Updated by Jean-Philippe Lang over 8 years ago

  • Status changed from New to Closed

Looks like it can be closed.

Actions #8

Updated by Go MAEDA over 8 years ago

  • Has duplicate Defect #17577: <code> blocks have no numbers, help shows line numbers for <code> blocks though added
Actions

Also available in: Atom PDF