markdown_views 2.4.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 856a7600f57c402af8e899bb6444dc4776380b66e260c6673b849277f8d7b480
-  data.tar.gz: 953208eb9aee28ed0b542236ad41f33429417c458e452eb202a9d1d386e95655
+  metadata.gz: 4bfc0f4474969a1bca917f425c0679cafea811519da5a5eff4739b9b82d24e10
+  data.tar.gz: ffa60b28850283d6c9a81311c1b96fa429dc8ff23989124cbdd3a074688e7528
 SHA512:
-  metadata.gz: 855af2f67b0817c791ea31b8450bbd80734019d71e79d00ebcdf1bf0b6b20d3fc048493af2153adf05907bf19f096c276e9a31415b227c93c4431836c7d31542
-  data.tar.gz: 816bf8266bf026afdfa92017155d61b6ef0665a0d3e496522b432efb7d33e9d65e30b2358f585e2958d18764e35f541b45a7cbd01882c4505e1c87766fdb5189
+  metadata.gz: f81b58690564e04a796200bff60a320a5f33c4efeadfdd8b713a53a7072e33040829a3753b3048d86ddfcdb79ef4589ed9bfbe51d8f7dc581808b155b44af563
+  data.tar.gz: 59ceeed4dcec3f1a99c4ce512693385fda0a5deee6c4af82d5fdb5c4850d8a9a027ae648a8e41ead568a33fbbd4eba0d89a7e6e31a9ec6c2ddc47ff7cdbf6d36

data/Gemfile.lock

@@ -1,74 +1,74 @@
 PATH
   remote: .
   specs:
