From d2f5f11ed11c17ac61cbf0d76cf69cf3d184c5ee Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 09:58:14 -0500
Subject: [PATCH 01/11] add release 1.4.2 to history... it was missing

---
 package.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/package.xml b/package.xml
index 36bd7f8..3ecbd1c 100755
--- a/package.xml
+++ b/package.xml
@@ -3218,6 +3218,30 @@ Includes these Sourceforge items:
 - [1733936] &quot;phpdoc&quot; does not return with error code &quot;0&quot; on success [ashnazg|blueyed]
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.4.2</release>
+    <api>1.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2008-03-30</date>
+   <license uri="http://www.opensource.org/licenses/lgpl-license.php">LGPL</license>
+   <notes>
+Includes these PEAR items:
+Bug #12361: missing links to the filesource
+Bug #12699: makedocs.sh script needs a better install location
+Bug #12929: paramete &apos;ignore&apos; oper mistake
+Doc #12764: Update INSTALL for web docbuilder
+
+Includes these Sourceforge items:
+- [1829133] Progress display not happening until conversion finished [ashnazg]
+- [1779257] ignore=.. option not working correctly on Win | fix attaced [ashnazg|mrasnika]
+
+   </notes>
+  </release>
   <release>
    <version>
     <release>1.4.3</release>

From 489cd853074d05adf4766a85365771e9dbf0e821 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 12:43:01 -0500
Subject: [PATCH 02/11] Bug #19243 Tutorials are not honoring ordered vs
 unordered lists

---
 phpDocumentor/Converter.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpDocumentor/Converter.inc b/phpDocumentor/Converter.inc
index f558b5e..caaa704 100755
--- a/phpDocumentor/Converter.inc
+++ b/phpDocumentor/Converter.inc
@@ -1267,7 +1267,8 @@ class Converter
             } else
             { // if close tag is specified, use the open and close as literal
                 if ($name == 'programlisting' && isset($attr['role']) &&
-                      ($attr['role'] == 'php' || $attr['role'] == 'tutorial' || $attr['role'] == 'html'))
+                      ($attr['role'] == 'php' || $attr['role'] == 'tutorial' ||
+                       $attr['role'] == 'html' || $attr['role'] == 'xml') )
                 { // highlight PHP source
 //                    var_dump($unconvertedcdata, $cdata);exit;
                     if ($attr['role'] == 'php') {
@@ -1276,7 +1277,10 @@ class Converter
                         $cdata = $this->TutorialExample($unconvertedcdata);
                     } elseif ($attr['role'] == 'html') {
                         $cdata = $unconvertedcdata;
+                    } elseif ($attr['role'] == 'xml') {
+                        $cdata = '<pre>'.htmlentities($unconvertedcdata).'</pre>';
                     }
+                    $cdata = $this->template_options['ppage'][$name].$this->AttrToString($name,$attr). $cdata .$this->template_options['ppage']['/'.$name];
                 } else
                 {// normal case below
                     $cdata = $this->template_options['ppage'][$name].$this->AttrToString($name,$attr). $cdata .$this->template_options['ppage']['/'.$name];

From a8e574bea88722e8f3ceb29f7c9143545671f088 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 13:03:10 -0500
Subject: [PATCH 03/11] Request #19242 Allow images in tutorials

---
 phpDocumentor/PackagePageElements.inc | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/phpDocumentor/PackagePageElements.inc b/phpDocumentor/PackagePageElements.inc
index 2d46018..a9afc74 100755
--- a/phpDocumentor/PackagePageElements.inc
+++ b/phpDocumentor/PackagePageElements.inc
@@ -189,6 +189,32 @@ class parserXMLDocBookTag extends parserStringWithInlineTags
             list($this->attributes,$value) = $c->ConvertTitle($this->name, 
                 $this->attributes, $this->_title->Convert($c, $postprocess), $value);
         }
+
+        // if current element is a graphic make sure the linked file is copied to the
+        // given location
+        if ($this->name == "graphic")
+        {
+          $val = $this->attributes['fileref'];
+          $src = substr($c->curpath, 0, (strrpos($c->curpath, $c->package) - strlen($c->curpath)) );
+          $sourceDir = $src.$c->package.'/';
+          $targetDir = $c->base_dir.'/'.$c->package.'/';
+          $targetDir.= (!empty($c->subpackage)) ? $c->subpackage.'/' : '';
+          $targetDir .= 'figures/';
+          $filename = substr($val, strrpos($val, '/') + 1);
+
+          if (file_exists($sourceDir.$val))
+          {
+            if (!file_exists($targetDir))
+            {
+                mkdir($targetDir,0775, true);
+            }
+            if (copy($sourceDir.$val, $targetDir.$filename))
+            {
+              $this->attributes['fileref'] = './figures/'.$filename;
+            }
+          }
+        }
+
         return $c->TranslateTag($this->name, $this->attributes, $value, $simvalue);
     }
     

From 31e5390876967cd866c93314c2b563b2b8e8b63b Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 14:21:13 -0500
Subject: [PATCH 04/11] Request #4960 support for different encoding

