From afe18e53f12da5299f274810cd3424ac211179f6 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 12 Jul 2010 23:05:46 -0700
Subject: Modified example refs so they can occur before or after target.

The refs are now replaced by numbers at the final stage, using
processWith.
---
 src/Text/Pandoc/Readers/Markdown.hs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/Text/Pandoc/Readers/Markdown.hs')

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 086f85bb4..33fb3d8e6 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -185,7 +185,18 @@ parseMarkdown = do
   -- now parse it for real...
   (title, author, date) <- option ([],[],[]) titleBlock
   blocks <- parseBlocks
-  return $ Pandoc (Meta title author date) $ filter (/= Null) blocks
+  let doc = Pandoc (Meta title author date) $ filter (/= Null) blocks
+  -- if there are labeled examples, change references into numbers
+  examples <- liftM stateExamples getState
+  let handleExampleRef :: Inline -> Inline
+      handleExampleRef z@(Str ('@':xs)) =
+        case M.lookup xs examples of
+              Just n     -> Str (show n)
+              Nothing    -> z
+      handleExampleRef z = z
+  if M.null examples
+     then return doc
+     else return $ processWith handleExampleRef doc
 
 -- 
 -- initial pass for references and notes
@@ -928,10 +939,9 @@ exampleRef :: GenParser Char ParserState Inline
 exampleRef = try $ do
   char '@'
   lab <- many1 (alphaNum <|> oneOf "-_")
-  examples <- liftM stateExamples getState
-  case M.lookup lab examples of
-       Just num  -> return (Str $ show num)
-       Nothing   -> pzero
+  -- We just return a Str. These are replaced with numbers
+  -- later. See the end of parseMarkdown.
+  return $ Str $ '@' : lab
 
 symbol :: GenParser Char ParserState Inline
 symbol = do 
-- 
cgit v1.2.3