xml compatibility fixes (mainly entities to unicode conversions)

6 files changed, 19 insertions, 19 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']);