SHA1 Hash:	cacb8db398981c501f4624967b9a1094c2a38db5
Date:	2009-09-26 14:33:22
User:	robert
Comment:	Minor fixes to creole
Timelines:	ancestors | descendants | both | creole
Other Links:	files | ZIP archive | manifest

• bgcolor=#c0ffc0 inherited from [ecd1f09632]
• branch=creole inherited from [7a2c37063a]
• sym-creole inherited from [7a2c37063a]

Modified Makefile from [c357142045] to [21ab1c0c9c].

@@ -24,11 +24,11 @@
 #    the finished binary for fossil.  The BCC compiler above is used
 #    for building intermediate code-generator tools.
 #
 #TCC = gcc -O6
 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
-TCC = gcc -g -Os -Wall
+TCC = gcc  -Os
 
 #### Extra arguments for linking the finished binary.  Fossil needs
 #    to link against the Z-Lib compression library.  There are no
 #    other dependencies.  We sometimes add the -static option here
 #    so that we can build a static executable that will run in a

Modified src/creoleparser.c from [f8a37ab2ca] to [e5d7a584f0].

@@ -362,11 +362,11 @@
   char *s = p->icursor + 3;
 
   int count = p->iend - p->icursor - 6;
   while (count--){
     if (s[0]=='}' && s[1]=='}' && s[2]=='}' && s[3]!='}'){
-      blob_appendf(p->iblob, "<tt style='background:oldlace'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
+      blob_appendf(p->iblob, "<tt class='creole-inline-nowiki'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
       p->icursor = s + 3;
       return 1;
     }
     s++;
   }
@@ -386,11 +386,11 @@
 
   int count = p->iend - p->icursor - 4;
   while (count--){
     if (s[0]=='}' && s[1]=='}'){
       if (!bar) bar = p->icursor + 2;
-      blob_appendf(p->iblob, "<span style='color:green;border:1px solid green;'>%s</span>", htmlize(bar, s - bar ));
+      blob_appendf(p->iblob, "<span class='creole-noimage'>%s</span>", htmlize(bar, s - bar ));
       p->icursor = s + 2;
       return 1;
     }
     if (!bar && s[0]=='|') bar=s+1;
     s++;
@@ -407,13 +407,12 @@
 
   char *s = p->icursor + 2;
 
   int count = p->iend - p->icursor - 3;
   while (count--){
-    blob_appendf(p->iblob, "|~%s|", s,2 );
-    if (s[0]=='>' && s[1]=='>'){
-      blob_appendf(p->iblob, "<span style='color:red;border:1px solid red;'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
+   if (s[0]=='>' && s[1]=='>'){
+      blob_appendf(p->iblob, "<span class='creole-nomacro'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
       p->icursor = s + 2;
       return 1;
     }
     s++;
   }
@@ -739,11 +738,11 @@
     return;
   }
 
   if (node->kind & KIND_NO_WIKI_BLOCK){
     blob_appendf(p->iblob,
-      "\n<blockquote style='background:oldlace'><pre>%s</pre></blockquote>\n",
+      "\n<pre class='creole-block-nowiki'>%s</pre>\n",
         htmlize( node->start, node->end - node->start)
     );
   }
 }
 //}}}

Modified src/style.c from [6ac00aef9b] to [4b7d601cb9].

@@ -416,17 +416,19 @@
 @   border-left: 1px solid #D9D9D9;
 @   border-top: 1px solid #D9D9D9;
 @   vertical-align: center;
 @   empty-cells: show;
 @ }
-@ .creole-nowiki {
+@ .creole-block-nowiki {
 @   background: oldlace;
+@   margin: 2em;
+@   overflow: auto;
 @ }
 @ .creole-inline-nowiki {
 @   background: oldlace;
 @ }
-@ .creole-image {
+@ .creole-noimage {
 @   color:green;
 @   border:1px solid green;
 @ }
 @ .creole-nomacro {
 @   color:red;