Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Back to using [WARNING] and [INFO] to mark messages.

Browse source
This commit is contained in:
John MacFarlane 2017-10-23 23:01:37 -07:00
parent fda0c0119f
commit ecb5475a2a
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Text/Pandoc/Class.hs
View file

@ -513,9 +513,7 @@ instance PandocMonad PandocIO where
putCommonState x = PandocIO $ lift $ put x putCommonState x = PandocIO $ lift $ put x
logOutput msg = liftIO $ do logOutput msg = liftIO $ do
UTF8.hPutStr stderr $ UTF8.hPutStr stderr $
case messageVerbosity msg of "[" ++ show (messageVerbosity msg) ++ "] "
WARNING -> "!! "
_ -> ".. "
alertIndent $ lines $ showLogMessage msg alertIndent $ lines $ showLogMessage msg
alertIndent :: [String] -> IO () alertIndent :: [String] -> IO ()
@ -523,7 +521,7 @@ alertIndent [] = return ()
alertIndent (l:ls) = do alertIndent (l:ls) = do
UTF8.hPutStrLn stderr l UTF8.hPutStrLn stderr l
mapM_ go ls mapM_ go ls
where go l' = do UTF8.hPutStr stderr " " where go l' = do UTF8.hPutStr stderr " "
UTF8.hPutStrLn stderr l' UTF8.hPutStrLn stderr l'
-- | Specialized version of parseURIReference that disallows -- | Specialized version of parseURIReference that disallows

2
test/command/1718.md
View file

@ -6,6 +6,6 @@ Note[^1].
[^2]: the second, unused, note. [^2]: the second, unused, note.
^D ^D
!! Note with key '2' defined at line 5 column 1 but not used. [WARNING] Note with key '2' defined at line 5 column 1 but not used.
[Para [Str "Note",Note [Para [Str "the",Space,Str "first",Space,Str "note."]],Str "."]] [Para [Str "Note",Note [Para [Str "the",Space,Str "first",Space,Str "note."]],Str "."]]
``` ```

2
test/command/512.md
View file

@ -36,7 +36,7 @@ Loop detection:
__ link1_ __ link1_
^D ^D
!! Circular reference 'link1' at line 1 column 15 [WARNING] Circular reference 'link1' at line 1 column 15
<p><a href="">click here</a></p> <p><a href="">click here</a></p>
``` ```

6
test/command/svg.md
View file

@ -2,7 +2,7 @@
% pandoc -f latex -t icml % pandoc -f latex -t icml
\includegraphics{command/corrupt.svg} \includegraphics{command/corrupt.svg}
^D ^D
!! 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
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">
@ -35,7 +35,7 @@
% pandoc -f latex -t icml % pandoc -f latex -t icml
\includegraphics{command/SVG_logo.svg} \includegraphics{command/SVG_logo.svg}
^D ^D
!! Could not determine image size for 'command/SVG_logo.svg': could not determine SVG size [WARNING] Could not determine image size for 'command/SVG_logo.svg': could not determine SVG size
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">
@ -68,7 +68,7 @@
% pandoc -f latex -t icml % pandoc -f latex -t icml
\includegraphics{command/SVG_logo-without-xml-declaration.svg} \includegraphics{command/SVG_logo-without-xml-declaration.svg}
^D ^D
!! Could not determine image size for 'command/SVG_logo-without-xml-declaration.svg': could not determine SVG size [WARNING] Could not determine image size for 'command/SVG_logo-without-xml-declaration.svg': could not determine SVG size
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100"> <Rectangle Self="uec" StrokeWeight="0" ItemTransform="1 0 0 1 150 -100">