-    markdown_views (2.4.1)
-      commonmarker (>= 0.18.2, < 0.24)
-      rails (>= 5.0, < 8.1)
-      rouge (>= 3.3, < 5.0)
+    markdown_views (3.1.0)
+      commonmarker (>= 1.1, < 3.0)
+      rails (>= 6.1, < 8.1)
+      rouge (~> 4)
+      securerandom
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2)
-      actionpack (= 7.2.2)
-      activesupport (= 7.2.2)
+    actioncable (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2)
-      actionpack (= 7.2.2)
-      activejob (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionmailbox (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.2)
-      actionpack (= 7.2.2)
-      actionview (= 7.2.2)
-      activejob (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionmailer (8.0.1)
+      actionpack (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activesupport (= 8.0.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2)
-      actionview (= 7.2.2)
-      activesupport (= 7.2.2)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2)
-      actionpack (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    actiontext (8.0.1)
+      actionpack (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2)
-      activesupport (= 7.2.2)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2)
-      activesupport (= 7.2.2)
+    activejob (8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2)
-      activesupport (= 7.2.2)
-    activerecord (7.2.2)
-      activemodel (= 7.2.2)
-      activesupport (= 7.2.2)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.2)
-      actionpack (= 7.2.2)
-      activejob (= 7.2.2)
-      activerecord (= 7.2.2)
-      activesupport (= 7.2.2)
+    activestorage (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activesupport (= 8.0.1)
       marcel (~> 1.0)
-    activesupport (7.2.2)
+    activesupport (8.0.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -80,28 +80,30 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ansi (1.5.0)
     base64 (0.2.0)
-    benchmark (0.3.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     builder (3.3.0)
-    commonmarker (0.23.10)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    commonmarker (2.0.2.1)
+      rb_sys (~> 0.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    date (3.4.0)
+    date (3.4.1)
     drb (2.2.1)
-    erubi (1.13.0)
+    erubi (1.13.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.1)
+    io-console (0.8.0)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    logger (1.6.1)
-    loofah (2.23.1)
+    logger (1.6.5)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -111,81 +113,85 @@ GEM
       net-smtp
     marcel (1.0.4)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    net-imap (0.5.0)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
+      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    psych (5.1.2)
+    psych (5.2.3)
+      date
       stringio
     racc (1.8.1)
     rack (3.1.8)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.2.2)
-      actioncable (= 7.2.2)
-      actionmailbox (= 7.2.2)
-      actionmailer (= 7.2.2)
-      actionpack (= 7.2.2)
-      actiontext (= 7.2.2)
-      actionview (= 7.2.2)
-      activejob (= 7.2.2)
-      activemodel (= 7.2.2)
-      activerecord (= 7.2.2)
-      activestorage (= 7.2.2)
-      activesupport (= 7.2.2)
+    rails (8.0.1)
+      actioncable (= 8.0.1)
+      actionmailbox (= 8.0.1)
+      actionmailer (= 8.0.1)
+      actionpack (= 8.0.1)
+      actiontext (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activemodel (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.2)
+      railties (= 8.0.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.2.2)
-      actionpack (= 7.2.2)
-      activesupport (= 7.2.2)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.2.1)
-    rdoc (6.7.0)
+    rb_sys (0.9.108)
+    rdoc (6.11.0)
       psych (>= 4.0.0)
-    reline (0.5.10)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rouge (4.4.0)
+    rouge (4.5.1)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
-    stringio (3.1.1)
+    securerandom (0.4.1)
+    stringio (3.1.2)
     thor (1.3.2)
-    timeout (0.4.1)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    useragent (0.16.10)
-    webrick (1.9.0)
-    websocket-driver (0.7.6)
+    uri (1.0.2)
+    useragent (0.16.11)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.7.1)
@@ -199,4 +205,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.5.11
+   2.5.22

data/README.md

@@ -1,6 +1,6 @@
 # MarkdownViews
 
-MarkdownViews enables Rails 5-8+ to process .md templates as part of `app/views/`, with optional preprocessing of ERB, HAML, etc. A `markdown()` helper is also provided for when you need Markdown for only part of a view.
+MarkdownViews enables Rails to process .md templates as part of `app/views/`, with optional preprocessing of ERB, HAML, etc. A `markdown()` helper is also provided for when you need Markdown for only part of a view.
 
 It uses CommonMarker for markdown processing and Rouge for syntax highlighting.
 
@@ -44,16 +44,16 @@ By default, all .md files are preprocessed with ERB (making them effectively .md
 
 CommonMarker's rendering can also be configured. See [CommonMarker's documentation](https://github.com/gjtorikian/commonmarker#options-and-plugins) for available options.
 
-    MarkdownViews.parsing_opts -= %i(UNSAFE)
+    MarkdownViews.parsing_opts.merge! smart: false
 
-    MarkdownViews.rendering_opts -= %i(UNSAFE TABLE_PREFER_STYLE_ATTRIBUTES)
+    MarkdownViews.rendering_opts.merge! unsafe: false
 
-    MarkdownViews.extensions -= %i(autolink)
+    MarkdownViews.extensions.merge! tasklist: true
 
 Likewise, Rouge can be configured:
 
     # Use inline formatting:
-    MarkdownViews.rouge_opts.merge! formatter: Rouge::Formatters::HTMLInline.new('pastie')
+    MarkdownViews.rouge_opts.merge! formatter: Rouge::Formatters::HTMLInline.new('monokai')
 
     # Enable line numbers:
     MarkdownViews.rouge_opts.merge!(
@@ -81,15 +81,16 @@ And then execute:
 
 ## Gem versions
 
-The 0.x series used RedCarpet and CodeRay.
-(There was no 1.x series.)
-The 2.x series uses CommonMarker and Rouge.
+The 3.x series uses CommonMarker 1.x or 2.x and Rouge. It is compatible with Rails 6.1-8+.
+The 2.x series uses CommonMarker 0.x and Rouge. It is compatible with Rails 5.0-8.0.
 
-#### Upgrading from 0.x to 2.x
+#### Upgrading from 2.x to 3.x
 
-The configuration options have changed. The defaults are roughly the same as before. However, if you had customized them previously, then it will need to be revisited.
+CommonMarker 1.x swapped out the underlying parser. While the rendered markdown output is very similar, the configuration flags were reworked. This gem's defaults are roughly the same as before. However, if your configuration was previously customized, it will need to be updated.
 
-Similarly, the provided stylesheets for syntax highlighting have been changed. If you were importing the 'coderay' stylesheet before, then a new stylesheet will need to be selected. Try 'rouge.colorful' or one of the others included in app/assets/stylesheets.
+CommonMarker 1's new syntax highlighting is not used, with preference instead given to Rouge. This preserves rendering compatibility, including existing stylesheets.
+
+The stylesheets were refreshed from Rouge 4.4 which corrects a few missing CSS selectors. The github stylesheet was also renamed from `rouge.github` to `rouge.github.light`.
 
 
 ## Contributing
@@ -99,3 +100,8 @@ Similarly, the provided stylesheets for syntax highlighting have been changed. I
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+## License
+
+MIT

data/Rakefile

@@ -1,11 +1,11 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :generate_stylesheet do
-  %w( base16.light base16.dark base16.solarized.light base16.solarized.dark
-      base16.monokai.light base16.monokai.dark colorful github
-      gruvbox.light gruvbox.dark igorpro molokai monokai monokai.sublime
-      pastie thankful_eyes tulip
+task :generate_stylesheets do
+  %w( base16.dark base16.light base16.monokai.dark base16.monokai.light
+      base16.solarized.dark base16.solarized.light bw colorful
+      github.dark github.light gruvbox.dark gruvbox.light igorpro molokai
+      monokai monokai.sublime pastie thankful_eyes tulip
   ).each do |theme|
     `rougify style #{theme} --scope .rouge-highlight > app/assets/stylesheets/rouge.#{theme}.css`
   end

data/app/assets/stylesheets/rouge.base16.dark.css

@@ -1,78 +1,91 @@
 .rouge-highlight table td { padding: 5px; }
 .rouge-highlight table pre { margin: 0; }
 .rouge-highlight, .rouge-highlight .w {
-  color: #d0d0d0;
-  background-color: #151515;
+  color: #d8d8d8;
+  background-color: #181818;
 }
 .rouge-highlight .err {
-  color: #151515;
-  background-color: #ac4142;
+  color: #181818;
+  background-color: #ab4642;
 }
-.rouge-highlight .c, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .c1, .rouge-highlight .cs {
-  color: #505050;
+.rouge-highlight .c, .rouge-highlight .ch, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .cpf, .rouge-highlight .c1, .rouge-highlight .cs {
+  color: #585858;
 }
 .rouge-highlight .cp {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .nt {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .o, .rouge-highlight .ow {
-  color: #d0d0d0;
+  color: #d8d8d8;
 }
 .rouge-highlight .p, .rouge-highlight .pi {
-  color: #d0d0d0;
+  color: #d8d8d8;
 }
 .rouge-highlight .gi {
-  color: #90a959;
+  color: #a1b56c;
 }
 .rouge-highlight .gd {
-  color: #ac4142;
+  color: #ab4642;
 }
 .rouge-highlight .gh {
-  color: #6a9fb5;
-  background-color: #151515;
+  color: #7cafc2;
+  background-color: #181818;
+  font-weight: bold;
+}
+.rouge-highlight .ge {
+  font-style: italic;
+}
+.rouge-highlight .ges {
+  font-weight: bold;
+  font-style: italic;
+}
+.rouge-highlight .gs {
   font-weight: bold;
 }
 .rouge-highlight .k, .rouge-highlight .kn, .rouge-highlight .kp, .rouge-highlight .kr, .rouge-highlight .kv {
-  color: #aa759f;
+  color: #ba8baf;
 }
 .rouge-highlight .kc {
-  color: #d28445;
+  color: #dc9656;
 }
 .rouge-highlight .kt {
-  color: #d28445;
+  color: #dc9656;
 }
 .rouge-highlight .kd {
-  color: #d28445;
+  color: #dc9656;
+}
+.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .dl, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
+  color: #a1b56c;
 }
-.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
-  color: #90a959;
+.rouge-highlight .sa {
+  color: #ba8baf;
 }
 .rouge-highlight .sr {
-  color: #75b5aa;
+  color: #86c1b9;
 }
 .rouge-highlight .si {
-  color: #8f5536;
+  color: #a16946;
 }
 .rouge-highlight .se {
-  color: #8f5536;
+  color: #a16946;
 }
 .rouge-highlight .nn {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .nc {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .no {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .na {
-  color: #6a9fb5;
+  color: #7cafc2;
 }
-.rouge-highlight .m, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mb, .rouge-highlight .mx {
-  color: #90a959;
+.rouge-highlight .m, .rouge-highlight .mb, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mx {
+  color: #a1b56c;
 }
 .rouge-highlight .ss {
-  color: #90a959;
+  color: #a1b56c;
 }

data/app/assets/stylesheets/rouge.base16.light.css

@@ -1,77 +1,90 @@
 .rouge-highlight table td { padding: 5px; }
 .rouge-highlight table pre { margin: 0; }
 .rouge-highlight, .rouge-highlight .w {
-  color: #303030;
+  color: #383838;
 }
 .rouge-highlight .err {
-  color: #151515;
-  background-color: #ac4142;
+  color: #181818;
+  background-color: #ab4642;
 }
-.rouge-highlight .c, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .c1, .rouge-highlight .cs {
-  color: #505050;
+.rouge-highlight .c, .rouge-highlight .ch, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .cpf, .rouge-highlight .c1, .rouge-highlight .cs {
+  color: #585858;
 }
 .rouge-highlight .cp {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .nt {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .o, .rouge-highlight .ow {
-  color: #d0d0d0;
+  color: #d8d8d8;
 }
 .rouge-highlight .p, .rouge-highlight .pi {
-  color: #d0d0d0;
+  color: #d8d8d8;
 }
 .rouge-highlight .gi {
-  color: #90a959;
+  color: #a1b56c;
 }
 .rouge-highlight .gd {
-  color: #ac4142;
+  color: #ab4642;
 }
 .rouge-highlight .gh {
-  color: #6a9fb5;
-  background-color: #151515;
+  color: #7cafc2;
+  background-color: #181818;
+  font-weight: bold;
+}
+.rouge-highlight .ge {
+  font-style: italic;
+}
+.rouge-highlight .ges {
+  font-weight: bold;
+  font-style: italic;
+}
+.rouge-highlight .gs {
   font-weight: bold;
 }
 .rouge-highlight .k, .rouge-highlight .kn, .rouge-highlight .kp, .rouge-highlight .kr, .rouge-highlight .kv {
-  color: #aa759f;
+  color: #ba8baf;
 }
 .rouge-highlight .kc {
-  color: #d28445;
+  color: #dc9656;
 }
 .rouge-highlight .kt {
-  color: #d28445;
+  color: #dc9656;
 }
 .rouge-highlight .kd {
-  color: #d28445;
+  color: #dc9656;
+}
+.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .dl, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
+  color: #a1b56c;
 }
-.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
-  color: #90a959;
+.rouge-highlight .sa {
+  color: #ba8baf;
 }
 .rouge-highlight .sr {
-  color: #75b5aa;
+  color: #86c1b9;
 }
 .rouge-highlight .si {
-  color: #8f5536;
+  color: #a16946;
 }
 .rouge-highlight .se {
-  color: #8f5536;
+  color: #a16946;
 }
 .rouge-highlight .nn {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .nc {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .no {
-  color: #f4bf75;
+  color: #f7ca88;
 }
 .rouge-highlight .na {
-  color: #6a9fb5;
+  color: #7cafc2;
 }
-.rouge-highlight .m, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mb, .rouge-highlight .mx {
-  color: #90a959;
+.rouge-highlight .m, .rouge-highlight .mb, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mx {
+  color: #a1b56c;
 }
 .rouge-highlight .ss {
-  color: #90a959;
+  color: #a1b56c;
 }

data/app/assets/stylesheets/rouge.base16.monokai.dark.css

@@ -8,7 +8,7 @@
   color: #272822;
   background-color: #f92672;
 }
-.rouge-highlight .c, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .c1, .rouge-highlight .cs {
+.rouge-highlight .c, .rouge-highlight .ch, .rouge-highlight .cd, .rouge-highlight .cm, .rouge-highlight .cpf, .rouge-highlight .c1, .rouge-highlight .cs {
   color: #75715e;
 }
 .rouge-highlight .cp {
@@ -34,6 +34,16 @@
   background-color: #272822;
   font-weight: bold;
 }
+.rouge-highlight .ge {
+  font-style: italic;
+}
+.rouge-highlight .ges {
+  font-weight: bold;
+  font-style: italic;
+}
+.rouge-highlight .gs {
+  font-weight: bold;
+}
 .rouge-highlight .k, .rouge-highlight .kn, .rouge-highlight .kp, .rouge-highlight .kr, .rouge-highlight .kv {
   color: #ae81ff;
 }
@@ -46,9 +56,12 @@
 .rouge-highlight .kd {
   color: #fd971f;
 }
-.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
+.rouge-highlight .s, .rouge-highlight .sb, .rouge-highlight .sc, .rouge-highlight .dl, .rouge-highlight .sd, .rouge-highlight .s2, .rouge-highlight .sh, .rouge-highlight .sx, .rouge-highlight .s1 {
   color: #a6e22e;
 }
+.rouge-highlight .sa {
+  color: #ae81ff;
+}
 .rouge-highlight .sr {
   color: #a1efe4;
 }
@@ -70,7 +83,7 @@
 .rouge-highlight .na {
   color: #66d9ef;
 }
-.rouge-highlight .m, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mb, .rouge-highlight .mx {
+.rouge-highlight .m, .rouge-highlight .mb, .rouge-highlight .mf, .rouge-highlight .mh, .rouge-highlight .mi, .rouge-highlight .il, .rouge-highlight .mo, .rouge-highlight .mx {
   color: #a6e22e;
 }
 .rouge-highlight .ss {