Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance the wiki rendering to support <div> markup. The closing </div> tag with and id= attribute can close off <verbatim> and <nowiki>. The wiki append page uses this to prevent unclosed tags from messing up the rendering of subsequent comments. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | e01aa8cb4b23e512b16f6d0bd05646b5 |
| User & Date: | drh 2008-07-17 15:49:24 |
Context
|
2008-07-17
| ||
| 20:34 | Give /wiki a link to the Wiki page with the same name as the Project Name. check-in: 82136b0a user: eric tags: trunk | |
| 15:49 | Enhance the wiki rendering to support <div> markup. The closing </div> tag with and id= attribute can close off <verbatim> and <nowiki>. The wiki append page uses this to prevent unclosed tags from messing up the rendering of subsequent comments. check-in: e01aa8cb user: drh tags: trunk | |
| 01:49 | Avoid the use of chdir() since this seems to cause problems on windows. check-in: 849b94c6 user: drh tags: trunk | |
Changes
Changes to src/wiki.c.
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 ... 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 ... 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 ... 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 ... 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 ... 553 554 555 556 557 558 559 560 561 562 563 564 565 566 |
@ <hr>
blob_reset(&wiki);
}
for(n=2, z=zBody; z[0]; z++){
if( z[0]=='\n' ) n++;
}
if( n<20 ) n = 20;
if( n>200 ) n = 200;
@ <form method="POST" action="%s(g.zBaseURL)/wikiedit">
@ <input type="hidden" name="name" value="%h(zPageName)">
@ <textarea name="w" class="wikiedit" cols="80"
@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
@ <br>
@ <input type="submit" name="preview" value="Preview Your Changes">
@ <input type="submit" name="submit" value="Apply These Changes">
................................................................................
/*
** Append the wiki text for an remark to the end of the given BLOB.
*/
static void appendRemark(Blob *p){
char *zDate;
const char *zUser;
const char *zRemark;
zDate = db_text(0, "SELECT datetime('now')");
blob_appendf(p, "\n\n<hr><i>On %s UTC %h", zDate, g.zLogin);
free(zDate);
zUser = PD("u",g.zLogin);
if( zUser[0] && strcmp(zUser,g.zLogin) ){
blob_appendf(p, " (claiming to be %h)", zUser);
}
zRemark = PD("r","");
blob_appendf(p, " added:</i><br />\n%s", zRemark);
}
/*
** WEBPAGE: wikiappend
** URL: /wikiappend?name=PAGENAME
*/
void wikiappend_page(void){
................................................................................
rid = db_int(0,
"SELECT rid FROM tagxref"
" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
" ORDER BY mtime DESC", zTag
);
free(zTag);
if( !rid ){
cgi_redirect("index");
return;
}
}
if( !g.okApndWiki ){
login_needed();
return;
}
................................................................................
blob_appendf(&body, db_get("sandbox",""));
appendRemark(&body);
db_set("sandbox", blob_str(&body), 0);
}else{
content_get(rid, &content);
manifest_parse(&m, &content);
if( m.type==CFTYPE_WIKI ){
blob_appendf(&body, m.zWiki, -1);
}
manifest_clear(&m);
blob_zero(&wiki);
db_begin_transaction();
zDate = db_text(0, "SELECT datetime('now')");
zDate[10] = 'T';
blob_appendf(&wiki, "D %s\n", zDate);
................................................................................
char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
blob_appendf(&wiki, "P %s\n", zUuid);
free(zUuid);
}
if( g.zLogin ){
blob_appendf(&wiki, "U %F\n", g.zLogin);
}
blob_appendf(&body, "\n<hr>\n");
appendRemark(&body);
blob_appendf(&wiki, "W %d\n%s\n", blob_size(&body), blob_str(&body));
md5sum_blob(&wiki, &cksum);
blob_appendf(&wiki, "Z %b\n", &cksum);
blob_reset(&cksum);
nrid = content_put(&wiki, 0, 0);
db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
................................................................................
@ <blockquote>
@ <br>
@ <center>
@ <cite>
@ <code>
@ <dd>
@ <dfn>
@ <dl>
@ <dt>
@ <em>
@ <font>
@ <h1>
@ <h2>
@ <h3>
|
| > > > | | | | < > |
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 ... 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 ... 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 ... 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 ... 396 397 398 399 400 401 402 403 404 405 406 407 408 409 ... 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 |
@ <hr>
blob_reset(&wiki);
}
for(n=2, z=zBody; z[0]; z++){
if( z[0]=='\n' ) n++;
}
if( n<20 ) n = 20;
if( n>40 ) n = 40;
@ <form method="POST" action="%s(g.zBaseURL)/wikiedit">
@ <input type="hidden" name="name" value="%h(zPageName)">
@ <textarea name="w" class="wikiedit" cols="80"
@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
@ <br>
@ <input type="submit" name="preview" value="Preview Your Changes">
@ <input type="submit" name="submit" value="Apply These Changes">
................................................................................
/*
** Append the wiki text for an remark to the end of the given BLOB.
*/
static void appendRemark(Blob *p){
char *zDate;
const char *zUser;
const char *zRemark;
char *zId;
zDate = db_text(0, "SELECT datetime('now')");
zId = db_text(0, "SELECT lower(hex(randomblob(8)))");
blob_appendf(p, "\n\n<hr><div id=\"%s\"><i>On %s UTC %h",
zId, zDate, g.zLogin);
free(zDate);
zUser = PD("u",g.zLogin);
if( zUser[0] && strcmp(zUser,g.zLogin) ){
blob_appendf(p, " (claiming to be %h)", zUser);
}
zRemark = PD("r","");
blob_appendf(p, " added:</i><br />\n%s</div id=\"%s\">", zRemark, zId);
}
/*
** WEBPAGE: wikiappend
** URL: /wikiappend?name=PAGENAME
*/
void wikiappend_page(void){
................................................................................
rid = db_int(0,
"SELECT rid FROM tagxref"
" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
" ORDER BY mtime DESC", zTag
);
free(zTag);
if( !rid ){
fossil_redirect_home();
return;
}
}
if( !g.okApndWiki ){
login_needed();
return;
}
................................................................................
blob_appendf(&body, db_get("sandbox",""));
appendRemark(&body);
db_set("sandbox", blob_str(&body), 0);
}else{
content_get(rid, &content);
manifest_parse(&m, &content);
if( m.type==CFTYPE_WIKI ){
blob_append(&body, m.zWiki, -1);
}
manifest_clear(&m);
blob_zero(&wiki);
db_begin_transaction();
zDate = db_text(0, "SELECT datetime('now')");
zDate[10] = 'T';
blob_appendf(&wiki, "D %s\n", zDate);
................................................................................
char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
blob_appendf(&wiki, "P %s\n", zUuid);
free(zUuid);
}
if( g.zLogin ){
blob_appendf(&wiki, "U %F\n", g.zLogin);
}
appendRemark(&body);
blob_appendf(&wiki, "W %d\n%s\n", blob_size(&body), blob_str(&body));
md5sum_blob(&wiki, &cksum);
blob_appendf(&wiki, "Z %b\n", &cksum);
blob_reset(&cksum);
nrid = content_put(&wiki, 0, 0);
db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
................................................................................
@ <blockquote>
@ <br>
@ <center>
@ <cite>
@ <code>
@ <dd>
@ <dfn>
@ <div>
@ <dl>
@ <dt>
@ <em>
@ <font>
@ <h1>
@ <h2>
@ <h3>
|
Changes to src/wikiformat.c.
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 ... 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 ... 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 ... 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 ... 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 ... 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 ... 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 ... 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 ... 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 ... 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 ... 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 ... 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 |
#define WIKI_NOBLOCK 0x008 /* No block markup of any kind */ #endif /* ** These are the only markup attributes allowed. */ #define ATTR_ALIGN 0x0000001 #define ATTR_ALT 0x0000002 #define ATTR_BGCOLOR 0x0000004 #define ATTR_BORDER 0x0000008 #define ATTR_CELLPADDING 0x0000010 #define ATTR_CELLSPACING 0x0000020 #define ATTR_CLEAR 0x0000040 #define ATTR_COLOR 0x0000080 #define ATTR_COLSPAN 0x0000100 #define ATTR_COMPACT 0x0000200 #define ATTR_FACE 0x0000400 #define ATTR_HEIGHT 0x0000800 #define ATTR_HREF 0x0001000 #define ATTR_HSPACE 0x0002000 #define ATTR_ID 0x0004000 #define ATTR_NAME 0x0008000 #define ATTR_ROWSPAN 0x0010000 #define ATTR_SIZE 0x0020000 #define ATTR_SRC 0x0040000 #define ATTR_START 0x0080000 #define ATTR_TYPE 0x0100000 #define ATTR_VALIGN 0x0200000 #define ATTR_VALUE 0x0400000 #define ATTR_VSPACE 0x0800000 #define ATTR_WIDTH 0x1000000 static const struct AllowedAttribute { const char *zName; unsigned int iMask; } aAttribute[] = { { 0, 0 }, { "align", ATTR_ALIGN, }, { "alt", ATTR_ALT, }, { "bgcolor", ATTR_BGCOLOR, }, { "border", ATTR_BORDER, }, { "cellpadding", ATTR_CELLPADDING, }, { "cellspacing", ATTR_CELLSPACING, }, { "clear", ATTR_CLEAR, }, { "color", ATTR_COLOR, }, { "colspan", ATTR_COLSPAN, }, { "compact", ATTR_COMPACT, }, { "face", ATTR_FACE, }, { "height", ATTR_HEIGHT, }, { "href", ATTR_HREF, }, { "hspace", ATTR_HSPACE, }, { "id", ATTR_ID, }, { "name", ATTR_NAME, }, { "rowspan", ATTR_ROWSPAN, }, { "size", ATTR_SIZE, }, { "src", ATTR_SRC, }, { "start", ATTR_START, }, { "type", ATTR_TYPE, }, { "valign", ATTR_VALIGN, }, { "value", ATTR_VALUE, }, { "vspace", ATTR_VSPACE, }, { "width", ATTR_WIDTH, }, }; /* ** Use binary search to locate a tag in the aAttribute[] table. */ static int findAttr(const char *z){ int i, c, first, last; ................................................................................ #define MARKUP_BLOCKQUOTE 5 #define MARKUP_BR 6 #define MARKUP_CENTER 7 #define MARKUP_CITE 8 #define MARKUP_CODE 9 #define MARKUP_DD 10 #define MARKUP_DFN 11 #define MARKUP_DL 12 #define MARKUP_DT 13 #define MARKUP_EM 14 #define MARKUP_FONT 15 #define MARKUP_H1 16 #define MARKUP_H2 17 #define MARKUP_H3 18 #define MARKUP_H4 19 #define MARKUP_H5 20 #define MARKUP_H6 21 #define MARKUP_HR 22 #define MARKUP_I 23 #define MARKUP_IMG 24 #define MARKUP_KBD 25 #define MARKUP_LI 26 #define MARKUP_NOBR 27 #define MARKUP_NOWIKI 28 #define MARKUP_OL 29 #define MARKUP_P 30 #define MARKUP_PRE 31 #define MARKUP_S 32 #define MARKUP_SAMP 33 #define MARKUP_SMALL 34 #define MARKUP_STRIKE 35 #define MARKUP_STRONG 36 #define MARKUP_SUB 37 #define MARKUP_SUP 38 #define MARKUP_TABLE 39 #define MARKUP_TD 40 #define MARKUP_TH 41 #define MARKUP_TR 42 #define MARKUP_TT 43 #define MARKUP_U 44 #define MARKUP_UL 45 #define MARKUP_VAR 46 #define MARKUP_VERBATIM 47 /* ** The various markup is divided into the following types: */ #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */ #define MUTYPE_BLOCK 0x0002 /* Forms a new paragraph. ex: <p>, <h2> */ #define MUTYPE_FONT 0x0004 /* Font changes. ex: <b>, <font>, <sub> */ ................................................................................ const char *zName; /* Name of the markup */ char iCode; /* The MARKUP_* code */ short int iType; /* The MUTYPE_* code */ int allowedAttr; /* Allowed attributes on this markup */ } aMarkup[] = { { 0, MARKUP_INVALID, 0, 0 }, { "a", MARKUP_A, MUTYPE_HYPERLINK, ATTR_HREF|ATTR_NAME }, { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 }, { "b", MARKUP_B, MUTYPE_FONT, 0 }, { "big", MARKUP_BIG, MUTYPE_FONT, 0 }, { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 }, { "br", MARKUP_BR, MUTYPE_SINGLE, ATTR_CLEAR }, { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 }, { "cite", MARKUP_CITE, MUTYPE_FONT, 0 }, { "code", MARKUP_CODE, MUTYPE_FONT, 0 }, { "dd", MARKUP_DD, MUTYPE_LI, 0 }, { "dfn", MARKUP_DFN, MUTYPE_FONT, 0 }, { "dl", MARKUP_DL, MUTYPE_LIST, ATTR_COMPACT }, { "dt", MARKUP_DT, MUTYPE_LI, 0 }, { "em", MARKUP_EM, MUTYPE_FONT, 0 }, { "font", MARKUP_FONT, MUTYPE_FONT, ATTR_COLOR|ATTR_FACE|ATTR_SIZE }, { "h1", MARKUP_H1, MUTYPE_BLOCK, ATTR_ALIGN }, { "h2", MARKUP_H2, MUTYPE_BLOCK, ATTR_ALIGN }, { "h3", MARKUP_H3, MUTYPE_BLOCK, ATTR_ALIGN }, { "h4", MARKUP_H4, MUTYPE_BLOCK, ATTR_ALIGN }, { "h5", MARKUP_H5, MUTYPE_BLOCK, ATTR_ALIGN }, { "h6", MARKUP_H6, MUTYPE_BLOCK, ATTR_ALIGN }, { "hr", MARKUP_HR, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_COLOR|ATTR_SIZE|ATTR_WIDTH }, { "i", MARKUP_I, MUTYPE_FONT, 0 }, { "img", MARKUP_IMG, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_ALT|ATTR_BORDER|ATTR_HEIGHT| ATTR_HSPACE|ATTR_SRC|ATTR_VSPACE|ATTR_WIDTH }, { "kbd", MARKUP_KBD, MUTYPE_FONT, 0 }, { "li", MARKUP_LI, MUTYPE_LI, ATTR_TYPE|ATTR_VALUE }, { "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 }, { "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 }, { "ol", MARKUP_OL, MUTYPE_LIST, ATTR_START|ATTR_TYPE|ATTR_COMPACT }, { "p", MARKUP_P, MUTYPE_BLOCK, ATTR_ALIGN }, { "pre", MARKUP_PRE, MUTYPE_BLOCK, 0 }, { "s", MARKUP_S, MUTYPE_FONT, 0 }, { "samp", MARKUP_SAMP, MUTYPE_FONT, 0 }, { "small", MARKUP_SMALL, MUTYPE_FONT, 0 }, { "strike", MARKUP_STRIKE, MUTYPE_FONT, 0 }, { "strong", MARKUP_STRONG, MUTYPE_FONT, 0 }, { "sub", MARKUP_SUB, MUTYPE_FONT, 0 }, { "sup", MARKUP_SUP, MUTYPE_FONT, 0 }, { "table", MARKUP_TABLE, MUTYPE_TABLE, ATTR_ALIGN|ATTR_BGCOLOR|ATTR_BORDER|ATTR_CELLPADDING| ATTR_CELLSPACING|ATTR_HSPACE|ATTR_VSPACE }, { "td", MARKUP_TD, MUTYPE_TD, ATTR_ALIGN|ATTR_BGCOLOR|ATTR_COLSPAN| ATTR_ROWSPAN|ATTR_VALIGN }, { "th", MARKUP_TH, MUTYPE_TD, ATTR_ALIGN|ATTR_BGCOLOR|ATTR_COLSPAN| ATTR_ROWSPAN|ATTR_VALIGN }, { "tr", MARKUP_TR, MUTYPE_TR, ATTR_ALIGN|ATTR_BGCOLOR||ATTR_VALIGN }, { "tt", MARKUP_TT, MUTYPE_FONT, 0 }, { "u", MARKUP_U, MUTYPE_FONT, 0 }, { "ul", MARKUP_UL, MUTYPE_LIST, ATTR_TYPE|ATTR_COMPACT }, { "var", MARKUP_VAR, MUTYPE_FONT, 0 }, { "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, ATTR_ID }, }; /* ** Use binary search to locate a tag in the aMarkup[] table. */ static int findTag(const char *z){ int i, c, first, last; ................................................................................ int inVerbatim; /* True in <verbatim> mode */ int preVerbState; /* Value of state prior to verbatim */ int wantAutoParagraph; /* True if a <p> is desired */ int inAutoParagraph; /* True if within an automatic paragraph */ const char *zVerbatimId; /* The id= attribute of <verbatim> */ int nStack; /* Number of elements on the stack */ int nAlloc; /* Space allocated for aStack */ unsigned char *aStack; /* Open markup stack */ }; /* ** z points to a "<" character. Check to see if this is the start of ** a valid markup. If it is, return the total number of characters in ** the markup including the initial "<" and the terminating ">". If ................................................................................ typedef struct ParsedMarkup ParsedMarkup; struct ParsedMarkup { unsigned char endTag; /* True if </...> instead of <...> */ unsigned char iCode; /* MARKUP_* */ unsigned char nAttr; /* Number of attributes */ unsigned short iType; /* MUTYPE_* */ struct { unsigned char iCode; /* ATTR_* */ char *zValue; /* Argument to this attribute. Might be NULL */ char cTerm; /* Original argument termination character */ } aAttr[10]; }; /* ** z[] is an HTML markup element - something that begins with '<'. ................................................................................ ** Parse this element into the p structure. ** ** The content of z[] might be modified by converting characters ** to lowercase and by inserting some "\000" characters. */ static void parseMarkup(ParsedMarkup *p, char *z){ int i, j, c; int iCode; char *zValue; int seen = 0; char zTag[100]; if( z[1]=='/' ){ p->endTag = 1; i = 2; ................................................................................ int attrOk; /* True to preserver attribute. False to ignore it */ j = 0; while( isalnum(z[i]) ){ if( j<sizeof(zTag)-1 ) zTag[j++] = tolower(z[i]); i++; } zTag[j] = 0; p->aAttr[p->nAttr].iCode = iCode = findAttr(zTag); attrOk = iCode!=0 && (seen & aAttribute[iCode].iMask)==0; while( isspace(z[i]) ){ z++; } if( z[i]!='=' ){ p->aAttr[p->nAttr].zValue = 0; p->aAttr[p->nAttr].cTerm = 0; c = 0; }else{ i++; ................................................................................ p->aAttr[p->nAttr].zValue = zValue; p->aAttr[p->nAttr].cTerm = c = z[i]; z[i] = 0; } i++; } if( attrOk ){ seen |= aAttribute[iCode].iMask; p->nAttr++; } while( isspace(z[i]) ){ i++; } if( z[i]=='>' || (z[i]=='/' && z[i+1]=='>') ) break; } } ................................................................................ static void renderMarkup(Blob *pOut, ParsedMarkup *p){ int i; if( p->endTag ){ blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName); }else{ blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName); for(i=0; i<p->nAttr; i++){ blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iCode].zName); if( p->aAttr[i].zValue ){ blob_appendf(pOut, "=\"%s\"", p->aAttr[i].zValue); } } blob_append(pOut, ">", 1); } } ................................................................................ for(i=0; i<p->nAttr; i++){ char *z = p->aAttr[i].zValue; if( z==0 ) continue; n = strlen(z); z[n] = p->aAttr[i].cTerm; } } /* ** Pop a single element off of the stack. As the element is popped, ** output its end tag. */ static void popStack(Renderer *p){ if( p->nStack ){ p->nStack--; blob_appendf(p->pOut, "</%s>", aMarkup[p->aStack[p->nStack]].zName); } } /* ** Push a new markup value onto the stack. Enlarge the stack ** if necessary. */ static void pushStack(Renderer *p, int elem){ if( p->nStack>=p->nAlloc ){ p->nAlloc = p->nAlloc*2 + 100; p->aStack = realloc(p->aStack, p->nAlloc); if( p->aStack==0 ){ fossil_panic("out of memory"); } } p->aStack[p->nStack++] = elem; } /* ** Pop the stack until the top-most iTag element is removed. ** If there is no iTag element on the stack, this routine ** is a no-op. */ static void popStackToTag(Renderer *p, int iTag){ int i; for(i=p->nStack-1; i>=0 && p->aStack[i]!=iTag; i--){} if( i<0 ) return; while( p->nStack>i ){ popStack(p); } } /* ** Pop the stack until the top-most element of the stack ** is an element that matches the type in iMask. Return ** code of the markup element that is on left on top of the stack. ** If the stack does not have an element ** that matches iMask, then leave the stack unchanged and ** return false (MARKUP_INVALID). */ static int backupToType(Renderer *p, int iMask){ int i; for(i=p->nStack-1; i>=0 && (aMarkup[p->aStack[i]].iType&iMask)==0; i--){} if( i<0 ) return 0; i++; while( p->nStack>i ){ popStack(p); } return p->aStack[i-1]; } /* ** Begin a new paragraph if that something that is needed. */ static void startAutoParagraph(Renderer *p){ if( p->wantAutoParagraph==0 ) return; ................................................................................ } /* ** Return the MUTYPE for the top of the stack. */ static int stackTopType(Renderer *p){ if( p->nStack<=0 ) return 0; return aMarkup[p->aStack[p->nStack-1]].iType; } /* ** Convert the wiki in z[] into html in the renderer p. The ** renderer has already been initialized. ** ** This routine will probably modify the content of z[]. ................................................................................ } case TOKEN_TEXT: { startAutoParagraph(p); blob_append(p->pOut, z, n); break; } case TOKEN_MARKUP: { parseMarkup(&markup, z); if( p->inVerbatim ){ if( endVerbatim(p, &markup) ){ p->inVerbatim = 0; p->state = p->preVerbState; blob_append(p->pOut, "</pre>", 6); }else{ unparseMarkup(&markup); blob_append(p->pOut, "<", 4); n = 1; } }else if( markup.iCode==MARKUP_INVALID ){ unparseMarkup(&markup); startAutoParagraph(p); blob_append(p->pOut, "<", 4); n = 1; }else if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){ /* Do nothing */ }else 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 if( markup.endTag ){ popStackToTag(p, markup.iCode); }else if( markup.iCode==MARKUP_VERBATIM ){ if( markup.nAttr==1 ){ p->zVerbatimId = markup.aAttr[0].zValue; }else{ p->zVerbatimId = 0; } p->inVerbatim = 1; p->preVerbState = p->state; p->state &= ~ALLOW_WIKI; 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); } pushStack(p, MARKUP_LI); renderMarkup(p->pOut, &markup); }else if( markup.iType==MUTYPE_TR ){ if( backupToType(p, MUTYPE_TABLE) ){ pushStack(p, MARKUP_TR); renderMarkup(p->pOut, &markup); } }else if( markup.iType==MUTYPE_TD ){ if( backupToType(p, MUTYPE_TABLE|MUTYPE_TR) ){ if( stackTopType(p)==MUTYPE_TABLE ){ pushStack(p, MARKUP_TR); blob_append(p->pOut, "<tr>", 4); } pushStack(p, markup.iCode); renderMarkup(p->pOut, &markup); } }else if( markup.iType==MUTYPE_HYPERLINK ){ popStackToTag(p, markup.iCode); startAutoParagraph(p); renderMarkup(p->pOut, &markup); pushStack(p, markup.iCode); }else{ if( markup.iType==MUTYPE_FONT ){ startAutoParagraph(p); }else if( markup.iType==MUTYPE_BLOCK ){ p->wantAutoParagraph = 0; } if( (markup.iType & MUTYPE_STACK )!=0 ){ pushStack(p, markup.iCode); |
| | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | > > > > | | | | | | > > > > > > > > > > > > > > | > > > | > | | > | > > > > > | > > > > > > > > > > > > > > > > > > > > | > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > | > > > > | > > | > > > | > > > > > > > > > > > > > | > | > | > | > | | > |
37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 ... 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 ... 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 ... 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 ... 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 ... 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 ... 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 ... 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 ... 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 ... 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 ... 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 .... 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 |
#define WIKI_NOBLOCK 0x008 /* No block markup of any kind */ #endif /* ** These are the only markup attributes allowed. */ #define ATTR_ALIGN 1 #define ATTR_ALT 2 #define ATTR_BGCOLOR 3 #define ATTR_BORDER 4 #define ATTR_CELLPADDING 5 #define ATTR_CELLSPACING 6 #define ATTR_CLEAR 7 #define ATTR_COLOR 8 #define ATTR_COLSPAN 9 #define ATTR_COMPACT 10 #define ATTR_FACE 11 #define ATTR_HEIGHT 12 #define ATTR_HREF 13 #define ATTR_HSPACE 14 #define ATTR_ID 15 #define ATTR_NAME 16 #define ATTR_ROWSPAN 17 #define ATTR_SIZE 18 #define ATTR_SRC 19 #define ATTR_START 20 #define ATTR_TYPE 21 #define ATTR_VALIGN 22 #define ATTR_VALUE 23 #define ATTR_VSPACE 24 #define ATTR_WIDTH 25 #define AMSK_ALIGN 0x0000001 #define AMSK_ALT 0x0000002 #define AMSK_BGCOLOR 0x0000004 #define AMSK_BORDER 0x0000008 #define AMSK_CELLPADDING 0x0000010 #define AMSK_CELLSPACING 0x0000020 #define AMSK_CLEAR 0x0000040 #define AMSK_COLOR 0x0000080 #define AMSK_COLSPAN 0x0000100 #define AMSK_COMPACT 0x0000200 #define AMSK_FACE 0x0000400 #define AMSK_HEIGHT 0x0000800 #define AMSK_HREF 0x0001000 #define AMSK_HSPACE 0x0002000 #define AMSK_ID 0x0004000 #define AMSK_NAME 0x0008000 #define AMSK_ROWSPAN 0x0010000 #define AMSK_SIZE 0x0020000 #define AMSK_SRC 0x0040000 #define AMSK_START 0x0080000 #define AMSK_TYPE 0x0100000 #define AMSK_VALIGN 0x0200000 #define AMSK_VALUE 0x0400000 #define AMSK_VSPACE 0x0800000 #define AMSK_WIDTH 0x1000000 static const struct AllowedAttribute { const char *zName; unsigned int iMask; } aAttribute[] = { { 0, 0 }, { "align", AMSK_ALIGN, }, { "alt", AMSK_ALT, }, { "bgcolor", AMSK_BGCOLOR, }, { "border", AMSK_BORDER, }, { "cellpadding", AMSK_CELLPADDING, }, { "cellspacing", AMSK_CELLSPACING, }, { "clear", AMSK_CLEAR, }, { "color", AMSK_COLOR, }, { "colspan", AMSK_COLSPAN, }, { "compact", AMSK_COMPACT, }, { "face", AMSK_FACE, }, { "height", AMSK_HEIGHT, }, { "href", AMSK_HREF, }, { "hspace", AMSK_HSPACE, }, { "id", AMSK_ID, }, { "name", AMSK_NAME, }, { "rowspan", AMSK_ROWSPAN, }, { "size", AMSK_SIZE, }, { "src", AMSK_SRC, }, { "start", AMSK_START, }, { "type", AMSK_TYPE, }, { "valign", AMSK_VALIGN, }, { "value", AMSK_VALUE, }, { "vspace", AMSK_VSPACE, }, { "width", AMSK_WIDTH, }, }; /* ** Use binary search to locate a tag in the aAttribute[] table. */ static int findAttr(const char *z){ int i, c, first, last; ................................................................................ #define MARKUP_BLOCKQUOTE 5 #define MARKUP_BR 6 #define MARKUP_CENTER 7 #define MARKUP_CITE 8 #define MARKUP_CODE 9 #define MARKUP_DD 10 #define MARKUP_DFN 11 #define MARKUP_DIV 12 #define MARKUP_DL 13 #define MARKUP_DT 14 #define MARKUP_EM 15 #define MARKUP_FONT 16 #define MARKUP_H1 17 #define MARKUP_H2 18 #define MARKUP_H3 19 #define MARKUP_H4 20 #define MARKUP_H5 21 #define MARKUP_H6 22 #define MARKUP_HR 23 #define MARKUP_I 24 #define MARKUP_IMG 25 #define MARKUP_KBD 26 #define MARKUP_LI 27 #define MARKUP_NOBR 28 #define MARKUP_NOWIKI 29 #define MARKUP_OL 30 #define MARKUP_P 31 #define MARKUP_PRE 32 #define MARKUP_S 33 #define MARKUP_SAMP 34 #define MARKUP_SMALL 35 #define MARKUP_STRIKE 36 #define MARKUP_STRONG 37 #define MARKUP_SUB 38 #define MARKUP_SUP 39 #define MARKUP_TABLE 40 #define MARKUP_TD 41 #define MARKUP_TH 42 #define MARKUP_TR 43 #define MARKUP_TT 44 #define MARKUP_U 45 #define MARKUP_UL 46 #define MARKUP_VAR 47 #define MARKUP_VERBATIM 48 /* ** The various markup is divided into the following types: */ #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */ #define MUTYPE_BLOCK 0x0002 /* Forms a new paragraph. ex: <p>, <h2> */ #define MUTYPE_FONT 0x0004 /* Font changes. ex: <b>, <font>, <sub> */ ................................................................................ const char *zName; /* Name of the markup */ char iCode; /* The MARKUP_* code */ short int iType; /* The MUTYPE_* code */ int allowedAttr; /* Allowed attributes on this markup */ } aMarkup[] = { { 0, MARKUP_INVALID, 0, 0 }, { "a", MARKUP_A, MUTYPE_HYPERLINK, AMSK_HREF|AMSK_NAME }, { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 }, { "b", MARKUP_B, MUTYPE_FONT, 0 }, { "big", MARKUP_BIG, MUTYPE_FONT, 0 }, { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 }, { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR }, { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 }, { "cite", MARKUP_CITE, MUTYPE_FONT, 0 }, { "code", MARKUP_CODE, MUTYPE_FONT, 0 }, { "dd", MARKUP_DD, MUTYPE_LI, 0 }, { "dfn", MARKUP_DFN, MUTYPE_FONT, 0 }, { "div", MARKUP_DIV, MUTYPE_BLOCK, AMSK_ID }, { "dl", MARKUP_DL, MUTYPE_LIST, AMSK_COMPACT }, { "dt", MARKUP_DT, MUTYPE_LI, 0 }, { "em", MARKUP_EM, MUTYPE_FONT, 0 }, { "font", MARKUP_FONT, MUTYPE_FONT, AMSK_COLOR|AMSK_FACE|AMSK_SIZE }, { "h1", MARKUP_H1, MUTYPE_BLOCK, AMSK_ALIGN }, { "h2", MARKUP_H2, MUTYPE_BLOCK, AMSK_ALIGN }, { "h3", MARKUP_H3, MUTYPE_BLOCK, AMSK_ALIGN }, { "h4", MARKUP_H4, MUTYPE_BLOCK, AMSK_ALIGN }, { "h5", MARKUP_H5, MUTYPE_BLOCK, AMSK_ALIGN }, { "h6", MARKUP_H6, MUTYPE_BLOCK, AMSK_ALIGN }, { "hr", MARKUP_HR, MUTYPE_SINGLE, AMSK_ALIGN|AMSK_COLOR|AMSK_SIZE|AMSK_WIDTH }, { "i", MARKUP_I, MUTYPE_FONT, 0 }, { "img", MARKUP_IMG, MUTYPE_SINGLE, AMSK_ALIGN|AMSK_ALT|AMSK_BORDER|AMSK_HEIGHT| AMSK_HSPACE|AMSK_SRC|AMSK_VSPACE|AMSK_WIDTH }, { "kbd", MARKUP_KBD, MUTYPE_FONT, 0 }, { "li", MARKUP_LI, MUTYPE_LI, AMSK_TYPE|AMSK_VALUE }, { "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 }, { "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 }, { "ol", MARKUP_OL, MUTYPE_LIST, AMSK_START|AMSK_TYPE|AMSK_COMPACT }, { "p", MARKUP_P, MUTYPE_BLOCK, AMSK_ALIGN }, { "pre", MARKUP_PRE, MUTYPE_BLOCK, 0 }, { "s", MARKUP_S, MUTYPE_FONT, 0 }, { "samp", MARKUP_SAMP, MUTYPE_FONT, 0 }, { "small", MARKUP_SMALL, MUTYPE_FONT, 0 }, { "strike", MARKUP_STRIKE, MUTYPE_FONT, 0 }, { "strong", MARKUP_STRONG, MUTYPE_FONT, 0 }, { "sub", MARKUP_SUB, MUTYPE_FONT, 0 }, { "sup", MARKUP_SUP, MUTYPE_FONT, 0 }, { "table", MARKUP_TABLE, MUTYPE_TABLE, AMSK_ALIGN|AMSK_BGCOLOR|AMSK_BORDER|AMSK_CELLPADDING| AMSK_CELLSPACING|AMSK_HSPACE|AMSK_VSPACE }, { "td", MARKUP_TD, MUTYPE_TD, AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN| AMSK_ROWSPAN|AMSK_VALIGN }, { "th", MARKUP_TH, MUTYPE_TD, AMSK_ALIGN|AMSK_BGCOLOR|AMSK_COLSPAN| AMSK_ROWSPAN|AMSK_VALIGN }, { "tr", MARKUP_TR, MUTYPE_TR, AMSK_ALIGN|AMSK_BGCOLOR||AMSK_VALIGN }, { "tt", MARKUP_TT, MUTYPE_FONT, 0 }, { "u", MARKUP_U, MUTYPE_FONT, 0 }, { "ul", MARKUP_UL, MUTYPE_LIST, AMSK_TYPE|AMSK_COMPACT }, { "var", MARKUP_VAR, MUTYPE_FONT, 0 }, { "verbatim", MARKUP_VERBATIM, MUTYPE_SPECIAL, AMSK_ID }, }; /* ** Use binary search to locate a tag in the aMarkup[] table. */ static int findTag(const char *z){ int i, c, first, last; ................................................................................ int inVerbatim; /* True in <verbatim> mode */ int preVerbState; /* Value of state prior to verbatim */ int wantAutoParagraph; /* True if a <p> is desired */ int inAutoParagraph; /* True if within an automatic paragraph */ const char *zVerbatimId; /* The id= attribute of <verbatim> */ int nStack; /* Number of elements on the stack */ int nAlloc; /* Space allocated for aStack */ struct sStack { short iCode; /* Markup code */ short allowWiki; /* ALLOW_WIKI if wiki allowed before tag */ const char *zId; /* ID attribute or NULL */ } *aStack; }; /* ** z points to a "<" character. Check to see if this is the start of ** a valid markup. If it is, return the total number of characters in ** the markup including the initial "<" and the terminating ">". If ................................................................................ typedef struct ParsedMarkup ParsedMarkup; struct ParsedMarkup { unsigned char endTag; /* True if </...> instead of <...> */ unsigned char iCode; /* MARKUP_* */ unsigned char nAttr; /* Number of attributes */ unsigned short iType; /* MUTYPE_* */ struct { unsigned char iACode; /* ATTR_* */ char *zValue; /* Argument to this attribute. Might be NULL */ char cTerm; /* Original argument termination character */ } aAttr[10]; }; /* ** z[] is an HTML markup element - something that begins with '<'. ................................................................................ ** Parse this element into the p structure. ** ** The content of z[] might be modified by converting characters ** to lowercase and by inserting some "\000" characters. */ static void parseMarkup(ParsedMarkup *p, char *z){ int i, j, c; int iACode; char *zValue; int seen = 0; char zTag[100]; if( z[1]=='/' ){ p->endTag = 1; i = 2; ................................................................................ int attrOk; /* True to preserver attribute. False to ignore it */ j = 0; while( isalnum(z[i]) ){ if( j<sizeof(zTag)-1 ) zTag[j++] = tolower(z[i]); i++; } zTag[j] = 0; p->aAttr[p->nAttr].iACode = iACode = findAttr(zTag); attrOk = iACode!=0 && (seen & aAttribute[iACode].iMask)==0; while( isspace(z[i]) ){ z++; } if( z[i]!='=' ){ p->aAttr[p->nAttr].zValue = 0; p->aAttr[p->nAttr].cTerm = 0; c = 0; }else{ i++; ................................................................................ p->aAttr[p->nAttr].zValue = zValue; p->aAttr[p->nAttr].cTerm = c = z[i]; z[i] = 0; } i++; } if( attrOk ){ seen |= aAttribute[iACode].iMask; p->nAttr++; } while( isspace(z[i]) ){ i++; } if( z[i]=='>' || (z[i]=='/' && z[i+1]=='>') ) break; } } ................................................................................ static void renderMarkup(Blob *pOut, ParsedMarkup *p){ int i; if( p->endTag ){ blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName); }else{ blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName); for(i=0; i<p->nAttr; i++){ blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName); if( p->aAttr[i].zValue ){ blob_appendf(pOut, "=\"%s\"", p->aAttr[i].zValue); } } blob_append(pOut, ">", 1); } } ................................................................................ for(i=0; i<p->nAttr; i++){ char *z = p->aAttr[i].zValue; if( z==0 ) continue; n = strlen(z); z[n] = p->aAttr[i].cTerm; } } /* ** Return the ID attribute for markup. Return NULL if there is no ** ID attribute. */ static const char *markupId(ParsedMarkup *p){ int i; for(i=0; i<p->nAttr; i++){ if( p->aAttr[i].iACode==ATTR_ID ){ return p->aAttr[i].zValue; } } return 0; } /* ** Pop a single element off of the stack. As the element is popped, ** output its end tag if it is not a </div> tag. */ static void popStack(Renderer *p){ if( p->nStack ){ int iCode; p->nStack--; iCode = p->aStack[p->nStack].iCode; if( iCode!=MARKUP_DIV ){ blob_appendf(p->pOut, "</%s>", aMarkup[iCode].zName); } } } /* ** Push a new markup value onto the stack. Enlarge the stack ** if necessary. */ static void pushStackWithId(Renderer *p, int elem, const char *zId, int w){ if( p->nStack>=p->nAlloc ){ p->nAlloc = p->nAlloc*2 + 100; p->aStack = realloc(p->aStack, p->nAlloc*sizeof(p->aStack[0])); if( p->aStack==0 ){ fossil_panic("out of memory"); } } p->aStack[p->nStack].iCode = elem; p->aStack[p->nStack].zId = zId; p->aStack[p->nStack].allowWiki = w; p->nStack++; } static void pushStack(Renderer *p, int elem){ pushStackWithId(p, elem, 0, 0); } /* ** Pop the stack until the top-most iTag element is removed. ** If there is no iTag element on the stack, this routine ** is a no-op. */ static void popStackToTag(Renderer *p, int iTag){ int i; for(i=p->nStack-1; i>=0; i--){ if( p->aStack[i].iCode!=iTag ) continue; if( p->aStack[i].zId ) continue; break; } if( i<0 ) return; while( p->nStack>i ){ popStack(p); } } /* ** Attempt to find a find a tag of type iTag with id zId. Return -1 ** if not found. If found, return its stack level. */ static int findTagWithId(Renderer *p, int iTag, const char *zId){ int i; assert( zId!=0 ); for(i=p->nStack-1; i>=0; i--){ if( p->aStack[i].iCode!=iTag ) continue; if( p->aStack[i].zId==0 ) continue; if( strcmp(zId, p->aStack[i].zId)!=0 ) continue; break; } return i; } /* ** Pop the stack until the top-most element of the stack ** is an element that matches the type in iMask. Return ** code of the markup element that is on left on top of the stack. ** If the stack does not have an element ** that matches iMask, then leave the stack unchanged and ** return false (MARKUP_INVALID). */ static int backupToType(Renderer *p, int iMask){ int i; for(i=p->nStack-1; i>=0; i--){ if( aMarkup[p->aStack[i].iCode].iType & iMask ) break; } if( i<0 ) return 0; i++; while( p->nStack>i ){ popStack(p); } return p->aStack[i-1].iCode; } /* ** Begin a new paragraph if that something that is needed. */ static void startAutoParagraph(Renderer *p){ if( p->wantAutoParagraph==0 ) return; ................................................................................ } /* ** Return the MUTYPE for the top of the stack. */ static int stackTopType(Renderer *p){ if( p->nStack<=0 ) return 0; return aMarkup[p->aStack[p->nStack-1].iCode].iType; } /* ** Convert the wiki in z[] into html in the renderer p. The ** renderer has already been initialized. ** ** This routine will probably modify the content of z[]. ................................................................................ } case TOKEN_TEXT: { startAutoParagraph(p); blob_append(p->pOut, z, n); break; } case TOKEN_MARKUP: { const char *zId; int iDiv; parseMarkup(&markup, z); /* Markup of the form </div id=ID> where there is a matching ** ID somewhere on the stack. Exit the verbatim if were are in ** it. Pop the stack up to the matching <div>. Discard the ** </div> */ if( markup.iCode==MARKUP_DIV && markup.endTag && (zId = markupId(&markup))!=0 && (iDiv = findTagWithId(p, MARKUP_DIV, zId))>=0 ){ if( p->inVerbatim ){ p->inVerbatim = 0; p->state = p->preVerbState; blob_append(p->pOut, "</pre>", 6); } while( p->nStack>iDiv+1 ) popStack(p); if( p->aStack[iDiv].allowWiki ){ p->state |= ALLOW_WIKI; }else{ p->state &= ~ALLOW_WIKI; } assert( p->nStack==iDiv+1 ); p->nStack--; }else /* If within <verbatim id=ID> ignore everything other than ** </verbatim id=ID> and the </dev id=ID2> above. */ if( p->inVerbatim ){ if( endVerbatim(p, &markup) ){ p->inVerbatim = 0; p->state = p->preVerbState; blob_append(p->pOut, "</pre>", 6); }else{ unparseMarkup(&markup); blob_append(p->pOut, "<", 4); n = 1; } }else /* Render invalid markup literally. The markup appears in the ** final output as plain text. */ if( markup.iCode==MARKUP_INVALID ){ unparseMarkup(&markup); startAutoParagraph(p); blob_append(p->pOut, "<", 4); n = 1; }else /* If the markup is not font-change markup ignore it if the ** font-change-only flag is set. */ 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 /* Generate end-tags */ if( markup.endTag ){ popStackToTag(p, markup.iCode); }else /* Push <div> markup onto the stack together with the id=ID attribute. */ if( markup.iCode==MARKUP_DIV ){ pushStackWithId(p, markup.iCode, markupId(&markup), (p->state & ALLOW_WIKI)!=0); }else /* Enter <verbatim> processing. With verbatim enabled, all other ** markup other than the corresponding end-tag with the same ID is ** ignored. */ if( markup.iCode==MARKUP_VERBATIM ){ if( markup.nAttr==1 ){ p->zVerbatimId = markup.aAttr[0].zValue; }else{ p->zVerbatimId = 0; } p->inVerbatim = 1; p->preVerbState = p->state; p->state &= ~ALLOW_WIKI; 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); } pushStack(p, MARKUP_LI); renderMarkup(p->pOut, &markup); }else if( markup.iType==MUTYPE_TR ){ if( backupToType(p, MUTYPE_TABLE) ){ pushStack(p, MARKUP_TR); renderMarkup(p->pOut, &markup); } }else if( markup.iType==MUTYPE_TD ){ if( backupToType(p, MUTYPE_TABLE|MUTYPE_TR) ){ if( stackTopType(p)==MUTYPE_TABLE ){ pushStack(p, MARKUP_TR); blob_append(p->pOut, "<tr>", 4); } pushStack(p, markup.iCode); renderMarkup(p->pOut, &markup); } }else if( markup.iType==MUTYPE_HYPERLINK ){ popStackToTag(p, markup.iCode); startAutoParagraph(p); renderMarkup(p->pOut, &markup); pushStack(p, markup.iCode); }else { if( markup.iType==MUTYPE_FONT ){ startAutoParagraph(p); }else if( markup.iType==MUTYPE_BLOCK ){ p->wantAutoParagraph = 0; } if( (markup.iType & MUTYPE_STACK )!=0 ){ pushStack(p, markup.iCode); |