---
 phpDocumentor/Converter.inc                          | 11 ++++++++++-
 .../Converters/CHM/default/CHMdefaultConverter.inc   |  4 ++--
 .../default/templates/default/templates/blank.tpl    |  4 ++--
 .../default/templates/default/templates/header.tpl   |  3 ++-
 .../default/templates/default/templates/index.tpl    |  1 +
 .../Converters/HTML/Smarty/HTMLSmartyConverter.inc   |  4 ++--
 .../HTML/Smarty/templates/HandS/templates/header.tpl |  6 +++---
 .../HTML/Smarty/templates/PHP/templates/header.tpl   |  3 ++-
 .../Smarty/templates/default/templates/header.tpl    |  1 +
 .../Converters/HTML/frames/HTMLframesConverter.inc   |  4 ++--
 .../frames/templates/DOM/default/templates/blank.tpl |  4 ++--
 .../templates/DOM/default/templates/header.tpl       |  4 ++--
 .../frames/templates/DOM/default/templates/index.tpl |  4 ++--
 .../templates/DOM/default/templates/top_frame.tpl    |  4 ++--
 .../frames/templates/DOM/earthli/templates/blank.tpl |  4 ++--
 .../templates/DOM/earthli/templates/header.tpl       |  4 ++--
 .../frames/templates/DOM/earthli/templates/index.tpl |  4 ++--
 .../templates/DOM/earthli/templates/top_frame.tpl    |  4 ++--
 .../frames/templates/DOM/l0l33t/templates/blank.tpl  |  4 ++--
 .../frames/templates/DOM/l0l33t/templates/header.tpl |  4 ++--
 .../frames/templates/DOM/l0l33t/templates/index.tpl  |  4 ++--
 .../templates/DOM/l0l33t/templates/top_frame.tpl     |  4 ++--
 .../templates/DOM/phpdoc.de/templates/blank.tpl      |  4 ++--
 .../templates/DOM/phpdoc.de/templates/header.tpl     |  4 ++--
 .../templates/DOM/phpdoc.de/templates/index.tpl      |  4 ++--
 .../templates/DOM/phpdoc.de/templates/top_frame.tpl  |  4 ++--
 .../templates/DOM/phphtmllib/templates/blank.tpl     |  4 ++--
 .../templates/DOM/phphtmllib/templates/header.tpl    |  4 ++--
 .../templates/DOM/phphtmllib/templates/index.tpl     |  4 ++--
 .../templates/DOM/phphtmllib/templates/top_frame.tpl |  4 ++--
 .../frames/templates/default/templates/blank.tpl     |  4 ++--
 .../frames/templates/default/templates/header.tpl    |  4 ++--
 .../frames/templates/default/templates/index.tpl     |  4 ++--
 .../frames/templates/default/templates/top_frame.tpl |  6 +++---
 .../frames/templates/earthli/templates/blank.tpl     |  4 ++--
 .../frames/templates/earthli/templates/header.tpl    |  4 ++--
 .../frames/templates/earthli/templates/index.tpl     |  4 ++--
 .../frames/templates/earthli/templates/top_frame.tpl |  6 +++---
 .../HTML/frames/templates/l0l33t/templates/blank.tpl |  4 ++--
 .../frames/templates/l0l33t/templates/header.tpl     |  4 ++--
 .../HTML/frames/templates/l0l33t/templates/index.tpl |  4 ++--
 .../frames/templates/l0l33t/templates/top_frame.tpl  |  4 ++--
 .../frames/templates/phpdoc.de/templates/blank.tpl   |  4 ++--
 .../frames/templates/phpdoc.de/templates/header.tpl  |  4 ++--
 .../frames/templates/phpdoc.de/templates/index.tpl   |  4 ++--
 .../templates/phpdoc.de/templates/top_frame.tpl      |  4 ++--
 .../frames/templates/phpedit/templates/blank.tpl     |  4 ++--
 .../frames/templates/phpedit/templates/header.tpl    |  4 ++--
 .../frames/templates/phpedit/templates/index.tpl     |  4 ++--
 .../frames/templates/phphtmllib/templates/blank.tpl  |  4 ++--
 .../frames/templates/phphtmllib/templates/header.tpl |  4 ++--
 .../frames/templates/phphtmllib/templates/index.tpl  |  4 ++--
 .../templates/phphtmllib/templates/top_frame.tpl     |  4 ++--
 .../Converters/PDF/default/PDFdefaultConverter.inc   |  6 +++---
 .../Converters/XML/DocBook/XMLDocBookConverter.inc   |  2 +-
 .../DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc |  4 ++--
 phpDocumentor/IntermediateParser.inc                 | 12 +++++++++---
 phpDocumentor/Io.inc                                 |  4 ++++
 phpDocumentor/Setup.inc.php                          |  6 ++++--
 59 files changed, 138 insertions(+), 113 deletions(-)

diff --git a/phpDocumentor/Converter.inc b/phpDocumentor/Converter.inc
index caaa704..7992723 100755
--- a/phpDocumentor/Converter.inc
+++ b/phpDocumentor/Converter.inc
@@ -391,6 +391,12 @@ class Converter
      */
     var $title = 'Generated Documentation';
 
+    /**
+     * @var string
+     * @see phpDocumentor_IntermediateParser::$charset
+     */
+    var $charset = 'iso-8859-1';
+
     /**
      * Options for each template, parsed from the options.ini file in the template base directory
      * @tutorial phpDocumentor/tutorials.pkg#conversion.ppage
@@ -448,8 +454,9 @@ class Converter
      * @param string {@link $targetDir} value
      * @param string {@link $templateDir} value
      * @param string (@link $title} value
+     * @param string (@link $charset} value
      */
-    function Converter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $template, $title)
+    function Converter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $template, $title, $charset)
     {
         $this->all_packages = $allp;
         $this->package_parents = $packp;
@@ -467,6 +474,7 @@ class Converter
         $this->classes = &$classes;
         $this->roots = $classes->getRoots($this->processSpecialRoots);
         $this->title = $title;
+        $this->charset = $charset;
         $this->setTemplateDir($template);
         $this->setTargetdir($targetDir);
     }
@@ -5091,6 +5099,7 @@ class Converter
         $templ->config_dir = realpath($this->smarty_dir . PATH_DELIMITER . 'configs');
         $templ->assign("date",date("r",time()));
         $templ->assign("maintitle",$this->title);
+        $templ->assign("charset",$this->charset);
         $templ->assign('default_package',$GLOBALS['phpDocumentor_DefaultPackageName']);
         $templ->assign("package",$this->package);
         $templ->assign("phpdocversion",PHPDOCUMENTOR_VER);
diff --git a/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc b/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
index ea0dd45..91c0010 100755
--- a/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
+++ b/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
@@ -132,9 +132,9 @@ class CHMdefaultConverter extends Converter
      * sets {@link $base_dir} to $targetDir
      * @see Converter()
      */
-    function CHMdefaultConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function CHMdefaultConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
-        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title);
+        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title, $charset);
         $this->base_dir = $targetDir;
     }
 
diff --git a/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl b/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
+++ b/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl b/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
index 30fad6b..8ea73c1 100755
--- a/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
+++ b/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
@@ -9,6 +9,7 @@
 	<!-- Generated by PhpDoc date: '{$date}' -->
 	<TITLE>{$title}</TITLE>
 <LINK REL ='stylesheet' TYPE='text/css' HREF='{$subdir}media/stylesheet.css' TITLE='Style'>
+<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 {if $bgleft}
 <STYLE type="text/css"><!--
 	BODY								{ldelim}
@@ -19,4 +20,4 @@
 {/if}
 </HEAD>
 <BODY {if !$bgleft}BGCOLOR='white'{/if}>
-<a name="top"><!-- --></a>
\ No newline at end of file
+<a name="top"><!-- --></a>
diff --git a/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl b/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
index 4e05309..b7dab69 100755
--- a/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
+++ b/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
@@ -4,6 +4,7 @@
 <HEAD>
 	<!-- Generated by PhpDoc on {$date}  -->
 	<TITLE>{$title}</TITLE>
+        <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </HEAD>
 <FRAMESET cols='220,*'>
 {if $package_count > 1}
diff --git a/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc b/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
index 050b90d..af41a4f 100755
--- a/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
+++ b/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
@@ -145,9 +145,9 @@ class HTMLSmartyConverter extends Converter
     var $ric_contents = array();
     /**#@-*/
 
-    function HTMLSmartyConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function HTMLSmartyConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
-        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title);
+        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title, $charset);
         $this->base_dir = $targetDir;
     }
 
