Fixed duplicate text bug in markdown2pdf.hs. (Paulo Tanimoto)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1582 788f1e2b-df1e-0410-8736-df70ead52e1b

pandoc.cabal

@@ -238,9 +238,8 @@ Executable markdown2pdf
   Ghc-Options:        -Wall -threaded
   Ghc-Prof-Options:   -auto-all
   Extensions:         CPP, TemplateHaskell
-  Buildable:      False
+  if flag(wrappers)
---  if flag(wrappers)
+    Buildable:      True
---    Buildable:      True
+  else
---  else
+    Buildable:      False
---    Buildable:      False
 

src/markdown2pdf.hs

@@ -171,17 +171,19 @@ main = bracket
                filter (\l -> any (`isInfixOf` l) goodoptsLong) $ lines out
       exitWith code
     -- parse arguments
+    -- if no input given, use 'stdin'
     pandocArgs <- parsePandocArgs args
-    (inputs, output) <- case pandocArgs of
+    (input, output) <- case pandocArgs of
-      Nothing     -> exit "Could not parse arguments"
+      Nothing      -> exit "Could not parse arguments"
       Just ([],out) -> do
         stdinFile <- saveStdin (replaceDirectory (takeBaseName out) tmp)
         case stdinFile of
           Left err  -> exit err
           Right f   -> return ([f], out)
-      Just (fs,out) -> return (fs, out)
+      -- no need because we'll pass all arguments to pandoc
+      Just (_ ,out) -> return ([], out)
     -- run pandoc
-    pandocRes <- runPandoc (args ++ inputs) $ replaceDirectory output tmp
+    pandocRes <- runPandoc (input ++ args) $ replaceDirectory output tmp
     case pandocRes of
       Left err -> exit err
       Right texFile  -> do