SHA1 Hash:	d6bfe8d9a8ea9c417b1594c968f37f0af2ab9de8
Date:	2009-09-23 13:08:33
User:	drh
Comment:	Change default ticket viewer format to display ticket title as wiki. Show event summaries as wiki on the timeline. Allow <nowiki> markup in "NOBLOCK" wiki renderings. Ticket 218153bb7c3.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Modified src/manifest.c from [5e32c12dce] to [daaac5b065].

@@ -952,11 +952,11 @@
       if( strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
         zNewStatus = pManifest->aField[i].zValue;
       }
     }
     if( zNewStatus ){
-      blob_appendf(&comment, "%h ticket [%.10s]: <i>%h</i>",
+      blob_appendf(&comment, "%h ticket [%.10s]: <i>%s</i>",
          zNewStatus, pManifest->zTicketUuid, zTitle
       );
       if( pManifest->nField>1 ){
         blob_appendf(&comment, " plus %d other change%s",
           pManifest->nField-1, pManifest->nField==2 ? "" : "s");
@@ -966,11 +966,11 @@
     }else{
       zNewStatus = db_text("unknown",
          "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
          zStatusColumn, pManifest->zTicketUuid
       );
-      blob_appendf(&comment, "Ticket [%.10s] <i>%h</i> status still %h with "
+      blob_appendf(&comment, "Ticket [%.10s] <i>%s</i> status still %h with "
            "%d other change%s",
            pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
            pManifest->nField==1 ? "" : "s"
       );
       free(zNewStatus);

Modified src/tktsetup.c from [831f07a38a] to [57c97126a8].

@@ -363,11 +363,11 @@
 @ <tr><td align="right">Ticket&nbsp;UUID:</td><td bgcolor="#d0d0d0" colspan="3">
 @ $<tkt_uuid>
 @ </td></tr>
 @ <tr><td align="right">Title:</td>
 @ <td bgcolor="#d0d0d0" colspan="3" valign="top">
-@ $<title>
+@ <th1>wiki $title</th1>
 @ </td></tr>
 @ <tr><td align="right">Status:</td><td bgcolor="#d0d0d0">
 @ $<status>
 @ </td>
 @ <td align="right">Type:</td><td bgcolor="#d0d0d0">

Modified src/wikiformat.c from [0e593fe2f2] to [eea8f89fd5].

@@ -1212,22 +1212,22 @@
         */
         if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){
           /* Do nothing */
         }else
 
-        /* Ignore block markup for in-line rendering.
-        */
-        if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
-          /* Do nothing */
-        }else
-
         if( markup.iCode==MARKUP_NOWIKI ){
           if( markup.endTag ){
             p->state |= ALLOW_WIKI;
           }else{
             p->state &= ~ALLOW_WIKI;
           }
+        }else
+
+        /* Ignore block markup for in-line rendering.
+        */
+        if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
+          /* Do nothing */
         }else
 
         /* Generate end-tags */
         if( markup.endTag ){
           popStackToTag(p, markup.iCode);