xml compatibility fixes (mainly entities to unicode conversions)

16 files changed, 35 insertions, 34 deletions

diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php
index 0a7ce8e7c..1b68cf6d3 100644
--- a/inc/DifferenceEngine.php
+++ b/inc/DifferenceEngine.php
@@ -1039,8 +1039,8 @@ class TableDiffFormatter extends DiffFormatter {
         // Preserve whitespaces by converting some to non-breaking spaces.
         // Do not convert all of them to allow word-wrap.
         $val = parent::format($diff);
-        $val = str_replace('  ','  ', $val);
-        $val = preg_replace('/ (?=<)|(?<=[ >]) /', '&nbsp;', $val);
+        $val = str_replace('  ','&#160; ', $val);
+        $val = preg_replace('/ (?=<)|(?<=[ >]) /', '&#160;', $val);
         return $val;
     }
 
@@ -1078,7 +1078,7 @@ class TableDiffFormatter extends DiffFormatter {
     }
 
     function emptyLine() {
-        return '<td colspan="2">&nbsp;</td>';
+        return '<td colspan="2">&#160;</td>';
     }
 
     function contextLine($line) {
@@ -1132,8 +1132,8 @@ class InlineDiffFormatter extends DiffFormatter {
         // Preserve whitespaces by converting some to non-breaking spaces.
         // Do not convert all of them to allow word-wrap.
         $val = parent::format($diff);
-        $val = str_replace('  ','&nbsp; ', $val);
-        $val = preg_replace('/ (?=<)|(?<=[ >]) /', '&nbsp;', $val);
+        $val = str_replace('  ','&#160; ', $val);
+        $val = preg_replace('/ (?=<)|(?<=[ >]) /', '&#160;', $val);
         return $val;
     }
 
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 5c043fb6b..ac29bca66 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -2972,7 +2972,7 @@ class JpegMeta {
             elseif ($c == 62)
                 $ascii .= '&gt;';
             elseif ($c == 32)
-                $ascii .= '&nbsp;';
+                $ascii .= '&#160;';
             elseif ($c > 32)
                 $ascii .= chr($c);
             else
diff --git a/inc/html.php b/inc/html.php
index 738b1f1b4..f9712d975 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -327,7 +327,7 @@ function html_search(){
 
     //show progressbar
     print '<div id="dw__loading">'.NL;
-    print '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'.NL;
+    print '<script type="text/javascript"><!--//--><![CDATA[//><!--'.NL;
     print 'showLoadBar();'.NL;
     print '//--><!]]></script>'.NL;
     print '</div>'.NL;
@@ -389,7 +389,7 @@ function html_search(){
     }
 
     //hide progressbar
-    print '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'.NL;
+    print '<script type="text/javascript"><!--//--><![CDATA[//><!--'.NL;
     print 'hideLoadBar("dw__loading");'.NL;
     print '//--><!]]></script>'.NL;
     flush();
@@ -494,7 +494,7 @@ function html_revisions($first=0, $media_id = false){
 
         if (!$media_id) {
             $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-            $form->addElement(' &ndash; ');
+            $form->addElement(' – ');
             $form->addElement(htmlspecialchars($INFO['sum']));
             $form->addElement(form_makeCloseTag('span'));
         }
@@ -573,7 +573,7 @@ function html_revisions($first=0, $media_id = false){
 
         if ($info['sum']) {
             $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-            if (!$media_id) $form->addElement(' &ndash; ');
+            if (!$media_id) $form->addElement(' – ');
             $form->addElement(htmlspecialchars($info['sum']));
             $form->addElement(form_makeCloseTag('span'));
         }
@@ -765,7 +765,7 @@ function html_recent($first=0, $show_changes='both'){
             $form->addElement(html_wikilink(':'.$recent['id'],useHeading('navigation')?null:$recent['id']));
         }
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-        $form->addElement(' &ndash; '.htmlspecialchars($recent['sum']));
+        $form->addElement(' – '.htmlspecialchars($recent['sum']));
         $form->addElement(form_makeCloseTag('span'));
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
@@ -1418,7 +1418,7 @@ function html_edit(){
 
     if ($wr) {
         // sets changed to true when previewed
-        echo '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'. NL;
+        echo '<script type="text/javascript"><!--//--><![CDATA[//><!--'. NL;
         echo 'textChanged = ' . ($mod ? 'true' : 'false');
         echo '//--><!]]></script>' . NL;
     } ?>
diff --git a/inc/media.php b/inc/media.php
index 2462a1deb..e1d5d511e 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1442,7 +1442,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         $size .= (int) $item['meta']->getField('File.Height');
         echo '<dd class="size">'.$size.'</dd>'.NL;
     } else {
-        echo '<dd class="size">&nbsp;</dd>'.NL;
+        echo '<dd class="size">&#160;</dd>'.NL;
     }
     $date = dformat($item['mtime']);
     echo '<dd class="date">'.$date.'</dd>'.NL;
@@ -1723,7 +1723,7 @@ function media_nstree_li($item){
     if($item['open']){
         $class .= ' open';
         $img   = DOKU_BASE.'lib/images/minus.gif';
-        $alt   = '&minus;';
+        $alt   = '−';
     }else{
         $class .= ' closed';
         $img   = DOKU_BASE.'lib/images/plus.gif';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 119ac3f01..2f09dbd4f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -549,7 +549,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         global $ID;
         $name  = $this->_getLinkTitle($name, $hash, $isImage);
         $hash  = $this->_headerToLink($hash);
-        $title = $ID.' &crarr;';
+        $title = $ID.' ↵';
         $this->doc .= '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
         $this->doc .= $name;
         $this->doc .= '</a>';
diff --git a/inc/template.php b/inc/template.php
index c9e899034..41da64d2e 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -714,7 +714,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_breadcrumbs($sep='&bull;'){
+function tpl_breadcrumbs($sep='•'){
     global $lang;
     global $conf;
 
@@ -757,7 +757,7 @@ function tpl_breadcrumbs($sep='&bull;'){
  * @author <fredrik@averpil.com>
  * @todo   May behave strangely in RTL languages
  */
-function tpl_youarehere($sep=' &raquo; '){
+function tpl_youarehere($sep=' » '){
     global $conf;
     global $ID;
     global $lang;
@@ -843,7 +843,7 @@ function tpl_pageinfo($ret=false){
     if($INFO['exists']){
         $out = '';
         $out .= $fn;
-        $out .= ' &middot; ';
+        $out .= ' · ';
         $out .= $lang['lastmod'];
         $out .= ': ';
         $out .= $date;
@@ -854,7 +854,7 @@ function tpl_pageinfo($ret=false){
             $out .= ' ('.$lang['external_edit'].')';
         }
         if($INFO['locked']){
-            $out .= ' &middot; ';
+            $out .= ' · ';
             $out .= $lang['lockedby'];
             $out .= ': ';
             $out .= editorinfo($INFO['locked']);
diff --git a/install.php b/install.php
index a1d406209..3d9fddbb2 100644
--- a/install.php
+++ b/install.php
@@ -78,7 +78,7 @@ header('Content-Type: text/html; charset=utf-8');
         select.text, input.text { width: 30em; margin: 0 0.5em; }
         a {text-decoration: none}
     </style>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
         function acltoggle(){
             var cb = document.getElementById('acl');
             var fs = document.getElementById('acldep');
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 1f88c6ff9..a0d2e430e 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -507,7 +507,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($item['type']=='d'){
             if($item['open']){
                 $img   = DOKU_BASE.'lib/images/minus.gif';
-                $alt   = '&minus;';
+                $alt   = '−';
             }else{
                 $img   = DOKU_BASE.'lib/images/plus.gif';
                 $alt   = '+';
@@ -747,7 +747,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
             //build code
             $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
-            $ret .= '<input '.buildAttributes($atts).' />&nbsp;';
+            $ret .= '<input '.buildAttributes($atts).' />&#160;';
             $ret .= $this->getLang('acl_perm'.$perm);
             $ret .= '</label>'.NL;
         }
@@ -783,7 +783,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
         echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
         if (!empty($this->specials)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->specials as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
@@ -801,7 +801,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo '  </optgroup>'.NL;
         }
         if (!empty($this->usersgroups)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->usersgroups as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 9a9bb5329..c5f7ee532 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -118,6 +118,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
           // config setting group
           if ($in_fieldset) {
             ptln('  </table>');
+            ptln('  </div>');
             ptln('  </fieldset>');
           } else {
             $in_fieldset = true;
diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php
index ec97fe966..b01637dd1 100644
--- a/lib/plugins/config/lang/no/lang.php
+++ b/lib/plugins/config/lang/no/lang.php
@@ -43,8 +43,8 @@ $lang['_links']                = 'Innstillinger for lenker';
 $lang['_media']                = 'Innstillinger for mediafiler';
 $lang['_advanced']             = 'Avanserte innstillinger';
 $lang['_network']              = 'Nettverksinnstillinger';
-$lang['_plugin_sufix']         = '&ndash; innstillinger for tillegg';
-$lang['_template_sufix']       = '&ndash; innstillinger for mal';
+$lang['_plugin_sufix']         = '– innstillinger for tillegg';
+$lang['_template_sufix']       = '– innstillinger for mal';
 $lang['_msg_setting_undefined'] = 'Ingen innstillingsmetadata';
 $lang['_msg_setting_no_class'] = 'Ingen innstillingsklasse';
 $lang['_msg_setting_no_default'] = 'Ingen standard verdi';
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 1cdab607f..a1430016e 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -452,8 +452,8 @@ if (!class_exists('setting')) {
 
     function _out_key($pretty=false,$url=false) {
         if($pretty){
-            $out = str_replace(CM_KEYMARKER,"&raquo;",$this->_key);
-            if ($url && !strstr($out,'&raquo;')) {//provide no urls for plugins, etc.
+            $out = str_replace(CM_KEYMARKER,"»",$this->_key);
+            if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc.
                 if ($out == 'start') //one exception
                     return '<a href="http://www.dokuwiki.org/config:startpage">'.$out.'</a>';
                 else
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 2aaf1395f..ff5fa69ba 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -159,7 +159,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             echo '</a> ';
 
             echo html_wikilink(':'.$recent['id'],(useHeading('navigation'))?NULL:$recent['id']);
-            echo ' &ndash; '.htmlspecialchars($recent['sum']);
+            echo ' – '.htmlspecialchars($recent['sum']);
 
             echo ' <span class="user">';
                 echo $recent['user'].' '.$recent['ip'];
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 8b646b426..2bb0a863d 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -153,7 +153,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("  <table class=\"inline\">");
         ptln("    <thead>");
         ptln("      <tr>");
-        ptln("        <th>&nbsp;</th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
+        ptln("        <th>&#160;</th><th>".$this->lang["user_id"]."</th><th>".$this->lang["user_name"]."</th><th>".$this->lang["user_mail"]."</th><th>".$this->lang["user_groups"]."</th>");
         ptln("      </tr>");
 
         ptln("      <tr>");
diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 728887687..74aca9c06 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -119,7 +119,7 @@ dw_page = {
                 $handle.addClass('closed');
                 $handle.removeClass('open');
             }else{
-                $clicky.html('<span>&minus;</span>');
+                $clicky.html('<span>−</span>');
                 $handle.addClass('open');
                 $handle.removeClass('closed');
             }
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 3e85c58f2..9a14f29a2 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -61,7 +61,7 @@ if (!defined('DOKU_INC')) die();
 
       <div class="bar-right" id="bar__topright">
         <?php tpl_button('recent')?>
-        <?php tpl_searchform()?>&nbsp;
+        <?php tpl_searchform()?>&#160;
       </div>
 
       <div class="clearer"></div>
@@ -121,7 +121,7 @@ if (!defined('DOKU_INC')) die();
         <?php tpl_button('profile')?>
         <?php tpl_button('login')?>
         <?php tpl_button('index')?>
-        <?php tpl_button('top')?>&nbsp;
+        <?php tpl_button('top')?>&#160;
       </div>
       <div class="clearer"></div>
     </div>
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 0273e5678..4570f70f5 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -54,7 +54,7 @@ if ($ini) {
         echo '<td>'.htmlspecialchars($val).'</td>';
         echo '<td>';
         if(preg_match('/^#[0-f]{3,6}$/i',$val)){
-            echo '<div class="color" style="background-color:'.$val.';">&nbsp;</div>';
+            echo '<div class="color" style="background-color:'.$val.';">&#160;</div>';
         }
         echo '</td>';
         echo '</tr>';