Require main branch sixteen for now, line-highlight style improvements

shard.yml

@@ -15,6 +15,7 @@ dependencies:
     github: crystal-china/base58.cr
   sixteen:
     github: ralsina/sixteen
+    branch: main
   docopt:
     github: chenkovsky/docopt.cr
 

src/main.cr

@@ -23,12 +23,13 @@ HELP
 
 lexer = Tartrazine.lexer("crystal")
 theme = Tartrazine.theme(ARGV[1])
-formatter = Tartrazine::Json.new
+# formatter = Tartrazine::Json.new
-# formatter.standalone = true
+formatter = Tartrazine::Html.new
-# formatter.class_prefix = "hl-"
+formatter.standalone = true
-# formatter.line_number_id_prefix = "ln-"
+formatter.class_prefix = "hl-"
-# formatter.line_numbers = true
+formatter.line_number_id_prefix = "ln-"
-# formatter.highlight_lines = [3..7, 20..30]
+formatter.line_numbers = true
-# formatter.linkable_line_numbers = false
+formatter.highlight_lines = [3..7, 20..30]
-# formatter.wrap_long_lines = false
+formatter.linkable_line_numbers = false
+formatter.wrap_long_lines = false
 puts formatter.format(File.read(ARGV[0]), lexer, theme)

src/styles.cr

@@ -12,7 +12,7 @@ module Tartrazine
 
   def self.theme(name : String) : Theme
     begin
-    return Theme.from_base16(name)
+      return Theme.from_base16(name)
     rescue ex : Exception
       raise ex unless ex.message.try &.includes? "Theme not found"
     end
@@ -111,7 +111,7 @@ module Tartrazine
       # The color assignments are adapted from
       # https://github.com/mohd-akram/base16-pygments/
 
-      theme.styles["Background"] = Style.new(color: t["base05"], background: t["base00"])
+      theme.styles["Background"] = Style.new(color: t["base05"], background: t["base00"], bold: true)
       theme.styles["LineHighlight"] = Style.new(color: t["base0D"], background: t["base01"])
       theme.styles["Text"] = Style.new(color: t["base05"])
       theme.styles["Error"] = Style.new(color: t["base08"])
@@ -175,27 +175,22 @@ module Tartrazine
       if !theme.styles.has_key?("LineHighlight")
         theme.styles["LineHighlight"] = Style.new
         theme.styles["LineHighlight"].background = make_highlight_color(theme.styles["Background"].background)
+        theme.styles["LineHighlight"].bold = true
       end
       theme
     end
 
     # If the color is dark, make it brighter and viceversa
     def self.make_highlight_color(base_color)
-      # FIXME: do a proper luminance adjustment in the color class
+      if base_color.nil?
-      return nil if base_color.nil?
+        # WHo knows
-      color = Color.new(base_color.hex)
+        return Color.new(127, 127, 127)
-      if base_color.light?
+      end
-        color.r = [(base_color.r - 40), 255].min.to_u8
+      if base_color.dark?
-        color.g = [(base_color.g - 40), 255].min.to_u8
+        return base_color.lighter(0.2)
-        color.b = [(base_color.b - 40), 255].min.to_u8
+      else
-      else
+        return base_color.darker(0.2)
-        color.r = [(base_color.r + 40), 255].min.to_u8
-        color.g = [(base_color.g + 40), 255].min.to_u8
-        color.b = [(base_color.b + 40), 255].min.to_u8
       end
-      # Bug in color, setting rgb doesn't update hex
-      color.hex = "#{color.r.to_s(16)}#{color.g.to_s(16)}#{color.b.to_s(16)}"
-      color
     end
   end
 end