Support bold and italics at the same time (#2053)

Author: tancnle

lib/rouge/lexers/markdown.rb

@@ -107,7 +107,8 @@ def html
           push :link
         end
 
-        rule %r/[*][*]#{edot}*?[*][*]/, Generic::Strong
+        rule %r/[*]{2}[^* \n][^*\n]*[*]{2}/, Generic::Strong
+        rule %r/[*]{3}[^* \n][^*\n]*[*]{3}/, Generic::EmphStrong
         rule %r/__#{edot}*?__/, Generic::Strong
 
         rule %r/[*]#{edot}*?[*]/, Generic::Emph

lib/rouge/themes/base16.rb

@@ -61,6 +61,10 @@ def self.make_light!
       style Generic::Deleted, :fg => :base08
       style Generic::Heading, :fg => :base0D, :bg => :base00, :bold => true
 
+      style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
+      style Generic::Strong, :bold => true
+
       style Keyword, :fg => :base0E
       style Keyword::Constant,
             Keyword::Type, :fg => :base09

lib/rouge/themes/bw.rb

@@ -33,6 +33,7 @@ class BlackWhiteTheme < CSSTheme
       style Generic::Heading,            :bold => true
       style Generic::Subheading,         :bold => true
       style Generic::Emph,               :italic => true
+      style Generic::EmphStrong,         :italic => true, :bold => true
       style Generic::Strong,             :bold => true
       style Generic::Prompt,             :bold => true
 

lib/rouge/themes/colorful.rb

@@ -58,6 +58,7 @@ class Colorful < CSSTheme
       style Generic::Inserted,           :fg => "#00A000"
       style Generic::Error,              :fg => "#FF0000"
       style Generic::Emph,               :italic => true
+      style Generic::EmphStrong,         :italic => true, :bold => true
       style Generic::Strong,             :bold => true
       style Generic::Prompt,             :fg => "#c65d09", :bold => true
       style Generic::Output,             :fg => "#888"

lib/rouge/themes/github.rb

@@ -111,6 +111,7 @@ def self.make_light!
             Name::Tag,                  :fg => :tag
 
       style Generic::Inserted,          :fg => :fgInserted, :bg => :bgInserted
+      style Generic::EmphStrong, :italic => true, :bold => true
 
       style Keyword::Constant,
             Literal,

lib/rouge/themes/gruvbox.rb

@@ -140,6 +140,10 @@ def self.make_light!
       style Generic::Deleted, :fg => :red, :bg => :bg0
       style Generic::Heading, :fg => :green, :bold => true
 
+      style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
+      style Generic::Strong, :bold => true
+
       style Keyword, :fg => :red
       style Keyword::Constant, :fg => :purple
       style Keyword::Type, :fg => :yellow
@@ -164,7 +168,6 @@ def self.make_light!
       style Literal::Number, :fg => :purple
 
       style Literal::String::Symbol, :fg => :blue
-
     end
   end
 end

lib/rouge/themes/igor_pro.rb

@@ -10,6 +10,9 @@ class IgorPro < CSSTheme
       style Comment::Preproc,                 :fg => '#CC00A3'
       style Comment::Special,                 :fg => '#CC00A3'
       style Comment,                          :fg => '#FF0000'
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
+      style Generic::Strong,                  :bold => true
       style Keyword::Constant,                :fg => '#C34E00'
       style Keyword::Declaration,             :fg => '#0000FF'
       style Keyword::Reserved,                :fg => '#007575'

lib/rouge/themes/magritte.rb

@@ -41,6 +41,7 @@ class Magritte < CSSTheme
       style Generic::Deleted,             :fg => :cherry
       style Generic::Inserted,            :fg => :forest
       style Generic::Emph,                :italic => true
+      style Generic::EmphStrong,          :italic => true, :bold => true
       style Generic::Strong,              :bold => true
       style Generic::Traceback,           :fg => :black, :bg => :lavender
       style Keyword::Constant,            :fg => :forest, :bold => true

lib/rouge/themes/molokai.rb

@@ -25,7 +25,8 @@ class Molokai < CSSTheme
       style Error,                            :fg => :white, :bg => :grey
       style Generic::Inserted,                :fg => :green
       style Generic::Deleted,                 :fg => :red
-      style Generic::Emph,                    :fg => :black, :italic => true
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
       style Generic::Error,
             Generic::Traceback,               :fg => :red
       style Generic::Heading,                 :fg => :grey

lib/rouge/themes/monokai.rb

@@ -35,7 +35,8 @@ class Monokai < CSSTheme
       style Error,                            :fg => :carmine, :bg => :very_dark
       style Generic::Inserted,                :fg => :white, :bg => :dimgreen
       style Generic::Deleted,                 :fg => :white, :bg => :dimred
-      style Generic::Emph,                    :fg => :black, :italic => true
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
       style Generic::Error,
             Generic::Traceback,               :fg => :dark_red
       style Generic::Heading,                 :fg => :grey