rouge 2.0.7 → 2.1.0

data/lib/rouge/lexers/typescript/common.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    module TypescriptCommon
+      def self.keywords
+        @keywords ||= super + Set.new(%w(
+          is namespace static private protected public
+          implements readonly
+        ))
+      end
+
+      def self.declarations
+        @declarations ||= super + Set.new(%w(
+          type abstract
+        ))
+      end
+
+      def self.reserved
+        @reserved ||= super + Set.new(%w(
+          string any void number namespace module
+          declare default interface keyof
+        ))
+      end
+
+      def self.builtins
+        @builtins ||= super + %w(
+          Pick Partial Readonly Record
+        )
+      end
+    end
+  end
+end

data/lib/rouge/lexers/viml/keywords.rb

@@ -5,8 +5,8 @@ module Rouge
   module Lexers
     class VimL
       def self.keywords
-        @keywords ||= {:command=>[["a", "a"], ["ab", "ab"], ["abc", "abclear"], ["abo", "aboveleft"], ["al", "all"], ["ar", "ar"], ["ar", "args"], ["arga", "argadd"], ["argd", "argdelete"], ["argdo", "argdo"], ["arge", "argedit"], ["argg", "argglobal"], ["argl", "arglocal"], ["argu", "argument"], ["as", "ascii"], ["au", "au"], ["b", "buffer"], ["bN", "bNext"], ["ba", "ball"], ["bad", "badd"], ["bd", "bdelete"], ["bel", "belowright"], ["bf", "bfirst"], ["bl", "blast"], ["bm", "bmodified"], ["bn", "bnext"], ["bo", "botright"], ["bp", "bprevious"], ["br", "br"], ["br", "brewind"], ["brea", "break"], ["breaka", "breakadd"], ["breakd", "breakdel"], ["breakl", "breaklist"], ["bro", "browse"], ["bu", "bu"], ["buf", "buf"], ["bufdo", "bufdo"], ["buffers", "buffers"], ["bun", "bunload"], ["bw", "bwipeout"], ["c", "c"], ["c", "change"], ["cN", "cN"], ["cN", "cNext"], ["cNf", "cNf"], ["cNf", "cNfile"], ["cabc", "cabclear"], ["cad", "cad"], ["cad", "caddexpr"], ["caddb", "caddbuffer"], ["caddf", "caddfile"], ["cal", "call"], ["cat", "catch"], ["cb", "cbuffer"], ["cc", "cc"], ["ccl", "cclose"], ["cd", "cd"], ["ce", "center"], ["cex", "cexpr"], ["cf", "cfile"], ["cfir", "cfirst"], ["cg", "cgetfile"], ["cgetb", "cgetbuffer"], ["cgete", "cgetexpr"], ["changes", "changes"], ["chd", "chdir"], ["che", "checkpath"], ["checkt", "checktime"], ["cl", "cl"], ["cl", "clist"], ["cla", "clast"], ["clo", "close"], ["cmapc", "cmapclear"], ["cn", "cn"], ["cn", "cnext"], ["cnew", "cnewer"], ["cnf", "cnf"], ["cnf", "cnfile"], ["co", "copy"], ["col", "colder"], ["colo", "colorscheme"], ["com", "com"], ["comc", "comclear"], ["comp", "compiler"], ["con", "con"], ["con", "continue"], ["conf", "confirm"], ["cope", "copen"], ["cp", "cprevious"], ["cpf", "cpfile"], ["cq", "cquit"], ["cr", "crewind"], ["cs", "cs"], ["cscope", "cscope"], ["cstag", "cstag"], ["cuna", "cunabbrev"], ["cw", "cwindow"], ["d", "d"], ["d", "delete"], ["de", "de"], ["debug", "debug"], ["debugg", "debuggreedy"], ["del", "del"], ["delc", "delcommand"], ["delel", "delel"], ["delep", "delep"], ["deletel", "deletel"], ["deletep", "deletep"], ["deletl", "deletl"], ["deletp", "deletp"], ["delf", "delf"], ["delf", "delfunction"], ["dell", "dell"], ["delm", "delmarks"], ["delp", "delp"], ["dep", "dep"], ["di", "di"], ["di", "display"], ["diffg", "diffget"], ["diffo", "diffoff"], ["diffp", "diffpatch"], ["diffpu", "diffput"], ["diffs", "diffsplit"], ["difft", "diffthis"], ["diffu", "diffupdate"], ["dig", "dig"], ["dig", "digraphs"], ["dir", "dir"], ["dj", "djump"], ["dl", "dl"], ["dli", "dlist"], ["do", "do"], ["doau", "doau"], ["dp", "dp"], ["dr", "drop"], ["ds", "dsearch"], ["dsp", "dsplit"], ["e", "e"], ["e", "edit"], ["ea", "ea"], ["earlier", "earlier"], ["ec", "ec"], ["echoe", "echoerr"], ["echom", "echomsg"], ["echon", "echon"], ["el", "else"], ["elsei", "elseif"], ["em", "emenu"], ["en", "en"], ["en", "endif"], ["endf", "endf"], ["endf", "endfunction"], ["endfo", "endfor"], ["endfun", "endfun"], ["endt", "endtry"], ["endw", "endwhile"], ["ene", "enew"], ["ex", "ex"], ["exi", "exit"], ["exu", "exusage"], ["f", "f"], ["f", "file"], ["files", "files"], ["filet", "filet"], ["filetype", "filetype"], ["fin", "fin"], ["fin", "find"], ["fina", "finally"], ["fini", "finish"], ["fir", "first"], ["fix", "fixdel"], ["fo", "fold"], ["foldc", "foldclose"], ["foldd", "folddoopen"], ["folddoc", "folddoclosed"], ["foldo", "foldopen"], ["for", "for"], ["fu", "fu"], ["fu", "function"], ["fun", "fun"], ["g", "g"], ["go", "goto"], ["gr", "grep"], ["grepa", "grepadd"], ["gui", "gui"], ["gvim", "gvim"], ["h", "h"], ["h", "help"], ["ha", "hardcopy"], ["helpf", "helpfind"], ["helpg", "helpgrep"], ["helpt", "helptags"], ["hi", "hi"], ["hid", "hide"], ["his", "history"], ["i", "i"], ["ia", "ia"], ["iabc", "iabclear"], ["if", "if"], ["ij", "ijump"], ["il", "ilist"], ["imapc", "imapclear"], ["in", "in"], ["intro", "intro"], ["is", "isearch"], ["isp", "isplit"], ["iuna", "iunabbrev"], ["j", "join"], ["ju", "jumps"], ["k", "k"], ["kee", "keepmarks"], ["keepa", "keepa"], ["keepalt", "keepalt"], ["keepj", "keepjumps"], ["keepp", "keeppatterns"], ["l", "l"], ["l", "list"], ["lN", "lN"], ["lN", "lNext"], ["lNf", "lNf"], ["lNf", "lNfile"], ["la", "la"], ["la", "last"], ["lad", "lad"], ["lad", "laddexpr"], ["laddb", "laddbuffer"], ["laddf", "laddfile"], ["lan", "lan"], ["lan", "language"], ["lat", "lat"], ["later", "later"], ["lb", "lbuffer"], ["lc", "lcd"], ["lch", "lchdir"], ["lcl", "lclose"], ["lcs", "lcs"], ["lcscope", "lcscope"], ["le", "left"], ["lefta", "leftabove"], ["lex", "lexpr"], ["lf", "lfile"], ["lfir", "lfirst"], ["lg", "lgetfile"], ["lgetb", "lgetbuffer"], ["lgete", "lgetexpr"], ["lgr", "lgrep"], ["lgrepa", "lgrepadd"], ["lh", "lhelpgrep"], ["ll", "ll"], ["lla", "llast"], ["lli", "llist"], ["lmak", "lmake"], ["lmapc", "lmapclear"], ["lne", "lne"], ["lne", "lnext"], ["lnew", "lnewer"], ["lnf", "lnf"], ["lnf", "lnfile"], ["lo", "lo"], ["lo", "loadview"], ["loadk", "loadk"], ["loadkeymap", "loadkeymap"], ["loc", "lockmarks"], ["lockv", "lockvar"], ["lol", "lolder"], ["lop", "lopen"], ["lp", "lprevious"], ["lpf", "lpfile"], ["lr", "lrewind"], ["ls", "ls"], ["lt", "ltag"], ["lua", "lua"], ["luado", "luado"], ["luafile", "luafile"], ["lv", "lvimgrep"], ["lvimgrepa", "lvimgrepadd"], ["lw", "lwindow"], ["m", "move"], ["ma", "ma"], ["ma", "mark"], ["mak", "make"], ["marks", "marks"], ["mat", "match"], ["menut", "menut"], ["menut", "menutranslate"], ["mes", "mes"], ["messages", "messages"], ["mk", "mk"], ["mk", "mkexrc"], ["mks", "mksession"], ["mksp", "mkspell"], ["mkv", "mkv"], ["mkv", "mkvimrc"], ["mkvie", "mkview"], ["mo", "mo"], ["mod", "mode"], ["mz", "mz"], ["mz", "mzscheme"], ["mzf", "mzfile"], ["n", "n"], ["n", "next"], ["nb", "nbkey"], ["nbc", "nbclose"], ["nbs", "nbstart"], ["ne", "ne"], ["new", "new"], ["nmapc", "nmapclear"], ["noa", "noa"], ["noautocmd", "noautocmd"], ["noh", "nohlsearch"], ["nu", "number"], ["o", "o"], ["o", "open"], ["ol", "oldfiles"], ["omapc", "omapclear"], ["on", "only"], ["opt", "options"], ["ownsyntax", "ownsyntax"], ["p", "p"], ["p", "print"], ["pc", "pclose"], ["pe", "pe"], ["pe", "perl"], ["ped", "pedit"], ["perld", "perldo"], ["po", "pop"], ["popu", "popu"], ["popu", "popup"], ["pp", "ppop"], ["pr", "pr"], ["pre", "preserve"], ["prev", "previous"], ["pro", "pro"], ["prof", "profile"], ["profd", "profdel"], ["promptf", "promptfind"], ["promptr", "promptrepl"], ["ps", "psearch"], ["ptN", "ptN"], ["ptN", "ptNext"], ["pta", "ptag"], ["ptf", "ptfirst"], ["ptj", "ptjump"], ["ptl", "ptlast"], ["ptn", "ptn"], ["ptn", "ptnext"], ["ptp", "ptprevious"], ["ptr", "ptrewind"], ["pts", "ptselect"], ["pu", "put"], ["pw", "pwd"], ["py", "py"], ["py", "python"], ["py3", "py3"], ["py3", "py3"], ["py3do", "py3do"], ["pydo", "pydo"], ["pyf", "pyfile"], ["python3", "python3"], ["q", "q"], ["q", "quit"], ["qa", "qall"], ["quita", "quitall"], ["r", "r"], ["r", "read"], ["re", "re"], ["rec", "recover"], ["red", "red"], ["red", "redo"], ["redi", "redir"], ["redr", "redraw"], ["redraws", "redrawstatus"], ["reg", "registers"], ["res", "resize"], ["ret", "retab"], ["retu", "return"], ["rew", "rewind"], ["ri", "right"], ["rightb", "rightbelow"], ["ru", "ru"], ["ru", "runtime"], ["rub", "ruby"], ["rubyd", "rubydo"], ["rubyf", "rubyfile"], ["rundo", "rundo"], ["rv", "rviminfo"], ["sN", "sNext"], ["sa", "sargument"], ["sal", "sall"], ["san", "sandbox"], ["sav", "saveas"], ["sb", "sbuffer"], ["sbN", "sbNext"], ["sba", "sball"], ["sbf", "sbfirst"], ["sbl", "sblast"], ["sbm", "sbmodified"], ["sbn", "sbnext"], ["sbp", "sbprevious"], ["sbr", "sbrewind"], ["scrip", "scrip"], ["scrip", "scriptnames"], ["scripte", "scriptencoding"], ["scs", "scs"], ["scscope", "scscope"], ["se", "set"], ["setf", "setfiletype"], ["setg", "setglobal"], ["setl", "setlocal"], ["sf", "sfind"], ["sfir", "sfirst"], ["sh", "shell"], ["si", "si"], ["sig", "sig"], ["sign", "sign"], ["sil", "silent"], ["sim", "simalt"], ["sl", "sl"], ["sl", "sleep"], ["sla", "slast"], ["sm", "smagic"], ["sm", "smap"], ["sme", "sme"], ["smenu", "smenu"], ["sn", "snext"], ["sni", "sniff"], ["sno", "snomagic"], ["snoreme", "snoreme"], ["snoremenu", "snoremenu"], ["so", "so"], ["so", "source"], ["sor", "sort"], ["sp", "split"], ["spe", "spe"], ["spe", "spellgood"], ["spelld", "spelldump"], ["spelli", "spellinfo"], ["spellr", "spellrepall"], ["spellu", "spellundo"], ["spellw", "spellwrong"], ["spr", "sprevious"], ["sre", "srewind"], ["st", "st"], ["st", "stop"], ["sta", "stag"], ["star", "star"], ["star", "startinsert"], ["start", "start"], ["startg", "startgreplace"], ["startr", "startreplace"], ["stj", "stjump"], ["stopi", "stopinsert"], ["sts", "stselect"], ["sun", "sunhide"], ["sunme", "sunme"], ["sunmenu", "sunmenu"], ["sus", "suspend"], ["sv", "sview"], ["sw", "swapname"], ["sy", "sy"], ["syn", "syn"], ["sync", "sync"], ["syncbind", "syncbind"], ["syntime", "syntime"], ["t", "t"], ["tN", "tN"], ["tN", "tNext"], ["ta", "ta"], ["ta", "tag"], ["tab", "tab"], ["tabN", "tabN"], ["tabN", "tabNext"], ["tabc", "tabclose"], ["tabd", "tabdo"], ["tabe", "tabedit"], ["tabf", "tabfind"], ["tabfir", "tabfirst"], ["tabl", "tablast"], ["tabm", "tabmove"], ["tabn", "tabnext"], ["tabnew", "tabnew"], ["tabo", "tabonly"], ["tabp", "tabprevious"], ["tabr", "tabrewind"], ["tabs", "tabs"], ["tags", "tags"], ["tc", "tcl"], ["tcld", "tcldo"], ["tclf", "tclfile"], ["te", "tearoff"], ["tf", "tfirst"], ["th", "throw"], ["tj", "tjump"], ["tl", "tlast"], ["tm", "tm"], ["tm", "tmenu"], ["tn", "tn"], ["tn", "tnext"], ["to", "topleft"], ["tp", "tprevious"], ["tr", "tr"], ["tr", "trewind"], ["try", "try"], ["ts", "tselect"], ["tu", "tu"], ["tu", "tunmenu"], ["u", "u"], ["u", "undo"], ["un", "un"], ["una", "unabbreviate"], ["undoj", "undojoin"], ["undol", "undolist"], ["unh", "unhide"], ["unl", "unl"], ["unlo", "unlockvar"], ["uns", "unsilent"], ["up", "update"], ["v", "v"], ["ve", "ve"], ["ve", "version"], ["verb", "verbose"], ["vert", "vertical"], ["vi", "vi"], ["vi", "visual"], ["vie", "view"], ["vim", "vimgrep"], ["vimgrepa", "vimgrepadd"], ["viu", "viusage"], ["vmapc", "vmapclear"], ["vne", "vnew"], ["vs", "vsplit"], ["w", "w"], ["w", "write"], ["wN", "wNext"], ["wa", "wall"], ["wh", "while"], ["win", "win"], ["win", "winsize"], ["winc", "wincmd"], ["windo", "windo"], ["winp", "winpos"], ["wn", "wnext"], ["wp", "wprevious"], ["wq", "wq"], ["wqa", "wqall"], ["ws", "wsverb"], ["wundo", "wundo"], ["wv", "wviminfo"], ["x", "x"], ["x", "xit"], ["xa", "xall"], ["xmapc", "xmapclear"], ["xme", "xme"], ["xmenu", "xmenu"], ["xnoreme", "xnoreme"], ["xnoremenu", "xnoremenu"], ["xunme", "xunme"], ["xunmenu", "xunmenu"], ["xwininfo", "xwininfo"], ["y", "yank"]], :option=>[], :auto=>[["BufAdd", "BufAdd"], ["BufCreate", "BufCreate"], ["BufDelete", "BufDelete"], ["BufEnter", "BufEnter"], ["BufFilePost", "BufFilePost"], ["BufFilePre", "BufFilePre"], ["BufHidden", "BufHidden"], ["BufLeave", "BufLeave"], ["BufNew", "BufNew"], ["BufNewFile", "BufNewFile"], ["BufRead", "BufRead"], ["BufReadCmd", "BufReadCmd"], ["BufReadPost", "BufReadPost"], ["BufReadPre", "BufReadPre"], ["BufUnload", "BufUnload"], ["BufWinEnter", "BufWinEnter"], ["BufWinLeave", "BufWinLeave"], ["BufWipeout", "BufWipeout"], ["BufWrite", "BufWrite"], ["BufWriteCmd", "BufWriteCmd"], ["BufWritePost", "BufWritePost"], ["BufWritePre", "BufWritePre"], ["Cmd", "Cmd"], ["CmdwinEnter", "CmdwinEnter"], ["CmdwinLeave", "CmdwinLeave"], ["ColorScheme", "ColorScheme"], ["CompleteDone", "CompleteDone"], ["CursorHold", "CursorHold"], ["CursorHoldI", "CursorHoldI"], ["CursorMoved", "CursorMoved"], ["CursorMovedI", "CursorMovedI"], ["EncodingChanged", "EncodingChanged"], ["FileAppendCmd", "FileAppendCmd"], ["FileAppendPost", "FileAppendPost"], ["FileAppendPre", "FileAppendPre"], ["FileChangedRO", "FileChangedRO"], ["FileChangedShell", "FileChangedShell"], ["FileChangedShellPost", "FileChangedShellPost"], ["FileEncoding", "FileEncoding"], ["FileReadCmd", "FileReadCmd"], ["FileReadPost", "FileReadPost"], ["FileReadPre", "FileReadPre"], ["FileType", "FileType"], ["FileWriteCmd", "FileWriteCmd"], ["FileWritePost", "FileWritePost"], ["FileWritePre", "FileWritePre"], ["FilterReadPost", "FilterReadPost"], ["FilterReadPre", "FilterReadPre"], ["FilterWritePost", "FilterWritePost"], ["FilterWritePre", "FilterWritePre"], ["FocusGained", "FocusGained"], ["FocusLost", "FocusLost"], ["FuncUndefined", "FuncUndefined"], ["GUIEnter", "GUIEnter"], ["GUIFailed", "GUIFailed"], ["InsertChange", "InsertChange"], ["InsertCharPre", "InsertCharPre"], ["InsertEnter", "InsertEnter"], ["InsertLeave", "InsertLeave"], ["MenuPopup", "MenuPopup"], ["QuickFixCmdPost", "QuickFixCmdPost"], ["QuickFixCmdPre", "QuickFixCmdPre"], ["QuitPre", "QuitPre"], ["RemoteReply", "RemoteReply"], ["SessionLoadPost", "SessionLoadPost"], ["ShellCmdPost", "ShellCmdPost"], ["ShellFilterPost", "ShellFilterPost"], ["SourceCmd", "SourceCmd"], ["SourcePre", "SourcePre"], ["SpellFileMissing", "SpellFileMissing"], ["StdinReadPost", "StdinReadPost"], ["StdinReadPre", "StdinReadPre"], ["SwapExists", "SwapExists"], ["Syntax", "Syntax"], ["TabEnter", "TabEnter"], ["TabLeave", "TabLeave"], ["TermChanged", "TermChanged"], ["TermResponse", "TermResponse"], ["TextChanged", "TextChanged"], ["TextChangedI", "TextChangedI"], ["User", "User"], ["UserGettingBored", "UserGettingBored"], ["VimEnter", "VimEnter"], ["VimLeave", "VimLeave"], ["VimLeavePre", "VimLeavePre"], ["VimResized", "VimResized"], ["WinEnter", "WinEnter"], ["WinLeave", "WinLeave"], ["event", "event"]]}
+        @keywords ||= {:command=>[["a", "a"], ["abc", "abclear"], ["abo", "aboveleft"], ["al", "all"], ["ar", "args"], ["arga", "argadd"], ["argd", "argdelete"], ["argdo", "argdo"], ["arge", "argedit"], ["argg", "argglobal"], ["argl", "arglocal"], ["argu", "argument"], ["as", "ascii"], ["au", "au"], ["b", "buffer"], ["bN", "bNext"], ["ba", "ball"], ["bad", "badd"], ["bd", "bdelete"], ["bel", "belowright"], ["bf", "bfirst"], ["bl", "blast"], ["bm", "bmodified"], ["bn", "bnext"], ["bo", "botright"], ["bp", "bprevious"], ["br", "brewind"], ["brea", "break"], ["breaka", "breakadd"], ["breakd", "breakdel"], ["breakl", "breaklist"], ["bro", "browse"], ["bufdo", "bufdo"], ["buffers", "buffers"], ["bun", "bunload"], ["bw", "bwipeout"], ["c", "change"], ["cN", "cNext"], ["cNf", "cNfile"], ["cabc", "cabclear"], ["cad", "caddbuffer"], ["cadde", "caddexpr"], ["caddf", "caddfile"], ["cal", "call"], ["cat", "catch"], ["cb", "cbuffer"], ["cbo", "cbottom"], ["cc", "cc"], ["ccl", "cclose"], ["cd", "cd"], ["cdo", "cdo"], ["ce", "center"], ["cex", "cexpr"], ["cf", "cfile"], ["cfdo", "cfdo"], ["cfir", "cfirst"], ["cg", "cgetfile"], ["cgetb", "cgetbuffer"], ["cgete", "cgetexpr"], ["changes", "changes"], ["chd", "chdir"], ["che", "checkpath"], ["checkt", "checktime"], ["chi", "chistory"], ["cl", "clist"], ["cla", "clast"], ["cle", "clearjumps"], ["clo", "close"], ["cmapc", "cmapclear"], ["cn", "cnext"], ["cnew", "cnewer"], ["cnf", "cnfile"], ["co", "copy"], ["col", "colder"], ["colo", "colorscheme"], ["com", "com"], ["comc", "comclear"], ["comp", "compiler"], ["con", "continue"], ["conf", "confirm"], ["cope", "copen"], ["cp", "cprevious"], ["cpf", "cpfile"], ["cq", "cquit"], ["cr", "crewind"], ["cs", "cs"], ["cscope", "cscope"], ["cstag", "cstag"], ["cuna", "cunabbrev"], ["cw", "cwindow"], ["d", "delete"], ["debug", "debug"], ["debugg", "debuggreedy"], ["delc", "delcommand"], ["delel", "delel"], ["delep", "delep"], ["deletel", "deletel"], ["deletep", "deletep"], ["deletl", "deletl"], ["deletp", "deletp"], ["delf", "delfunction"], ["dell", "dell"], ["delm", "delmarks"], ["delp", "delp"], ["dep", "dep"], ["di", "display"], ["dif", "diffupdate"], ["diffg", "diffget"], ["diffo", "diffoff"], ["diffp", "diffpatch"], ["diffpu", "diffput"], ["diffs", "diffsplit"], ["difft", "diffthis"], ["dig", "digraphs"], ["dir", "dir"], ["dj", "djump"], ["dl", "dl"], ["dli", "dlist"], ["do", "do"], ["doau", "doau"], ["dp", "dp"], ["dr", "drop"], ["ds", "dsearch"], ["dsp", "dsplit"], ["e", "edit"], ["ea", "ea"], ["earlier", "earlier"], ["echoe", "echoerr"], ["echom", "echomsg"], ["echon", "echon"], ["el", "else"], ["elsei", "elseif"], ["em", "emenu"], ["en", "endif"], ["endf", "endfunction"], ["endfo", "endfor"], ["endt", "endtry"], ["endw", "endwhile"], ["ene", "enew"], ["ex", "ex"], ["exi", "exit"], ["exu", "exusage"], ["f", "file"], ["files", "files"], ["filet", "filet"], ["filetype", "filetype"], ["filt", "filter"], ["fin", "find"], ["fina", "finally"], ["fini", "finish"], ["fir", "first"], ["fix", "fixdel"], ["fo", "fold"], ["foldc", "foldclose"], ["foldd", "folddoopen"], ["folddoc", "folddoclosed"], ["foldo", "foldopen"], ["for", "for"], ["fu", "function"], ["g", "g"], ["go", "goto"], ["gr", "grep"], ["grepa", "grepadd"], ["gui", "gui"], ["gvim", "gvim"], ["h", "help"], ["ha", "hardcopy"], ["helpc", "helpclose"], ["helpf", "helpfind"], ["helpg", "helpgrep"], ["helpt", "helptags"], ["hi", "hi"], ["hid", "hide"], ["his", "history"], ["i", "i"], ["iabc", "iabclear"], ["if", "if"], ["ij", "ijump"], ["il", "ilist"], ["imapc", "imapclear"], ["in", "in"], ["intro", "intro"], ["is", "isearch"], ["isp", "isplit"], ["iuna", "iunabbrev"], ["j", "join"], ["ju", "jumps"], ["k", "k"], ["kee", "keepmarks"], ["keepa", "keepa"], ["keepalt", "keepalt"], ["keepj", "keepjumps"], ["keepp", "keeppatterns"], ["l", "list"], ["lN", "lNext"], ["lNf", "lNfile"], ["la", "last"], ["lad", "laddexpr"], ["laddb", "laddbuffer"], ["laddf", "laddfile"], ["lan", "language"], ["lat", "lat"], ["later", "later"], ["lb", "lbuffer"], ["lbo", "lbottom"], ["lc", "lcd"], ["lch", "lchdir"], ["lcl", "lclose"], ["lcs", "lcs"], ["lcscope", "lcscope"], ["ld", "ldo"], ["le", "left"], ["lefta", "leftabove"], ["lex", "lexpr"], ["lf", "lfile"], ["lfdo", "lfdo"], ["lfir", "lfirst"], ["lg", "lgetfile"], ["lgetb", "lgetbuffer"], ["lgete", "lgetexpr"], ["lgr", "lgrep"], ["lgrepa", "lgrepadd"], ["lh", "lhelpgrep"], ["lhi", "lhistory"], ["ll", "ll"], ["lla", "llast"], ["lli", "llist"], ["lmak", "lmake"], ["lmapc", "lmapclear"], ["lne", "lnext"], ["lnew", "lnewer"], ["lnf", "lnfile"], ["lo", "loadview"], ["loadk", "loadk"], ["loadkeymap", "loadkeymap"], ["loc", "lockmarks"], ["lockv", "lockvar"], ["lol", "lolder"], ["lop", "lopen"], ["lp", "lprevious"], ["lpf", "lpfile"], ["lr", "lrewind"], ["ls", "ls"], ["lt", "ltag"], ["lua", "lua"], ["luado", "luado"], ["luafile", "luafile"], ["lv", "lvimgrep"], ["lvimgrepa", "lvimgrepadd"], ["lw", "lwindow"], ["m", "move"], ["ma", "mark"], ["mak", "make"], ["marks", "marks"], ["mat", "match"], ["menut", "menutranslate"], ["mes", "mes"], ["messages", "messages"], ["mk", "mkexrc"], ["mks", "mksession"], ["mksp", "mkspell"], ["mkv", "mkvimrc"], ["mkvie", "mkview"], ["mod", "mode"], ["mz", "mzscheme"], ["mzf", "mzfile"], ["n", "next"], ["nb", "nbkey"], ["nbc", "nbclose"], ["nbs", "nbstart"], ["new", "new"], ["nmapc", "nmapclear"], ["noa", "noa"], ["noautocmd", "noautocmd"], ["noh", "nohlsearch"], ["nor", "nor"], ["nore", "nore"], ["nos", "noswapfile"], ["nu", "number"], ["o", "open"], ["ol", "oldfiles"], ["omapc", "omapclear"], ["on", "only"], ["opt", "options"], ["ownsyntax", "ownsyntax"], ["p", "print"], ["pa", "packadd"], ["packl", "packloadall"], ["pc", "pclose"], ["pe", "perl"], ["ped", "pedit"], ["perld", "perldo"], ["po", "pop"], ["popu", "popup"], ["pp", "ppop"], ["pre", "preserve"], ["prev", "previous"], ["pro", "pro"], ["prof", "profile"], ["profd", "profdel"], ["promptf", "promptfind"], ["promptr", "promptrepl"], ["ps", "psearch"], ["ptN", "ptNext"], ["pta", "ptag"], ["ptf", "ptfirst"], ["ptj", "ptjump"], ["ptl", "ptlast"], ["ptn", "ptnext"], ["ptp", "ptprevious"], ["ptr", "ptrewind"], ["pts", "ptselect"], ["pu", "put"], ["pw", "pwd"], ["py", "python"], ["py3", "py3"], ["py3", "py3"], ["py3do", "py3do"], ["pydo", "pydo"], ["pyf", "pyfile"], ["python3", "python3"], ["q", "quit"], ["qa", "qall"], ["quita", "quitall"], ["r", "read"], ["rec", "recover"], ["red", "redo"], ["redi", "redir"], ["redr", "redraw"], ["redraws", "redrawstatus"], ["reg", "registers"], ["res", "resize"], ["ret", "retab"], ["retu", "return"], ["rew", "rewind"], ["ri", "right"], ["rightb", "rightbelow"], ["ru", "runtime"], ["rub", "ruby"], ["rubyd", "rubydo"], ["rubyf", "rubyfile"], ["rundo", "rundo"], ["rv", "rviminfo"], ["sI", "sI"], ["sIc", "sIc"], ["sIe", "sIe"], ["sIg", "sIg"], ["sIl", "sIl"], ["sIn", "sIn"], ["sIp", "sIp"], ["sIr", "sIr"], ["sN", "sNext"], ["sa", "sargument"], ["sal", "sall"], ["san", "sandbox"], ["sav", "saveas"], ["sb", "sbuffer"], ["sbN", "sbNext"], ["sba", "sball"], ["sbf", "sbfirst"], ["sbl", "sblast"], ["sbm", "sbmodified"], ["sbn", "sbnext"], ["sbp", "sbprevious"], ["sbr", "sbrewind"], ["sc", "sc"], ["scI", "scI"], ["sce", "sce"], ["scg", "scg"], ["sci", "sci"], ["scl", "scl"], ["scp", "scp"], ["scr", "scriptnames"], ["scripte", "scriptencoding"], ["scs", "scs"], ["scscope", "scscope"], ["se", "set"], ["setf", "setfiletype"], ["setg", "setglobal"], ["setl", "setlocal"], ["sf", "sfind"], ["sfir", "sfirst"], ["sg", "sg"], ["sgI", "sgI"], ["sgc", "sgc"], ["sge", "sge"], ["sgi", "sgi"], ["sgl", "sgl"], ["sgn", "sgn"], ["sgp", "sgp"], ["sgr", "sgr"], ["sh", "shell"], ["si", "si"], ["sic", "sic"], ["sie", "sie"], ["sig", "sig"], ["sign", "sign"], ["sil", "silent"], ["sim", "simalt"], ["sin", "sin"], ["sip", "sip"], ["sir", "sir"], ["sl", "sleep"], ["sla", "slast"], ["sm", "smagic"], ["sm", "smap"], ["sme", "sme"], ["smenu", "smenu"], ["smile", "smile"], ["sn", "snext"], ["sno", "snomagic"], ["snoreme", "snoreme"], ["snoremenu", "snoremenu"], ["so", "source"], ["sor", "sort"], ["sp", "split"], ["spe", "spellgood"], ["spelld", "spelldump"], ["spelli", "spellinfo"], ["spellr", "spellrepall"], ["spellu", "spellundo"], ["spellw", "spellwrong"], ["spr", "sprevious"], ["sr", "sr"], ["srI", "srI"], ["src", "src"], ["sre", "srewind"], ["srg", "srg"], ["sri", "sri"], ["srl", "srl"], ["srn", "srn"], ["srp", "srp"], ["st", "stop"], ["sta", "stag"], ["star", "startinsert"], ["startg", "startgreplace"], ["startr", "startreplace"], ["stj", "stjump"], ["stopi", "stopinsert"], ["sts", "stselect"], ["sun", "sunhide"], ["sunme", "sunme"], ["sunmenu", "sunmenu"], ["sus", "suspend"], ["sv", "sview"], ["sw", "swapname"], ["sy", "sy"], ["syn", "syn"], ["sync", "sync"], ["syncbind", "syncbind"], ["syntime", "syntime"], ["t", "t"], ["tN", "tNext"], ["ta", "tag"], ["tab", "tab"], ["tabN", "tabNext"], ["tabc", "tabclose"], ["tabd", "tabdo"], ["tabe", "tabedit"], ["tabf", "tabfind"], ["tabfir", "tabfirst"], ["tabl", "tablast"], ["tabm", "tabmove"], ["tabn", "tabnext"], ["tabnew", "tabnew"], ["tabo", "tabonly"], ["tabp", "tabprevious"], ["tabr", "tabrewind"], ["tabs", "tabs"], ["tags", "tags"], ["tc", "tcl"], ["tcld", "tcldo"], ["tclf", "tclfile"], ["te", "tearoff"], ["tf", "tfirst"], ["th", "throw"], ["tj", "tjump"], ["tl", "tlast"], ["tm", "tmenu"], ["tn", "tnext"], ["to", "topleft"], ["tp", "tprevious"], ["tr", "trewind"], ["try", "try"], ["ts", "tselect"], ["tu", "tunmenu"], ["u", "undo"], ["una", "unabbreviate"], ["undoj", "undojoin"], ["undol", "undolist"], ["unh", "unhide"], ["unlo", "unlockvar"], ["uns", "unsilent"], ["up", "update"], ["v", "v"], ["ve", "version"], ["verb", "verbose"], ["vert", "vertical"], ["vi", "visual"], ["vie", "view"], ["vim", "vimgrep"], ["vimgrepa", "vimgrepadd"], ["viu", "viusage"], ["vmapc", "vmapclear"], ["vne", "vnew"], ["vs", "vsplit"], ["w", "write"], ["wN", "wNext"], ["wa", "wall"], ["wh", "while"], ["win", "winsize"], ["winc", "wincmd"], ["windo", "windo"], ["winp", "winpos"], ["wn", "wnext"], ["wp", "wprevious"], ["wq", "wq"], ["wqa", "wqall"], ["ws", "wsverb"], ["wundo", "wundo"], ["wv", "wviminfo"], ["x", "xit"], ["xa", "xall"], ["xmapc", "xmapclear"], ["xme", "xme"], ["xmenu", "xmenu"], ["xnoreme", "xnoreme"], ["xnoremenu", "xnoremenu"], ["xprop", "xprop"], ["xunme", "xunme"], ["xunmenu", "xunmenu"], ["xwininfo", "xwininfo"], ["y", "yank"]], :option=>[], :auto=>[["BufAdd", "BufAdd"], ["BufCreate", "BufCreate"], ["BufDelete", "BufDelete"], ["BufEnter", "BufEnter"], ["BufFilePost", "BufFilePost"], ["BufFilePre", "BufFilePre"], ["BufHidden", "BufHidden"], ["BufLeave", "BufLeave"], ["BufNew", "BufNew"], ["BufNewFile", "BufNewFile"], ["BufRead", "BufRead"], ["BufReadCmd", "BufReadCmd"], ["BufReadPost", "BufReadPost"], ["BufReadPre", "BufReadPre"], ["BufUnload", "BufUnload"], ["BufWinEnter", "BufWinEnter"], ["BufWinLeave", "BufWinLeave"], ["BufWipeout", "BufWipeout"], ["BufWrite", "BufWrite"], ["BufWriteCmd", "BufWriteCmd"], ["BufWritePost", "BufWritePost"], ["BufWritePre", "BufWritePre"], ["CmdUndefined", "CmdUndefined"], ["CmdwinEnter", "CmdwinEnter"], ["CmdwinLeave", "CmdwinLeave"], ["ColorScheme", "ColorScheme"], ["CompleteDone", "CompleteDone"], ["CursorHold", "CursorHold"], ["CursorHoldI", "CursorHoldI"], ["CursorMoved", "CursorMoved"], ["CursorMovedI", "CursorMovedI"], ["EncodingChanged", "EncodingChanged"], ["FileAppendCmd", "FileAppendCmd"], ["FileAppendPost", "FileAppendPost"], ["FileAppendPre", "FileAppendPre"], ["FileChangedRO", "FileChangedRO"], ["FileChangedShell", "FileChangedShell"], ["FileChangedShellPost", "FileChangedShellPost"], ["FileEncoding", "FileEncoding"], ["FileReadCmd", "FileReadCmd"], ["FileReadPost", "FileReadPost"], ["FileReadPre", "FileReadPre"], ["FileType", "FileType"], ["FileWriteCmd", "FileWriteCmd"], ["FileWritePost", "FileWritePost"], ["FileWritePre", "FileWritePre"], ["FilterReadPost", "FilterReadPost"], ["FilterReadPre", "FilterReadPre"], ["FilterWritePost", "FilterWritePost"], ["FilterWritePre", "FilterWritePre"], ["FocusGained", "FocusGained"], ["FocusLost", "FocusLost"], ["FuncUndefined", "FuncUndefined"], ["GUIEnter", "GUIEnter"], ["GUIFailed", "GUIFailed"], ["InsertChange", "InsertChange"], ["InsertCharPre", "InsertCharPre"], ["InsertEnter", "InsertEnter"], ["InsertLeave", "InsertLeave"], ["MenuPopup", "MenuPopup"], ["OptionSet", "OptionSet"], ["QuickFixCmdPost", "QuickFixCmdPost"], ["QuickFixCmdPre", "QuickFixCmdPre"], ["QuitPre", "QuitPre"], ["RemoteReply", "RemoteReply"], ["SessionLoadPost", "SessionLoadPost"], ["ShellCmdPost", "ShellCmdPost"], ["ShellFilterPost", "ShellFilterPost"], ["SourceCmd", "SourceCmd"], ["SourcePre", "SourcePre"], ["SpellFileMissing", "SpellFileMissing"], ["StdinReadPost", "StdinReadPost"], ["StdinReadPre", "StdinReadPre"], ["SwapExists", "SwapExists"], ["Syntax", "Syntax"], ["TabClosed", "TabClosed"], ["TabEnter", "TabEnter"], ["TabLeave", "TabLeave"], ["TabNew", "TabNew"], ["TermChanged", "TermChanged"], ["TermResponse", "TermResponse"], ["TextChanged", "TextChanged"], ["TextChangedI", "TextChangedI"], ["User", "User"], ["VimEnter", "VimEnter"], ["VimLeave", "VimLeave"], ["VimLeavePre", "VimLeavePre"], ["VimResized", "VimResized"], ["WinEnter", "WinEnter"], ["WinLeave", "WinLeave"], ["WinNew", "WinNew"]]}
       end
     end
   end
