Improved syntax for markdown definition lists.

Definition lists are now more compatible with PHP Markdown Extra.
Resolves Issue #24.

+ You can have multiple definitions for a term (but still not
  multiple terms).
+ Multi-block definitions no longer need a
  column before each block (indeed, this will now cause
  multiple definitions).
+ The marker no longer needs to be flush with the left margin,
  but can be indented at or two spaces.  Also, ~ as well as :
  can be used as the marker (this suggestion due to David
  Wheeler.)
+ There can now be a blank line between the term and
  the definitions.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 0e8eff217..6f11d0200 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -796,10 +796,12 @@ prettyBlock (OrderedList attribs blockLists) =
 prettyBlock (BulletList blockLists) = "BulletList\n" ++ 
   indentBy 2 0 ("[ " ++ (intercalate ", "
   (map (\blocks -> prettyBlockList 2 blocks) blockLists))) ++ " ]" 
-prettyBlock (DefinitionList blockLists) = "DefinitionList\n" ++ 
-  indentBy 2 0 ("[" ++ (intercalate ",\n"
-  (map (\(term, blocks) -> "  (" ++ show term ++ ",\n" ++ 
-  indentBy 1 2 (prettyBlockList 2 blocks) ++ "  )") blockLists))) ++ " ]" 
+prettyBlock (DefinitionList items) = "DefinitionList\n" ++ 
+  indentBy 2 0 ("[ " ++ (intercalate "\n, "
+  (map (\(term, defs) -> "(" ++ show term ++ ",\n" ++ 
+  indentBy 3 0 ("[ " ++ (intercalate ", "
+  (map (\blocks -> prettyBlockList 2 blocks) defs)) ++ "]") ++
+   ")") items))) ++ " ]" 
 prettyBlock (Table caption aligns widths header rows) = 
   "Table " ++ show caption ++ " " ++ show aligns ++ " " ++ 
   show widths ++ "\n" ++ prettyRow header ++ " [\n" ++