1 files changed, 219 insertions, 149 deletions
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
index 56474470..4566db60 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
@@ -5,122 +5,189 @@ preservedocbooktags = false
 ;; format:
 ;; T_CONSTANTNAME = open
 ;; /T_CONSTANTNAME = close
-T_ABSTRACT = <font color="blue">
-/T_ABSTRACT = </font>
-T_CLONE = <font color="blue">
-/T_CLONE = </font>
-T_HALT_COMPILER = <font color="red">
-/T_HALT_COMPILER = </font>
-T_PUBLIC = <font color="blue">
-/T_PUBLIC = </font>
-T_PRIVATE = <font color="blue">
-/T_PRIVATE = </font>
-T_PROTECTED = <font color="blue">
-/T_PROTECTED = </font>
-T_FINAL = <font color="blue">
-/T_FINAL = </font>
-T_IMPLEMENTS = <font color="blue">
-/T_IMPLEMENTS = </font>
-T_CLASS = <font color="blue">
-/T_CLASS = </font>
-T_INTERFACE = <font color="blue">
-/T_INTERFACE = </font>
-T_INCLUDE = <font color="blue">
-/T_INCLUDE = </font>
-T_INCLUDE_ONCE = <font color="blue">
-/T_INCLUDE_ONCE = </font>
-T_REQUIRE_ONCE = <font color="blue">
-/T_REQUIRE_ONCE = </font>
-T_FUNCTION = <font color="blue">
-/T_FUNCTION = </font>
-T_VARIABLE = <strong>
-/T_VARIABLE = </strong>
-T_CONSTANT_ENCAPSED_STRING = <font color="#66cccc">
-/T_CONSTANT_ENCAPSED_STRING = </font>
-T_COMMENT = <font color="green">
-/T_COMMENT = </font>
-T_OBJECT_OPERATOR = <strong>
-/T_OBJECT_OPERATOR = </strong>
-T_RETURN = <font color="blue">
-/T_RETURN = </font>
-T_STATIC = <font color="blue">
-/T_STATIC = </font>
-T_SWITCH = <font color="blue">
-/T_SWITCH = </font>
-T_IF = <font color="blue">
-/T_IF = </font>
-T_FOREACH = <font color="blue">
-/T_FOREACH = </font>
-T_FOR = <font color="blue">
-/T_FOR = </font>
-T_VAR = <font color="blue">
-/T_VAR = </font>
-T_EXTENDS = <font color="blue">
-/T_EXTENDS = </font>
-T_RETURN = <font color="blue">
-/T_RETURN = </font>
-T_GLOBAL = <font color="blue">
-/T_GLOBAL = </font>
-T_DOUBLE_COLON = <strong>
-/T_DOUBLE_COLON = </strong>
-T_OBJECT_OPERATOR = <strong>
-/T_OBJECT_OPERATOR = </strong>
-T_OPEN_TAG = <strong>
-/T_OPEN_TAG = </strong>
-T_CLOSE_TAG = <strong>
-/T_CLOSE_TAG = </strong>
+
+T_INCLUDE = <span class="src-inc">
+/T_INCLUDE = </span>
+T_INCLUDE_ONCE = <span class="src-inc">
+/T_INCLUDE_ONCE = </span>
+T_REQUIRE_ONCE = <span class="src-inc">
+/T_REQUIRE_ONCE = </span>
+T_REQUIRE_ONCE = <span class="src-inc">
+/T_REQUIRE_ONCE = </span>
+
+T_CONSTANT_ENCAPSED_STRING = <span class="src-str">
+/T_CONSTANT_ENCAPSED_STRING = </span>
+T_STRING_VARNAME = <span class="src-str">
+/T_STRING_VARNAME = </span>
+
+T_STRING = <span class="src-id">
+/T_STRING = </span>
+
+T_DNUMBER = <span class="src-num">
+/T_DNUMBER = </span>
+T_LNUMBER = <span class="src-num">
+/T_LNUMBER = </span>
+
+T_VARIABLE = <span class="src-var">
+/T_VARIABLE = </span>
+
+T_COMMENT = <span class="src-comm">
+/T_COMMENT = </span>
+T_ML_COMMENT = <span class="src-comm">
+/T_ML_COMMENT = </span>
+
+T_OBJECT_OPERATOR = <span class="src-sym">
+/T_OBJECT_OPERATOR = </span>
+
+T_ABSTRACT = <span class="src-key">
+/T_ABSTRACT = </span>
+T_CLONE = <span class="src-key">
+/T_CLONE = </span>
+T_HALT_COMPILER = <span class="src-key">
+/T_HALT_COMPILER = </span>
+T_ARRAY = <span class="src-key">
+/T_ARRAY = </span>
+T_AS = <span class="src-key">
+/T_AS = </span>
+T_BREAK = <span class="src-key">
+/T_BREAK = </span>
+T_CLASS = <span class="src-key">
+/T_CLASS = </span>
+T_CASE = <span class="src-key">
+/T_CASE = </span>
+T_CONST = <span class="src-key">
+/T_CONST = </span>
+T_CONTINUE = <span class="src-key">
+/T_CONTINUE = </span>
+T_DECLARE = <span class="src-key">
+/T_DECLARE = </span>
+T_DEFAULT = <span class="src-key">
+/T_DEFAULT = </span>
+T_ELSE = <span class="src-key">
+/T_ELSE = </span>
+T_ELSEIF = <span class="src-key">
+/T_ELSEIF = </span>
+T_EMPTY = <span class="src-key">
+/T_EMPTY = </span>
+T_ENDDECLARE = <span class="src-key">
+/T_ENDDECLARE = </span>
+T_ENDFOR = <span class="src-key">
+/T_ENDFOR = </span>
+T_ENDSWITCH = <span class="src-key">
+/T_ENDSWITCH = </span>
+T_ENDFOREACH = <span class="src-key">
+/T_ENDFOREACH = </span>
+T_ENDIF = <span class="src-key">
+/T_ENDIF = </span>
+T_ENDWHILE = <span class="src-key">
+/T_ENDWHILE = </span>
+T_EXIT = <span class="src-key">
+/T_EXIT = </span>
+T_EXTENDS = <span class="src-key">
+/T_EXTENDS = </span>
+T_FINAL = <span class="src-key">
+/T_FINAL = </span>
+T_FOR = <span class="src-key">
+/T_FOR = </span>
+T_FOREACH = <span class="src-key">
+/T_FOREACH = </span>
+T_FUNCTION = <span class="src-key">
+/T_FUNCTION = </span>
+T_GLOBAL = <span class="src-key">
+/T_GLOBAL = </span>
+T_IF = <span class="src-key">
+/T_IF = </span>
+T_IMPLEMENTS = <span class="src-key">
+/T_IMPLEMENTS = </span>
+T_INTERFACE = <span class="src-key">
+/T_INTERFACE = </span>
+T_LOGICAL_AND = <span class="src-key">
+/T_LOGICAL_AND = </span>
+T_LOGICAL_OR = <span class="src-key">
+/T_LOGICAL_OR = </span>
+T_LOGICAL_XOR = <span class="src-key">
+/T_LOGICAL_XOR = </span>
+T_NEW = <span class="src-key">
+/T_NEW = </span>
+T_PRIVATE = <span class="src-key">
+/T_PRIVATE = </span>
+T_PROTECTED = <span class="src-key">
+/T_PROTECTED = </span>
+T_PUBLIC = <span class="src-key">
+/T_PUBLIC = </span>
+T_RETURN = <span class="src-key">
+/T_RETURN = </span>
+T_STATIC = <span class="src-key">
+/T_STATIC = </span>
+T_SWITCH = <span class="src-key">
+/T_SWITCH = </span>
+T_VAR = <span class="src-key">
+/T_VAR = </span>
+T_WHILE = <span class="src-key">
+/T_WHILE = </span>
+
+T_DOUBLE_COLON = <span class="src-sym">
+/T_DOUBLE_COLON = </span>
+
+T_OPEN_TAG = <span class="src-php">
+/T_OPEN_TAG = </span>
+T_OPEN_TAG_WITH_ECHO = <span class="src-php">
+/T_OPEN_TAG_WITH_ECHO = </span>
+T_CLOSE_TAG = <span class="src-php">
+/T_CLOSE_TAG = </span>
+
 
 [highlightSource]
 ;; this is for highlighting things that aren't tokens like "&"
 ;; format:
 ;; word = open
 ;; /word = close
