rouge 3.3.0 → 3.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (216) hide show
  1. checksums.yaml +5 -5
  2. data/Gemfile +15 -3
  3. data/lib/rouge.rb +49 -41
  4. data/lib/rouge/cli.rb +64 -15
  5. data/lib/rouge/demos/ada +26 -0
  6. data/lib/rouge/demos/armasm +12 -0
  7. data/lib/rouge/demos/batchfile +3 -0
  8. data/lib/rouge/demos/bbcbasic +6 -0
  9. data/lib/rouge/demos/bpf +7 -0
  10. data/lib/rouge/demos/brainfuck +5 -0
  11. data/lib/rouge/demos/cmhg +8 -0
  12. data/lib/rouge/demos/cuda +11 -0
  13. data/lib/rouge/demos/cython +6 -0
  14. data/lib/rouge/demos/epp +4 -0
  15. data/lib/rouge/demos/escape +3 -0
  16. data/lib/rouge/demos/gdscript +18 -0
  17. data/lib/rouge/demos/hocon +8 -0
  18. data/lib/rouge/demos/magik +6 -0
  19. data/lib/rouge/demos/mason +22 -0
  20. data/lib/rouge/demos/msgtrans +4 -0
  21. data/lib/rouge/demos/openedge +4 -0
  22. data/lib/rouge/demos/opentype_feature_file +6 -0
  23. data/lib/rouge/demos/plist +1 -132
  24. data/lib/rouge/demos/powershell +12 -48
  25. data/lib/rouge/demos/reasonml +12 -0
  26. data/lib/rouge/demos/sas +13 -0
  27. data/lib/rouge/demos/supercollider +11 -0
  28. data/lib/rouge/demos/xojo +14 -0
  29. data/lib/rouge/demos/xpath +2 -0
  30. data/lib/rouge/demos/xquery +22 -0
  31. data/lib/rouge/formatter.rb +37 -1
  32. data/lib/rouge/formatters/html.rb +20 -2
  33. data/lib/rouge/formatters/html_line_table.rb +53 -0
  34. data/lib/rouge/formatters/html_linewise.rb +6 -11
  35. data/lib/rouge/formatters/html_table.rb +20 -31
  36. data/lib/rouge/formatters/terminal256.rb +1 -0
  37. data/lib/rouge/formatters/tex.rb +92 -0
  38. data/lib/rouge/guessers/disambiguation.rb +25 -0
  39. data/lib/rouge/guessers/glob_mapping.rb +1 -1
  40. data/lib/rouge/guessers/modeline.rb +1 -1
  41. data/lib/rouge/guessers/source.rb +1 -1
  42. data/lib/rouge/lexer.rb +64 -14
  43. data/lib/rouge/lexers/abap.rb +11 -11
  44. data/lib/rouge/lexers/actionscript.rb +34 -34
  45. data/lib/rouge/lexers/ada.rb +162 -0
  46. data/lib/rouge/lexers/apache.rb +8 -8
  47. data/lib/rouge/lexers/apple_script.rb +15 -14
  48. data/lib/rouge/lexers/armasm.rb +145 -0
  49. data/lib/rouge/lexers/awk.rb +25 -25
  50. data/lib/rouge/lexers/batchfile.rb +164 -0
  51. data/lib/rouge/lexers/bbcbasic.rb +112 -0
  52. data/lib/rouge/lexers/biml.rb +4 -4
  53. data/lib/rouge/lexers/bpf.rb +104 -0
  54. data/lib/rouge/lexers/brainfuck.rb +53 -0
  55. data/lib/rouge/lexers/bsl.rb +12 -12
  56. data/lib/rouge/lexers/c.rb +34 -57
  57. data/lib/rouge/lexers/ceylon.rb +6 -34
  58. data/lib/rouge/lexers/cfscript.rb +26 -26
  59. data/lib/rouge/lexers/clojure.rb +14 -14
  60. data/lib/rouge/lexers/cmake.rb +14 -14
  61. data/lib/rouge/lexers/cmhg.rb +34 -0
  62. data/lib/rouge/lexers/coffeescript.rb +43 -35
  63. data/lib/rouge/lexers/common_lisp.rb +37 -37
  64. data/lib/rouge/lexers/conf.rb +6 -6
  65. data/lib/rouge/lexers/console.rb +3 -3
  66. data/lib/rouge/lexers/coq.rb +18 -18
  67. data/lib/rouge/lexers/cpp.rb +12 -9
  68. data/lib/rouge/lexers/crystal.rb +70 -70
  69. data/lib/rouge/lexers/csharp.rb +28 -29
  70. data/lib/rouge/lexers/css.rb +23 -23
  71. data/lib/rouge/lexers/cuda.rb +35 -0
  72. data/lib/rouge/lexers/cython.rb +151 -0
  73. data/lib/rouge/lexers/d.rb +59 -59
  74. data/lib/rouge/lexers/dart.rb +33 -33
  75. data/lib/rouge/lexers/diff.rb +8 -4
  76. data/lib/rouge/lexers/digdag.rb +1 -1
  77. data/lib/rouge/lexers/docker.rb +11 -11
  78. data/lib/rouge/lexers/dot.rb +16 -16
  79. data/lib/rouge/lexers/eiffel.rb +20 -20
  80. data/lib/rouge/lexers/elixir.rb +34 -30
  81. data/lib/rouge/lexers/elm.rb +29 -29
  82. data/lib/rouge/lexers/epp.rb +51 -0
  83. data/lib/rouge/lexers/erb.rb +4 -4
  84. data/lib/rouge/lexers/escape.rb +58 -0
  85. data/lib/rouge/lexers/factor.rb +40 -40
  86. data/lib/rouge/lexers/fortran.rb +32 -32
  87. data/lib/rouge/lexers/fsharp.rb +30 -30
  88. data/lib/rouge/lexers/gdscript.rb +171 -0
  89. data/lib/rouge/lexers/gherkin.rb +16 -14
  90. data/lib/rouge/lexers/glsl.rb +1 -5
  91. data/lib/rouge/lexers/go.rb +2 -2
  92. data/lib/rouge/lexers/graphql.rb +77 -60
  93. data/lib/rouge/lexers/groovy.rb +23 -25
  94. data/lib/rouge/lexers/hack.rb +1 -1
  95. data/lib/rouge/lexers/haml.rb +25 -29
  96. data/lib/rouge/lexers/handlebars.rb +31 -20
  97. data/lib/rouge/lexers/haskell.rb +66 -65
  98. data/lib/rouge/lexers/hcl.rb +25 -25
  99. data/lib/rouge/lexers/hocon.rb +86 -0
  100. data/lib/rouge/lexers/html.rb +32 -31
  101. data/lib/rouge/lexers/http.rb +4 -4
  102. data/lib/rouge/lexers/hylang.rb +14 -14
  103. data/lib/rouge/lexers/idlang.rb +32 -32
  104. data/lib/rouge/lexers/igorpro.rb +31 -31
  105. data/lib/rouge/lexers/ini.rb +12 -12
  106. data/lib/rouge/lexers/io.rb +7 -7
  107. data/lib/rouge/lexers/irb.rb +5 -5
  108. data/lib/rouge/lexers/java.rb +28 -24
  109. data/lib/rouge/lexers/javascript.rb +57 -61
  110. data/lib/rouge/lexers/jinja.rb +34 -20
  111. data/lib/rouge/lexers/json.rb +50 -11
  112. data/lib/rouge/lexers/json_doc.rb +2 -2
  113. data/lib/rouge/lexers/jsonnet.rb +18 -18
  114. data/lib/rouge/lexers/jsp.rb +30 -30
  115. data/lib/rouge/lexers/jsx.rb +16 -16
  116. data/lib/rouge/lexers/julia.rb +181 -58
  117. data/lib/rouge/lexers/kotlin.rb +14 -7
  118. data/lib/rouge/lexers/lasso.rb +50 -50
  119. data/lib/rouge/lexers/liquid.rb +76 -53
  120. data/lib/rouge/lexers/literate_coffeescript.rb +2 -2
  121. data/lib/rouge/lexers/literate_haskell.rb +5 -5
  122. data/lib/rouge/lexers/llvm.rb +23 -16
  123. data/lib/rouge/lexers/lua.rb +3 -3
  124. data/lib/rouge/lexers/m68k.rb +18 -19
  125. data/lib/rouge/lexers/magik.rb +127 -0
  126. data/lib/rouge/lexers/make.rb +56 -34
  127. data/lib/rouge/lexers/markdown.rb +55 -38
  128. data/lib/rouge/lexers/mason.rb +115 -0
  129. data/lib/rouge/lexers/mathematica.rb +11 -11
  130. data/lib/rouge/lexers/matlab.rb +23 -16
  131. data/lib/rouge/lexers/moonscript.rb +3 -3
  132. data/lib/rouge/lexers/mosel.rb +63 -63
  133. data/lib/rouge/lexers/msgtrans.rb +26 -0
  134. data/lib/rouge/lexers/mxml.rb +18 -18
  135. data/lib/rouge/lexers/nasm.rb +24 -25
  136. data/lib/rouge/lexers/nginx.rb +14 -14
  137. data/lib/rouge/lexers/nim.rb +3 -2
  138. data/lib/rouge/lexers/nix.rb +43 -43
  139. data/lib/rouge/lexers/objective_c.rb +43 -48
  140. data/lib/rouge/lexers/ocaml.rb +28 -64
  141. data/lib/rouge/lexers/ocaml/common.rb +53 -0
  142. data/lib/rouge/lexers/openedge.rb +429 -0
  143. data/lib/rouge/lexers/opentype_feature_file.rb +113 -0
  144. data/lib/rouge/lexers/pascal.rb +4 -4
  145. data/lib/rouge/lexers/perl.rb +98 -68
  146. data/lib/rouge/lexers/php.rb +66 -44
  147. data/lib/rouge/lexers/php/builtins.rb +181 -174
  148. data/lib/rouge/lexers/plain_text.rb +1 -1
  149. data/lib/rouge/lexers/plist.rb +14 -14
  150. data/lib/rouge/lexers/pony.rb +19 -19
  151. data/lib/rouge/lexers/powershell.rb +184 -638
  152. data/lib/rouge/lexers/praat.rb +75 -75
  153. data/lib/rouge/lexers/prolog.rb +26 -20
  154. data/lib/rouge/lexers/prometheus.rb +30 -30
  155. data/lib/rouge/lexers/properties.rb +12 -12
  156. data/lib/rouge/lexers/protobuf.rb +22 -22
  157. data/lib/rouge/lexers/puppet.rb +32 -32
  158. data/lib/rouge/lexers/python.rb +52 -52
  159. data/lib/rouge/lexers/q.rb +12 -12
  160. data/lib/rouge/lexers/qml.rb +12 -12
  161. data/lib/rouge/lexers/r.rb +12 -13
  162. data/lib/rouge/lexers/racket.rb +22 -22
  163. data/lib/rouge/lexers/reasonml.rb +65 -0
  164. data/lib/rouge/lexers/ruby.rb +72 -70
  165. data/lib/rouge/lexers/rust.rb +38 -35
  166. data/lib/rouge/lexers/sas.rb +563 -0
  167. data/lib/rouge/lexers/sass.rb +8 -8
  168. data/lib/rouge/lexers/sass/common.rb +40 -40
  169. data/lib/rouge/lexers/scala.rb +63 -37
  170. data/lib/rouge/lexers/scheme.rb +18 -18
  171. data/lib/rouge/lexers/scss.rb +3 -3
  172. data/lib/rouge/lexers/sed.rb +30 -30
  173. data/lib/rouge/lexers/shell.rb +62 -53
  174. data/lib/rouge/lexers/sieve.rb +8 -8
  175. data/lib/rouge/lexers/slim.rb +26 -26
  176. data/lib/rouge/lexers/smalltalk.rb +33 -33
  177. data/lib/rouge/lexers/smarty.rb +19 -19
  178. data/lib/rouge/lexers/sml.rb +67 -67
  179. data/lib/rouge/lexers/sqf.rb +1 -1
  180. data/lib/rouge/lexers/sql.rb +21 -21
  181. data/lib/rouge/lexers/supercollider.rb +116 -0
  182. data/lib/rouge/lexers/swift.rb +46 -43
  183. data/lib/rouge/lexers/tap.rb +20 -20
  184. data/lib/rouge/lexers/tcl.rb +27 -27
  185. data/lib/rouge/lexers/terraform.rb +13 -13
  186. data/lib/rouge/lexers/tex.rb +19 -19
  187. data/lib/rouge/lexers/toml.rb +19 -19
  188. data/lib/rouge/lexers/tulip.rb +36 -36
  189. data/lib/rouge/lexers/turtle.rb +35 -38
  190. data/lib/rouge/lexers/vala.rb +18 -18
  191. data/lib/rouge/lexers/vb.rb +27 -27
  192. data/lib/rouge/lexers/verilog.rb +25 -27
  193. data/lib/rouge/lexers/vhdl.rb +11 -11
  194. data/lib/rouge/lexers/viml.rb +14 -14
  195. data/lib/rouge/lexers/vue.rb +9 -9
  196. data/lib/rouge/lexers/wollok.rb +26 -26
  197. data/lib/rouge/lexers/xml.rb +17 -21
  198. data/lib/rouge/lexers/xojo.rb +61 -0
  199. data/lib/rouge/lexers/xpath.rb +332 -0
  200. data/lib/rouge/lexers/xquery.rb +145 -0
  201. data/lib/rouge/lexers/yaml.rb +63 -61
  202. data/lib/rouge/plugins/redcarpet.rb +1 -1
  203. data/lib/rouge/regex_lexer.rb +26 -25
  204. data/lib/rouge/tex_theme_renderer.rb +132 -0
  205. data/lib/rouge/theme.rb +4 -0
  206. data/lib/rouge/themes/bw.rb +41 -0
  207. data/lib/rouge/themes/magritte.rb +78 -0
  208. data/lib/rouge/themes/monokai_sublime.rb +2 -1
  209. data/lib/rouge/themes/pastie.rb +1 -1
  210. data/lib/rouge/themes/thankful_eyes.rb +1 -1
  211. data/lib/rouge/themes/tulip.rb +1 -1
  212. data/lib/rouge/token.rb +30 -22
  213. data/lib/rouge/util.rb +2 -2
  214. data/lib/rouge/version.rb +1 -1
  215. data/rouge.gemspec +4 -3
  216. metadata +61 -6
