From 6a4b449bb45386434f5ddc0cd43d7692b2573e87 Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Wed, 24 Jun 2015 21:59:51 +0000
Subject: [PATCH] wiki: Fix "forgotten" backslashes in text nodes of generated
 html and chm files. Some more improvements of css file

git-svn-id: trunk@49437 -
---
 components/wiki/chm/wiki.css                  | 11 +++--------
 components/wiki/html/wiki.css                 | 11 +++--------
 components/wiki/lazwiki/wiki2xhtmlconvert.pas |  1 +
 components/wiki/lazwiki/wikiparser.pas        |  6 ++++--
 components/wiki/xhtml/wiki.css                | 11 +++--------
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/components/wiki/chm/wiki.css b/components/wiki/chm/wiki.css
index d4ae424154..e3955525c0 100644
--- a/components/wiki/chm/wiki.css
+++ b/components/wiki/chm/wiki.css
@@ -127,7 +127,6 @@ pre, .pascal {
     /*padding: 1em;*/
     padding: 10px;
     overflow: auto;
-/*    line-height: 1.25em;*/
     line-height: 125%;
 }
 
@@ -185,17 +184,15 @@ span.keypress {
     background: #f0ece8;
     padding: 0.1em 0.4em;
     font-size: 80%;
-/*    font-size: 0.8em;*/
     white-space: nowrap;
 }
 
 div.categories {
     background-color: #F9F9F9;
-    border: 1px solid #2F6FAB;
+    border: 1px solid #aaa;
     color: black;
-    padding: 1em;
-    padding-top: 0.75em;
-    line-height: 1.25em;
+    padding: 10px;
+    margin-top: 20px;
 }
 
 
@@ -221,8 +218,6 @@ div.image {
 /* roadmap.css */
 
 table {
-/*    margin-top: 1em;
-    margin-bottom: 1em;*/
     margin-top: 10px;
     margin-bottom: 10px;
     border-collapse: collapse;
diff --git a/components/wiki/html/wiki.css b/components/wiki/html/wiki.css
index d4ae424154..e3955525c0 100644
--- a/components/wiki/html/wiki.css
+++ b/components/wiki/html/wiki.css
@@ -127,7 +127,6 @@ pre, .pascal {
     /*padding: 1em;*/
     padding: 10px;
     overflow: auto;
-/*    line-height: 1.25em;*/
     line-height: 125%;
 }
 
@@ -185,17 +184,15 @@ span.keypress {
     background: #f0ece8;
     padding: 0.1em 0.4em;
     font-size: 80%;
-/*    font-size: 0.8em;*/
     white-space: nowrap;
 }
 
 div.categories {
     background-color: #F9F9F9;
-    border: 1px solid #2F6FAB;
+    border: 1px solid #aaa;
     color: black;
-    padding: 1em;
-    padding-top: 0.75em;
-    line-height: 1.25em;
+    padding: 10px;
+    margin-top: 20px;
 }
 
 
@@ -221,8 +218,6 @@ div.image {
 /* roadmap.css */
 
 table {
-/*    margin-top: 1em;
-    margin-bottom: 1em;*/
     margin-top: 10px;
     margin-bottom: 10px;
     border-collapse: collapse;
diff --git a/components/wiki/lazwiki/wiki2xhtmlconvert.pas b/components/wiki/lazwiki/wiki2xhtmlconvert.pas
index dc818532bd..e161f6c04e 100644
--- a/components/wiki/lazwiki/wiki2xhtmlconvert.pas
+++ b/components/wiki/lazwiki/wiki2xhtmlconvert.pas
@@ -161,6 +161,7 @@ begin
       '"':  Result := Result + '&quot;';
       '''': Result := Result + '&apos;';
       '%':  Result := Result + '&#37;';
+      '\':  Result := Result + '&#92;';
       else  Result := Result + AText[i];
     end;
   end;
diff --git a/components/wiki/lazwiki/wikiparser.pas b/components/wiki/lazwiki/wikiparser.pas
index 4ee8c779fb..429afbb2a6 100644
--- a/components/wiki/lazwiki/wikiparser.pas
+++ b/components/wiki/lazwiki/wikiparser.pas
@@ -1446,7 +1446,9 @@ begin
     FNameValueToken:=TWPNameValueToken.Create(Self,Data);
     while FCurP^<>#0 do begin
       case FCurP^ of
-
+      { wp: this case is responsible that backslashes do no appear in converted
+            windows pathnames. I don't know if a backslash has a special meaning
+            in the wiki syntax.
       '\':
         begin
           // special character as normal character
@@ -1455,7 +1457,7 @@ begin
           FLastEmitPos:=FCurP;
           if FCurP^<>#0 then inc(FCurP);
         end;
-
+      }
       #10,#13:
         begin
           EmitTextToken;
diff --git a/components/wiki/xhtml/wiki.css b/components/wiki/xhtml/wiki.css
index d4ae424154..e3955525c0 100644
--- a/components/wiki/xhtml/wiki.css
+++ b/components/wiki/xhtml/wiki.css
@@ -127,7 +127,6 @@ pre, .pascal {
     /*padding: 1em;*/
     padding: 10px;
     overflow: auto;
-/*    line-height: 1.25em;*/
     line-height: 125%;
 }
 
@@ -185,17 +184,15 @@ span.keypress {
     background: #f0ece8;
     padding: 0.1em 0.4em;
     font-size: 80%;
-/*    font-size: 0.8em;*/
     white-space: nowrap;
 }
 
 div.categories {
     background-color: #F9F9F9;
-    border: 1px solid #2F6FAB;
+    border: 1px solid #aaa;
     color: black;
-    padding: 1em;
-    padding-top: 0.75em;
-    line-height: 1.25em;
+    padding: 10px;
+    margin-top: 20px;
 }
 
 
@@ -221,8 +218,6 @@ div.image {
 /* roadmap.css */
 
 table {
-/*    margin-top: 1em;
-    margin-bottom: 1em;*/
     margin-top: 10px;
     margin-bottom: 10px;
     border-collapse: collapse;