From f371e656dc6bb2473acb220a28c90a4b7be665f2 Mon Sep 17 00:00:00 2001 From: Matt Mascarenhas Date: Sun, 30 Apr 2017 04:20:31 +0100 Subject: [PATCH] hmmlconv.c: Fix-up \-escaping hmml_to_html.c: More concisely set QuoteDir --- hmml_to_html/hmml_to_html.c | 6 +----- hmmlconv/hmmlconv.c | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hmml_to_html/hmml_to_html.c b/hmml_to_html/hmml_to_html.c index 5812416..365ad4c 100644 --- a/hmml_to_html/hmml_to_html.c +++ b/hmml_to_html/hmml_to_html.c @@ -358,15 +358,11 @@ StringToInt(char *String) int BuildQuote(quote_info *Info, char *Speaker, int ID) { - char *QuoteDir; + char *QuoteDir = "/home/matt/git/GitHub/insofaras/25fc16d58a297a486334"; if(!StringsDiffer(Speaker, "handmade_hero")) { QuoteDir = "/home/matt/git/GitHub/Chronister/01e754a09fd84c839ad7"; } - else - { - QuoteDir = "/home/matt/git/GitHub/insofaras/25fc16d58a297a486334"; - } char Path[255] = {0}; sprintf(Path, "%s/#%s", QuoteDir, Speaker); diff --git a/hmmlconv/hmmlconv.c b/hmmlconv/hmmlconv.c index e605bc9..9ad6c12 100644 --- a/hmmlconv/hmmlconv.c +++ b/hmmlconv/hmmlconv.c @@ -248,7 +248,8 @@ void ProcessAnnotation(char *Line, FILE *OutFile) // Escape stuff else if(*LinePtr == ']' || - (LinePtr[0] == '\\' && LinePtr[1] != '"') || + *LinePtr == '[' || + *LinePtr == '\\' || (LinePtr > Line && LinePtr[-1] == ' ' && strchr(":~@", LinePtr[0]) && !IsAlNum(LinePtr[1]))) { fprintf(OutFile, "%.*s\\", (int)(LinePtr - RunStart), RunStart);