Fossil SCM

Minor fixes to creole

robert 2009-09-26 14:33 creole
Commit cacb8db398981c501f4624967b9a1094c2a38db5
Parent 7a39dde24bbc243…
3 files changed +1 -1 +5 -6 +4 -2
~ Makefile ~ src/creoleparser.c ~ src/style.c
M Makefile
+1 -1
--- Makefile
+++ Makefile
@@ -24,11 +24,11 @@
2424
 # the finished binary for fossil. The BCC compiler above is used
2525
 # for building intermediate code-generator tools.
2626
 #
2727
 #TCC = gcc -O6
2828
 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
29
-TCC = gcc -g -Os -Wall
29
+TCC = gcc -Os
3030
3131
 #### Extra arguments for linking the finished binary. Fossil needs
3232
 # to link against the Z-Lib compression library. There are no
3333
 # other dependencies. We sometimes add the -static option here
3434
 # so that we can build a static executable that will run in a
3535
--- Makefile
+++ Makefile
@@ -24,11 +24,11 @@
24 # the finished binary for fossil. The BCC compiler above is used
25 # for building intermediate code-generator tools.
26 #
27 #TCC = gcc -O6
28 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
29 TCC = gcc -g -Os -Wall
30
31 #### Extra arguments for linking the finished binary. Fossil needs
32 # to link against the Z-Lib compression library. There are no
33 # other dependencies. We sometimes add the -static option here
34 # so that we can build a static executable that will run in a
35
--- Makefile
+++ Makefile
@@ -24,11 +24,11 @@
24 # the finished binary for fossil. The BCC compiler above is used
25 # for building intermediate code-generator tools.
26 #
27 #TCC = gcc -O6
28 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
29 TCC = gcc -Os
30
31 #### Extra arguments for linking the finished binary. Fossil needs
32 # to link against the Z-Lib compression library. There are no
33 # other dependencies. We sometimes add the -static option here
34 # so that we can build a static executable that will run in a
35
M src/creoleparser.c
+5 -6
--- src/creoleparser.c
+++ src/creoleparser.c
@@ -362,11 +362,11 @@
362362
 char *s = p->icursor + 3;
363363
364364
 int count = p->iend - p->icursor - 6;
