Major code cleanup in all modules. (Removed unneeded imports,

reformatted, etc.)  More major changes are documented below:

+ Removed Text.Pandoc.ParserCombinators and moved all its definitions
  to Text.Pandoc.Shared.
+ In Text.Pandoc.Shared:
  - Removed unneeded 'try' in blanklines.
  - Removed endsWith function and rewrote functions to use isSuffixOf instead.
  - Added >>~ combinator.
  - Rewrote stripTrailingNewlines, removeLeadingSpaces.
+ Moved Text.Pandoc.Entities -> Text.Pandoc.CharacterReferences.
  - Removed unneeded functions charToEntity, charToNumericalEntity.
  - Renamed functions using proper terminology (character references,
    not entities).  decodeEntities -> decodeCharacterReferences,
    characterEntity -> characterReference.
  - Moved escapeStringToXML to Docbook writer, which is the only thing
    that uses it.
  - Removed old entity parser in HTML and Markdown readers; replaced with
    new charRef parser in Text.Pandoc.Shared.
+ Fixed accent bug in Text.Pandoc.Readers.LaTeX:  \^{} now correctly
  parses as a '^' character.
+ Text.Pandoc.ASCIIMathML is no longer an exported module.


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

1 files changed, 7 insertions, 8 deletions

diff --git a/src/Text/Pandoc/Definition.hs b/src/Text/Pandoc/Definition.hs
index 3d3858b7e..7d1125c5a 100644
--- a/src/Text/Pandoc/Definition.hs
+++ b/src/Text/Pandoc/Definition.hs
@@ -34,10 +34,10 @@ data Pandoc = Pandoc Meta [Block] deriving (Eq, Read, Show)
 
 -- | Bibliographic information for the document:  title (list of 'Inline'),
 -- authors (list of strings), date (string).
-data Meta   = Meta [Inline] -- title
-                   [String] -- authors
-                   String   -- date
-              deriving (Eq, Show, Read)
+data Meta = Meta [Inline] -- title
+                 [String] -- authors
+                 String   -- date
+            deriving (Eq, Show, Read)
 
 -- | Alignment of a table column.
 data Alignment = AlignLeft 
@@ -65,12 +65,11 @@ data ListNumberDelim = DefaultDelim
 -- | Block element.
 data Block  
     = Plain [Inline]        -- ^ Plain text, not a paragraph
-    | Null                  -- ^ Nothing
     | Para [Inline]         -- ^ Paragraph
     | CodeBlock String      -- ^ Code block (literal)
     | RawHtml String        -- ^ Raw HTML block (literal)
     | BlockQuote [Block]    -- ^ Block quote (list of blocks)
-    | OrderedList ListAttributes [[Block]] -- ^ Ordered list (attributes,
+    | OrderedList ListAttributes [[Block]] -- ^ Ordered list (attributes
                             -- and a list of items, each a list of blocks)
     | BulletList [[Block]]  -- ^ Bullet list (list of items, each
                             -- a list of blocks)
@@ -84,6 +83,7 @@ data Block
                             -- relative column widths, column headers
                             -- (each a list of blocks), and rows
                             -- (each a list of lists of blocks)
+    | Null                  -- ^ Nothing
     deriving (Eq, Read, Show)
 
 -- | Type of quotation marks to use in Quoted inline.
@@ -112,6 +112,5 @@ data Inline
     | Link [Inline] Target  -- ^ Hyperlink: text (list of inlines), target
     | Image [Inline] Target -- ^ Image:  alt text (list of inlines), target
                             -- and target
-    | Note [Block]          -- ^ Footnote or endnote - reference (string),
-                            -- text (list of blocks)
+    | Note [Block]          -- ^ Footnote or endnote 
     deriving (Show, Eq, Read)