diff --git a/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/header.tpl b/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/header.tpl
index b57cbdb..09e7be3 100755
--- a/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/header.tpl
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>{$title}</title>
 	<link rel="stylesheet" type="text/css" href="{$subdir}media/style.css">
-	<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+	<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 
@@ -107,4 +107,4 @@
 {if $hasel}
 <h1>{$eltype|capitalize}: {$class_name}</h1>
 Source Location: {$source_location}<br /><br />
-{/if}
\ No newline at end of file
+{/if}
diff --git a/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/header.tpl b/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/header.tpl
index 7d3e8f7..e3c23be 100755
--- a/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/header.tpl
@@ -2,6 +2,7 @@
 <head>
 <title>{$title}</title>
 <link rel="stylesheet" type="text/css" href="{$subdir}media/style.css">
+<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 
@@ -94,4 +95,4 @@
 {if $hasel}
 <h1>{$eltype|capitalize}: {$class_name}</h1>
 Source Location: {$source_location}<br /><br />
-{/if}
\ No newline at end of file
+{/if}
diff --git a/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/header.tpl b/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/header.tpl
index f23687e..f671c19 100755
--- a/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/header.tpl
@@ -5,6 +5,7 @@
 	<link rel="stylesheet" type="text/css" id="layout" href="{$subdir}media/layout.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="{$subdir}media/style.css" media="all">
 	<link rel="stylesheet" type="text/css" href="{$subdir}media/print.css" media="print">
+        <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <body>
diff --git a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
index fb406be..0cdf052 100755
--- a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
+++ b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
@@ -130,9 +130,9 @@ class HTMLframesConverter extends Converter
      * sets {@link $base_dir} to $targetDir
      * @see Converter()
      */
-    function HTMLframesConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function HTMLframesConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
-        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title);
+        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title, $charset);
         $this->base_dir = $targetDir;
     }
 
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/header.tpl
index 0d62619..e49cf33 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -9,7 +9,7 @@
 			<script src="{$subdir}media/lib/classTree.js"></script>
 			{/if}
 			{if $top2}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 			{/if}
 			{if $top3 || $top2}
 			<script language="javascript" type="text/javascript">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/top_frame.tpl
index 36d1e5a..3968125 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="${charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/header.tpl
index 0d62619..e49cf33 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -9,7 +9,7 @@
 			<script src="{$subdir}media/lib/classTree.js"></script>
 			{/if}
 			{if $top2}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 			{/if}
 			{if $top3 || $top2}
 			<script language="javascript" type="text/javascript">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/header.tpl
index cd34cf9..f507d38 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -9,7 +9,7 @@
 			<script src="{$subdir}media/lib/classTree.js"></script>
 			{/if}
 			{if $top2}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
 			<style>
 			  body {ldelim} padding: 1em {rdelim}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/header.tpl
index 0d62619..e49cf33 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -9,7 +9,7 @@
 			<script src="{$subdir}media/lib/classTree.js"></script>
 			{/if}
 			{if $top2}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 			{/if}
 			{if $top3 || $top2}
 			<script language="javascript" type="text/javascript">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/header.tpl
index 0d62619..e49cf33 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -9,7 +9,7 @@
 			<script src="{$subdir}media/lib/classTree.js"></script>
 			{/if}
 			{if $top2}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 			{/if}
 			{if $top3 || $top2}
 			<script language="javascript" type="text/javascript">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/default/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/default/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/default/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/default/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/default/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/default/templates/header.tpl
index c22ba37..84845f9 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/default/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/default/templates/header.tpl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
 			<!-- template designed by Marco Von Ballmoos -->
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			{if $top3}<div class="page-body">{/if}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/default/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/default/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/default/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/default/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/default/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/default/templates/top_frame.tpl
index fbe7eda..b87be36 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/default/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/default/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
@@ -40,4 +40,4 @@
 				</div>
 			</div>
 		</body>
-	</html>
\ No newline at end of file
+	</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/header.tpl
index c22ba37..84845f9 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/header.tpl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
 			<!-- template designed by Marco Von Ballmoos -->
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			{if $top3}<div class="page-body">{/if}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/top_frame.tpl
index 69beb10..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
@@ -42,4 +42,4 @@
 				</div>
 			</div>
 		</body>
-	</html>
\ No newline at end of file
+	</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/header.tpl
index 09fc985..b2bca4b 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -11,7 +11,7 @@
 				body {ldelim} padding: 1em; {rdelim}
 			</style>
 			{/if}
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			{if $top3}<div class="page-body">{/if}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/header.tpl
index c22ba37..84845f9 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/header.tpl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
 			<!-- template designed by Marco Von Ballmoos -->
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			{if $top3}<div class="page-body">{/if}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/header.tpl
index 378f67e..5767994 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/header.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -12,7 +12,7 @@
 <script type="text/javascript" src="{$subdir}media/lib/tabpane.js"></script>
 {/if}
 {if $top2}
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 {/if}
 {if $top3 || $top2}
   <script language="javascript" type="text/javascript" src="{$subdir}media/lib/ua.js"></script>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/index.tpl
index a0ade4f..162bd11 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET cols='220,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/blank.tpl b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/blank.tpl
index 6a05f27..0b71781 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/blank.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/blank.tpl
@@ -2,7 +2,7 @@
 <head>
 	<title>{$maintitle}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 <body>
 <div align="center"><h1>{$maintitle}</h1></div>
@@ -10,4 +10,4 @@
 <br />
 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/header.tpl b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/header.tpl
index c22ba37..84845f9 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/header.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/header.tpl
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
 			<!-- template designed by Marco Von Ballmoos -->
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			{if $top3}<div class="page-body">{/if}
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/index.tpl b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/index.tpl
index 7cd6109..6bc5eee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/index.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/index.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//FR"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -6,7 +6,7 @@
 <head>
 	<!-- Generated by phpDocumentor on {$date}  -->
   <title>{$title}</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+  <meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 </head>
 
 <FRAMESET rows='120,*'>
diff --git a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/top_frame.tpl b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/top_frame.tpl
index 36d1e5a..c4121ee 100755
--- a/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/top_frame.tpl
+++ b/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/top_frame.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="{$charset}"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
 		<head>
@@ -6,7 +6,7 @@
 			<title>{$title}</title>
 			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />
 			<link rel="stylesheet" href="{$subdir}media/banner.css" />
-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+			<meta http-equiv='Content-Type' content='text/html; charset={$charset}'/>
 		</head>
 		<body>
 			<div class="banner">
diff --git a/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc b/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc
index 86b4f17..4ab332f 100755
--- a/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc
+++ b/phpDocumentor/Converters/PDF/default/PDFdefaultConverter.inc
@@ -85,9 +85,9 @@ class PDFdefaultConverter extends Converter
     /**
      * @see Converter::Converter()
      */