-@ = <strong>
-/@ = </strong>
-& = <strong>
-/& = </strong>
-[ = <strong>
-/[ = </strong>
-] = <strong>
-/] = </strong>
-! = <strong>
-/! = </strong>
-";" = <strong>
-/; = </strong>
-( = <strong>
-/( = </strong>
-) = <strong>
-/) = </strong>
-, = <strong>
-/, = </strong>
-{ = <strong>
-/{ = </strong>
-} = <strong>
-/} = </strong>
-""" = <font color="#66cccc">
-/" = </font>
+@ = <span class="src-sym">
+/@ = </span>
+& = <span class="src-sym">
+/& = </span>
+[ = <span class="src-sym">
+/[ = </span>
+] = <span class="src-sym">
+/] = </span>
+! = <span class="src-sym">
+/! = </span>
+";" = <span class="src-sym">
+/; = </span>
+( = <span class="src-sym">
+/( = </span>
+) = <span class="src-sym">
+/) = </span>
+, = <span class="src-sym">
+/, = </span>
+{ = <span class="src-sym">
+/{ = </span>
+} = <span class="src-sym">
+/} = </span>
+""" = <span class="src-str">
+/" = </span>
 
 [highlightDocBlockSourceTokens]
 ;; this is for docblock tokens, using by phpDocumentor_HighlightParser
 ;; tagphptype is for "string" in @param string description, for example