-end
+end

data/lib/rouge/lexers/wollok.rb

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*- # 
+
+module Rouge
+  module Lexers
+    class Wollok < RegexLexer
+      title 'Wollok'
+      desc 'Wollok lang'
+      tag 'wollok'
+      filenames *%w(*.wlk *.wtest *.wpgm)
+
+      def self.analyze_text(_text)
+        0.3
+      end
+
+      keywords = %w(new super return if else var const override constructor)
+
+      entity_name = /[a-zA-Z][a-zA-Z0-9]*/
+      variable_naming = /_?#{entity_name}/
+
+      entities = []
+
+      state :whitespaces_and_comments do
+        rule /\s+/m, Text::Whitespace
+        rule /$+/m, Text::Whitespace
+        rule %r(//.*$), Comment::Single
+        rule %r(/\*(.|\s)*?\*/)m, Comment::Multiline
+      end
+
+      state :root do
+        mixin :whitespaces_and_comments
+        rule /(import)(.+$)/ do
+          groups Keyword::Reserved, Text
+        end
+        rule /(class|object|mixin)/, Keyword::Reserved, :foo
+        rule /test|program/, Keyword::Reserved #, :chunk_naming
+        rule /(package)(\s+)(#{entity_name})/ do
+          groups Keyword::Reserved, Text::Whitespace, Name::Class
+        end
+        rule /{|}/, Text
+        mixin :keywords
+        mixin :symbols
+        mixin :objects
+      end
+
+      state :foo do
+        mixin :whitespaces_and_comments
+        rule /inherits|mixed|with|and/, Keyword::Reserved
+        rule /#{entity_name}(?=\s*{)/ do |m|
+          token Name::Class
+          entities << m[0]
+          pop!
+        end
+        rule /#{entity_name}/ do |m|
+          token Name::Class
+          entities << m[0]
+        end
+      end
+
+      state :keywords do
+        def any(expressions)
+          /#{expressions.map { |keyword| "#{keyword}\\b" }.join('|')}/
+        end
+
+        rule /self\b/, Name::Builtin::Pseudo
+        rule any(keywords), Keyword::Reserved
+        rule /(method)(\s+)(#{variable_naming})/ do
+          groups Keyword::Reserved, Text::Whitespace, Text
+        end
+      end
+
+      state :objects do
+        rule variable_naming do |m|
+          variable = m[0]
+          if entities.include?(variable) || ('A'..'Z').include?(variable[0])
+            token Name::Class
+          else
+            token Keyword::Variable
+          end
+        end
+        rule /\.#{entity_name}/, Text
+        mixin :literals
+      end
+
+      state :literals do
+        mixin :whitespaces_and_comments
+        rule /[0-9]+\.?[0-9]*/, Literal::Number
+        rule /"[^"]*"/m, Literal::String
+        rule /\[|\#{/, Punctuation, :lists
+      end
+
+      state :lists do
+        rule /,/, Punctuation
+        rule /]|}/, Punctuation, :pop!
+        mixin :objects
+      end
+
+      state :symbols do
+        rule /\+\+|--|\+=|-=|\*\*|!/, Operator
+        rule /\+|-|\*|\/|%/, Operator
+        rule /<=|=>|===|==|<|>/, Operator
+        rule /and\b|or\b|not\b/, Operator
+        rule /\(|\)|=/, Text
+        rule /,/, Punctuation
+      end
+    end
+  end
+end

data/lib/rouge/lexers/xml.rb

@@ -52,7 +52,7 @@ module Rouge
 
       state :attr do
         rule /\s+/m, Text
-        rule /".*?"|'.*?'|[^\s>]+/, Str, :pop!
+        rule /".*?"|'.*?'|[^\s>]+/m, Str, :pop!
       end
     end
   end

data/lib/rouge/lexers/yaml.rb

@@ -8,13 +8,15 @@ module Rouge
       mimetypes 'text/x-yaml'
       tag 'yaml'
       aliases 'yml'
+      filenames '*.yaml', '*.yml'
 
       def self.analyze_text(text)
         # look for the %YAML directive
         return 1 if text =~ /\A\s*%YAML/m
       end
 
-      filenames '*.yaml', '*.yml'
+      SPECIAL_VALUES = Regexp.union(%w(true false null))
+
       # NB: Tabs are forbidden in YAML, which is why you see things
       # like /[ ]+/.
 
@@ -335,6 +337,7 @@ module Rouge
         end
 
         rule /[ ]+/, Str
+        rule SPECIAL_VALUES, Name::Constant
         # regular non-whitespace characters
         rule /[^\s:]+/, Str
       end

data/lib/rouge/regex_lexer.rb

@@ -233,6 +233,7 @@ module Rouge
       @stack = nil
       @current_stream = nil
 
+      puts "start blocks" if @debug && self.class.start_procs.any?
       self.class.start_procs.each do |pr|
         instance_eval(&pr)
       end

data/lib/rouge/template_lexer.rb

@@ -10,13 +10,11 @@ module Rouge
     # the parent lexer - the one being templated.
     def parent
       return @parent if instance_variable_defined? :@parent
-      @parent = option(:parent) || 'html'
-      if @parent.is_a? ::String
-        lexer_class = Lexer.find(@parent)
-        @parent = lexer_class.new(self.options)
-      end
+      @parent = lexer_option(:parent) || Lexers::HTML.new(@options)
     end
 
+    option :parent, "the parent language (default: html)"
+
     start { parent.reset! }
   end
 end

data/lib/rouge/theme.rb

@@ -111,7 +111,11 @@ module Rouge
         return @name if n.nil?
 
         @name = n.to_s
-        Theme.registry[@name] = self
+        register(@name)
+      end
+
+      def register(name)
+        Theme.registry[name.to_s] = self
       end
 
       def find(n)
@@ -136,12 +140,18 @@ module Rouge
       return self if self.mode == mode
 
       new_name = "#{self.name}.#{mode}"
-      Class.new(self) { name(new_name); mode!(mode) }
+      Class.new(self) { name(new_name); set_mode!(mode) }
+    end
+
+    def set_mode!(mode)
+      @mode = mode
+      send("make_#{mode}!")
     end
 
     def mode!(arg)
-      @mode = arg
-      send("make_#{arg}!")
+      alt_name = "#{self.name}.#{arg}"
+      register(alt_name)
+      set_mode!(arg)
     end
   end
 

data/lib/rouge/themes/igor_pro.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Themes
+    class IgorPro < CSSTheme
+      name 'igorpro'
+
+      style Text,                             :fg => '#444444'
+      style Comment::Preproc,                 :fg => '#CC00A3'
+      style Comment::Special,                 :fg => '#CC00A3'
+      style Comment,                          :fg => '#FF0000'
+      style Keyword::Constant,                :fg => '#C34E00'
+      style Keyword::Declaration,             :fg => '#0000FF'
+      style Keyword::Reserved,                :fg => '#007575'
+      style Keyword,                          :fg => '#0000FF'
+      style Literal::String,                  :fg => '#009C00'
+      style Name::Builtin,                    :fg => '#C34E00'
+    end
+  end
+end

data/lib/rouge/themes/pastie.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class Pastie < CSSTheme
+      name 'pastie' 
+
+      style Comment,                   :fg => '#888888'
+      style Comment::Preproc,          :fg => '#cc0000', :bold => true
+      style Comment::Special,          :fg => '#cc0000', :bg => '#fff0f0', :bold => true
+
+      style Error,                     :fg => '#a61717', :bg => '#e3d2d2'
+      style Generic::Error,            :fg => '#aa0000'
+
+      style Generic::Heading,          :fg => '#333333'
+      style Generic::Subheading,       :fg => '#666666'
+
+      style Generic::Deleted,          :fg => '#000000', :bg => '#ffdddd'
+      style Generic::Inserted,         :fg => '#000000', :bg => '#ddffdd'
+
+      style Generic::Emph,             :italic => true
+      style Generic::Strong,           :bold => true
+
+      style Generic::Lineno,           :fg => '#888888'
+      style Generic::Output,           :fg => '#888888'
+      style Generic::Prompt,           :fg => '#555555'
+      style Generic::Traceback,        :fg => '#aa0000'
+
+      style Keyword,                   :fg => '#008800', :bold => true
+      style Keyword::Pseudo,           :fg => '#008800'
+      style Keyword::Type,             :fg => '#888888', :bold => true
+
+      style Num,                       :fg => '#0000dd', :bold => true
+
+      style Str,                       :fg => '#dd2200', :bg => '#fff0f0'
+      style Str::Escape,               :fg => '#0044dd', :bg => '#fff0f0'
+      style Str::Interpol,             :fg => '#3333bb', :bg => '#fff0f0'
+      style Str::Other,                :fg => '#22bb22', :bg => '#f0fff0'
+      #style Str::Regex,                :fg => '#008800', :bg => '#fff0ff'
+      # The background color on regex really doesn't look good, so let's drop it
+      style Str::Regex,                :fg => '#008800'
+      style Str::Symbol,               :fg => '#aa6600', :bg => '#fff0f0'
+
+      style Name::Attribute,           :fg => '#336699'
+      style Name::Builtin,             :fg => '#003388'
+      style Name::Class,               :fg => '#bb0066', :bold => true
+      style Name::Constant,            :fg => '#003366', :bold => true
+      style Name::Decorator,           :fg => '#555555'
+      style Name::Exception,           :fg => '#bb0066', :bold => true
+      style Name::Function,            :fg => '#0066bb', :bold => true
+      #style Name::Label,              :fg => '#336699', :italic => true
+      # Name::Label is used for built-in CSS properties in Rouge, so let's drop italics
+      style Name::Label,               :fg => '#336699'
+      style Name::Namespace,           :fg => '#bb0066', :bold => true
+      style Name::Property,            :fg => '#336699', :bold => true
+      style Name::Tag,                 :fg => '#bb0066', :bold => true
+      style Name::Variable,            :fg => '#336699'
+      style Name::Variable::Global,    :fg => '#dd7700'
+      style Name::Variable::Instance,  :fg => '#3333bb'
+
+      style Operator::Word,            :fg => '#008800'
+
+      style Text,                      {}
+      style Text::Whitespace,          :fg => '#bbbbbb'
+    end
+  end
+end

data/lib/rouge/themes/thankful_eyes.rb

@@ -25,13 +25,15 @@ module Rouge
       style Text, :fg => :unicorn, :bg => :krasna
       style Generic::Lineno, :fg => :eggshell_cloud, :bg => :slate_blue
 
+      style Generic::Prompt, :fg => :chilly, :bold => true
+
       style Comment, :fg => :cool_as_ice, :italic => true
       style Comment::Preproc, :fg => :go_get_it, :bold => true, :italic => true
-      style Error,
-            Generic::Error, :fg => :aluminum1, :bg => :scarletred2
+      style Error, :fg => :aluminum1, :bg => :scarletred2
+      style Generic::Error, :fg => :scarletred2, :italic => true, :bold => true
       style Keyword, :fg => :sandy, :bold => true
-      style Operator,
-            Punctuation, :fg => :backlit
+      style Operator, :fg => :backlit, :bold => true
+      style Punctuation, :fg => :backlit
       style Generic::Deleted, :fg => :scarletred2
       style Generic::Inserted, :fg => :go_get_it
       style Generic::Emph, :italic => true
@@ -61,7 +63,8 @@ module Rouge
             Literal::String::Interpol, :fg => :backlit, :bold => true
       style Name::Builtin, :bold => true
       style Name::Entity, :fg => '#999999', :bold => true
-      style Text::Whitespace, :fg => '#BBBBBB'
+      style Text::Whitespace,
+            Generic::Output, :fg => '#BBBBBB'
       style Name::Function,
             Name::Property,
             Name::Attribute, :fg => :chilly

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "2.0.7"
+    "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -28,6 +28,7 @@ files:
 - lib/rouge/demos/apache
 - lib/rouge/demos/apiblueprint
 - lib/rouge/demos/applescript
+- lib/rouge/demos/awk
 - lib/rouge/demos/biml
 - lib/rouge/demos/bsl
 - lib/rouge/demos/c
@@ -38,6 +39,7 @@ files:
 - lib/rouge/demos/coffeescript
 - lib/rouge/demos/common_lisp
 - lib/rouge/demos/conf
+- lib/rouge/demos/console
 - lib/rouge/demos/coq
 - lib/rouge/demos/cpp
 - lib/rouge/demos/csharp
@@ -45,7 +47,9 @@ files:
 - lib/rouge/demos/d
 - lib/rouge/demos/dart
 - lib/rouge/demos/diff
+- lib/rouge/demos/digdag
 - lib/rouge/demos/docker
+- lib/rouge/demos/dot
 - lib/rouge/demos/eiffel
 - lib/rouge/demos/elixir
 - lib/rouge/demos/erb
@@ -57,15 +61,20 @@ files:
 - lib/rouge/demos/glsl
 - lib/rouge/demos/go
 - lib/rouge/demos/gradle
+- lib/rouge/demos/graphql
 - lib/rouge/demos/groovy
 - lib/rouge/demos/haml
 - lib/rouge/demos/handlebars
 - lib/rouge/demos/haskell
 - lib/rouge/demos/html
 - lib/rouge/demos/http
+- lib/rouge/demos/hylang
 - lib/rouge/demos/idlang
+- lib/rouge/demos/igorpro
 - lib/rouge/demos/ini
 - lib/rouge/demos/io
+- lib/rouge/demos/irb
+- lib/rouge/demos/irb_output
 - lib/rouge/demos/java
 - lib/rouge/demos/javascript
 - lib/rouge/demos/jinja
@@ -75,6 +84,7 @@ files:
 - lib/rouge/demos/jsx
 - lib/rouge/demos/julia
 - lib/rouge/demos/kotlin
+- lib/rouge/demos/lasso
 - lib/rouge/demos/liquid
 - lib/rouge/demos/literate_coffeescript
 - lib/rouge/demos/literate_haskell
@@ -84,6 +94,7 @@ files:
 - lib/rouge/demos/markdown
 - lib/rouge/demos/matlab
 - lib/rouge/demos/moonscript
+- lib/rouge/demos/mosel
 - lib/rouge/demos/mxml
 - lib/rouge/demos/nasm
 - lib/rouge/demos/nginx
@@ -94,6 +105,8 @@ files:
 - lib/rouge/demos/perl
 - lib/rouge/demos/php
 - lib/rouge/demos/plaintext
+- lib/rouge/demos/plist
+- lib/rouge/demos/pony
 - lib/rouge/demos/powershell
 - lib/rouge/demos/praat
 - lib/rouge/demos/prolog
@@ -102,6 +115,7 @@ files:
 - lib/rouge/demos/protobuf
 - lib/rouge/demos/puppet
 - lib/rouge/demos/python
+- lib/rouge/demos/q
 - lib/rouge/demos/qml
 - lib/rouge/demos/r
 - lib/rouge/demos/racket
@@ -113,7 +127,7 @@ files:
 - lib/rouge/demos/scss
 - lib/rouge/demos/sed
 - lib/rouge/demos/shell
-- lib/rouge/demos/shell_session
+- lib/rouge/demos/sieve
 - lib/rouge/demos/slim
 - lib/rouge/demos/smalltalk
 - lib/rouge/demos/smarty
@@ -124,6 +138,7 @@ files:
 - lib/rouge/demos/tcl
 - lib/rouge/demos/tex
 - lib/rouge/demos/toml
+- lib/rouge/demos/tsx
 - lib/rouge/demos/tulip
 - lib/rouge/demos/turtle
 - lib/rouge/demos/twig
@@ -134,6 +149,7 @@ files:
 - lib/rouge/demos/vhdl
 - lib/rouge/demos/viml
 - lib/rouge/demos/vue
+- lib/rouge/demos/wollok
 - lib/rouge/demos/xml
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
@@ -158,6 +174,7 @@ files:
 - lib/rouge/lexers/apache/keywords.yml
 - lib/rouge/lexers/apiblueprint.rb
 - lib/rouge/lexers/apple_script.rb
+- lib/rouge/lexers/awk.rb
 - lib/rouge/lexers/biml.rb
 - lib/rouge/lexers/bsl.rb
 - lib/rouge/lexers/c.rb
@@ -168,6 +185,7 @@ files:
 - lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/common_lisp.rb
 - lib/rouge/lexers/conf.rb
+- lib/rouge/lexers/console.rb
 - lib/rouge/lexers/coq.rb
 - lib/rouge/lexers/cpp.rb
 - lib/rouge/lexers/csharp.rb
@@ -175,7 +193,9 @@ files:
 - lib/rouge/lexers/d.rb
 - lib/rouge/lexers/dart.rb
 - lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/digdag.rb
 - lib/rouge/lexers/docker.rb
+- lib/rouge/lexers/dot.rb
 - lib/rouge/lexers/eiffel.rb
 - lib/rouge/lexers/elixir.rb
 - lib/rouge/lexers/erb.rb
@@ -188,15 +208,19 @@ files:
 - lib/rouge/lexers/glsl.rb
 - lib/rouge/lexers/go.rb
 - lib/rouge/lexers/gradle.rb
+- lib/rouge/lexers/graphql.rb
 - lib/rouge/lexers/groovy.rb
 - lib/rouge/lexers/haml.rb
 - lib/rouge/lexers/handlebars.rb
 - lib/rouge/lexers/haskell.rb
 - lib/rouge/lexers/html.rb
 - lib/rouge/lexers/http.rb
+- lib/rouge/lexers/hylang.rb
 - lib/rouge/lexers/idlang.rb
+- lib/rouge/lexers/igorpro.rb
 - lib/rouge/lexers/ini.rb
 - lib/rouge/lexers/io.rb
+- lib/rouge/lexers/irb.rb
 - lib/rouge/lexers/java.rb
 - lib/rouge/lexers/javascript.rb
 - lib/rouge/lexers/jinja.rb
@@ -206,6 +230,8 @@ files:
 - lib/rouge/lexers/jsx.rb
 - lib/rouge/lexers/julia.rb
 - lib/rouge/lexers/kotlin.rb
+- lib/rouge/lexers/lasso.rb
+- lib/rouge/lexers/lasso/keywords.yml
 - lib/rouge/lexers/liquid.rb
 - lib/rouge/lexers/literate_coffeescript.rb
 - lib/rouge/lexers/literate_haskell.rb
@@ -217,6 +243,7 @@ files:
 - lib/rouge/lexers/matlab.rb
 - lib/rouge/lexers/matlab/builtins.rb
 - lib/rouge/lexers/moonscript.rb
+- lib/rouge/lexers/mosel.rb
 - lib/rouge/lexers/mxml.rb
 - lib/rouge/lexers/nasm.rb
 - lib/rouge/lexers/nginx.rb
@@ -228,6 +255,8 @@ files:
 - lib/rouge/lexers/php.rb
 - lib/rouge/lexers/php/builtins.rb
 - lib/rouge/lexers/plain_text.rb
+- lib/rouge/lexers/plist.rb
+- lib/rouge/lexers/pony.rb
 - lib/rouge/lexers/powershell.rb
 - lib/rouge/lexers/praat.rb
 - lib/rouge/lexers/prolog.rb
@@ -236,6 +265,7 @@ files:
 - lib/rouge/lexers/protobuf.rb
 - lib/rouge/lexers/puppet.rb
 - lib/rouge/lexers/python.rb
+- lib/rouge/lexers/q.rb
 - lib/rouge/lexers/qml.rb
 - lib/rouge/lexers/r.rb
 - lib/rouge/lexers/racket.rb
@@ -248,7 +278,7 @@ files:
 - lib/rouge/lexers/scss.rb
 - lib/rouge/lexers/sed.rb
 - lib/rouge/lexers/shell.rb
-- lib/rouge/lexers/shell_session.rb
+- lib/rouge/lexers/sieve.rb
 - lib/rouge/lexers/slim.rb
 - lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/smarty.rb
@@ -259,10 +289,12 @@ files:
 - lib/rouge/lexers/tcl.rb
 - lib/rouge/lexers/tex.rb
 - lib/rouge/lexers/toml.rb
+- lib/rouge/lexers/tsx.rb
 - lib/rouge/lexers/tulip.rb
 - lib/rouge/lexers/turtle.rb
 - lib/rouge/lexers/twig.rb
 - lib/rouge/lexers/typescript.rb
+- lib/rouge/lexers/typescript/common.rb
 - lib/rouge/lexers/vala.rb
 - lib/rouge/lexers/vb.rb
 - lib/rouge/lexers/verilog.rb
@@ -270,6 +302,7 @@ files:
 - lib/rouge/lexers/viml.rb
 - lib/rouge/lexers/viml/keywords.rb
 - lib/rouge/lexers/vue.rb
+- lib/rouge/lexers/wollok.rb
 - lib/rouge/lexers/xml.rb
 - lib/rouge/lexers/yaml.rb
 - lib/rouge/plugins/redcarpet.rb
@@ -281,9 +314,11 @@ files:
 - lib/rouge/themes/colorful.rb
 - lib/rouge/themes/github.rb
 - lib/rouge/themes/gruvbox.rb
+- lib/rouge/themes/igor_pro.rb
 - lib/rouge/themes/molokai.rb
 - lib/rouge/themes/monokai.rb
 - lib/rouge/themes/monokai_sublime.rb
+- lib/rouge/themes/pastie.rb
 - lib/rouge/themes/thankful_eyes.rb
 - lib/rouge/themes/tulip.rb
 - lib/rouge/token.rb
@@ -310,9 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments
 test_files: []
-has_rdoc: