From: Daniel Gruno Date: Wed, 25 Apr 2012 15:51:31 +0000 (+0000) Subject: Recognize IPv6 addresses as literals, update comment colors so they don't clash with... X-Git-Tag: 2.5.0-alpha~7023 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c02a1b0b916e385ee41ca569a1fb40cd16a04b4a;p=thirdparty%2Fapache%2Fhttpd.git Recognize IPv6 addresses as literals, update comment colors so they don't clash with section directives. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330363 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/style/css/prettify.css b/docs/manual/style/css/prettify.css index 8fd204dabb1..9b814c89104 100644 --- a/docs/manual/style/css/prettify.css +++ b/docs/manual/style/css/prettify.css @@ -32,7 +32,7 @@ } /* Put a border around prettyprinted code snippets. */ -pre.prettyprint { padding: 2px; border: 1px solid #888 } +pre.prettyprint { padding: 2px; border: 1px solid #888; tab-size: 4; } /* Specify class=linenums on a pre to get line numbering */ ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */ @@ -51,6 +51,8 @@ li.L5, li.L7, li.L9 { background: #eee } + + /* Highlighting style for Apache configuration files */ pre.lang-config{ background-color: #e5ecf3; @@ -59,9 +61,10 @@ pre.lang-config{ margin: 1em 2em 1em 1em; border: none; } - .lang-config .tag { color: #821; font-weight: bold } /* enclosures */ .lang-config .kwd { color: #128; font-weight: bold } /* directives */ +.lang-config .com { color: #c46d34 } /* comments */ + @@ -74,7 +77,7 @@ pre.lang-c{ border: 1px dotted #666; } -.lang-c .com { color: #c34e00 } /* a comment */ +.lang-c .com { color: #c46d34 } /* a comment */ .lang-c .lit { color: #088 } /* a literal */ .lang-c .str { color: #009606 } /* string content */ .lang-c .kwd { color: #00C; font-weight: bold } /* a keyword */ @@ -82,6 +85,8 @@ pre.lang-c{ .lang-c .tag { color: #248 } /* a markup tag name */ + + /* Highlighting style for Lua source code */ pre.lang-lua{ background-color: #f8f6ee; diff --git a/docs/manual/style/scripts/prettify.js b/docs/manual/style/scripts/prettify.js index 78de7922bdd..f287cdecc15 100644 --- a/docs/manual/style/scripts/prettify.js +++ b/docs/manual/style/scripts/prettify.js @@ -896,6 +896,8 @@ var REGEXP_PRECEDER_PATTERN = '(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[ '^(?:' // A hex number + '0x[a-f0-9]+' + // An IPv6 Address + + '|[a-f0-9:]+:[a-f0-9:]+:[a-f0-9:]+:[a-f0-9:]+:[a-f0-9:]+:[a-f0-9:]+' // or an octal or decimal number, + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)' // possibly in scientific notation