-docblock = <font color="#009999">
-/docblock = </font>
-tagphptype = <em>
-/tagphptype = </em>
-tagvarname = <strong>
-/tagvarname = </strong>
-coretag = <strong><font color = "#0099FF">
-/coretag = </font></strong>
-tag = <strong><font color="#009999">
-/tag = </font></strong>
-inlinetag = <em><font color="#0099FF">
-/inlinetag = </font></em>
-internal = <em><font color = "#6699cc">
-/internal = </font></em>
-closetemplate = <strong><font color="blue">
-/closetemplate = </font></strong>
-docblocktemplate = <font color="blue">
-/docblocktemplate = </font color="blue">
+docblock = <span class="src-doc">
+/docblock = </span>
+tagphptype = <span class="src-doc-type">
+/tagphptype = </span>
+tagvarname = <span class="src-doc-var">
+/tagvarname = </span>
+coretag = <span class="src-doc-coretag">
+/coretag = </span>
+tag = <span class="src-doc-tag">
+/tag = </span>
+inlinetag = <span class="src-doc-inlinetag">
+/inlinetag = </span>
+internal = <span class="src-doc-internal">
+/internal = </span>
+closetemplate = <span class="src-doc-close-template">
+/closetemplate = </span>
+docblocktemplate = <span class="src-doc-template">
+/docblocktemplate = </span>
 
 [highlightTutorialSourceTokens]
 ;; this is for XML DocBook-based tutorials, highlighted by phpDocumentor_TutorialHighlightParser
@@ -154,8 +221,8 @@ ol = <ol>
 /ol = </ol>
 li = <li>
 /li = </li>
-code = <code><pre>
-/code = </pre></code>
+code = <div class="listing"><pre>
+/code = </pre></div>
 var = <var>
 /var = </var>
 samp = <samp>
@@ -174,7 +241,8 @@ br = <br />
 
 [ppage]
 ;; this is the DocBook package page translation section.  All DocBook tags
-;; that have a corresponding html tag must be listed here
+;; that have a corresponding html tag must be listed here.  Entities should
+;; also be listed here
 ;;
 ;; examples:
 ;; 1)
@@ -286,33 +354,34 @@ blockquote = blockquote
 arg = span
 arg->choice = class
 
-author = <font size="-1"><strong>by <em>
-/author = </em></strong></font>
+author = <span class="author">
+/author = </span>
 author! = 0
 
-authorblurb = blockquote
+authorblurb = <div class="author-blurb">
+/authorblurb = </div>
 