-    function PDFdefaultConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function PDFdefaultConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
-        Converter::Converter($allp, $packp, $classes, $procpages, $po, $pp, $qm, $targetDir, $templateDir, $title);
+        Converter::Converter($allp, $packp, $classes, $procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset);
         $this->pdf =& new phpdocpdf($this, $this->getConverterDir() . PATH_DELIMITER .'templates/fonts/','letter');
         $this->pdf->selectFont($this->getConverterDir() . PATH_DELIMITER .'templates/fonts/Helvetica.afm');
 // put a line top and bottom on all the pages
@@ -979,4 +979,4 @@ class PDFdefaultConverter extends Converter
         return $source;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc b/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
index 64d6d45..098d575 100755
--- a/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
+++ b/phpDocumentor/Converters/XML/DocBook/XMLDocBookConverter.inc
@@ -164,7 +164,7 @@ class XMLDocBookConverter extends Converter
      * sets {@link $base_dir} to $targetDir
      * @see Converter()
      */
-    function XMLDocBookConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function XMLDocBookConverter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
         die("XMLDocBookConverter is not supported in this development version.  Use XML:DocBook/peardoc2:default");
     }
diff --git a/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc b/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc
index 8c21aaa..6ed64d6 100755
--- a/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc
+++ b/phpDocumentor/Converters/XML/DocBook/peardoc2/XMLDocBookpeardoc2Converter.inc
@@ -217,12 +217,12 @@ class XMLDocBookpeardoc2Converter extends Converter
      * sets {@link $base_dir} to $targetDir
      * @see Converter()
      */
