From 8d5014fdfc57b80be54a3d23358e92c3b45a7e7d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 25 May 2021 10:36:51 -0700 Subject: Logging: remove single quotes around paths in messages. We weren't doing it consistently and it seems unnecessary. --- src/Text/Pandoc/Logging.hs | 12 ++++++------ test/command/7099.md | 2 +- test/command/svg.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Text/Pandoc/Logging.hs b/src/Text/Pandoc/Logging.hs index 2642d72ac..193b8b61c 100644 --- a/src/Text/Pandoc/Logging.hs +++ b/src/Text/Pandoc/Logging.hs @@ -282,7 +282,7 @@ showLogMessage msg = ParsingUnescaped s pos -> "Parsing unescaped '" <> s <> "' at " <> showPos pos CouldNotLoadIncludeFile fp pos -> - "Could not load include file '" <> fp <> "' at " <> showPos pos + "Could not load include file " <> fp <> " at " <> showPos pos MacroAlreadyDefined name pos -> "Macro '" <> name <> "' already defined, ignoring at " <> showPos pos InlineNotRendered il -> @@ -294,18 +294,18 @@ showLogMessage msg = IgnoredIOError s -> "IO Error (ignored): " <> s CouldNotFetchResource fp s -> - "Could not fetch resource '" <> fp <> "'" <> + "Could not fetch resource " <> fp <> if Text.null s then "" else ": " <> s CouldNotDetermineImageSize fp s -> - "Could not determine image size for '" <> fp <> "'" <> + "Could not determine image size for " <> fp <> if Text.null s then "" else ": " <> s CouldNotConvertImage fp s -> - "Could not convert image '" <> fp <> "'" <> + "Could not convert image " <> fp <> if Text.null s then "" else ": " <> s CouldNotDetermineMimeType fp -> - "Could not determine mime type for '" <> fp <> "'" + "Could not determine mime type for " <> fp CouldNotConvertTeXMath s m -> - "Could not convert TeX math '" <> s <> "', rendering as TeX" <> + "Could not convert TeX math " <> s <> ", rendering as TeX" <> if Text.null m then "" else ":\n" <> m CouldNotParseCSS m -> "Could not parse CSS" <> if Text.null m then "" else ":\n" <> m diff --git a/test/command/7099.md b/test/command/7099.md index 33ac8aea1..467b22a16 100644 --- a/test/command/7099.md +++ b/test/command/7099.md @@ -11,7 +11,7 @@ ^D [INFO] Fetching h:invalid@url... -[WARNING] Could not fetch resource 'h:invalid@url': Could not fetch h:invalid@url +[WARNING] Could not fetch resource h:invalid@url: Could not fetch h:invalid@url InvalidUrlException "h:invalid@url" "Invalid scheme" [INFO] Skipped '' at input line 1 column 29 [] diff --git a/test/command/svg.md b/test/command/svg.md index 4ba836b20..57c99db33 100644 --- a/test/command/svg.md +++ b/test/command/svg.md @@ -2,7 +2,7 @@ % pandoc -f latex -t icml \includegraphics{command/corrupt.svg} ^D -[WARNING] Could not determine image size for 'command/corrupt.svg': could not determine image type +[WARNING] Could not determine image size for command/corrupt.svg: could not determine image type -- cgit v1.2.3