From 9bafad9398d0d56dd2f4bfeb264737c0fa178d6b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 17 Nov 2012 19:11:21 +0000 Subject: [PATCH] 2012-11-17 20:10 UTC+0100 Viktor Szakats (harbour syenar.net) * website/js/shBrushHarbour.js + added preprocessor rule from C/C++ script * website/css/shThemeDefault.css * swapped colors of comments and PP --- harbour/ChangeLog | 7 +++++++ harbour/website/css/shThemeDefault.css | 4 ++-- harbour/website/js/shBrushHarbour.js | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32e338ee44..947ef49a60 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-17 20:10 UTC+0100 Viktor Szakats (harbour syenar.net) + * website/js/shBrushHarbour.js + + added preprocessor rule from C/C++ script + + * website/css/shThemeDefault.css + * swapped colors of comments and PP + 2012-11-17 19:55 UTC+0100 Viktor Szakats (harbour syenar.net) * src/rtl/hbjson.c ! applied patch supplied by Oscar Hernandez Suarez diff --git a/harbour/website/css/shThemeDefault.css b/harbour/website/css/shThemeDefault.css index 2942c4a2c2..365c3e9768 100644 --- a/harbour/website/css/shThemeDefault.css +++ b/harbour/website/css/shThemeDefault.css @@ -58,7 +58,7 @@ color: black !important; } .syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #008200 !important; + color: gray !important; } .syntaxhighlighter .string, .syntaxhighlighter .string a { color: blue !important; @@ -67,7 +67,7 @@ color: #006699 !important; } .syntaxhighlighter .preprocessor { - color: gray !important; + color: #008200 !important; } .syntaxhighlighter .variable { color: #aa7700 !important; diff --git a/harbour/website/js/shBrushHarbour.js b/harbour/website/js/shBrushHarbour.js index cf874001d9..58667fd9fc 100644 --- a/harbour/website/js/shBrushHarbour.js +++ b/harbour/website/js/shBrushHarbour.js @@ -22,6 +22,7 @@ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings { regex: /\$\w+/g, css: 'variable' }, // variables + { regex: /^ *#.*/gm, css: 'preprocessor' }, { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' }, // common functions { regex: new RegExp(this.getKeywords(constants), 'gmi'), css: 'constants' }, // constants { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // keyword