-    function XMLDocBookpeardoc2Converter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title)
+    function XMLDocBookpeardoc2Converter(&$allp, &$packp, &$classes, &$procpages, $po, $pp, $qm, $targetDir, $templateDir, $title, $charset)
     {
         if (!class_exists('XML_Beautifier')) {
             @include_once 'XML/Beautifier.php';
         }
-        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title);
+        Converter::Converter($allp, $packp, $classes, $procpages,$po, $pp, $qm, $targetDir, $templateDir, $title, $charset);
         if (class_exists('XML_Beautifier')) {
             require_once 'phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php';
             $this->_beautifier = new phpDocumentor_peardoc2_XML_Beautifier;
diff --git a/phpDocumentor/IntermediateParser.inc b/phpDocumentor/IntermediateParser.inc
index 3d85a3b..be3037c 100755
--- a/phpDocumentor/IntermediateParser.inc
+++ b/phpDocumentor/IntermediateParser.inc
@@ -290,6 +290,11 @@ class phpDocumentor_IntermediateParser
      */
     var $title = '';
 
+    /**
+     * @var string Character encoding of generated documentation, passed to Converters
+     */
+    var $charset = '';
+
     var $uses = array();
 
     var $db_template;
@@ -323,9 +328,10 @@ class phpDocumentor_IntermediateParser
      * @param string Title of generated documentation, passed to Converters
      * @see $title, $data, $classes, $proceduralpages
      */
-    function phpDocumentor_IntermediateParser($title='Generated Documentation')
+    function phpDocumentor_IntermediateParser($title='Generated Documentation', $charset='iso-8859-1')
     {
         $this->title = $title;
+        $this->charset = $charset;
         $this->data = new parserData;
         $this->classes = new Classes;
         $this->proceduralpages = new ProceduralPages;
@@ -1830,7 +1836,7 @@ class phpDocumentor_IntermediateParser
             }
             phpDocumentor_out("Formatting @uses list...");
             flush();
-            $a = new __dummyConverter($this->all_packages, $this->package_parents, $this->classes, $this->proceduralpages, $this->packageoutput, $this->parsePrivate, $this->quietMode, $this->targetDir , '', $this->title);
+            $a = new __dummyConverter($this->all_packages, $this->package_parents, $this->classes, $this->proceduralpages, $this->packageoutput, $this->parsePrivate, $this->quietMode, $this->targetDir , '', $this->title, $this->charset);
             $this->_setupUsesList($a);
             unset($a);
             phpDocumentor_out("done\n\n");
@@ -1856,7 +1862,7 @@ class phpDocumentor_IntermediateParser
                             {
                                 $extraout .= SMART_PATH_DELIMITER . str_replace(PATH_DELIMITER, SMART_PATH_DELIMITER, substr($template,0,strlen($template) - 1));
                             }
-                            $a = new $converter($this->all_packages, $this->package_parents, $this->classes, $this->proceduralpages, $this->packageoutput, $this->parsePrivate, $this->quietMode, $this->targetDir . $extraout, $template, $this->title);
+                            $a = new $converter($this->all_packages, $this->package_parents, $this->classes, $this->proceduralpages, $this->packageoutput, $this->parsePrivate, $this->quietMode, $this->targetDir . $extraout, $template, $this->title, $this->charset);
                             if (isset($this->templateBase))
                             {
                                 $a->setTemplateBase($this->templateBase, $template);
diff --git a/phpDocumentor/Io.inc b/phpDocumentor/Io.inc
index ad85b37..97d103d 100755
--- a/phpDocumentor/Io.inc
+++ b/phpDocumentor/Io.inc
@@ -138,6 +138,10 @@ class Io
         $this->phpDocOptions['title']['desc'] = "title of generated documentation, default is 'Generated Documentation'";
         $this->phpDocOptions['title']['type'] = "value";
 
+        $this->phpDocOptions['charset']['tag'] = array("-cs", "--charset");
+        $this->phpDocOptions['charset']['desc'] = "character encoding used in the Content-Type meta element or the XML declaration, default is 'iso-8859-1'";
+        $this->phpDocOptions['charset']['type'] = "value";
+
         $this->phpDocOptions['help']['tag'] = array("-h", "--help");
         $this->phpDocOptions['help']['desc'] = "    show this help message";
 
diff --git a/phpDocumentor/Setup.inc.php b/phpDocumentor/Setup.inc.php
index d531c30..7d655ac 100755
--- a/phpDocumentor/Setup.inc.php
+++ b/phpDocumentor/Setup.inc.php
@@ -272,7 +272,9 @@ function readCommandLineSettings()
         if (!isset($_phpDocumentor_setting['junk'])) $_phpDocumentor_setting['junk'] = '';
         if (!isset($_phpDocumentor_setting['title'])) $_phpDocumentor_setting['title'] = 'Generated Documentation';
         $temp_title = $_phpDocumentor_setting['title'];
-        $this->render = new phpDocumentor_IntermediateParser($temp_title);
+        if (!isset($_phpDocumentor_setting['charset'])) $_phpDocumentor_setting['charset'] = 'iso-8859-1';
+        $charset = $_phpDocumentor_setting['charset'];
+        $this->render = new phpDocumentor_IntermediateParser($temp_title, $charset);
         if (isset($_phpDocumentor_setting['help']) || $_phpDocumentor_setting['junk'] == "-h" || $_phpDocumentor_setting['junk'] == "--help")
         {
             echo $this->setup->displayHelpMsg();
@@ -995,4 +997,4 @@ function checkForBugCondition($php_version, $php_bug_number = 'none', $pear_bug_
      */
     class DOMUserData {}
 }
-?>
\ No newline at end of file
+?>

From b79a324e83f93f202f3e3e17e49fa463875de706 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 14:56:53 -0500
Subject: [PATCH 05/11] Bug #16784 CHM: files are duplicated in the [FILES]
 section of the project file.

---
 .../Converters/CHM/default/CHMdefaultConverter.inc       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc b/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
index 91c0010..3af79b2 100755
--- a/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
+++ b/phpDocumentor/Converters/CHM/default/CHMdefaultConverter.inc
@@ -128,6 +128,11 @@ class CHMdefaultConverter extends Converter
      */
     var $KLinks = array();
 
+    /**
+     * track which files have already been parsed
+     */
+    var $_filenames = array();
+
     /**
      * sets {@link $base_dir} to $targetDir
      * @see Converter()
@@ -159,6 +164,10 @@ class CHMdefaultConverter extends Converter
      */
     function writeSource($path, $value)
     {
+        if (in_array($path, $this->_filenames)) {
+            return; // this file has already been parsed
+        }
+        array_push($this->_filenames,$path);
         $templ = &$this->newSmarty();
         $pathinfo = $this->proceduralpages->getPathInfo($path, $this);
         $templ->assign('source',$value);

From 1ce185f0482340a3145ac941a06553bcc975fb0d Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 15:41:20 -0500
Subject: [PATCH 06/11] Bug #12733 Warning in error.html file with
 XML:DocBook:peardoc2

---
 package.xml                                                     | 2 ++
 .../XML/DocBook/peardoc2/templates/default/templates/footer.tpl | 1 +
 .../XML/DocBook/peardoc2/templates/default/templates/header.tpl | 1 +
 3 files changed, 4 insertions(+)
 create mode 100755 phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/footer.tpl
 create mode 100755 phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/header.tpl

diff --git a/package.xml b/package.xml
index 3ecbd1c..a206646 100755
--- a/package.xml
+++ b/package.xml
@@ -1230,7 +1230,9 @@ Includes these Sourceforge items:
            <file baseinstalldir="PhpDocumentor" name="constants.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="docblock.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="errors.tpl" role="data" />
+           <file baseinstalldir="PhpDocumentor" name="footer.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="globals.tpl" role="data" />
+           <file baseinstalldir="PhpDocumentor" name="header.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="imethods.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="ivars.tpl" role="data" />
            <file baseinstalldir="PhpDocumentor" name="method.tpl" role="data" />
diff --git a/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/footer.tpl b/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/footer.tpl
new file mode 100755
index 0000000..8d1c8b6
--- /dev/null
+++ b/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/footer.tpl
@@ -0,0 +1 @@
+ 
diff --git a/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/header.tpl b/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/header.tpl
new file mode 100755
index 0000000..8d1c8b6
--- /dev/null
+++ b/phpDocumentor/Converters/XML/DocBook/peardoc2/templates/default/templates/header.tpl
@@ -0,0 +1 @@
+ 

From 99607e3a355bf9478da0fda3f3bb671c62505009 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 16:15:43 -0500
Subject: [PATCH 07/11] Request #12236 Allow RIC files in all directory

---
 phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc | 4 ++--
 phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc | 4 ++--
 phpDocumentor/Io.inc                                         | 2 +-
 phpDocumentor/Setup.inc.php                                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc b/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
index af41a4f..d0d4ad4 100755
--- a/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
+++ b/phpDocumentor/Converters/HTML/Smarty/HTMLSmartyConverter.inc
@@ -872,7 +872,7 @@ class HTMLSmartyConverter extends Converter
     function Convert_RIC($name, $contents)
     {
         $this->ric_contents[$name] = $contents;
-        $this->ric_set[] = array('file' => 'ric_'.$name . '.html','name' => $name);
+        $this->ric_set[] = array('file' => 'ric_'.str_replace(DIRECTORY_SEPARATOR, '_', $name) . '.html','name' => $name);
     }
 
     function writeRIC()
@@ -886,7 +886,7 @@ class HTMLSmartyConverter extends Converter
             $template->assign('name',$name);
             $template->assign('title',$name);
             $this->setTargetDir($this->base_dir);
-            $this->writefile('ric_'.$name . '.html',$template->fetch('ric.tpl'));
+            $this->writefile('ric_'.str_replace(DIRECTORY_SEPARATOR, '_', $name). '.html',$template->fetch('ric.tpl'));
         }
     }
 
diff --git a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
index 0cdf052..0245be9 100755
--- a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
+++ b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
@@ -683,7 +683,7 @@ class HTMLframesConverter extends Converter
         {
             foreach($this->ric_set as $name => $u)
             {
-                $package->append('ric',array('file' => 'ric_'.$name.'.html','name' => $name));
+                $package->append('ric',array('file' => 'ric_'.str_replace(DIRECTORY_SEPARATOR, '_', $name).'.html','name' => $name));
             }
         }
         $package->assign("packages",$this->package_index);
@@ -872,7 +872,7 @@ class HTMLframesConverter extends Converter
         $template->assign('contents',$contents);
         $template->assign('name',$name);
         $this->setTargetDir($this->base_dir);
-        $this->writefile('ric_'.$name . '.html',$template->fetch('ric.tpl'));
+        $this->writefile('ric_'.str_replace(DIRECTORY_SEPARATOR, '_', $name). '.html',$template->fetch('ric.tpl'));
         $this->ric_set[$name] = true;
     }
 
diff --git a/phpDocumentor/Io.inc b/phpDocumentor/Io.inc
index 97d103d..f99b7b9 100755
--- a/phpDocumentor/Io.inc
+++ b/phpDocumentor/Io.inc
@@ -544,7 +544,7 @@ class Io
         $names = $GLOBALS['_phpDocumentor_RIC_files'];
         foreach($filelist as $file)
         {
-            if ((dirname($file) == $base) && in_array(strtoupper(basename($file)), $names))
+            if (in_array(strtoupper(basename($file)), $names))
             { // be sure to change $this->checkIgnore() if any other files are added here!!
                 $ric[] = $file;
             } else
diff --git a/phpDocumentor/Setup.inc.php b/phpDocumentor/Setup.inc.php
index 7d655ac..f887de0 100755
--- a/phpDocumentor/Setup.inc.php
+++ b/phpDocumentor/Setup.inc.php
@@ -686,7 +686,7 @@ function createDocs($title = false)
                 flush();
                 $fp = fopen($file,'r');
                 $contents = fread($fp,filesize($file));
-                $this->render->HandleEvent(PHPDOCUMENTOR_EVENT_README_INSTALL_CHANGELOG, array(basename($file),$contents));
+                $this->render->HandleEvent(PHPDOCUMENTOR_EVENT_README_INSTALL_CHANGELOG, array(preg_replace('|^' . $source_base . DIRECTORY_SEPARATOR . '|', '', $file),$contents));
                 fclose($fp);
             }
             phpDocumentor_out("\ndone\n");

From 42176d1875b677949652b682e5700d6960c21279 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 17:20:26 -0500
Subject: [PATCH 08/11] Bug #19410 Sourcecode Option does not work

---
 phpDocumentor/IntermediateParser.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpDocumentor/IntermediateParser.inc b/phpDocumentor/IntermediateParser.inc
index be3037c..49d8a01 100755
--- a/phpDocumentor/IntermediateParser.inc
+++ b/phpDocumentor/IntermediateParser.inc
@@ -1121,7 +1121,7 @@ class phpDocumentor_IntermediateParser
         $this->data->clean = false;
         $this->data->explicitDocBlock();
         $data->canSource();
-        if (isset($_phpDocumentor_setting['source']) && $_phpDocumentor_setting['sourcecode'])
+        if (isset($_phpDocumentor_setting['sourcecode']) && $_phpDocumentor_setting['sourcecode'])
         {
             $data->addFileSource($this->data->parent->path, $this->data->parent->source);
         }

From 3417923b979985b07e3101a991c1c3ad7a203dfb Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 18:29:16 -0500
Subject: [PATCH 09/11] archive the 1.4.3 release doc

---
 Release-1.4.3 => Documentation/Release-old/Release-1.4.3 | 0
 package.xml                                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Release-1.4.3 => Documentation/Release-old/Release-1.4.3 (100%)

diff --git a/Release-1.4.3 b/Documentation/Release-old/Release-1.4.3
similarity index 100%
rename from Release-1.4.3
rename to Documentation/Release-old/Release-1.4.3
diff --git a/package.xml b/package.xml
index a206646..2475c6c 100755
--- a/package.xml
+++ b/package.xml
@@ -193,6 +193,7 @@ Includes these Sourceforge items:
      <file baseinstalldir="PhpDocumentor" name="Release-1.4.0rc2" role="doc" />
      <file baseinstalldir="PhpDocumentor" name="Release-1.4.1" role="doc" />
      <file baseinstalldir="PhpDocumentor" name="Release-1.4.2" role="doc" />
+     <file baseinstalldir="PhpDocumentor" name="Release-1.4.3" role="doc" />
     </dir> <!-- /Documentation/Release-old -->
     <dir name="tests">
      <dir name="bug-557861">
@@ -1582,7 +1583,6 @@ Includes these Sourceforge items:
     <tasks:replace from="@VER@" to="version" type="package-info" />
     <tasks:replace from="@STABILITY@" to="state" type="package-info" />
    </file>
-   <file baseinstalldir="PhpDocumentor" name="Release-1.4.3" role="doc" />
   </dir> <!-- / -->
  </contents>
  <dependencies>

From a08e6ef5c34c4293759dd9e17c6270f0a5997da5 Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 18:31:48 -0500
Subject: [PATCH 10/11] add missing category and ignore tags, to clear up
 runtime warnings when phpdoc runs against itself

---
 docbuilder/actions.php                               |  3 +++
 docbuilder/builder.php                               |  3 ++-
 docbuilder/config.php                                |  1 +
 docbuilder/file_dialog.php                           |  2 ++
 docbuilder/includes/utilities.php                    |  5 ++++-
 docbuilder/top.php                                   |  3 +++
 .../Converters/HTML/frames/HTMLframesConverter.inc   |  2 ++
 .../Converters/XML/DocBook/peardoc2/Beautifier.php   |  4 +++-
 phpDocumentor/ParserElements.inc                     | 12 ++++++++++++
 phpDocumentor/Setup.inc.php                          |  3 +++
 phpDocumentor/clone5.inc.php                         |  2 ++
 scripts/create_package.xml.php                       |  7 +++++++
 scripts/tokenizer_test.php                           |  3 ++-
 13 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/docbuilder/actions.php b/docbuilder/actions.php
index d69e30d..2273797 100755
--- a/docbuilder/actions.php
+++ b/docbuilder/actions.php
@@ -23,6 +23,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
@@ -33,8 +34,10 @@
 $path = dirname(__FILE__);
 if ('@WEB-DIR@' != '@'.'WEB-DIR@')
 {
+    /** @ignore */
     include_once( "@WEB-DIR@/PhpDocumentor/docbuilder/includes/utilities.php" );
 } else {
+    /** @ignore */
     include_once( "$path/includes/utilities.php" );
 }
 
diff --git a/docbuilder/builder.php b/docbuilder/builder.php
index f4200f0..967cb5c 100755
--- a/docbuilder/builder.php
+++ b/docbuilder/builder.php
@@ -26,6 +26,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
@@ -125,4 +126,4 @@
 } else {
 	echo "whoops!";
 }