@@ -0,0 +1,127 @@
1
+ # -*- coding: utf-8 -*- #
2
+ # frozen_string_literal: true
3
+
4
+ module Rouge
5
+ module Lexers
6
+ class Magik < RegexLexer
7
+ title "Magik"
8
+ desc "Smallworld Magik"
9
+ tag 'magik'
10
+ filenames '*.magik'
11
+ mimetypes 'text/x-magik', 'application/x-magik'
12
+
13
+ def self.keywords
14
+ @keywords ||= %w(
15
+ _package
16
+ _pragma
17
+ _block _endblock
18
+ _handling _default
19
+ _protect _protection _endprotect
20
+ _try _with _when _endtry
21
+ _catch _endcatch
22
+ _throw
23
+ _lock _endlock
24
+ _if _then _elif _else _endif
25
+ _for _over _while _loop _endloop _loopbody _continue _leave
26
+ _return
27
+ _class
28
+ _local _constant _recursive _global _dynamic _import
29
+ _private _iter _abstract _method _endmethod
30
+ _proc _endproc
31
+ _gather _scatter _allresults _optional
32
+ _thisthread _self _clone _super
33
+ _primitive
34
+ _unset _true _false _maybe
35
+ _is _isnt _not _and _or _xor _cf _andif _orif
36
+ _div _mod
37
+ )
38
+ end
39
+
40
+ def self.string_double
41
+ @string_double ||= /"[^"\n]*?"/
42
+ end
43
+ def self.string_single
44
+ @string_single ||= /'[^'\n]*?'/
45
+ end
46
+
47
+ def self.digits
48
+ @digits ||= /[0-9]+/
49
+ end
50
+ def self.radix
51
+ @radix ||= /r[0-9a-z]/i
52
+ end
53
+ def self.exponent
54
+ @exponent ||= /(e|&)[+-]?#{Magik.digits}/i
55
+ end
56
+ def self.decimal
57
+ @decimal ||= /\.#{Magik.digits}/
58
+ end
59
+ def self.number
60
+ @number = /#{Magik.digits}(#{Magik.radix}|#{Magik.exponent}|#{Magik.decimal})*/
61
+ end
62
+
63
+ def self.character
64
+ @character ||= /%u[0-9a-z]{4}|%[^\s]+/i
65
+ end
66
+
67
+ def self.simple_identifier
68
+ @simple_identifier ||= /(?>(?:[a-z0-9_!?]|\\.)+)/i
69
+ end
70
+ def self.piped_identifier
71
+ @piped_identifier ||= /\|[^\|\n]*\|/
72
+ end
73
+ def self.identifier
74
+ @identifier ||= /(?:#{Magik.simple_identifier}|#{Magik.piped_identifier})+/i
75
+ end
76
+ def self.package_identifier
77
+ @package_identifier ||= /#{Magik.identifier}:#{Magik.identifier}/
78
+ end
79
+ def self.symbol
80
+ @symbol ||= /:#{Magik.identifier}/i
81
+ end
82
+ def self.global_ref
83
+ @global_ref ||= /@[\s]*#{Magik.identifier}:#{Magik.identifier}/
84
+ end
85
+ def self.label
86
+ @label = /@[\s]*#{Magik.identifier}/
87
+ end
88
+
89
+ state :root do
90
+ rule %r/##(.*)?/, Comment::Doc
91
+ rule %r/#(.*)?/, Comment::Single
92
+
93
+ rule %r/(_method)(\s+)/ do
94
+ groups Keyword, Text::Whitespace
95
+ push :method_name
96
+ end
97
+
98
+ rule %r/(?:#{Magik.keywords.join('|')})\b/, Keyword
99
+
100
+ rule Magik.string_double, Literal::String
101
+ rule Magik.string_single, Literal::String
102
+ rule Magik.symbol, Str::Symbol
103
+ rule Magik.global_ref, Name::Label
104
+ rule Magik.label, Name::Label
105
+ rule Magik.character, Literal::String::Char
106
+ rule Magik.number, Literal::Number
107
+ rule Magik.package_identifier, Name
108
+ rule Magik.identifier, Name
109
+
110
+ rule %r/[\[\]{}()\.,;]/, Punctuation
111
+ rule %r/\$/, Punctuation
112
+ rule %r/(<<|^<<)/, Operator
113
+ rule %r/(>>)/, Operator
114
+ rule %r/[-~+\/*%=&^<>]|!=/, Operator
115
+
116
+ rule %r/[\s]+/, Text::Whitespace
117
+ end
118
+
119
+ state :method_name do
120
+ rule %r/(#{Magik.identifier})(\.)(#{Magik.identifier})/ do
121
+ groups Name::Class, Punctuation, Name::Function
122
+ pop!
123
+ end
124
+ end
125
+ end
126
+ end
127
+ end
@@ -8,18 +8,22 @@ module Rouge
8
8
  desc "Makefile syntax"
9
9
  tag 'make'
10
10
  aliases 'makefile', 'mf', 'gnumake', 'bsdmake'
11
- filenames '*.make', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile'
11
+ filenames '*.make', '*.mak', '*.mk', 'Makefile', 'makefile', 'Makefile.*', 'GNUmakefile', '*,fe1'
12
12
  mimetypes 'text/x-makefile'
13
13
 
14
- bsd_special = %w(
15
- include undef error warning if else elif endif for endfor
16
- )
17
-
18
- gnu_special = %w(
19
- ifeq ifneq ifdef ifndef else endif include -include define endef :
20
- )
14
+ def self.functions
15
+ @functions ||= %w(
16
+ abspath addprefix addsuffix and basename call dir error eval file
17
+ filter filter-out findstring firstword flavor foreach if join lastword
18
+ notdir or origin patsubst realpath shell sort strip subst suffix value
19
+ warning wildcard word wordlist words
20
+ )
21
+ end
21
22
 
22
- line = /(?:\\.|\\\n|[^\\\n])*/m
23
+ # TODO: Add support for special keywords
24
+ # bsd_special = %w(
25
+ # include undef error warning if else elif endif for endfor
26
+ # )
23
27
 
24
28
  def initialize(opts={})
25
29
  super
@@ -29,53 +33,71 @@ module Rouge
29
33
  start { @shell.reset! }
30
34
 
31
35
  state :root do
32
- rule /\s+/, Text
36
+ rule %r/\s+/, Text
37
+
38
+ rule %r/#.*?\n/, Comment
33
39
 
34
- rule /#.*?\n/, Comment
40
+ rule %r/([-s]?include)((?:[\t ]+[^\t\n #]+)+)/ do
41
+ groups Keyword, Literal::String::Other
42
+ end
43
+
44
+ rule %r/(ifn?def|ifn?eq)([\t ]+)([^#\n]+)/ do
45
+ groups Keyword, Text, Name::Variable
46
+ end
35
47
 
36
- rule /(export)(\s+)(?=[a-zA-Z0-9_\${}\t -]+\n)/ do
48
+ rule %r/(?:else|endif)[\t ]*(?=[#\n])/, Keyword
49
+
50
+ rule %r/(export)([\t ]+)(?=[\w\${}()\t -]+\n)/ do
37
51
  groups Keyword, Text
38
52
  push :export
39
53
  end
40
54
 
41
- rule /export\s+/, Keyword
55
+ rule %r/export[\t ]+/, Keyword
42
56
 
43
57
  # assignment
44
- rule /([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)/m do |m|
58
+ rule %r/([\w${}().-]+)([\t ]*)([!?:+]?=)/m do |m|
45
59
  token Name::Variable, m[1]
46
60
  token Text, m[2]
47
61
  token Operator, m[3]
48
62
  push :shell_line
49
63
  end
50
64
 
51
- rule /"(\\\\|\\.|[^"\\])*"/, Str::Double
52
- rule /'(\\\\|\\.|[^'\\])*'/, Str::Single
53
- rule /([^\n:]+)(:+)([ \t]*)/ do
65
+ rule %r/"(\\\\|\\.|[^"\\])*"/, Str::Double
66
+ rule %r/'(\\\\|\\.|[^'\\])*'/, Str::Single
67
+ rule %r/([^\n:]+)(:+)([ \t]*)/ do
54
68
  groups Name::Label, Operator, Text
55
69
  push :block_header
56
70
  end
57
71
  end
58
72
 
59
73
  state :export do
60
- rule /[\w\${}-]/, Name::Variable
61
- rule /\n/, Text, :pop!
62
- rule /\s+/, Text
74
+ rule %r/[\w\${}()-]/, Name::Variable
75
+ rule %r/\n/, Text, :pop!
76
+ rule %r/[\t ]+/, Text
63
77
  end
64
78
 
65
79
  state :block_header do
66
- rule /[^,\\\n#]+/, Name::Function
67
- rule /,/, Punctuation
68
- rule /#.*?/, Comment
69
- rule /\\\n/, Text
70
- rule /\\./, Text
71
- rule /\n/ do
80
+ rule %r/[^,\\\n#]+/, Name::Function
81
+ rule %r/,/, Punctuation
82
+ rule %r/#.*?/, Comment
83
+ rule %r/\\\n/, Text
84
+ rule %r/\\./, Text
85
+ rule %r/\n/ do
72
86
  token Text
73
87
  goto :block_body
74
88
  end
75
89
  end
76
90
 
77
91
  state :block_body do
78
- rule /(\t[\t ]*)([@-]?)/ do |m|
92
+ rule %r/(ifn?def|ifn?eq)([\t ]+)([^#\n]+)(#.*)?(\n)/ do
93
+ groups Keyword, Text, Name::Variable, Comment, Text
94
+ end
95
+
96
+ rule %r/(else|endif)([\t ]*)(#.*)?(\n)/ do
97
+ groups Keyword, Text, Comment, Text
98
+ end
99
+
100
+ rule %r/(\t[\t ]*)([@-]?)/ do
79
101
  groups Text, Punctuation
80
102
  push :shell_line
81
103
  end
@@ -85,27 +107,27 @@ module Rouge
85
107
 
86
108
  state :shell do
87
109
  # macro interpolation
88
- rule /\$\(\s*[a-z_]\w*\s*\)/i, Name::Variable
89
- # $(shell ...)
90
- rule /(\$\()(\s*)(shell)(\s+)/m do
110
+ rule %r/\$[({][\t ]*\w[\w:=%.]*[\t ]*[)}]/i, Name::Variable
111
+ # function invocation
112
+ rule %r/(\$[({])([\t ]*)(#{Make.functions.join('|')})([\t ]+)/m do
91
113
  groups Name::Function, Text, Name::Builtin, Text
92
114
  push :shell_expr
93
115
  end
94
116
 
95
117
  rule(/\\./m) { delegate @shell }
96
- stop = /\$\(|\(|\)|\\|$/
118
+ stop = /\$\(|\$\{|\(|\)|\}|\\|$/
97
119
  rule(/.+?(?=#{stop})/m) { delegate @shell }
98
120
  rule(stop) { delegate @shell }
99
121
  end
100
122
 
101
123
  state :shell_expr do
102
- rule(/\(/) { delegate @shell; push }
103
- rule /\)/, Name::Variable, :pop!
124
+ rule(/[({]/) { delegate @shell; push }
125
+ rule %r/[)}]/, Name::Function, :pop!
104
126
  mixin :shell
105
127
  end
106
128
 
107
129
  state :shell_line do
108
- rule /\n/, Text, :pop!
130
+ rule %r/\n/, Text, :pop!
109
131
  mixin :shell
110
132
  end
111
133
  end
@@ -24,44 +24,61 @@ module Rouge
24
24
  # YAML frontmatter
25
25
  rule(/\A(---\s*\n.*?\n?)^(---\s*$\n?)/m) { delegate YAML }
26
26
 
27
- rule /\\./, Str::Escape
27
+ rule %r/\\./, Str::Escape
28
28
 
29
- rule /^[\S ]+\n(?:---*)\n/, Generic::Heading
30
- rule /^[\S ]+\n(?:===*)\n/, Generic::Subheading
29
+ rule %r/^[\S ]+\n(?:---*)\n/, Generic::Heading
30
+ rule %r/^[\S ]+\n(?:===*)\n/, Generic::Subheading
31
31
 
32
- rule /^#(?=[^#]).*?$/, Generic::Heading
33
- rule /^##*.*?$/, Generic::Subheading
32
+ rule %r/^#(?=[^#]).*?$/, Generic::Heading
33
+ rule %r/^##*.*?$/, Generic::Subheading
34
34
 
35
- rule /(\n[ \t]*)(```|~~~)(.*?)(\n.*?\n)(\2)/m do |m|
36
- sublexer = Lexer.find_fancy(m[3].strip, m[4], @options)
35
+ rule %r/^([ \t]*)(```|~~~)([^\n]*\n)((.*?)(\2))?/m do |m|
36
+ name = m[3].strip
37
+ sublexer = Lexer.find_fancy(name.empty? ? "guess" : name, m[5], @options)
37
38
  sublexer ||= PlainText.new(@options.merge(:token => Str::Backtick))
38
39
  sublexer.reset!
39
40
 
40
41
  token Text, m[1]
41
42
  token Punctuation, m[2]
42
43
  token Name::Label, m[3]
43
- delegate sublexer, m[4]
44
- token Punctuation, m[5]
44
+ if m[5]
45
+ delegate sublexer, m[5]
46
+ end
47
+
48
+ if m[6]
49
+ token Punctuation, m[6]
50
+ else
51
+ push do
52
+ rule %r/^([ \t]*)(#{m[2]})/ do |mb|
53
+ pop!
54
+ token Text, mb[1]
55
+ token Punctuation, mb[2]
56
+ end
57
+ rule %r/^.*\n/ do |mb|
58
+ delegate sublexer, mb[1]
59
+ end
60
+ end
61
+ end
45
62
  end
46
63
 
47
- rule /\n\n(( |\t).*?\n|\n)+/, Str::Backtick
64
+ rule %r/\n\n(( |\t).*?\n|\n)+/, Str::Backtick
48
65
 
49
- rule /(`+)(?:#{edot}|\n)+?\1/, Str::Backtick
66
+ rule %r/(`+)(?:#{edot}|\n)+?\1/, Str::Backtick
50
67
 
51
68
  # various uses of * are in order of precedence
52
69
 
53
70
  # line breaks
54
- rule /^(\s*[*]){3,}\s*$/, Punctuation
55
- rule /^(\s*[-]){3,}\s*$/, Punctuation
71
+ rule %r/^(\s*[*]){3,}\s*$/, Punctuation
72
+ rule %r/^(\s*[-]){3,}\s*$/, Punctuation
56
73
 
57
74
  # bulleted lists
58
- rule /^\s*[*+-](?=\s)/, Punctuation
75
+ rule %r/^\s*[*+-](?=\s)/, Punctuation
59
76
 
60
77
  # numbered lists
61
- rule /^\s*\d+\./, Punctuation
78
+ rule %r/^\s*\d+\./, Punctuation
62
79
 
63
80
  # blockquotes
64
- rule /^\s*>.*?$/, Generic::Traceback
81
+ rule %r/^\s*>.*?$/, Generic::Traceback
65
82
 
66
83
  # link references
67
84
  # [foo]: bar "baz"
@@ -77,77 +94,77 @@ module Rouge
77
94
  end
78
95
 
79
96
  # links and images
80
- rule /(!?\[)(#{edot}*?)(\])/ do
97
+ rule %r/(!?\[)(#{edot}*?)(\])/ do
81
98
  groups Punctuation, Name::Variable, Punctuation
82
99
  push :link
83
100
  end
84
101
 
85
- rule /[*][*]#{edot}*?[*][*]/, Generic::Strong
86
- rule /__#{edot}*?__/, Generic::Strong
102
+ rule %r/[*][*]#{edot}*?[*][*]/, Generic::Strong
103
+ rule %r/__#{edot}*?__/, Generic::Strong
87
104
 
88
- rule /[*]#{edot}*?[*]/, Generic::Emph
89
- rule /_#{edot}*?_/, Generic::Emph
105
+ rule %r/[*]#{edot}*?[*]/, Generic::Emph
106
+ rule %r/_#{edot}*?_/, Generic::Emph
90
107
 
91
108
  # Automatic links
92
- rule /<.*?@.+[.].+>/, Name::Variable
109
+ rule %r/<.*?@.+[.].+>/, Name::Variable
93
110
  rule %r[<(https?|mailto|ftp)://#{edot}*?>], Name::Variable
94
111
 
95
112
 
96
- rule /[^\\`\[*\n&<]+/, Text
113
+ rule %r/[^\\`\[*\n&<]+/, Text
97
114
 
98
115
  # inline html
99
116
  rule(/&\S*;/) { delegate html }
100
117
  rule(/<#{edot}*?>/) { delegate html }
101
- rule /[&<]/, Text
118
+ rule %r/[&<]/, Text
102
119
 
103
- rule /\n/, Text
120
+ rule %r/\n/, Text
104
121
  end
105
122
 
106
123
  state :link do
107
- rule /(\[)(#{edot}*?)(\])/ do
124
+ rule %r/(\[)(#{edot}*?)(\])/ do
108
125
  groups Punctuation, Str::Symbol, Punctuation
109
126
  pop!
110
127
  end
111
128
 
112
- rule /[(]/ do
129
+ rule %r/[(]/ do
113
130
  token Punctuation
114
131
  push :inline_title
115
132
  push :inline_url
116
133
  end
117
134
 
118
- rule /[ \t]+/, Text
135
+ rule %r/[ \t]+/, Text
119
136
 
120
137
  rule(//) { pop! }
121
138
  end
122
139
 
123
140
  state :url do
124
- rule /[ \t]+/, Text
141
+ rule %r/[ \t]+/, Text
125
142
 
126
143
  # the url
127
- rule /(<)(#{edot}*?)(>)/ do
144
+ rule %r/(<)(#{edot}*?)(>)/ do
128
145
  groups Name::Tag, Str::Other, Name::Tag
129
146
  pop!
130
147
  end
131
148
 
132
- rule /\S+/, Str::Other, :pop!
149
+ rule %r/\S+/, Str::Other, :pop!
133
150
  end
134
151
 
135
152
  state :title do
136
- rule /"#{edot}*?"/, Name::Namespace
137
- rule /'#{edot}*?'/, Name::Namespace
138
- rule /[(]#{edot}*?[)]/, Name::Namespace
139
- rule /\s*(?=["'()])/, Text
153
+ rule %r/"#{edot}*?"/, Name::Namespace
154
+ rule %r/'#{edot}*?'/, Name::Namespace
155
+ rule %r/[(]#{edot}*?[)]/, Name::Namespace
156
+ rule %r/\s*(?=["'()])/, Text
140
157
  rule(//) { pop! }
141
158
  end
142
159
 
143
160
  state :inline_title do
144
- rule /[)]/, Punctuation, :pop!
161
+ rule %r/[)]/, Punctuation, :pop!
145
162
  mixin :title
146
163
  end
147
164
 
148
165
  state :inline_url do
149
- rule /[^<\s)]+/, Str::Other, :pop!
150
- rule /\s+/m, Text
166
+ rule %r/[^<\s)]+/, Str::Other, :pop!
167
+ rule %r/\s+/m, Text
151
168
  mixin :url
152
169
  end
153
170
  end