Change 'HtmlEntities' module to 'Entities'. Adjusted calling

code accordingly.


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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs
index 9beaaacff..79bdab76a 100644
--- a/src/Text/Pandoc/Readers/HTML.hs
+++ b/src/Text/Pandoc/Readers/HTML.hs
@@ -45,7 +45,7 @@ import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Pandoc
 import Text.Pandoc.Definition
 import Text.Pandoc.Shared 
-import Text.Pandoc.HtmlEntities ( decodeEntities, htmlEntityToChar )
+import Text.Pandoc.Entities ( decodeEntities, entityToChar )
 import Maybe ( fromMaybe )
 import Char ( toUpper, toLower )
 
@@ -397,7 +397,7 @@ entity = try (do
                                           num <- many1 digit
                                           return ("#" ++ num)))]
   char ';'
-  return (Str [fromMaybe '?' (htmlEntityToChar ("&" ++ body ++ ";"))]))
+  return (Str [fromMaybe '?' (entityToChar ("&" ++ body ++ ";"))]))
 
 code = try (do 
   htmlTag "code"
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 9913b60f9..30d6a11df 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -41,7 +41,7 @@ import Text.Pandoc.Readers.HTML ( rawHtmlBlock,
                                   anyHtmlTag, anyHtmlEndTag,
                                   htmlEndTag, extractTagType,
                                   htmlBlockElement )
-import Text.Pandoc.HtmlEntities ( decodeEntities )
+import Text.Pandoc.Entities ( decodeEntities )
 import Text.Regex ( matchRegex, mkRegex )
 import Text.ParserCombinators.Parsec