From 09aec9f3e36bdfce0cc2060b9032b8eba6d85b4c Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 19 Dec 2010 10:13:36 -0800
Subject: Shared: Use stringify to simplify inlineListToIdentifier.

---
 src/Text/Pandoc/Shared.hs | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 7de3fabb2..c57ecb989 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -399,6 +399,11 @@ stringify = queryWith go
         go (Str x) = x
         go (Code x) = x
         go (Math _ x) = x
+        go EmDash = "--"
+        go EnDash = "-"
+        go Apostrophe = "'"
+        go Ellipses = "..."
+        go LineBreak = " "
         go _ = ""
 
 -- | Change final list item from @Para@ to @Plain@ if the list contains
@@ -432,34 +437,12 @@ data Element = Blk Block
 -- letters, digits, and the characters _-.
 inlineListToIdentifier :: [Inline] -> String
 inlineListToIdentifier =
-  dropWhile (not . isAlpha) . intercalate "-" . words . map toLower .
-  filter (\c -> isLetter c || isDigit c || c `elem` "_-. ") .
-  concatMap extractText
-    where extractText x = case x of
-              Str s           -> map nbspToSp s
-              Emph lst        -> concatMap extractText lst
-              Strikeout lst   -> concatMap extractText lst
-              Superscript lst -> concatMap extractText lst
-              SmallCaps   lst -> concatMap extractText lst
-              Subscript lst   -> concatMap extractText lst
-              Strong lst      -> concatMap extractText lst
-              Quoted _ lst    -> concatMap extractText lst
-              Cite   _ lst    -> concatMap extractText lst
-              Code s          -> s
-              Space           -> " "
-              EmDash          -> "---"
-              EnDash          -> "--"
-              Apostrophe      -> ""
-              Ellipses        -> "..."
-              LineBreak       -> " "
-              Math _ s        -> s
-              TeX _           -> ""
-              HtmlInline _    -> ""
-              Link lst _      -> concatMap extractText lst
-              Image lst _     -> concatMap extractText lst
-              Note _          -> ""
-          nbspToSp '\160'     =  ' '
-          nbspToSp x          =  x
+  dropWhile (not . isAlpha) . intercalate "-" . words .
+    map (nbspToSp . toLower) .
+    filter (\c -> isLetter c || isDigit c || c `elem` "_-. ") .
+    stringify
+ where nbspToSp '\160'     =  ' '
+       nbspToSp x          =  x
 
 -- | Convert list of Pandoc blocks into (hierarchical) list of Elements
 hierarchicalize :: [Block] -> [Element]
-- 
cgit v1.2.3