-?>
\ No newline at end of file
+?>
diff --git a/docbuilder/config.php b/docbuilder/config.php
index 44bde7d..acdf980 100755
--- a/docbuilder/config.php
+++ b/docbuilder/config.php
@@ -26,6 +26,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
diff --git a/docbuilder/file_dialog.php b/docbuilder/file_dialog.php
index b9160ad..5ae6047 100755
--- a/docbuilder/file_dialog.php
+++ b/docbuilder/file_dialog.php
@@ -26,6 +26,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
@@ -63,6 +64,7 @@
     }
 } else {
 
+    /** @ignore */
     define(PHPDOC_WEBROOT_DIR, dirname(dirname(__FILE__)));
     /**
     * common file information
diff --git a/docbuilder/includes/utilities.php b/docbuilder/includes/utilities.php
index 65f0b8c..1ff3b30 100755
--- a/docbuilder/includes/utilities.php
+++ b/docbuilder/includes/utilities.php
@@ -23,6 +23,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
@@ -33,8 +34,10 @@
 
 if ('@DATA-DIR@' != '@'.'DATA-DIR@')
 {
+    /** @ignore */
     include_once('PhpDocumentor/HTML_TreeMenu-1.1.2/TreeMenu.php');
 } else {
+    /** @ignore */
     include_once(dirname(realpath(__FILE__))."/../../HTML_TreeMenu-1.1.2/TreeMenu.php");
 }
 
@@ -213,4 +216,4 @@ function vdump_par($tree)
 	}
 	debug('<br>');
 }
-?>
\ No newline at end of file
+?>
diff --git a/docbuilder/top.php b/docbuilder/top.php
index 0562d64..0fd56fa 100755
--- a/docbuilder/top.php
+++ b/docbuilder/top.php
@@ -26,6 +26,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Andrew Eddie
  * @author     Greg Beaver <cellog@php.net>
