Added `emoji` extension to Markdown.

This is enabled by default in `markdown_github`.
Added `Ext_emoji` to `Extension` in `Text.Pandoc.Options` (API change).

Closes #2523.

7 files changed, 938 insertions, 1 deletions

diff --git a/README b/README
index 408bc66a4..abc4c165b 100644
--- a/README
+++ b/README
@@ -3146,6 +3146,10 @@ treated as spaces or as hard line breaks.  This option is intended for
 use with East Asian languages where spaces are not used between words,
 but text is divided into lines for readability.
 
+#### Extension: `emoji` ####
+
+Parses textual emojis like `:smile:` as Unicode emoticons.
+
 #### Extension: `tex_math_single_backslash` ####
 
 Causes anything between `\(` and `\)` to be interpreted as inline
@@ -3256,7 +3260,7 @@ variants are supported:
 :   `pipe_tables`, `raw_html`, `tex_math_single_backslash`,
     `fenced_code_blocks`, `auto_identifiers`,
     `ascii_identifiers`, `backtick_code_blocks`, `autolink_bare_uris`,
-    `intraword_underscores`, `strikeout`, `hard_line_breaks`,
+    `intraword_underscores`, `strikeout`, `hard_line_breaks`, `emoji`,
     `shortcut_reference_links`.
 
 `markdown_mmd` (MultiMarkdown)
