SHA1 Hash:	81eb00def74419c7881cb4296613288ecce2f25e
Date:	2008-05-16 16:01:06
User:	drh
Comment:	Merge in stephan's fork.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/style.c from [93f13836b2] to [ba8c800cff].

@@ -304,10 +304,16 @@
 @   padding: 5px 10px 5px 10px;
 @   text-align: right;
 @   background-color: #558195;
 @   color: white;
 @ }
+@
+@ /* <verbatim> blocks */
+@ pre.verbatim {
+@    background-color: #f5f5f5;
+@    padding: 0.5em;
+@}
 @
 @ /* The label/value pairs on (for example) the vinfo page */
 @ table.label-value th {
 @   vertical-align: top;
 @   text-align: right;

Modified src/wikiformat.c from [1c1385ba0c] to [33d82dd4cf].

@@ -1021,11 +1021,11 @@
             p->zVerbatimId = 0;
           }
           p->inVerbatim = 1;
           p->preVerbState = p->state;
           p->state &= ~ALLOW_WIKI;
-          blob_append(p->pOut, "<pre>", 5);
+          blob_append(p->pOut, "<pre class='verbatim'>",-1);
           p->wantAutoParagraph = 0;
         }else if( markup.iType==MUTYPE_LI ){
           if( backupToType(p, MUTYPE_LIST)==0 ){
             pushStack(p, MARKUP_UL);
             blob_append(p->pOut, "<ul>", 4);