@@ -37,9 +38,11 @@
  */
 if ('@DATA-DIR@' != '@'.'DATA-DIR@')
 {
+    /** @ignore */
     include_once( "PhpDocumentor/phpDocumentor/common.inc.php");
 } else {
     $path = dirname(dirname(__FILE__));
+    /** @ignore */
     include_once( "$path/phpDocumentor/common.inc.php");
 }
 //
diff --git a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
index 0245be9..3bd115c 100755
--- a/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
+++ b/phpDocumentor/Converters/HTML/frames/HTMLframesConverter.inc
@@ -26,6 +26,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    Converters
  * @subpackage HTMLframes
  * @author     Gregory Beaver <cellog@php.net>
@@ -43,6 +44,7 @@
  * HTML output converter.
  * This Converter takes output from the {@link Parser} and converts it to HTML-ready output for use with {@link Smarty}.
  *
+ * @category ToolsAndUtilities
  * @package Converters
  * @subpackage HTMLframes
  * @see parserDocBlock, parserInclude, parserPage, parserClass, parserDefine, parserFunction, parserMethod, parserVar
diff --git a/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php b/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php
index 5474b52..e27ae7b 100644
--- a/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php
+++ b/phpDocumentor/Converters/XML/DocBook/peardoc2/Beautifier.php
@@ -27,6 +27,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @subpackage Parsers
  * @author     Greg Beaver <cellog@php.net>
@@ -42,6 +43,7 @@
 
 /**
  * This is just like XML_Beautifier, but uses {@link phpDocumentor_XML_Beautifier_Tokenizer}
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage Parsers
  * @since 1.3.0
@@ -132,4 +134,4 @@ function formatString($string, $renderer = "Plain")
         return $xml;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/phpDocumentor/ParserElements.inc b/phpDocumentor/ParserElements.inc
index 864cde1..c95ce11 100755
--- a/phpDocumentor/ParserElements.inc
+++ b/phpDocumentor/ParserElements.inc
@@ -25,6 +25,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @subpackage ParserElements
  * @author     Gregory Beaver <cellog@php.net>
@@ -40,6 +41,7 @@
 /**
  * all elements except {@link parserPackagePage} descend from this abstract class
  * @abstract
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -192,6 +194,7 @@ class parserElement extends parserBase
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -208,6 +211,7 @@ class parserInclude extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -312,6 +316,7 @@ class parserGlobal extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -673,6 +678,7 @@ class parserFunction extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -1406,6 +1412,7 @@ class parserClass extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -1570,6 +1577,7 @@ class parserVar extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -1619,6 +1627,7 @@ class parserConst extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -1974,6 +1983,7 @@ class parserMethod extends parserFunction
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -2018,6 +2028,7 @@ class parserDefine extends parserElement
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @author Greg Beaver <cellog@php.net>
@@ -2052,6 +2063,7 @@ class parserPackagePage extends parserStringWithInlineTags
 }
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  * @subpackage ParserElements
  * @since 1.2
diff --git a/phpDocumentor/Setup.inc.php b/phpDocumentor/Setup.inc.php
index f887de0..a090f9d 100755
--- a/phpDocumentor/Setup.inc.php
+++ b/phpDocumentor/Setup.inc.php
@@ -25,6 +25,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
+ * @category   ToolsAndUtilities
  * @package    phpDocumentor
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  2002-2006 Gregory Beaver
@@ -94,6 +95,7 @@
 $GLOBALS['phpDocumentor_DefaultCategoryName'] = 'default';
 
 /**
+ * @category ToolsAndUtilities
  * @package phpDocumentor
  */
 class phpDocumentor_setup
