paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 12:12:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

wiki: Fix "forgotten" backslashes in text nodes of generated html and chm files. Some more improvements of css file

Browse Source 
git-svn-id: trunk@49437 -
This commit is contained in:
wp 2015-06-24 21:59:51 +00:00
parent c65d9574ef
commit 6a4b449bb4
5 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/wiki/chm/wiki.css
View File

@ -127,7 +127,6 @@ pre, .pascal {
/*padding: 1em;*/ /*padding: 1em;*/
padding: 10px; padding: 10px;
overflow: auto; overflow: auto;
/* line-height: 1.25em;*/
line-height: 125%; line-height: 125%;
} }
@ -185,17 +184,15 @@ span.keypress {
background: #f0ece8; background: #f0ece8;
padding: 0.1em 0.4em; padding: 0.1em 0.4em;
font-size: 80%; font-size: 80%;
/* font-size: 0.8em;*/
white-space: nowrap; white-space: nowrap;
} }
div.categories { div.categories {
background-color: #F9F9F9; background-color: #F9F9F9;
border: 1px solid #2F6FAB; border: 1px solid #aaa;
color: black; color: black;
padding: 1em; padding: 10px;
padding-top: 0.75em; margin-top: 20px;
line-height: 1.25em;
} }
@ -221,8 +218,6 @@ div.image {
/* roadmap.css */ /* roadmap.css */
table { table {
/* margin-top: 1em;
margin-bottom: 1em;*/
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-collapse: collapse; border-collapse: collapse;

11
components/wiki/html/wiki.css
View File

@ -127,7 +127,6 @@ pre, .pascal {
/*padding: 1em;*/ /*padding: 1em;*/
padding: 10px; padding: 10px;
overflow: auto; overflow: auto;
/* line-height: 1.25em;*/
line-height: 125%; line-height: 125%;
} }
@ -185,17 +184,15 @@ span.keypress {
background: #f0ece8; background: #f0ece8;
padding: 0.1em 0.4em; padding: 0.1em 0.4em;
font-size: 80%; font-size: 80%;
/* font-size: 0.8em;*/
white-space: nowrap; white-space: nowrap;
} }
div.categories { div.categories {
background-color: #F9F9F9; background-color: #F9F9F9;
border: 1px solid #2F6FAB; border: 1px solid #aaa;
color: black; color: black;
padding: 1em; padding: 10px;
padding-top: 0.75em; margin-top: 20px;
line-height: 1.25em;
} }
@ -221,8 +218,6 @@ div.image {
/* roadmap.css */ /* roadmap.css */
table { table {
/* margin-top: 1em;
margin-bottom: 1em;*/
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-collapse: collapse; border-collapse: collapse;

1
components/wiki/lazwiki/wiki2xhtmlconvert.pas
View File

@ -161,6 +161,7 @@ begin
'"': Result := Result + '"'; '"': Result := Result + '"';
'''': Result := Result + '''; '''': Result := Result + ''';
'%': Result := Result + '%'; '%': Result := Result + '%';
'\': Result := Result + '\';
else Result := Result + AText[i]; else Result := Result + AText[i];
end; end;
end; end;

6
components/wiki/lazwiki/wikiparser.pas
View File

@ -1446,7 +1446,9 @@ begin
FNameValueToken:=TWPNameValueToken.Create(Self,Data); FNameValueToken:=TWPNameValueToken.Create(Self,Data);
while FCurP^<>#0 do begin while FCurP^<>#0 do begin
case FCurP^ of 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 begin
// special character as normal character // special character as normal character
@ -1455,7 +1457,7 @@ begin
FLastEmitPos:=FCurP; FLastEmitPos:=FCurP;
if FCurP^<>#0 then inc(FCurP); if FCurP^<>#0 then inc(FCurP);
end; end;
}
#10,#13: #10,#13:
begin begin
EmitTextToken; EmitTextToken;

11
components/wiki/xhtml/wiki.css
View File

@ -127,7 +127,6 @@ pre, .pascal {
/*padding: 1em;*/ /*padding: 1em;*/
padding: 10px; padding: 10px;
overflow: auto; overflow: auto;
/* line-height: 1.25em;*/
line-height: 125%; line-height: 125%;
} }
@ -185,17 +184,15 @@ span.keypress {
background: #f0ece8; background: #f0ece8;
padding: 0.1em 0.4em; padding: 0.1em 0.4em;
font-size: 80%; font-size: 80%;
/* font-size: 0.8em;*/
white-space: nowrap; white-space: nowrap;
} }
div.categories { div.categories {
background-color: #F9F9F9; background-color: #F9F9F9;
border: 1px solid #2F6FAB; border: 1px solid #aaa;
color: black; color: black;
padding: 1em; padding: 10px;
padding-top: 0.75em; margin-top: 20px;
line-height: 1.25em;
} }
@ -221,8 +218,6 @@ div.image {
/* roadmap.css */ /* roadmap.css */
table { table {
/* margin-top: 1em;
margin-bottom: 1em;*/
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-collapse: collapse; border-collapse: collapse;