365365
 while (count--){
366366
 if (s[0]=='}' && s[1]=='}' && s[2]=='}' && s[3]!='}'){
367
- blob_appendf(p->iblob, "<tt style='background:oldlace'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
367
+ blob_appendf(p->iblob, "<tt class='creole-inline-nowiki'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
368368
 p->icursor = s + 3;
369369
 return 1;
370370
 }
371371
 s++;
372372
 }
@@ -386,11 +386,11 @@
386386
387387
 int count = p->iend - p->icursor - 4;
388388
 while (count--){
389389
 if (s[0]=='}' && s[1]=='}'){
390390
 if (!bar) bar = p->icursor + 2;
391
- blob_appendf(p->iblob, "<span style='color:green;border:1px solid green;'>%s</span>", htmlize(bar, s - bar ));
391
+ blob_appendf(p->iblob, "<span class='creole-noimage'>%s</span>", htmlize(bar, s - bar ));
392392
 p->icursor = s + 2;
393393
 return 1;
394394
 }
395395
 if (!bar && s[0]=='|') bar=s+1;
396396
 s++;
@@ -407,13 +407,12 @@
407407
408408
 char *s = p->icursor + 2;
409409
410410
 int count = p->iend - p->icursor - 3;
411411
 while (count--){
412
- blob_appendf(p->iblob, "|~%s|", s,2 );
413
- if (s[0]=='>' && s[1]=='>'){
414
- blob_appendf(p->iblob, "<span style='color:red;border:1px solid red;'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
412
+ if (s[0]=='>' && s[1]=='>'){
413
+ blob_appendf(p->iblob, "<span class='creole-nomacro'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
415414
 p->icursor = s + 2;
416415
 return 1;
417416
 }
418417
 s++;
419418
 }
@@ -739,11 +738,11 @@
739738
 return;
740739
 }
741740
742741
 if (node->kind & KIND_NO_WIKI_BLOCK){
743742
 blob_appendf(p->iblob,
744
- "\n<blockquote style='background:oldlace'><pre>%s</pre></blockquote>\n",
743
+ "\n<pre class='creole-block-nowiki'>%s</pre>\n",
745744
 htmlize( node->start, node->end - node->start)
746745
 );
747746
 }
748747
 }
749748
 //}}}
750749
--- src/creoleparser.c
+++ src/creoleparser.c
@@ -362,11 +362,11 @@
362 char *s = p->icursor + 3;
363
364 int count = p->iend - p->icursor - 6;
365 while (count--){
366 if (s[0]=='}' && s[1]=='}' && s[2]=='}' && s[3]!='}'){
367 blob_appendf(p->iblob, "<tt style='background:oldlace'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
368 p->icursor = s + 3;
369 return 1;
370 }
371 s++;
372 }
@@ -386,11 +386,11 @@
386
387 int count = p->iend - p->icursor - 4;
388 while (count--){
389 if (s[0]=='}' && s[1]=='}'){
390 if (!bar) bar = p->icursor + 2;
391 blob_appendf(p->iblob, "<span style='color:green;border:1px solid green;'>%s</span>", htmlize(bar, s - bar ));
392 p->icursor = s + 2;
393 return 1;
394 }
395 if (!bar && s[0]=='|') bar=s+1;
396 s++;
@@ -407,13 +407,12 @@
407
408 char *s = p->icursor + 2;
409
410 int count = p->iend - p->icursor - 3;
411 while (count--){
412 blob_appendf(p->iblob, "|~%s|", s,2 );
413 if (s[0]=='>' && s[1]=='>'){
414 blob_appendf(p->iblob, "<span style='color:red;border:1px solid red;'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
415 p->icursor = s + 2;
416 return 1;
417 }
418 s++;
419 }
@@ -739,11 +738,11 @@
739 return;
740 }
741
742 if (node->kind & KIND_NO_WIKI_BLOCK){
743 blob_appendf(p->iblob,
744 "\n<blockquote style='background:oldlace'><pre>%s</pre></blockquote>\n",
745 htmlize( node->start, node->end - node->start)
746 );
747 }
748 }
749 //}}}
750
--- src/creoleparser.c
+++ src/creoleparser.c
@@ -362,11 +362,11 @@
362 char *s = p->icursor + 3;
363
364 int count = p->iend - p->icursor - 6;
365 while (count--){
366 if (s[0]=='}' && s[1]=='}' && s[2]=='}' && s[3]!='}'){
367 blob_appendf(p->iblob, "<tt class='creole-inline-nowiki'>%s</tt>", htmlize(p->icursor + 3, s - p->icursor-3));
368 p->icursor = s + 3;
369 return 1;
370 }
371 s++;
372 }
@@ -386,11 +386,11 @@
386
387 int count = p->iend - p->icursor - 4;
388 while (count--){
389 if (s[0]=='}' && s[1]=='}'){
390 if (!bar) bar = p->icursor + 2;
391 blob_appendf(p->iblob, "<span class='creole-noimage'>%s</span>", htmlize(bar, s - bar ));
392 p->icursor = s + 2;
393 return 1;
394 }
395 if (!bar && s[0]=='|') bar=s+1;
396 s++;
@@ -407,13 +407,12 @@
407
408 char *s = p->icursor + 2;
409
410 int count = p->iend - p->icursor - 3;
411 while (count--){
412 if (s[0]=='>' && s[1]=='>'){
413 blob_appendf(p->iblob, "<span class='creole-nomacro'>%s</span>", htmlize(p->icursor, s - p->icursor + 2));
 
414 p->icursor = s + 2;
415 return 1;
416 }
417 s++;
418 }
@@ -739,11 +738,11 @@
738 return;
739 }
740
741 if (node->kind & KIND_NO_WIKI_BLOCK){
742 blob_appendf(p->iblob,
743 "\n<pre class='creole-block-nowiki'>%s</pre>\n",
744 htmlize( node->start, node->end - node->start)
745 );
746 }
747 }
748 //}}}
749
M src/style.c
+4 -2
--- src/style.c
+++ src/style.c
@@ -416,17 +416,19 @@
416416
 @ border-left: 1px solid #D9D9D9;
417417
 @ border-top: 1px solid #D9D9D9;
418418
 @ vertical-align: center;
419419
 @ empty-cells: show;
420420
 @ }
421
-@ .creole-nowiki {
421
+@ .creole-block-nowiki {
422422
 @ background: oldlace;
423
+@ margin: 2em;
424
+@ overflow: auto;
423425
 @ }
424426
 @ .creole-inline-nowiki {
425427
 @ background: oldlace;
426428
 @ }
427
-@ .creole-image {
429
+@ .creole-noimage {
428430
 @ color:green;
429431
 @ border:1px solid green;
430432
 @ }
431433
 @ .creole-nomacro {
432434
 @ color:red;
433435
--- src/style.c
+++ src/style.c
@@ -416,17 +416,19 @@
416 @ border-left: 1px solid #D9D9D9;
417 @ border-top: 1px solid #D9D9D9;
418 @ vertical-align: center;
419 @ empty-cells: show;
420 @ }
421 @ .creole-nowiki {
422 @ background: oldlace;
 
 
423 @ }
424 @ .creole-inline-nowiki {
425 @ background: oldlace;
426 @ }
427 @ .creole-image {
428 @ color:green;
429 @ border:1px solid green;
430 @ }
431 @ .creole-nomacro {
432 @ color:red;
433
--- src/style.c
+++ src/style.c
@@ -416,17 +416,19 @@
416 @ border-left: 1px solid #D9D9D9;
417 @ border-top: 1px solid #D9D9D9;
418 @ vertical-align: center;
419 @ empty-cells: show;
420 @ }
421 @ .creole-block-nowiki {
422 @ background: oldlace;
423 @ margin: 2em;
424 @ overflow: auto;
425 @ }
426 @ .creole-inline-nowiki {
427 @ background: oldlace;
428 @ }
429 @ .creole-noimage {
430 @ color:green;
431 @ border:1px solid green;
432 @ }
433 @ .creole-nomacro {
434 @ color:red;
435

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button