@@ -992,6 +994,7 @@ function checkForBugCondition($php_version, $php_bug_number = 'none', $pear_bug_
     )
 ) {
     /**
+     * @category ToolsAndUtilities
      * @package phpDocumentor
      * @ignore
      */
diff --git a/phpDocumentor/clone5.inc.php b/phpDocumentor/clone5.inc.php
index 359b45d..ea7c07f 100644
--- a/phpDocumentor/clone5.inc.php
+++ b/phpDocumentor/clone5.inc.php
@@ -45,6 +45,8 @@
  * @return object the new clone
  * @ignore
  * @todo CS cleanup - rename function to PhpDocumentor_clone
+ * @category  ToolsAndUtilities
+ * @package   phpDocumentor
  */
 function phpDocumentor_clone($obj)
 {
diff --git a/scripts/create_package.xml.php b/scripts/create_package.xml.php
index afc6ddb..aafb897 100755
--- a/scripts/create_package.xml.php
+++ b/scripts/create_package.xml.php
@@ -1,6 +1,13 @@
 <?php
+/**
+ * @category ToolsAndUtilities
+ * @package  phpDocumentor
+ */
+
 set_time_limit(0);
+/** @ignore */
 require_once('PEAR/PackageFileManager.php');
+/** @ignore */
 require_once('PEAR/PackageFileManager2.php');
 PEAR::setErrorHandling(PEAR_ERROR_DIE);
 
diff --git a/scripts/tokenizer_test.php b/scripts/tokenizer_test.php
index e7c5748..097aa57 100755
--- a/scripts/tokenizer_test.php
+++ b/scripts/tokenizer_test.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package tests
+ * @category ToolsAndUtilities
+ * @package phpDocumentor
  */
 /**
 $fp = fopen("../phpDocumentor/Converter.inc","r");

From 3434d1e85edf00ee4c0a25dfe6f56d052d9f049c Mon Sep 17 00:00:00 2001
From: Chuck Burgess <ashnazg@php.net>
Date: Sat, 1 Sep 2012 18:35:49 -0500
Subject: [PATCH 11/11] prepare 1.5.0a1 release

---
 package.xml | 117 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 86 insertions(+), 31 deletions(-)

diff --git a/package.xml b/package.xml
index 2475c6c..8d68d6f 100755
--- a/package.xml
+++ b/package.xml
@@ -69,45 +69,31 @@ http://localhost/pear/PhpDocumentor is the web interface</description>
   <email>drewish@katherinehouse.com</email>
   <active>no</active>
  </developer>
- <date>2011-12-03</date>
- <time>13:00:00</time>
+ <date>2012-09-01</date>
  <version>
-  <release>1.4.4</release>
-  <api>1.4.0</api>
+  <release>1.5.0a1</release>
+  <api>1.5.0</api>
  </version>
  <stability>
-  <release>stable</release>
+  <release>alpha</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.opensource.org/licenses/lgpl-license.php">LGPL</license>
  <notes>
-Includes these PEAR items:
- * Fix Bug #11543: empty @todo tags/comments shouldn&apos;t be included in TODO list [ashnazg]
- * Fix Bug #12704: XML/Beautifier removed comment in XML Docbook peardoc2 converter
-   template [ashnazg]
- * Fix Bug #13606: parameter name and description do not line up in generated docs [ashnazg]
- * Fix Bug #13653: Media file copy - copies incorrect file [ashnazg]
- * Fix Bug #14201: templatebase not working as intended [ashnazg]
- * Fix Bug #14640: class witch extending DOMDocument [ashnazg]
- * Fix Bug #16279: Type Hints in Function Signature Cause Loss of @param type [ashnazg]
- * Fix Bug #16546: Default parser uses php 4.0 standards [ashnazg]
- * Fix Bug #16825: Templates Point to Nonexistent Image Files [ashnazg]
- * Fix Bug #16826: Unused media folder and files exist [ashnazg]
- * Fix Bug #17395: Fatal Error when trying to run document [ashnazg]
- * Fix Bug #18058: Patch: fix some notices (which may cause a crash of other tools) [ashnazg]
- * Fix Bug #18100: phpdocu-general@sourceforge.net bounces [ashnazg]
- * Fix Bug #18220: Truncated filenames in Converter files [ashnazg]
- * Fix Bug #18782: class tree generation mistake [ashnazg]
- * Fix Bug #18870: Class tree wont shows implemented interfaces if class has no childs [ashnazg]
- * Fix Bug #18871: Class tree wont shows internal PHP interfaces [ashnazg]
- * Fix Bug #18872: Class tree puts comma uncorrectly in interfaces list [ashnazg]
- * Fix Bug #19017: remove error_reporting (for PEAR QA team) [ashnazg]
- * Implement Feature #12211: @inheritdoc not working for child methods &amp; variables [ashnazg]
- * Implement Feature #15580: Add link back from api document to pear website or package website [ashnazg]
- * Implement Feature #17906: Please, consider realising &apos;Plain.php&apos; file under PHP 3.01 license [ashnazg]
+This release includes a new --charset runtime option.
 
-Includes these Sourceforge items:
-* [2155014] fatal error when parsing 'myclass extends DOMDocument'
+This release will also see and document "RIC" files (Readme/Changelog/Install) in project subdirectories,
+rather than only seeing them in the project root.
+
+* Bug #12733: Warning in error.html file with XML:DocBook:peardoc2 [ashnazg]
+* Bug #16784: CHM: files are duplicated in the [FILES] section of the project file. [ashnazg]
+* Bug #19197: Fatal Error on building documentation [ashnazg]
+* Bug #19243: Tutorials are not honoring ordered vs unordered lists [ashnazg|lapistano]
+* Bug #19410: Sourcecode Option does not work [ashnazg|rhorber]
+
+* Req #4960: support for different encoding [ashnazg|miau]
+* Req #12236: Allow RIC files in all directory [ashnazg|yunosh]
+* Req #19242: Allow images in tutorials [ashnazg|lapistano]
  </notes>
  <contents>
   <dir baseinstalldir="PhpDocumentor" name="/">
@@ -3267,5 +3253,74 @@ Includes these Sourceforge items:
 - [1779257] ignore=.. option not working correctly on Win | fix attaced [ashnazg|mrasnika]
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.4.4</release>
+    <api>1.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2011-12-03</date>
+   <license uri="http://www.opensource.org/licenses/lgpl-license.php">LGPL</license>
+   <notes>
+Includes these PEAR items:
+ * Fix Bug #11543: empty @todo tags/comments shouldn&apos;t be included in TODO list [ashnazg]
+ * Fix Bug #12704: XML/Beautifier removed comment in XML Docbook peardoc2 converter
+   template [ashnazg]
+ * Fix Bug #13606: parameter name and description do not line up in generated docs [ashnazg]
+ * Fix Bug #13653: Media file copy - copies incorrect file [ashnazg]
+ * Fix Bug #14201: templatebase not working as intended [ashnazg]
+ * Fix Bug #14640: class witch extending DOMDocument [ashnazg]
+ * Fix Bug #16279: Type Hints in Function Signature Cause Loss of @param type [ashnazg]
+ * Fix Bug #16546: Default parser uses php 4.0 standards [ashnazg]
+ * Fix Bug #16825: Templates Point to Nonexistent Image Files [ashnazg]
+ * Fix Bug #16826: Unused media folder and files exist [ashnazg]
+ * Fix Bug #17395: Fatal Error when trying to run document [ashnazg]
+ * Fix Bug #18058: Patch: fix some notices (which may cause a crash of other tools) [ashnazg]
+ * Fix Bug #18100: phpdocu-general@sourceforge.net bounces [ashnazg]
+ * Fix Bug #18220: Truncated filenames in Converter files [ashnazg]
+ * Fix Bug #18782: class tree generation mistake [ashnazg]
+ * Fix Bug #18870: Class tree wont shows implemented interfaces if class has no childs [ashnazg]
+ * Fix Bug #18871: Class tree wont shows internal PHP interfaces [ashnazg]
+ * Fix Bug #18872: Class tree puts comma uncorrectly in interfaces list [ashnazg]
+ * Fix Bug #19017: remove error_reporting (for PEAR QA team) [ashnazg]
+ * Implement Feature #12211: @inheritdoc not working for child methods &amp; variables [ashnazg]
+ * Implement Feature #15580: Add link back from api document to pear website or package website [ashnazg]
+ * Implement Feature #17906: Please, consider realising &apos;Plain.php&apos; file under PHP 3.01 license [ashnazg]
+
+Includes these Sourceforge items:
+* [2155014] fatal error when parsing 'myclass extends DOMDocument'
+   </notes>
+  </release>
+  <release>
+   <date>2012-09-01</date>
+   <version>
+    <release>1.5.0a1</release>
+    <api>1.5.0</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>stable</api>
+    </stability>
+   <license uri="http://www.opensource.org/licenses/lgpl-license.php">LGPL</license>
+   <notes>
+This release includes a new --charset runtime option.
+
+This release will also see and document "RIC" files (Readme/Changelog/Install) in project subdirectories,
+rather than only seeing them in the project root.
+
+* Bug #12733: Warning in error.html file with XML:DocBook:peardoc2 [ashnazg]
+* Bug #16784: CHM: files are duplicated in the [FILES] section of the project file. [ashnazg]
+* Bug #19197: Fatal Error on building documentation [ashnazg]
+* Bug #19243: Tutorials are not honoring ordered vs unordered lists [ashnazg|lapistano]
+* Bug #19410: Sourcecode Option does not work [ashnazg|rhorber]
+
+* Req #4960: support for different encoding [ashnazg|miau]
+* Req #12236: Allow RIC files in all directory [ashnazg|yunosh]
+* Req #19242: Allow images in tutorials [ashnazg|lapistano]
+   </notes>
+  </release>
  </changelog>
 </package>