1 files changed, 19 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 019a0e272..898e6c32d 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -40,7 +40,7 @@ import Text.Pandoc.Options
 import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space)
 import Data.Maybe (fromMaybe)
 import Data.List ( group, stripPrefix, find, intersperse, transpose, sortBy )
-import Data.Char ( isSpace, isPunctuation )
+import Data.Char ( isSpace, isPunctuation, ord, chr )
 import Data.Ord ( comparing )
 import Text.Pandoc.Pretty
 import Control.Monad.State
@@ -260,10 +260,13 @@ tableOfContents opts headers =
 
 -- | Converts an Element to a list item for a table of contents,
 elementToListItem :: WriterOptions -> Element -> [Block]
-elementToListItem opts (Sec lev _ _ headerText subsecs)
-  = Plain headerText :
+elementToListItem opts (Sec lev _nums (ident,_,_) headerText subsecs)
+  = Plain headerLink :
     [ BulletList (map (elementToListItem opts) subsecs) |
       not (null subsecs) && lev < writerTOCDepth opts ]
+   where headerLink = if null ident
+                         then headerText
+                         else [Link nullAttr headerText ('#':ident, "")]
 elementToListItem _ (Blk _) = []
 
 attrsToMarkdown :: Attr -> Doc
@@ -780,14 +783,25 @@ inlineToMarkdown opts (Superscript lst) = do
               then "^" <> contents <> "^"
               else if isEnabled Ext_raw_html opts
                        then "<sup>" <> contents <> "</sup>"
-                       else contents
+                       else case (render Nothing contents) of
+                                 ds | all (\d -> d >= '0' && d <= '9') ds
+                                   -> text (map toSuperscript ds)
+                                 _ -> contents
+                        where toSuperscript '1' = '\x00B9'
+                              toSuperscript '2' = '\x00B2'
+                              toSuperscript '3' = '\x00B3'
+                              toSuperscript c = chr (0x2070 + (ord c - 48))
 inlineToMarkdown opts (Subscript lst) = do
   contents <- inlineListToMarkdown opts $ walk escapeSpaces lst
   return $ if isEnabled Ext_subscript opts
               then "~" <> contents <> "~"
               else if isEnabled Ext_raw_html opts
                        then "<sub>" <> contents <> "</sub>"
-                       else contents
+                       else case (render Nothing contents) of
+                                 ds | all (\d -> d >= '0' && d <= '9') ds
+                                   -> text (map toSubscript ds)
+                                 _ -> contents
+                        where toSubscript c = chr (0x2080 + (ord c - 48))
 inlineToMarkdown opts (SmallCaps lst) = do
   plain <- gets stPlain
   if not plain &&