Fossil

Check-in [1029539757]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Further tweaks to the markdown style formatting in wiki.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | comment-markdown-links
Files: files | file ages | folders
SHA3-256: 1029539757cb1ee369819f7ff3f5e648495029e25f523cff6f48c9079cfe507c
User & Date: drh 2025-03-05 21:43:26.335
Context
2025-03-07
23:19
Merge the latest trunk enhancements into the comment-markdown-links branch. check-in: 459499b0ea user: drh tags: comment-markdown-links
2025-03-05
21:43
Further tweaks to the markdown style formatting in wiki. check-in: 1029539757 user: drh tags: comment-markdown-links
21:19
Get Markdown italic and bold working in wiki. check-in: 079615cb7a user: drh tags: comment-markdown-links
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/printf.c.
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
    }else{
      wikiFlags = WIKI_INLINE | WIKI_NOBLOCK | WIKI_NOBADLINKS;
    }
    if( db_get_boolean("timeline-plaintext", 0) ){
      wikiFlags |= WIKI_LINKSONLY;
      wikiFlags &= ~WIKI_MARKDOWN_INLINE;
    }else{
      int x = db_get_boolean("timeline-markdown", 0);
      if( x & 1 ) wikiFlags |= WIKI_MARKDOWN_LINK;
      if( x & 2 ) wikiFlags |= WIKI_MARKDOWN_FONT;
    }
    if( db_get_boolean("timeline-hard-newlines", 0) ){
      wikiFlags |= WIKI_NEWLINE;
    }
  }







|







260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
    }else{
      wikiFlags = WIKI_INLINE | WIKI_NOBLOCK | WIKI_NOBADLINKS;
    }
    if( db_get_boolean("timeline-plaintext", 0) ){
      wikiFlags |= WIKI_LINKSONLY;
      wikiFlags &= ~WIKI_MARKDOWN_INLINE;
    }else{
      int x = db_get_int("timeline-markdown", 0);
      if( x & 1 ) wikiFlags |= WIKI_MARKDOWN_LINK;
      if( x & 2 ) wikiFlags |= WIKI_MARKDOWN_FONT;
    }
    if( db_get_boolean("timeline-hard-newlines", 0) ){
      wikiFlags |= WIKI_NEWLINE;
    }
  }
Changes to src/wikiformat.c.
1548
1549
1550
1551
1552
1553
1554

1555
1556
1557
1558
1559
1560
1561
    if( tokenType==TOKEN_PARAGRAPH ) break;
    if( tokenType==TOKEN_MDCODE ) inCode = !inCode;
    if( tokenType==TOKEN_MDFONT
     && n==sz
     && z[i]==z[0]
     && !inCode
     && (!fossil_isspace(z[i+n]) || !fossil_isspace(z[i-1]))

    ){
      return 1;
    }
    i += n;
  }
  return 0;
}







>







1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
    if( tokenType==TOKEN_PARAGRAPH ) break;
    if( tokenType==TOKEN_MDCODE ) inCode = !inCode;
    if( tokenType==TOKEN_MDFONT
     && n==sz
     && z[i]==z[0]
     && !inCode
     && (!fossil_isspace(z[i+n]) || !fossil_isspace(z[i-1]))
     && (!fossil_isalnum(z[i+n]) || !fossil_isalnum(z[i-1]))
    ){
      return 1;
    }
    i += n;
  }
  return 0;
}
1789
1790
1791
1792
1793
1794
1795




1796
1797
1798
1799
1800
1801
1802
          break;
        }
        if( fossil_isspace(z[n])
         && (z==zOrig || fossil_isspace(z[-1]))
        ){
          blob_append(p->pOut, z, n);
          break;




        }
        inEmph = z[0]=='*' ? p->inEmphS : p->inEmphU;
        if( inEmph[n] ){
          blob_append(p->pOut, n==1 ? "</i>" : "</b>", 4);
          inEmph[n] = 0;
          break;
        }







>
>
>
>







1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
          break;
        }
        if( fossil_isspace(z[n])
         && (z==zOrig || fossil_isspace(z[-1]))
        ){
          blob_append(p->pOut, z, n);
          break;
        }
        if( fossil_isalnum(z[n]) && z>zOrig && fossil_isalnum(z[-1]) ){
          blob_append(p->pOut, z, n);
          break;
        }
        inEmph = z[0]=='*' ? p->inEmphS : p->inEmphU;
        if( inEmph[n] ){
          blob_append(p->pOut, n==1 ? "</i>" : "</b>", 4);
          inEmph[n] = 0;
          break;
        }