Fossil SCM
Further tweaks to the markdown style formatting in wiki.
Commit
1029539757cb1ee369819f7ff3f5e648495029e25f523cff6f48c9079cfe507c
Parent
079615cb7a412aa…
2 files changed
+1
-1
+5
+1
-1
| --- src/printf.c | ||
| +++ src/printf.c | ||
| @@ -262,11 +262,11 @@ | ||
| 262 | 262 | } |
| 263 | 263 | if( db_get_boolean("timeline-plaintext", 0) ){ |
| 264 | 264 | wikiFlags |= WIKI_LINKSONLY; |
| 265 | 265 | wikiFlags &= ~WIKI_MARKDOWN_INLINE; |
| 266 | 266 | }else{ |
| 267 | - int x = db_get_boolean("timeline-markdown", 0); | |
| 267 | + int x = db_get_int("timeline-markdown", 0); | |
| 268 | 268 | if( x & 1 ) wikiFlags |= WIKI_MARKDOWN_LINK; |
| 269 | 269 | if( x & 2 ) wikiFlags |= WIKI_MARKDOWN_FONT; |
| 270 | 270 | } |
| 271 | 271 | if( db_get_boolean("timeline-hard-newlines", 0) ){ |
| 272 | 272 | wikiFlags |= WIKI_NEWLINE; |
| 273 | 273 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -262,11 +262,11 @@ | |
| 262 | } |
| 263 | if( db_get_boolean("timeline-plaintext", 0) ){ |
| 264 | wikiFlags |= WIKI_LINKSONLY; |
| 265 | wikiFlags &= ~WIKI_MARKDOWN_INLINE; |
| 266 | }else{ |
| 267 | int x = db_get_boolean("timeline-markdown", 0); |
| 268 | if( x & 1 ) wikiFlags |= WIKI_MARKDOWN_LINK; |
| 269 | if( x & 2 ) wikiFlags |= WIKI_MARKDOWN_FONT; |
| 270 | } |
| 271 | if( db_get_boolean("timeline-hard-newlines", 0) ){ |
| 272 | wikiFlags |= WIKI_NEWLINE; |
| 273 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -262,11 +262,11 @@ | |
| 262 | } |
| 263 | if( db_get_boolean("timeline-plaintext", 0) ){ |
| 264 | wikiFlags |= WIKI_LINKSONLY; |
| 265 | wikiFlags &= ~WIKI_MARKDOWN_INLINE; |
| 266 | }else{ |
| 267 | int x = db_get_int("timeline-markdown", 0); |
| 268 | if( x & 1 ) wikiFlags |= WIKI_MARKDOWN_LINK; |
| 269 | if( x & 2 ) wikiFlags |= WIKI_MARKDOWN_FONT; |
| 270 | } |
| 271 | if( db_get_boolean("timeline-hard-newlines", 0) ){ |
| 272 | wikiFlags |= WIKI_NEWLINE; |
| 273 |
+5
| --- src/wikiformat.c | ||
| +++ src/wikiformat.c | ||
| @@ -1550,10 +1550,11 @@ | ||
| 1550 | 1550 | if( tokenType==TOKEN_MDFONT |
| 1551 | 1551 | && n==sz |
| 1552 | 1552 | && z[i]==z[0] |
| 1553 | 1553 | && !inCode |
| 1554 | 1554 | && (!fossil_isspace(z[i+n]) || !fossil_isspace(z[i-1])) |
| 1555 | + && (!fossil_isalnum(z[i+n]) || !fossil_isalnum(z[i-1])) | |
| 1555 | 1556 | ){ |
| 1556 | 1557 | return 1; |
| 1557 | 1558 | } |
| 1558 | 1559 | i += n; |
| 1559 | 1560 | } |
| @@ -1791,10 +1792,14 @@ | ||
| 1791 | 1792 | if( fossil_isspace(z[n]) |
| 1792 | 1793 | && (z==zOrig || fossil_isspace(z[-1])) |
| 1793 | 1794 | ){ |
| 1794 | 1795 | blob_append(p->pOut, z, n); |
| 1795 | 1796 | break; |
| 1797 | + } | |
| 1798 | + if( fossil_isalnum(z[n]) && z>zOrig && fossil_isalnum(z[-1]) ){ | |
| 1799 | + blob_append(p->pOut, z, n); | |
| 1800 | + break; | |
| 1796 | 1801 | } |
| 1797 | 1802 | inEmph = z[0]=='*' ? p->inEmphS : p->inEmphU; |
| 1798 | 1803 | if( inEmph[n] ){ |
| 1799 | 1804 | blob_append(p->pOut, n==1 ? "</i>" : "</b>", 4); |
| 1800 | 1805 | inEmph[n] = 0; |
| 1801 | 1806 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1550,10 +1550,11 @@ | |
| 1550 | if( tokenType==TOKEN_MDFONT |
| 1551 | && n==sz |
| 1552 | && z[i]==z[0] |
| 1553 | && !inCode |
| 1554 | && (!fossil_isspace(z[i+n]) || !fossil_isspace(z[i-1])) |
| 1555 | ){ |
| 1556 | return 1; |
| 1557 | } |
| 1558 | i += n; |
| 1559 | } |
| @@ -1791,10 +1792,14 @@ | |
| 1791 | if( fossil_isspace(z[n]) |
| 1792 | && (z==zOrig || fossil_isspace(z[-1])) |
| 1793 | ){ |
| 1794 | blob_append(p->pOut, z, n); |
| 1795 | break; |
| 1796 | } |
| 1797 | inEmph = z[0]=='*' ? p->inEmphS : p->inEmphU; |
| 1798 | if( inEmph[n] ){ |
| 1799 | blob_append(p->pOut, n==1 ? "</i>" : "</b>", 4); |
| 1800 | inEmph[n] = 0; |
| 1801 |
| --- src/wikiformat.c | |
| +++ src/wikiformat.c | |
| @@ -1550,10 +1550,11 @@ | |
| 1550 | if( tokenType==TOKEN_MDFONT |
| 1551 | && n==sz |
| 1552 | && z[i]==z[0] |
| 1553 | && !inCode |
| 1554 | && (!fossil_isspace(z[i+n]) || !fossil_isspace(z[i-1])) |
| 1555 | && (!fossil_isalnum(z[i+n]) || !fossil_isalnum(z[i-1])) |
| 1556 | ){ |
| 1557 | return 1; |
| 1558 | } |
| 1559 | i += n; |
| 1560 | } |
| @@ -1791,10 +1792,14 @@ | |
| 1792 | if( fossil_isspace(z[n]) |
| 1793 | && (z==zOrig || fossil_isspace(z[-1])) |
| 1794 | ){ |
| 1795 | blob_append(p->pOut, z, n); |
| 1796 | break; |
| 1797 | } |
| 1798 | if( fossil_isalnum(z[n]) && z>zOrig && fossil_isalnum(z[-1]) ){ |
| 1799 | blob_append(p->pOut, z, n); |
| 1800 | break; |
| 1801 | } |
| 1802 | inEmph = z[0]=='*' ? p->inEmphS : p->inEmphU; |
| 1803 | if( inEmph[n] ){ |
| 1804 | blob_append(p->pOut, n==1 ? "</i>" : "</b>", 4); |
| 1805 | inEmph[n] = 0; |
| 1806 |