-authorgroup = <strong>Authors:</strong><br />
-/authorgroup = 
+authorgroup = <div class="authors"><h2 class="title">Authors</h2>
+/authorgroup = </div>
 authorgroup! = 0
 
-caution = <table border="1"><th align="center">Caution</th><tr><td>
-/caution = </td></tr></table>
+caution = <span class="warning">
+/caution = </span>
 caution! = 0
 
-command = <b class="cmd">
-/command = </b>
-
-cmdsynopsis = <div id="cmdsynopsis">
+cmdsynopsis = <div class="cmd-synopsis">
 /cmdsynopsis = </div>
 
-copyright = <em>
-/copyright = </em><br />
+command = <span class="cmd-title">
+/command = </span>
+
+copyright = <div class="notes">
+/copyright = </div>
 
 emphasis = strong
 
-example = <table class="example" width="100%" border="1"><tr><td>
-/example = </td></tr></table>
+example = <pre class="example">
+/example = </pre>
 example! = 0
 
 function =
@@ -324,11 +393,11 @@ graphic = img
 graphic->fileref = src
 graphic/ =
 
-important = u
+important = strong
 
 informalequation = blockquote
 
-informalexample = pre
+informalexample = div
 
 inlineequation = em
 
@@ -338,7 +407,7 @@ listitem = li
 
 literal = code
 
-literallayout = pre
+literallayout = span
 
 option = " "
 /option = 
@@ -347,22 +416,23 @@ orderedlist = ol
 
 para = p
 
-programlisting = <table border="0" bgcolor="#E0E0E0" cellpadding="5"><tr><td><pre class="php">
-/programlisting = </pre></td></tr></table>
+programlisting = <pre class="listing">
+/programlisting = </pre>
 programlisting! = 0
 
 refentry = div
 
-refnamediv = <div class="refname">
+refnamediv = <div class="ref-title-box">
 /refnamediv = </div>
 refnamediv! = 0
 
-refname = h1
+refname = <h1 class="ref-title">
+/refname = </h1>
 
-refpurpose = <h2 class="refpurpose"><em>
-/refpurpose = </em></h2>
+refpurpose = <h2 class="ref-purpose">
+/refpurpose = </h2>
 
-refsynopsisdiv = <div class="refsynopsis">
+refsynopsisdiv = <div class="ref-synopsis">
 /refsynopsisdiv = </div>
 refsynopsisdiv! = 0
 
@@ -374,8 +444,8 @@ refsect2 =
 refsect3 = 
 /refsect3 = <br />
 
-releaseinfo = (
-/releaseinfo = )<br />
+releaseinfo = <div class="release-info">(
+/releaseinfo = )</div>
 
 simpara = 
 /simpara = <br />
@@ -428,8 +498,8 @@ entry->morerows+9 = 10
 entry->morerows+10 = 11
 ;; add more if you need more colspans
 
-warning = <table border="1"><tr><td>
-/warning = </td></tr></table>
+warning = <span class="warning">
+/warning = </span>
 warning! = 0
 
 ;; now begins the attributes that should be tags in cdata
@@ -448,7 +518,7 @@ $id = name
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <h1 class="title" align="center">
+open = <h1 class="title">
 close = </h1>
 
 [refsect1_title]
@@ -456,40 +526,40 @@ close = </h1>
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <h2 class="title" align="center">
-close = </h1>
+open = <h2 class="title">
+close = </h2>
 
 [refsect2_title]
 ;tag_attr = true
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <h2 class="title" align="center">
-close = </h2>
+open = <h3 class="title">
+close = </h3>
 
 [refsect3_title]
 ;tag_attr = true
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <h3 class="title" align="center">
-close = </h3>
+open = <h4 class="title">
+close = </h4>
 
 [para_title]
 ;tag_attr = true
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <strong class="title" align="center">
-close = </strong>
+open = <div class="title">
+close = </div>
 
 [formalpara_title]
 ;tag_attr = true
 ;attr_name = title
 cdata_start = true
 ;cdata_end = true
-open = <strong class="title" align="center">
-close = </strong>
+open = <div class="title">
+close = </div>
 
 [example_title]
 ;tag_attr = true