Fossil SCM
Removed an extraneous space from pikchrshow DOM output. pikchr command error output now prepends a newline to pikchr-level errors to keep line number comment alignment intact for the first line.
Commit
c3b2671f6d5c775234e12654dce64c852a8f6156ac3171ebe1742220a0dcb0d7
Parent
ce3046290b9825e…
1 file changed
+4
-4
+4
-4
| --- src/pikchrshow.c | ||
| +++ src/pikchrshow.c | ||
| @@ -189,11 +189,11 @@ | ||
| 189 | 189 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 190 | 190 | }else if(PIKCHR_PROCESS_DIV_SOURCE & pikFlags){ |
| 191 | 191 | zClassSource = " source"; |
| 192 | 192 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 193 | 193 | } |
| 194 | - blob_appendf(pOut,"<div class='pikchr-wrapper " | |
| 194 | + blob_appendf(pOut,"<div class='pikchr-wrapper" | |
| 195 | 195 | "%s%s%s'>" |
| 196 | 196 | "<div class=\"pikchr-svg\" " |
| 197 | 197 | "style=\"max-width:%dpx\">\n", |
| 198 | 198 | zWrapperClass/*safe-for-%s*/, |
| 199 | 199 | zClassToggle/*safe-for-%s*/, |
| @@ -490,22 +490,22 @@ | ||
| 490 | 490 | zOutfile = g.argv[3]; |
| 491 | 491 | } |
| 492 | 492 | blob_read_from_file(&bIn, zInfile, ExtFILE); |
| 493 | 493 | if(fTh1){ |
| 494 | 494 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0) |
| 495 | - /* ^^^ needed for certain TH1 functions to work */;; | |
| 495 | + /* ^^^ needed for certain TH1 functions to work */; | |
| 496 | 496 | pikFlags |= PIKCHR_PROCESS_TH1; |
| 497 | 497 | if(fNosvg) pikFlags |= PIKCHR_PROCESS_TH1_NOSVG; |
| 498 | 498 | } |
| 499 | 499 | isErr = pikchr_process(blob_str(&bIn), pikFlags, |
| 500 | 500 | fTh1 ? fThFlags : 0, &bOut); |
| 501 | 501 | if(isErr){ |
| 502 | - /*fossil_print("ERROR: raw input:\n%b\n", &bIn);*/ | |
| 503 | - fossil_fatal("%s ERROR: %b", 1==isErr ? "TH1" : "pikchr", | |
| 502 | + fossil_fatal("%s ERROR:%c%b", 1==isErr ? "TH1" : "pikchr", | |
| 503 | + 1==isErr ? ' ' : '\n', | |
| 504 | 504 | &bOut); |
| 505 | 505 | }else{ |
| 506 | 506 | blob_write_to_file(&bOut, zOutfile); |
| 507 | 507 | } |
| 508 | 508 | Th_PrintTraceLog(); |
| 509 | 509 | blob_reset(&bIn); |
| 510 | 510 | blob_reset(&bOut); |
| 511 | 511 | } |
| 512 | 512 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -189,11 +189,11 @@ | |
| 189 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 190 | }else if(PIKCHR_PROCESS_DIV_SOURCE & pikFlags){ |
| 191 | zClassSource = " source"; |
| 192 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 193 | } |
| 194 | blob_appendf(pOut,"<div class='pikchr-wrapper " |
| 195 | "%s%s%s'>" |
| 196 | "<div class=\"pikchr-svg\" " |
| 197 | "style=\"max-width:%dpx\">\n", |
| 198 | zWrapperClass/*safe-for-%s*/, |
| 199 | zClassToggle/*safe-for-%s*/, |
| @@ -490,22 +490,22 @@ | |
| 490 | zOutfile = g.argv[3]; |
| 491 | } |
| 492 | blob_read_from_file(&bIn, zInfile, ExtFILE); |
| 493 | if(fTh1){ |
| 494 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0) |
| 495 | /* ^^^ needed for certain TH1 functions to work */;; |
| 496 | pikFlags |= PIKCHR_PROCESS_TH1; |
| 497 | if(fNosvg) pikFlags |= PIKCHR_PROCESS_TH1_NOSVG; |
| 498 | } |
| 499 | isErr = pikchr_process(blob_str(&bIn), pikFlags, |
| 500 | fTh1 ? fThFlags : 0, &bOut); |
| 501 | if(isErr){ |
| 502 | /*fossil_print("ERROR: raw input:\n%b\n", &bIn);*/ |
| 503 | fossil_fatal("%s ERROR: %b", 1==isErr ? "TH1" : "pikchr", |
| 504 | &bOut); |
| 505 | }else{ |
| 506 | blob_write_to_file(&bOut, zOutfile); |
| 507 | } |
| 508 | Th_PrintTraceLog(); |
| 509 | blob_reset(&bIn); |
| 510 | blob_reset(&bOut); |
| 511 | } |
| 512 |
| --- src/pikchrshow.c | |
| +++ src/pikchrshow.c | |
| @@ -189,11 +189,11 @@ | |
| 189 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 190 | }else if(PIKCHR_PROCESS_DIV_SOURCE & pikFlags){ |
| 191 | zClassSource = " source"; |
| 192 | pikFlags |= PIKCHR_PROCESS_SRC; |
| 193 | } |
| 194 | blob_appendf(pOut,"<div class='pikchr-wrapper" |
| 195 | "%s%s%s'>" |
| 196 | "<div class=\"pikchr-svg\" " |
| 197 | "style=\"max-width:%dpx\">\n", |
| 198 | zWrapperClass/*safe-for-%s*/, |
| 199 | zClassToggle/*safe-for-%s*/, |
| @@ -490,22 +490,22 @@ | |
| 490 | zOutfile = g.argv[3]; |
| 491 | } |
| 492 | blob_read_from_file(&bIn, zInfile, ExtFILE); |
| 493 | if(fTh1){ |
| 494 | db_find_and_open_repository(OPEN_ANY_SCHEMA | OPEN_OK_NOT_FOUND, 0) |
| 495 | /* ^^^ needed for certain TH1 functions to work */; |
| 496 | pikFlags |= PIKCHR_PROCESS_TH1; |
| 497 | if(fNosvg) pikFlags |= PIKCHR_PROCESS_TH1_NOSVG; |
| 498 | } |
| 499 | isErr = pikchr_process(blob_str(&bIn), pikFlags, |
| 500 | fTh1 ? fThFlags : 0, &bOut); |
| 501 | if(isErr){ |
| 502 | fossil_fatal("%s ERROR:%c%b", 1==isErr ? "TH1" : "pikchr", |
| 503 | 1==isErr ? ' ' : '\n', |
| 504 | &bOut); |
| 505 | }else{ |
| 506 | blob_write_to_file(&bOut, zOutfile); |
| 507 | } |
| 508 | Th_PrintTraceLog(); |
| 509 | blob_reset(&bIn); |
| 510 | blob_reset(&bOut); |
| 511 | } |
| 512 |