32 files changed, 3 insertions, 3 deletions

diff --git a/pandoc.cabal b/pandoc.cabal
index 011d6814f..13cdb4b3c 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -158,7 +158,7 @@ Library
     Build-depends: citeproc-hs
     Exposed-Modules: Text.Pandoc.Biblio
     cpp-options:   -D_CITEPROC
-  Hs-Source-Dirs:  .
+  Hs-Source-Dirs:  src
   Exposed-Modules: Text.Pandoc,
                    Text.Pandoc.Blocks,
                    Text.Pandoc.Definition,
@@ -198,7 +198,7 @@ Library
     Buildable:      False
 
 Executable pandoc
-  Hs-Source-Dirs:     .
+  Hs-Source-Dirs:     src
   Main-Is:            Main.hs
   Ghc-Options:        -O2 -Wall -threaded
   Ghc-Prof-Options:   -auto-all
diff --git a/Main.hs b/src/Main.hs
index e498b3c0a..e498b3c0a 100644
--- a/Main.hs
+++ b/src/Main.hs
diff --git a/Text/Pandoc.hs b/src/Text/Pandoc.hs
index e97103f97..e97103f97 100644
--- a/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
diff --git a/Text/Pandoc/Biblio.hs b/src/Text/Pandoc/Biblio.hs
index 1d93f19c1..1d93f19c1 100644
--- a/Text/Pandoc/Biblio.hs
+++ b/src/Text/Pandoc/Biblio.hs
diff --git a/Text/Pandoc/Blocks.hs b/src/Text/Pandoc/Blocks.hs
index 122931773..122931773 100644
--- a/Text/Pandoc/Blocks.hs
+++ b/src/Text/Pandoc/Blocks.hs
diff --git a/Text/Pandoc/CharacterReferences.hs b/src/Text/Pandoc/CharacterReferences.hs
index b0f4f6019..b0f4f6019 100644
--- a/Text/Pandoc/CharacterReferences.hs
+++ b/src/Text/Pandoc/CharacterReferences.hs
diff --git a/Text/Pandoc/DefaultHeaders.hs b/src/Text/Pandoc/DefaultHeaders.hs
index e9c1f17e5..e9c1f17e5 100644
--- a/Text/Pandoc/DefaultHeaders.hs
+++ b/src/Text/Pandoc/DefaultHeaders.hs
diff --git a/Text/Pandoc/Definition.hs b/src/Text/Pandoc/Definition.hs
index 92ce094d4..92ce094d4 100644
--- a/Text/Pandoc/Definition.hs
+++ b/src/Text/Pandoc/Definition.hs
diff --git a/Text/Pandoc/Highlighting.hs b/src/Text/Pandoc/Highlighting.hs
index 6726f1a42..6726f1a42 100644
--- a/Text/Pandoc/Highlighting.hs
+++ b/src/Text/Pandoc/Highlighting.hs
diff --git a/Text/Pandoc/LaTeXMathML.hs b/src/Text/Pandoc/LaTeXMathML.hs
index 1eb3c23cc..1eb3c23cc 100644
--- a/Text/Pandoc/LaTeXMathML.hs
+++ b/src/Text/Pandoc/LaTeXMathML.hs
diff --git a/Text/Pandoc/ODT.hs b/src/Text/Pandoc/ODT.hs
index f9e4dd8f1..f9e4dd8f1 100644
--- a/Text/Pandoc/ODT.hs
+++ b/src/Text/Pandoc/ODT.hs
diff --git a/Text/Pandoc/Plugins.hs b/src/Text/Pandoc/Plugins.hs
index cb8ad1e11..cb8ad1e11 100644
--- a/Text/Pandoc/Plugins.hs
+++ b/src/Text/Pandoc/Plugins.hs
diff --git a/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs
index 65e512b5e..65e512b5e 100644
--- a/Text/Pandoc/Readers/HTML.hs
+++ b/src/Text/Pandoc/Readers/HTML.hs
diff --git a/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 9ba5bf372..f35ab4f29 100644
--- a/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -635,7 +635,7 @@ doubleQuoteStart :: CharParser st String
 doubleQuoteStart = string "``"
 
 doubleQuoteEnd :: CharParser st String
-doubleQuoteEnd = string "\"" <|> try (string "''")
+doubleQuoteEnd = try $ string "''"
 
 ellipses :: GenParser Char st Inline
 ellipses = try $ string "\\ldots" >> optional (try $ string "{}") >>
diff --git a/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 896f5832e..896f5832e 100644
--- a/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
diff --git a/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index 255054c10..255054c10 100644
--- a/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
diff --git a/Text/Pandoc/Readers/TeXMath.hs b/src/Text/Pandoc/Readers/TeXMath.hs
index 04b0f3b8f..04b0f3b8f 100644
--- a/Text/Pandoc/Readers/TeXMath.hs
+++ b/src/Text/Pandoc/Readers/TeXMath.hs
diff --git a/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 6854e5ae6..6854e5ae6 100644
--- a/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
diff --git a/Text/Pandoc/TH.hs b/src/Text/Pandoc/TH.hs
index 0dc5a6719..0dc5a6719 100644
--- a/Text/Pandoc/TH.hs
+++ b/src/Text/Pandoc/TH.hs
diff --git a/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs
index 014751968..014751968 100644
--- a/Text/Pandoc/Writers/ConTeXt.hs
+++ b/src/Text/Pandoc/Writers/ConTeXt.hs
diff --git a/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index 3e535a87e..3e535a87e 100644
--- a/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
diff --git a/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index fb7320e92..fb7320e92 100644
--- a/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
diff --git a/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index f3cbf1acb..f3cbf1acb 100644
--- a/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
diff --git a/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index 210c7ed07..210c7ed07 100644
--- a/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
diff --git a/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 70d1f0c91..70d1f0c91 100644
--- a/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
diff --git a/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs
index c5f6b3bf1..c5f6b3bf1 100644
--- a/Text/Pandoc/Writers/MediaWiki.hs
+++ b/src/Text/Pandoc/Writers/MediaWiki.hs
diff --git a/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs
index 52438f81e..52438f81e 100644
--- a/Text/Pandoc/Writers/OpenDocument.hs
+++ b/src/Text/Pandoc/Writers/OpenDocument.hs
diff --git a/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs
index 91826cbcd..91826cbcd 100644
--- a/Text/Pandoc/Writers/RST.hs
+++ b/src/Text/Pandoc/Writers/RST.hs
diff --git a/Text/Pandoc/Writers/RTF.hs b/src/Text/Pandoc/Writers/RTF.hs
index fc6cd1bf0..fc6cd1bf0 100644
--- a/Text/Pandoc/Writers/RTF.hs
+++ b/src/Text/Pandoc/Writers/RTF.hs
diff --git a/Text/Pandoc/Writers/S5.hs b/src/Text/Pandoc/Writers/S5.hs
index 6f528503a..6f528503a 100644
--- a/Text/Pandoc/Writers/S5.hs
+++ b/src/Text/Pandoc/Writers/S5.hs
diff --git a/Text/Pandoc/Writers/Texinfo.hs b/src/Text/Pandoc/Writers/Texinfo.hs
index 305a1a8d0..305a1a8d0 100644
--- a/Text/Pandoc/Writers/Texinfo.hs
+++ b/src/Text/Pandoc/Writers/Texinfo.hs
diff --git a/Text/Pandoc/XML.hs b/src/Text/Pandoc/XML.hs
index 14e2eebbb..14e2eebbb 100644
--- a/Text/Pandoc/XML.hs
+++ b/src/Text/Pandoc/XML.hs