Fossil SCM
Merge in stephan's fork.
Commit
81eb00def74419c7881cb4296613288ecce2f25e
Parent
e5aac82dd59bc70…
2 files changed
+6
+1
-1
+6
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -304,10 +304,16 @@ | ||
| 304 | 304 | @ padding: 5px 10px 5px 10px; |
| 305 | 305 | @ text-align: right; |
| 306 | 306 | @ background-color: #558195; |
| 307 | 307 | @ color: white; |
| 308 | 308 | @ } |
| 309 | +@ | |
| 310 | +@ /* <verbatim> blocks */ | |
| 311 | +@ pre.verbatim { | |
| 312 | +@ background-color: #f5f5f5; | |
| 313 | +@ padding: 0.5em; | |
| 314 | +@} | |
| 309 | 315 | @ |
| 310 | 316 | @ /* The label/value pairs on (for example) the vinfo page */ |
| 311 | 317 | @ table.label-value th { |
| 312 | 318 | @ vertical-align: top; |
| 313 | 319 | @ text-align: right; |
| 314 | 320 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -304,10 +304,16 @@ | |
| 304 | @ padding: 5px 10px 5px 10px; |
| 305 | @ text-align: right; |
| 306 | @ background-color: #558195; |
| 307 | @ color: white; |
| 308 | @ } |
| 309 | @ |
| 310 | @ /* The label/value pairs on (for example) the vinfo page */ |
| 311 | @ table.label-value th { |
| 312 | @ vertical-align: top; |
| 313 | @ text-align: right; |
| 314 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -304,10 +304,16 @@ | |
| 304 | @ padding: 5px 10px 5px 10px; |
| 305 | @ text-align: right; |
| 306 | @ background-color: #558195; |
| 307 | @ color: white; |
| 308 | @ } |
| 309 | @ |
| 310 | @ /* <verbatim> blocks */ |
| 311 | @ pre.verbatim { |
| 312 | @ background-color: #f5f5f5; |
| 313 | @ padding: 0.5em; |
| 314 | @} |
| 315 | @ |
| 316 | @ /* The label/value pairs on (for example) the vinfo page */ |
| 317 | @ table.label-value th { |
| 318 | @ vertical-align: top; |
| 319 | @ text-align: right; |
| 320 |
+1
-1
| --- src/wikiformat.c | ||
| +++ src/wikiformat.c | ||
| @@ -1021,11 +1021,11 @@ | ||
| 1021 | 1021 | p->zVerbatimId = 0; |
| 1022 | 1022 | } |
| 1023 | 1023 | p->inVerbatim = 1; |
| 1024 | 1024 | p->preVerbState = p->state; |
| 1025 | 1025 | p->state &= ~ALLOW_WIKI; |
| 1026 | - blob_append(p->pOut, "<pre>", 5); | |
| 1026 | + blob_append(p->pOut, "<pre class='verbatim'>",-1); | |
| 1027 | 1027 | p->wantAutoParagraph = 0; |
| 1028 | 1028 | }else if( markup.iType==MUTYPE_LI ){ |
| 1029 | 1029 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1030 | 1030 | pushStack(p, MARKUP_UL); |
| 1031 | 1031 | blob_append(p->pOut, "<ul>", 4); |
| 1032 | 1032 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1021,11 +1021,11 @@ | |
| 1021 | p->zVerbatimId = 0; |
| 1022 | } |
| 1023 | p->inVerbatim = 1; |
| 1024 | p->preVerbState = p->state; |
| 1025 | p->state &= ~ALLOW_WIKI; |
| 1026 | blob_append(p->pOut, "<pre>", 5); |
| 1027 | p->wantAutoParagraph = 0; |
| 1028 | }else if( markup.iType==MUTYPE_LI ){ |
| 1029 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1030 | pushStack(p, MARKUP_UL); |
| 1031 | blob_append(p->pOut, "<ul>", 4); |
| 1032 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1021,11 +1021,11 @@ | |
| 1021 | p->zVerbatimId = 0; |
| 1022 | } |
| 1023 | p->inVerbatim = 1; |
| 1024 | p->preVerbState = p->state; |
| 1025 | p->state &= ~ALLOW_WIKI; |
| 1026 | blob_append(p->pOut, "<pre class='verbatim'>",-1); |
| 1027 | p->wantAutoParagraph = 0; |
| 1028 | }else if( markup.iType==MUTYPE_LI ){ |
| 1029 | if( backupToType(p, MUTYPE_LIST)==0 ){ |
| 1030 | pushStack(p, MARKUP_UL); |
| 1031 | blob_append(p->pOut, "<ul>", 4); |
| 1032 |