diff --git a/changelog b/changelog
index 46a8eb128..97e3bbaa0 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,10 @@ pandoc (1.15.2)
 
   * Fixed omitted `url(...)` in CSS data-uri with `--self-contained` (#2489).
 
+  * Added `emoji` Markdown extension, enabled by default in `markdown_github`
+    (#2523).  Added `Ext_emoji` to `Extension` in `Text.Pandoc.Options`
+    (API change).
+
   * `Text.Pandoc.Readers.HTML.parseTags`: Fixed over-eager raw HTML inline
     parsing (#2469).  Tightened up the inline HTML parser so it disallows
     TagWarnings.
diff --git a/pandoc.cabal b/pandoc.cabal
index 7c2666edf..40f994ef1 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -391,6 +391,7 @@ Library
                    Text.Pandoc.Writers.Shared,
                    Text.Pandoc.Asciify,
                    Text.Pandoc.MIME,
+                   Text.Pandoc.Emoji,
                    Text.Pandoc.Parsing,
                    Text.Pandoc.UUID,
                    Text.Pandoc.ImageSize,
diff --git a/src/Text/Pandoc/Emoji.hs b/src/Text/Pandoc/Emoji.hs
new file mode 100644
index 000000000..2ae7962cb
--- /dev/null
+++ b/src/Text/Pandoc/Emoji.hs
@@ -0,0 +1,905 @@
+{-
+Copyright (C) 2015 John MacFarlane <jgm@berkeley.edu>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-}
+
+{- |
+   Module      : Text.Pandoc.Emoji
+   Copyright   : Copyright (C) 2015 John MacFarlane
+   License     : GNU GPL, version 2 or above
+
+   Maintainer  : John MacFarlane <jgm@berkeley.edu>
+   Stability   : alpha
+   Portability : portable
+
+Emoji symbol lookup from canonical string identifier.
+-}
+module Text.Pandoc.Emoji ( emojis ) where
+import qualified Data.Map as M
+
+emojis :: M.Map String String
+emojis = M.fromList
+  [ ("100", "💯")
+  , ("1234", "🔢")
+  , ("smile", "😄")
+  , ("smiley", "😃")
+  , ("grinning", "😀")
+  , ("blush", "😊")
+  , ("relaxed", "☺️")
+  , ("wink", "😉")
+  , ("heart_eyes", "😍")
+  , ("kissing_heart", "😘")
+  , ("kissing_closed_eyes", "😚")
+  , ("kissing", "😗")
+  , ("kissing_smiling_eyes", "😙")
+  , ("stuck_out_tongue_winking_eye", "😜")
+  , ("stuck_out_tongue_closed_eyes", "😝")
+  , ("stuck_out_tongue", "😛")
+  , ("flushed", "😳")
+  , ("grin", "😁")
+  , ("pensive", "😔")
+  , ("relieved", "😌")
+  , ("unamused", "😒")
+  , ("disappointed", "😞")
+  , ("persevere", "😣")
+  , ("cry", "😢")
+  , ("joy", "😂")
+  , ("sob", "😭")
+  , ("sleepy", "😪")
+  , ("disappointed_relieved", "😥")
+  , ("cold_sweat", "😰")
+  , ("sweat_smile", "😅")
+  , ("sweat", "😓")
+  , ("weary", "😩")
+  , ("tired_face", "😫")
+  , ("fearful", "😨")
+  , ("scream", "😱")
+  , ("angry", "😠")
+  , ("rage", "😡")
+  , ("triumph", "😤")
+  , ("confounded", "😖")
+  , ("laughing", "😆")
+  , ("satisfied", "😆")
+  , ("yum", "😋")
+  , ("mask", "😷")
+  , ("sunglasses", "😎")
+  , ("sleeping", "😴")
+  , ("dizzy_face", "😵")
+  , ("astonished", "😲")
+  , ("worried", "😟")
+  , ("frowning", "😦")
+  , ("anguished", "😧")
+  , ("smiling_imp", "😈")
+  , ("imp", "👿")
+  , ("open_mouth", "😮")
+  , ("grimacing", "😬")
+  , ("neutral_face", "😐")
+  , ("confused", "😕")
+  , ("hushed", "😯")
+  , ("no_mouth", "😶")
+  , ("innocent", "😇")
+  , ("smirk", "😏")
+  , ("expressionless", "😑")
+  , ("man_with_gua_pi_mao", "👲")
+  , ("man_with_turban", "👳")
+  , ("cop", "👮")
+  , ("construction_worker", "👷")
+  , ("guardsman", "💂")
+  , ("baby", "👶")
+  , ("boy", "👦")
+  , ("girl", "👧")
+  , ("man", "👨")
+  , ("woman", "👩")
+  , ("older_man", "👴")
+  , ("older_woman", "👵")
+  , ("person_with_blond_hair", "👱")
+  , ("angel", "👼")
+  , ("princess", "👸")
+  , ("smiley_cat", "😺")
+  , ("smile_cat", "😸")
+  , ("heart_eyes_cat", "😻")
+  , ("kissing_cat", "😽")
+  , ("smirk_cat", "😼")
+  , ("scream_cat", "🙀")
+  , ("crying_cat_face", "😿")
+  , ("joy_cat", "😹")
+  , ("pouting_cat", "😾")
+  , ("japanese_ogre", "👹")
+  , ("japanese_goblin", "👺")
+  , ("see_no_evil", "🙈")
+  , ("hear_no_evil", "🙉")
+  , ("speak_no_evil", "🙊")
+  , ("skull", "💀")
+  , ("alien", "👽")
+  , ("hankey", "💩")
+  , ("poop", "💩")
+  , ("shit", "💩")
+  , ("fire", "🔥")
+  , ("sparkles", "✨")
+  , ("star2", "🌟")
+  , ("dizzy", "💫")
+  , ("boom", "💥")
+  , ("collision", "💥")
+  , ("anger", "💢")
+  , ("sweat_drops", "💦")
+  , ("droplet", "💧")
+  , ("zzz", "💤")
+  , ("dash", "💨")
+  , ("ear", "👂")
+  , ("eyes", "👀")
+  , ("nose", "👃")
+  , ("tongue", "👅")
+  , ("lips", "👄")
+  , ("+1", "👍")
+  , ("thumbsup", "👍")
+  , ("-1", "👎")
+  , ("thumbsdown", "👎")
+  , ("ok_hand", "👌")
+  , ("facepunch", "👊")
+  , ("punch", "👊")
+  , ("fist", "✊")
+  , ("v", "✌️")
+  , ("wave", "👋")
+  , ("hand", "✋")
+  , ("raised_hand", "✋")
+  , ("open_hands", "👐")
+  , ("point_up_2", "👆")
+  , ("point_down", "👇")
+  , ("point_right", "👉")
+  , ("point_left", "👈")
+  , ("raised_hands", "🙌")
+  , ("pray", "🙏")
+  , ("point_up", "☝️")
+  , ("clap", "👏")
+  , ("muscle", "💪")
+  , ("walking", "🚶")
+  , ("runner", "🏃")
+  , ("running", "🏃")
+  , ("dancer", "💃")
+  , ("couple", "👫")
+  , ("family", "👪")
+  , ("two_men_holding_hands", "👬")
+  , ("two_women_holding_hands", "👭")
+  , ("couplekiss", "💏")
+  , ("couple_with_heart", "💑")
+  , ("dancers", "👯")
+  , ("ok_woman", "🙆")
+  , ("no_good", "🙅")
+  , ("information_desk_person", "💁")
+  , ("raising_hand", "🙋")
+  , ("massage", "💆")
+  , ("haircut", "💇")
+  , ("nail_care", "💅")
+  , ("bride_with_veil", "👰")
+  , ("person_with_pouting_face", "🙎")
+  , ("person_frowning", "🙍")
+  , ("bow", "🙇")
+  , ("tophat", "🎩")
+  , ("crown", "👑")
+  , ("womans_hat", "👒")
+  , ("athletic_shoe", "👟")
+  , ("mans_shoe", "👞")
+  , ("shoe", "👞")
+  , ("sandal", "👡")
+  , ("high_heel", "👠")
+  , ("boot", "👢")
+  , ("shirt", "👕")
+  , ("tshirt", "👕")
+  , ("necktie", "👔")
+  , ("womans_clothes", "👚")
+  , ("dress", "👗")
+  , ("running_shirt_with_sash", "🎽")
+  , ("jeans", "👖")
+  , ("kimono", "👘")
+  , ("bikini", "👙")
+  , ("briefcase", "💼")
+  , ("handbag", "👜")
+  , ("pouch", "👝")
+  , ("purse", "👛")
+  , ("eyeglasses", "👓")
+  , ("ribbon", "🎀")
+  , ("closed_umbrella", "🌂")
+  , ("lipstick", "💄")
+  , ("yellow_heart", "💛")
+  , ("blue_heart", "💙")
+  , ("purple_heart", "💜")
+  , ("green_heart", "💚")
+  , ("heart", "❤️")
+  , ("broken_heart", "💔")
+  , ("heartpulse", "💗")
+  , ("heartbeat", "💓")
+  , ("two_hearts", "💕")
+  , ("sparkling_heart", "💖")
+  , ("revolving_hearts", "💞")
+  , ("cupid", "💘")
+  , ("love_letter", "💌")
+  , ("kiss", "💋")
+  , ("ring", "💍")
+  , ("gem", "💎")
+  , ("bust_in_silhouette", "👤")
+  , ("busts_in_silhouette", "👥")
+  , ("speech_balloon", "💬")
+  , ("footprints", "👣")
+  , ("thought_balloon", "💭")
+  , ("dog", "🐶")
+  , ("wolf", "🐺")
+  , ("cat", "🐱")
+  , ("mouse", "🐭")
+  , ("hamster", "🐹")
+  , ("rabbit", "🐰")
+  , ("frog", "🐸")
+  , ("tiger", "🐯")
+  , ("koala", "🐨")
+  , ("bear", "🐻")
+  , ("pig", "🐷")
+  , ("pig_nose", "🐽")
+  , ("cow", "🐮")
+  , ("boar", "🐗")
+  , ("monkey_face", "🐵")
+  , ("monkey", "🐒")
+  , ("horse", "🐴")
+  , ("sheep", "🐑")
+  , ("elephant", "🐘")
+  , ("panda_face", "🐼")
+  , ("penguin", "🐧")
+  , ("bird", "🐦")
+  , ("baby_chick", "🐤")
+  , ("hatched_chick", "🐥")
+  , ("hatching_chick", "🐣")
+  , ("chicken", "🐔")
+  , ("snake", "🐍")
+  , ("turtle", "🐢")
+  , ("bug", "🐛")
+  , ("bee", "🐝")
+  , ("honeybee", "🐝")
+  , ("ant", "🐜")
+  , ("beetle", "🐞")
+  , ("snail", "🐌")
+  , ("octopus", "🐙")
+  , ("shell", "🐚")
+  , ("tropical_fish", "🐠")
+  , ("fish", "🐟")
+  , ("dolphin", "🐬")
+  , ("flipper", "🐬")
+  , ("whale", "🐳")
+  , ("whale2", "🐋")
+  , ("cow2", "🐄")
+  , ("ram", "🐏")
+  , ("rat", "🐀")
+  , ("water_buffalo", "🐃")
+  , ("tiger2", "🐅")
+  , ("rabbit2", "🐇")
+  , ("dragon", "🐉")
+  , ("racehorse", "🐎")
+  , ("goat", "🐐")
+  , ("rooster", "🐓")
+  , ("dog2", "🐕")
+  , ("pig2", "🐖")
+  , ("mouse2", "🐁")
+  , ("ox", "🐂")
+  , ("dragon_face", "🐲")
+  , ("blowfish", "🐡")
+  , ("crocodile", "🐊")
+  , ("camel", "🐫")
+  , ("dromedary_camel", "🐪")
+  , ("leopard", "🐆")
+  , ("cat2", "🐈")
+  , ("poodle", "🐩")
+  , ("feet", "🐾")
+  , ("paw_prints", "🐾")
+  , ("bouquet", "💐")
+  , ("cherry_blossom", "🌸")
+  , ("tulip", "🌷")
+  , ("four_leaf_clover", "🍀")
+  , ("rose", "🌹")
+  , ("sunflower", "🌻")
+  , ("hibiscus", "🌺")
+  , ("maple_leaf", "🍁")
+  , ("leaves", "🍃")
+  , ("fallen_leaf", "🍂")
+  , ("herb", "🌿")
+  , ("ear_of_rice", "🌾")
+  , ("mushroom", "🍄")
+  , ("cactus", "🌵")
+  , ("palm_tree", "🌴")
+  , ("evergreen_tree", "🌲")
+  , ("deciduous_tree", "🌳")
+  , ("chestnut", "🌰")
+  , ("seedling", "🌱")
+  , ("blossom", "🌼")
+  , ("globe_with_meridians", "🌐")
+  , ("sun_with_face", "🌞")
+  , ("full_moon_with_face", "🌝")
+  , ("new_moon_with_face", "🌚")
+  , ("new_moon", "🌑")
+  , ("waxing_crescent_moon", "🌒")
+  , ("first_quarter_moon", "🌓")
+  , ("moon", "🌔")
+  , ("waxing_gibbous_moon", "🌔")
+  , ("full_moon", "🌕")
+  , ("waning_gibbous_moon", "🌖")
+  , ("last_quarter_moon", "🌗")
+  , ("waning_crescent_moon", "🌘")
+  , ("last_quarter_moon_with_face", "🌜")
+  , ("first_quarter_moon_with_face", "🌛")
+  , ("crescent_moon", "🌙")
+  , ("earth_africa", "🌍")
+  , ("earth_americas", "🌎")
+  , ("earth_asia", "🌏")
+  , ("volcano", "🌋")
+  , ("milky_way", "🌌")
+  , ("stars", "🌠")
+  , ("star", "⭐")
+  , ("sunny", "☀️")
+  , ("partly_sunny", "⛅")
+  , ("cloud", "☁️")
+  , ("zap", "⚡")
+  , ("umbrella", "☔")
+  , ("snowflake", "❄️")
+  , ("snowman", "⛄")
+  , ("cyclone", "🌀")
+  , ("foggy", "🌁")
+  , ("rainbow", "🌈")
+  , ("ocean", "🌊")
+  , ("bamboo", "🎍")
+  , ("gift_heart", "💝")
+  , ("dolls", "🎎")
+  , ("school_satchel", "🎒")
+  , ("mortar_board", "🎓")
+  , ("flags", "🎏")
+  , ("fireworks", "🎆")
+  , ("sparkler", "🎇")
+  , ("wind_chime", "🎐")
+  , ("rice_scene", "🎑")
+  , ("jack_o_lantern", "🎃")
+  , ("ghost", "👻")
+  , ("santa", "🎅")
+  , ("christmas_tree", "🎄")
+  , ("gift", "🎁")
+  , ("tanabata_tree", "🎋")
+  , ("tada", "🎉")
+  , ("confetti_ball", "🎊")
+  , ("balloon", "🎈")
+  , ("crossed_flags", "🎌")
+  , ("crystal_ball", "🔮")
+  , ("movie_camera", "🎥")
+  , ("camera", "📷")
+  , ("video_camera", "📹")
+  , ("vhs", "📼")
+  , ("cd", "💿")
+  , ("dvd", "📀")
+  , ("minidisc", "💽")
+  , ("floppy_disk", "💾")
+  , ("computer", "💻")
+  , ("iphone", "📱")
+  , ("phone", "☎️")
+  , ("telephone", "☎️")
+  , ("telephone_receiver", "📞")
+  , ("pager", "📟")
+  , ("fax", "📠")
+  , ("satellite", "📡")
+  , ("tv", "📺")
+  , ("radio", "📻")
+  , ("loud_sound", "🔊")
+  , ("sound", "🔉")
+  , ("speaker", "🔈")
+  , ("mute", "🔇")
+  , ("bell", "🔔")
+  , ("no_bell", "🔕")
+  , ("loudspeaker", "📢")
+  , ("mega", "📣")
+  , ("hourglass_flowing_sand", "⏳")
+  , ("hourglass", "⌛")
+  , ("alarm_clock", "⏰")
+  , ("watch", "⌚")
+  , ("unlock", "🔓")
+  , ("lock", "🔒")
+  , ("lock_with_ink_pen", "🔏")
+  , ("closed_lock_with_key", "🔐")
+  , ("key", "🔑")
+  , ("mag_right", "🔎")
+  , ("bulb", "💡")
+  , ("flashlight", "🔦")
+  , ("high_brightness", "🔆")
+  , ("low_brightness", "🔅")
+  , ("electric_plug", "🔌")
+  , ("battery", "🔋")
+  , ("mag", "🔍")
+  , ("bathtub", "🛁")
+  , ("bath", "🛀")
+  , ("shower", "🚿")
+  , ("toilet", "🚽")
+  , ("wrench", "🔧")
+  , ("nut_and_bolt", "🔩")
+  , ("hammer", "🔨")
+  , ("door", "🚪")
+  , ("smoking", "🚬")
+  , ("bomb", "💣")
+  , ("gun", "🔫")
+  , ("hocho", "🔪")
+  , ("knife", "🔪")
+  , ("pill", "💊")
+  , ("syringe", "💉")
+  , ("moneybag", "💰")
+  , ("yen", "💴")
+  , ("dollar", "💵")
+  , ("pound", "💷")
+  , ("euro", "💶")
+  , ("credit_card", "💳")
+  , ("money_with_wings", "💸")
+  , ("calling", "📲")
+  , ("e-mail", "📧")
+  , ("inbox_tray", "📥")
+  , ("outbox_tray", "📤")
+  , ("email", "✉️")
+  , ("envelope", "✉️")
+  , ("envelope_with_arrow", "📩")
+  , ("incoming_envelope", "📨")
+  , ("postal_horn", "📯")
+  , ("mailbox", "📫")
+  , ("mailbox_closed", "📪")
+  , ("mailbox_with_mail", "📬")
+  , ("mailbox_with_no_mail", "📭")
+  , ("postbox", "📮")
+  , ("package", "📦")
+  , ("memo", "📝")
+  , ("pencil", "📝")
+  , ("page_facing_up", "📄")
+  , ("page_with_curl", "📃")
+  , ("bookmark_tabs", "📑")
+  , ("bar_chart", "📊")
+  , ("chart_with_upwards_trend", "📈")
+  , ("chart_with_downwards_trend", "📉")
+  , ("scroll", "📜")
+  , ("clipboard", "📋")
+  , ("date", "📅")
+  , ("calendar", "📆")
+  , ("card_index", "📇")
+  , ("file_folder", "📁")
+  , ("open_file_folder", "📂")
+  , ("scissors", "✂️")
+  , ("pushpin", "📌")
+  , ("paperclip", "📎")
+  , ("black_nib", "✒️")
+  , ("pencil2", "✏️")
+  , ("straight_ruler", "📏")
+  , ("triangular_ruler", "📐")
+  , ("closed_book", "📕")
+  , ("green_book", "📗")
+  , ("blue_book", "📘")
+  , ("orange_book", "📙")
+  , ("notebook", "📓")
+  , ("notebook_with_decorative_cover", "📔")
+  , ("ledger", "📒")
+  , ("books", "📚")
+  , ("book", "📖")
+  , ("open_book", "📖")
+  , ("bookmark", "🔖")
+  , ("name_badge", "📛")
+  , ("microscope", "🔬")
+  , ("telescope", "🔭")
+  , ("newspaper", "📰")
+  , ("art", "🎨")
+  , ("clapper", "🎬")
+  , ("microphone", "🎤")
+  , ("headphones", "🎧")
+  , ("musical_score", "🎼")
+  , ("musical_note", "🎵")
+  , ("notes", "🎶")
+  , ("musical_keyboard", "🎹")
+  , ("violin", "🎻")
+  , ("trumpet", "🎺")
+  , ("saxophone", "🎷")
+  , ("guitar", "🎸")
+  , ("space_invader", "👾")
+  , ("video_game", "🎮")
+  , ("black_joker", "🃏")
+  , ("flower_playing_cards", "🎴")
+  , ("mahjong", "🀄")
+  , ("game_die", "🎲")
+  , ("dart", "🎯")
+  , ("football", "🏈")
+  , ("basketball", "🏀")
+  , ("soccer", "⚽")
+  , ("baseball", "⚾️")
+  , ("tennis", "🎾")
+  , ("8ball", "🎱")
+  , ("rugby_football", "🏉")
+  , ("bowling", "🎳")
+  , ("golf", "⛳")
+  , ("mountain_bicyclist", "🚵")
+  , ("bicyclist", "🚴")
+  , ("checkered_flag", "🏁")
+  , ("horse_racing", "🏇")
+  , ("trophy", "🏆")
+  , ("ski", "🎿")
+  , ("snowboarder", "🏂")
+  , ("swimmer", "🏊")
+  , ("surfer", "🏄")
+  , ("fishing_pole_and_fish", "🎣")
+  , ("coffee", "☕")
+  , ("tea", "🍵")
+  , ("sake", "🍶")
+  , ("baby_bottle", "🍼")
+  , ("beer", "🍺")
+  , ("beers", "🍻")
+  , ("cocktail", "🍸")
+  , ("tropical_drink", "🍹")
+  , ("wine_glass", "🍷")
+  , ("fork_and_knife", "🍴")
+  , ("pizza", "🍕")
+  , ("hamburger", "🍔")
+  , ("fries", "🍟")
+  , ("poultry_leg", "🍗")
+  , ("meat_on_bone", "🍖")
+  , ("spaghetti", "🍝")
+  , ("curry", "🍛")
+  , ("fried_shrimp", "🍤")
+  , ("bento", "🍱")
+  , ("sushi", "🍣")
+  , ("fish_cake", "🍥")
+  , ("rice_ball", "🍙")
+  , ("rice_cracker", "🍘")
+  , ("rice", "🍚")
+  , ("ramen", "🍜")
+  , ("stew", "🍲")
+  , ("oden", "🍢")
+  , ("dango", "🍡")
+  , ("egg", "🍳")
+  , ("bread", "🍞")
+  , ("doughnut", "🍩")
+  , ("custard", "🍮")
+  , ("icecream", "🍦")
+  , ("ice_cream", "🍨")
+  , ("shaved_ice", "🍧")
+  , ("birthday", "🎂")
+  , ("cake", "🍰")
+  , ("cookie", "🍪")
+  , ("chocolate_bar", "🍫")
+  , ("candy", "🍬")
+  , ("lollipop", "🍭")
+  , ("honey_pot", "🍯")
+  , ("apple", "🍎")
+  , ("green_apple", "🍏")
+  , ("tangerine", "🍊")
+  , ("lemon", "🍋")
+  , ("cherries", "🍒")
+  , ("grapes", "🍇")
+  , ("watermelon", "🍉")
+  , ("strawberry", "🍓")
+  , ("peach", "🍑")
+  , ("melon", "🍈")
+  , ("banana", "🍌")
+  , ("pear", "🍐")
+  , ("pineapple", "🍍")
+  , ("sweet_potato", "🍠")
+  , ("eggplant", "🍆")
+  , ("tomato", "🍅")
+  , ("corn", "🌽")
+  , ("house", "🏠")
+  , ("house_with_garden", "🏡")
+  , ("school", "🏫")
+  , ("office", "🏢")
+  , ("post_office", "🏣")
+  , ("hospital", "🏥")
+  , ("bank", "🏦")
+  , ("convenience_store", "🏪")
+  , ("love_hotel", "🏩")
+  , ("hotel", "🏨")
+  , ("wedding", "💒")
+  , ("church", "⛪")
+  , ("department_store", "🏬")
+  , ("european_post_office", "🏤")
+  , ("city_sunrise", "🌇")
+  , ("city_sunset", "🌆")
+  , ("japanese_castle", "🏯")
+  , ("european_castle", "🏰")
+  , ("tent", "⛺")
+  , ("factory", "🏭")
+  , ("tokyo_tower", "🗼")
+  , ("japan", "🗾")
+  , ("mount_fuji", "🗻")
+  , ("sunrise_over_mountains", "🌄")
+  , ("sunrise", "🌅")
+  , ("night_with_stars", "🌃")
+  , ("statue_of_liberty", "🗽")
+  , ("bridge_at_night", "🌉")
+  , ("carousel_horse", "🎠")
+  , ("ferris_wheel", "🎡")
+  , ("fountain", "⛲")
+  , ("roller_coaster", "🎢")
+  , ("ship", "🚢")
+  , ("boat", "⛵")
+  , ("sailboat", "⛵")
+  , ("speedboat", "🚤")
+  , ("rowboat", "🚣")
+  , ("anchor", "⚓")
+  , ("rocket", "🚀")
+  , ("airplane", "✈️")
+  , ("seat", "💺")
+  , ("helicopter", "🚁")
+  , ("steam_locomotive", "🚂")
+  , ("tram", "🚊")
+  , ("station", "🚉")
+  , ("mountain_railway", "🚞")
+  , ("train2", "🚆")
+  , ("bullettrain_side", "🚄")
+  , ("bullettrain_front", "🚅")
+  , ("light_rail", "🚈")
+  , ("metro", "🚇")
+  , ("monorail", "🚝")
+  , ("train", "🚋")
+  , ("railway_car", "🚃")
+  , ("trolleybus", "🚎")
+  , ("bus", "🚌")
+  , ("oncoming_bus", "🚍")
+  , ("blue_car", "🚙")
+  , ("oncoming_automobile", "🚘")
+  , ("car", "🚗")
+  , ("red_car", "🚗")
+  , ("taxi", "🚕")
+  , ("oncoming_taxi", "🚖")
+  , ("articulated_lorry", "🚛")
+  , ("truck", "🚚")
+  , ("rotating_light", "🚨")
+  , ("police_car", "🚓")
+  , ("oncoming_police_car", "🚔")
+  , ("fire_engine", "🚒")
+  , ("ambulance", "🚑")
+  , ("minibus", "🚐")
+  , ("bike", "🚲")
+  , ("aerial_tramway", "🚡")
+  , ("suspension_railway", "🚟")
+  , ("mountain_cableway", "🚠")
+  , ("tractor", "🚜")
+  , ("barber", "💈")
+  , ("busstop", "🚏")
+  , ("ticket", "🎫")
+  , ("vertical_traffic_light", "🚦")
+  , ("traffic_light", "🚥")
+  , ("warning", "⚠️")
+  , ("construction", "🚧")
+  , ("beginner", "🔰")
+  , ("fuelpump", "⛽")
+  , ("izakaya_lantern", "🏮")
+  , ("lantern", "🏮")
+  , ("slot_machine", "🎰")
+  , ("hotsprings", "♨️")
+  , ("moyai", "🗿")
+  , ("circus_tent", "🎪")
+  , ("performing_arts", "🎭")
+  , ("round_pushpin", "📍")
+  , ("triangular_flag_on_post", "🚩")
+  , ("jp", "🇯🇵")
+  , ("kr", "🇰🇷")
+  , ("de", "🇩🇪")
+  , ("cn", "🇨🇳")
+  , ("us", "🇺🇸")
+  , ("fr", "🇫🇷")
+  , ("es", "🇪🇸")
+  , ("it", "🇮🇹")
+  , ("ru", "🇷🇺")
+  , ("gb", "🇬🇧")
+  , ("uk", "🇬🇧")
+  , ("one", "1️⃣")
+  , ("two", "2️⃣")
+  , ("three", "3️⃣")
+  , ("four", "4️⃣")
+  , ("five", "5️⃣")
+  , ("six", "6️⃣")
+  , ("seven", "7️⃣")
+  , ("eight", "8️⃣")
+  , ("nine", "9️⃣")
+  , ("zero", "0️⃣")
+  , ("keycap_ten", "🔟")
+  , ("hash", "#️⃣")
+  , ("symbols", "🔣")
+  , ("arrow_up", "⬆️")
+  , ("arrow_down", "⬇️")
+  , ("arrow_left", "⬅️")
+  , ("arrow_right", "➡️")
+  , ("capital_abcd", "🔠")
+  , ("abcd", "🔡")
+  , ("abc", "🔤")
+  , ("arrow_upper_right", "↗️")
+  , ("arrow_upper_left", "↖️")
+  , ("arrow_lower_right", "↘️")
+  , ("arrow_lower_left", "↙️")
+  , ("left_right_arrow", "↔️")
+  , ("arrow_up_down", "↕️")
+  , ("arrows_counterclockwise", "🔄")
+  , ("arrow_backward", "◀️")
+  , ("arrow_forward", "▶️")
+  , ("arrow_up_small", "🔼")
+  , ("arrow_down_small", "🔽")
+  , ("leftwards_arrow_with_hook", "↩️")
+  , ("arrow_right_hook", "↪️")
+  , ("information_source", "ℹ️")
+  , ("rewind", "⏪")
+  , ("fast_forward", "⏩")
+  , ("arrow_double_up", "⏫")
+  , ("arrow_double_down", "⏬")
+  , ("arrow_heading_down", "⤵️")
+  , ("arrow_heading_up", "⤴️")
+  , ("ok", "🆗")
+  , ("twisted_rightwards_arrows", "🔀")
+  , ("repeat", "🔁")
+  , ("repeat_one", "🔂")
+  , ("new", "🆕")
+  , ("up", "🆙")
+  , ("cool", "🆒")
+  , ("free", "🆓")
+  , ("ng", "🆖")
+  , ("signal_strength", "📶")
+  , ("cinema", "🎦")
+  , ("koko", "🈁")
+  , ("u6307", "🈯")
+  , ("u7a7a", "🈳")
+  , ("u6e80", "🈵")
+  , ("u5408", "🈴")
+  , ("u7981", "🈲")
+  , ("ideograph_advantage", "🉐")
+  , ("u5272", "🈹")
+  , ("u55b6", "🈺")
+  , ("u6709", "🈶")
+  , ("u7121", "🈚")
+  , ("restroom", "🚻")
+  , ("mens", "🚹")
+  , ("womens", "🚺")
+  , ("baby_symbol", "🚼")
+  , ("wc", "🚾")
+  , ("potable_water", "🚰")
+  , ("put_litter_in_its_place", "🚮")
+  , ("parking", "🅿️")
+  , ("wheelchair", "♿")
+  , ("no_smoking", "🚭")
+  , ("u6708", "🈷️")
+  , ("u7533", "🈸")
+  , ("sa", "🈂️")
+  , ("m", "Ⓜ️")
+  , ("passport_control", "🛂")
+  , ("baggage_claim", "🛄")
+  , ("left_luggage", "🛅")
+  , ("customs", "🛃")
+  , ("accept", "🉑")
+  , ("secret", "㊙️")
+  , ("congratulations", "㊗️")
+  , ("cl", "🆑")
+  , ("sos", "🆘")
+  , ("id", "🆔")
+  , ("no_entry_sign", "🚫")
+  , ("underage", "🔞")
+  , ("no_mobile_phones", "📵")
+  , ("do_not_litter", "🚯")
+  , ("non-potable_water", "🚱")
+  , ("no_bicycles", "🚳")
+  , ("no_pedestrians", "🚷")
+  , ("children_crossing", "🚸")
+  , ("no_entry", "⛔")
+  , ("eight_spoked_asterisk", "✳️")
+  , ("sparkle", "❇️")
+  , ("negative_squared_cross_mark", "❎")
+  , ("white_check_mark", "✅")
+  , ("eight_pointed_black_star", "✴️")
+  , ("heart_decoration", "💟")
+  , ("vs", "🆚")
+  , ("vibration_mode", "📳")
+  , ("mobile_phone_off", "📴")
+  , ("a", "🅰️")
+  , ("b", "🅱️")
+  , ("ab", "🆎")
+  , ("o2", "🅾️")
+  , ("diamond_shape_with_a_dot_inside", "💠")
+  , ("loop", "➿")
+  , ("recycle", "♻️")
+  , ("aries", "♈")
+  , ("taurus", "♉")
+  , ("gemini", "♊")
+  , ("cancer", "♋")
+  , ("leo", "♌")
+  , ("virgo", "♍")
+  , ("libra", "♎")
+  , ("scorpius", "♏")
+  , ("sagittarius", "♐")
+  , ("capricorn", "♑")
+  , ("aquarius", "♒")
+  , ("pisces", "♓")
+  , ("ophiuchus", "⛎")
+  , ("six_pointed_star", "🔯")
+  , ("atm", "🏧")
+  , ("chart", "💹")
+  , ("heavy_dollar_sign", "💲")
+  , ("currency_exchange", "💱")
+  , ("copyright", "©️")
+  , ("registered", "®️")
+  , ("tm", "™️")
+  , ("x", "❌")
+  , ("bangbang", "‼️")
+  , ("interrobang", "⁉️")
+  , ("exclamation", "❗")
+  , ("heavy_exclamation_mark", "❗")
+  , ("question", "❓")
+  , ("grey_exclamation", "❕")
+  , ("grey_question", "❔")
+  , ("o", "⭕")
+  , ("top", "🔝")
+  , ("end", "🔚")
+  , ("back", "🔙")
+  , ("on", "🔛")
+  , ("soon", "🔜")
+  , ("arrows_clockwise", "🔃")
+  , ("clock12", "🕛")
+  , ("clock1230", "🕧")
+  , ("clock1", "🕐")
+  , ("clock130", "🕜")
+  , ("clock2", "🕑")
+  , ("clock230", "🕝")
+  , ("clock3", "🕒")
+  , ("clock330", "🕞")
+  , ("clock4", "🕓")
+  , ("clock430", "🕟")
+  , ("clock5", "🕔")
+  , ("clock530", "🕠")
+  , ("clock6", "🕕")
+  , ("clock7", "🕖")
+  , ("clock8", "🕗")
+  , ("clock9", "🕘")
+  , ("clock10", "🕙")
+  , ("clock11", "🕚")
+  , ("clock630", "🕡")
+  , ("clock730", "🕢")
+  , ("clock830", "🕣")
+  , ("clock930", "🕤")
+  , ("clock1030", "🕥")
+  , ("clock1130", "🕦")
+  , ("heavy_multiplication_x", "✖️")
+  , ("heavy_plus_sign", "➕")
+  , ("heavy_minus_sign", "➖")
+  , ("heavy_division_sign", "➗")
+  , ("spades", "♠️")
+  , ("hearts", "♥️")
+  , ("clubs", "♣️")
+  , ("diamonds", "♦️")
+  , ("white_flower", "💮")
+  , ("heavy_check_mark", "✔️")
+  , ("ballot_box_with_check", "☑️")
+  , ("radio_button", "🔘")
+  , ("link", "🔗")
+  , ("curly_loop", "➰")
+  , ("wavy_dash", "〰️")
+  , ("part_alternation_mark", "〽️")
+  , ("trident", "🔱")
+  , ("black_medium_square", "◼️")
+  , ("white_medium_square", "◻️")
+  , ("black_medium_small_square", "◾")
+  , ("white_medium_small_square", "◽")
+  , ("black_small_square", "▪️")
+  , ("white_small_square", "▫️")
+  , ("small_red_triangle", "🔺")
+  , ("black_square_button", "🔲")
+  , ("white_square_button", "🔳")
+  , ("black_circle", "⚫")
+  , ("white_circle", "⚪")
+  , ("red_circle", "🔴")
+  , ("large_blue_circle", "🔵")
+  , ("small_red_triangle_down", "🔻")
+  , ("white_large_square", "⬜")
+  , ("black_large_square", "⬛")
+  , ("large_orange_diamond", "🔶")
+  , ("large_blue_diamond", "🔷")
+  , ("small_orange_diamond", "🔸")
+  , ("small_blue_diamond", "🔹")
+  ]
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index 20c842e0d..b7d268a65 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -105,6 +105,7 @@ data Extension =
     | Ext_ignore_line_breaks  -- ^ Newlines in paragraphs are ignored
     | Ext_literate_haskell    -- ^ Enable literate Haskell conventions
     | Ext_abbreviations       -- ^ PHP markdown extra abbreviation definitions
+    | Ext_emoji               -- ^ Support emoji like :smile:
     | Ext_auto_identifiers    -- ^ Automatic identifiers for headers
     | Ext_ascii_identifiers   -- ^ ascii-only identifiers for headers
     | Ext_header_attributes   -- ^ Explicit header attributes {#id .class k=v}
@@ -203,6 +204,7 @@ githubMarkdownExtensions = Set.fromList
   , Ext_intraword_underscores
   , Ext_strikeout
   , Ext_hard_line_breaks
+  , Ext_emoji
   , Ext_lists_without_preceding_blankline
   , Ext_shortcut_reference_links
   ]
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index d73b92fbd..7e811a966 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -39,6 +39,7 @@ import Data.Ord ( comparing )
 import Data.Char ( isSpace, isAlphaNum, toLower )
 import Data.Maybe
 import Text.Pandoc.Definition
+import Text.Pandoc.Emoji (emojis)
 import qualified Data.Text as T
 import Data.Text (Text)
 import qualified Data.Yaml as Yaml
@@ -1467,6 +1468,7 @@ inline = choice [ whitespace
                 , exampleRef
                 , smart
                 , return . B.singleton <$> charRef
+                , emoji
                 , symbol
                 , ltSign
                 ] <?> "inline"
@@ -1898,6 +1900,21 @@ rawHtmlInline = do
                              else not . isTextTag
   return $ return $ B.rawInline "html" result
 
+-- Emoji
+
+emojiChars :: [Char]
+emojiChars = ['a'..'z'] ++ ['0'..'9'] ++ ['_','+','-']
+
+emoji :: MarkdownParser (F Inlines)
+emoji = try $ do
+  guardEnabled Ext_emoji
+  char ':'
+  emojikey <- many1 (oneOf emojiChars)
+  char ':'
+  case M.lookup emojikey emojis of
+       Just s  -> return (return (B.str s))
+       Nothing -> mzero
+
 -- Citations
 
 cite :: MarkdownParser (F Inlines)
diff --git a/tests/Tests/Readers/Markdown.hs b/tests/Tests/Readers/Markdown.hs
index f6afacb34..366ab7413 100644
--- a/tests/Tests/Readers/Markdown.hs
+++ b/tests/Tests/Readers/Markdown.hs
@@ -185,6 +185,10 @@ tests = [ testGroup "inline code"
             "<\n\na>" =?>
             para (text "<") <> para (text "a>")
           ]
+        , testGroup "emoji"
+          [ test markdownGH "emoji symbols" $
+            ":smile: and :+1:" =?> para (text "😄 and 👍")
+          ]
         , "unbalanced brackets" =:
             "[[[[[[[[[[[[[[[hi" =?> para (text "[[[[[[[[[[[[[[[hi")
         , testGroup "backslash escapes"