Fossil SCM
Undid part of [dd4b87c0] which was just plain broken. Yes, we do need TH_INIT_NO_ESC, or something similar, to avoid puts HTML-escaping our pikchr quotes.
Commit
a5eaa0661eb21baa23621f7bced6a5a3acfa7bf8da280faad1bee9a2dc22d7ee
Parent
80f7c6c02578337…
2 files changed
+1
-1
+1
-5
+1
-1
| --- src/pikchrshow.c | ||
| +++ src/pikchrshow.c | ||
| @@ -205,11 +205,11 @@ | ||
| 205 | 205 | const char * zOutfile = "-"; |
| 206 | 206 | const int fWithDiv = find_option("div",0,0)!=0; |
| 207 | 207 | const int fTh1 = find_option("th",0,0)!=0; |
| 208 | 208 | const int fNosvg = find_option("th-nosvg",0,0)!=0; |
| 209 | 209 | int isErr = 0; |
| 210 | - u32 fThFlags = TH_INIT_DEFAULT/* | TH_INIT_NO_ESC*/ | |
| 210 | + u32 fThFlags = TH_INIT_DEFAULT | TH_INIT_NO_ESC | |
| 211 | 211 | | (find_option("th-novar",0,0)!=0 ? TH_R2B_NO_VARS : 0); |
| 212 | 212 | |
| 213 | 213 | Th_InitTraceLog()/*processes -th-trace flag*/; |
| 214 | 214 | verify_all_options(); |
| 215 | 215 | if(g.argc>4){ |
| 216 | 216 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -205,11 +205,11 @@ | |
| 205 | const char * zOutfile = "-"; |
| 206 | const int fWithDiv = find_option("div",0,0)!=0; |
| 207 | const int fTh1 = find_option("th",0,0)!=0; |
| 208 | const int fNosvg = find_option("th-nosvg",0,0)!=0; |
| 209 | int isErr = 0; |
| 210 | u32 fThFlags = TH_INIT_DEFAULT/* | TH_INIT_NO_ESC*/ |
| 211 | | (find_option("th-novar",0,0)!=0 ? TH_R2B_NO_VARS : 0); |
| 212 | |
| 213 | Th_InitTraceLog()/*processes -th-trace flag*/; |
| 214 | verify_all_options(); |
| 215 | if(g.argc>4){ |
| 216 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -205,11 +205,11 @@ | |
| 205 | const char * zOutfile = "-"; |
| 206 | const int fWithDiv = find_option("div",0,0)!=0; |
| 207 | const int fTh1 = find_option("th",0,0)!=0; |
| 208 | const int fNosvg = find_option("th-nosvg",0,0)!=0; |
| 209 | int isErr = 0; |
| 210 | u32 fThFlags = TH_INIT_DEFAULT | TH_INIT_NO_ESC |
| 211 | | (find_option("th-novar",0,0)!=0 ? TH_R2B_NO_VARS : 0); |
| 212 | |
| 213 | Th_InitTraceLog()/*processes -th-trace flag*/; |
| 214 | verify_all_options(); |
| 215 | if(g.argc>4){ |
| 216 |
+1
-5
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -2141,15 +2141,11 @@ | ||
| 2141 | 2141 | int needConfig = flags & TH_INIT_NEED_CONFIG; |
| 2142 | 2142 | int forceReset = flags & TH_INIT_FORCE_RESET; |
| 2143 | 2143 | int forceTcl = flags & TH_INIT_FORCE_TCL; |
| 2144 | 2144 | int forceSetup = flags & TH_INIT_FORCE_SETUP; |
| 2145 | 2145 | int noRepo = flags & TH_INIT_NO_REPO; |
| 2146 | - static unsigned int aFlags[] = { | |
| 2147 | - 0, | |
| 2148 | - (TH_INIT_NO_ESC ? 0 : 1), | |
| 2149 | - WIKI_LINKSONLY | |
| 2150 | - }; | |
| 2146 | + static unsigned int aFlags[] = {0, 1, WIKI_LINKSONLY}; | |
| 2151 | 2147 | static int anonFlag = LOGIN_ANON; |
| 2152 | 2148 | static int zeroInt = 0; |
| 2153 | 2149 | static struct _Command { |
| 2154 | 2150 | const char *zName; |
| 2155 | 2151 | Th_CommandProc xProc; |
| 2156 | 2152 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -2141,15 +2141,11 @@ | |
| 2141 | int needConfig = flags & TH_INIT_NEED_CONFIG; |
| 2142 | int forceReset = flags & TH_INIT_FORCE_RESET; |
| 2143 | int forceTcl = flags & TH_INIT_FORCE_TCL; |
| 2144 | int forceSetup = flags & TH_INIT_FORCE_SETUP; |
| 2145 | int noRepo = flags & TH_INIT_NO_REPO; |
| 2146 | static unsigned int aFlags[] = { |
| 2147 | 0, |
| 2148 | (TH_INIT_NO_ESC ? 0 : 1), |
| 2149 | WIKI_LINKSONLY |
| 2150 | }; |
| 2151 | static int anonFlag = LOGIN_ANON; |
| 2152 | static int zeroInt = 0; |
| 2153 | static struct _Command { |
| 2154 | const char *zName; |
| 2155 | Th_CommandProc xProc; |
| 2156 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -2141,15 +2141,11 @@ | |
| 2141 | int needConfig = flags & TH_INIT_NEED_CONFIG; |
| 2142 | int forceReset = flags & TH_INIT_FORCE_RESET; |
| 2143 | int forceTcl = flags & TH_INIT_FORCE_TCL; |
| 2144 | int forceSetup = flags & TH_INIT_FORCE_SETUP; |
| 2145 | int noRepo = flags & TH_INIT_NO_REPO; |
| 2146 | static unsigned int aFlags[] = {0, 1, WIKI_LINKSONLY}; |
| 2147 | static int anonFlag = LOGIN_ANON; |
| 2148 | static int zeroInt = 0; |
| 2149 | static struct _Command { |
| 2150 | const char *zName; |
| 2151 | Th_CommandProc xProc; |
| 2152 |