0.1.1

Dockerfile.static

@@ -0,0 +1,15 @@
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20 AS build
+RUN apk add --no-cache \
+    crystal \
+    shards \
+    yaml-dev \
+    yaml-static \
+    openssl-dev \
+    openssl-libs-static \
+    libxml2-dev \
+    libxml2-static \
+    zlib-dev \
+    zlib-static \
+    xz-dev \
+    xz-static \
+    make

Makefile

@@ -0,0 +1,7 @@
+build: $(wildcard src/**/*.cr) $(wildcard lexers/*xml) $(wildcard styles/*xml) shard.yml
+	shards build -Dstrict_multi_assign -Dno_number_autocast
+release: $(wildcard src/**/*.cr) $(wildcard lexers/*xml) $(wildcard styles/*xml) shard.yml
+	shards build --release
+static: $(wildcard src/**/*.cr) $(wildcard lexers/*xml) $(wildcard styles/*xml) shard.yml
+	shards build --release --static
+	strip bin/tartrazine

build_static.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+docker run --rm --privileged \
+  multiarch/qemu-user-static \
+  --reset -p yes
+
+# Build for AMD64
+docker build . -f Dockerfile.static -t tartrazine-builder
+docker run -ti --rm -v "$PWD":/app --user="$UID" tartrazine-builder /bin/sh -c "cd /app && rm -rf lib shard.lock && make static"
+mv bin/tartrazine bin/tartrazine-static-linux-amd64
+
+# Build for ARM64
+docker build . -f Dockerfile.static --platform linux/arm64 -t tartrazine-builder
+docker run -ti --rm -v "$PWD":/app --platform linux/arm64 --user="$UID" tartrazine-builder /bin/sh -c "cd /app && rm -rf lib shard.lock && make static"
+mv bin/tartrazine bin/tartrazine-static-linux-arm64

shard.yml

@@ -1,5 +1,5 @@
 name: tartrazine
-version: 0.1.0
+version: 0.1.1
 
 authors:
   - Roberto Alsina <roberto.alsina@gmail.com>
@@ -15,7 +15,6 @@ dependencies:
     github: crystal-china/base58.cr
   sixteen:
     github: ralsina/sixteen
-    branch: main
 
 crystal: ">= 1.13.0"
 

src/actions.cr

@@ -4,6 +4,7 @@ require "./formatter"
 require "./rules"
 require "./styles"
 require "./tartrazine"
+
 # These are Lexer actions. When a rule matches, it will
 # perform a list of actions. These actions can emit tokens
 # or change the state machine.

src/formatter.cr

@@ -44,15 +44,13 @@ module Tartrazine
           theme.styles.has_key?(parent)
         }]
       end
-      text.colorize(*rgb(s.color)).back(*rgb(s.background)).to_s
-    end
-
-    def rgb(c : String?)
-      return {0_u8, 0_u8, 0_u8} unless c
-      r = c[0..1].to_u8(16)
-      g = c[2..3].to_u8(16)
-      b = c[4..5].to_u8(16)
-      {r, g, b}
+      colorized = text.colorize
+      s.color.try { |c| colorized = colorized.fore(c.colorize) }
+      # Intentionally not setting background color
+      colorized.mode(:bold) if s.bold
+      colorized.mode(:italic) if s.italic
+      colorized.mode(:underline) if s.underline
+      colorized.to_s
     end
   end
 
@@ -78,9 +76,9 @@ module Tartrazine
         theme.styles.each do |token, style|
           outp << ".#{get_css_class(token, theme)} {"
           # These are set or nil
-          outp << "color: #{style.color};" if style.color
-          outp << "background-color: #{style.background};" if style.background
-          outp << "border: 1px solid #{style.border};" if style.border
+          outp << "color: #{style.color.try &.hex};" if style.color
+          outp << "background-color: #{style.background.try &.hex};" if style.background
+          outp << "border: 1px solid #{style.border.try &.hex};" if style.border
 
           # These are true/false/nil
           outp << "border: none;" if style.border == false

src/main.cr

@@ -2,4 +2,4 @@ require "./**"
 
 lexer = Tartrazine.lexer("crystal")
 theme = Tartrazine.theme(ARGV[1])
-puts Tartrazine::Ansi.new.format(File.read(ARGV[0]), lexer, theme)
+puts Tartrazine::Html.new.format(File.read(ARGV[0]), lexer, theme)

src/rules.cr

@@ -106,6 +106,7 @@ module Tartrazine
       flags |= LibPCRE2::DOTALL if dotall
       flags |= LibPCRE2::CASELESS if ignorecase
       flags |= LibPCRE2::ANCHORED if anchored
+      flags |= LibPCRE2::NO_UTF_CHECK
       @re = Regex::PCRE2.compile(pattern, flags) do |error_message|
         raise Exception.new(error_message)
       end

src/styles.cr

@@ -8,6 +8,8 @@ require "sixteen"
 require "xml"
 
 module Tartrazine
+  alias Color = Sixteen::Color
+
   def self.theme(name : String) : Theme
     return Theme.from_base16(name[7..]) if name.starts_with? "base16_"
     Theme.from_xml(ThemeFiles.get("/#{name}.xml").gets_to_end)
@@ -29,9 +31,9 @@ module Tartrazine
 
     # These properties are either set or nil
     # (inherit from parent style)
-    property background : String?
-    property border : String?
-    property color : String?
+    property background : Color?
+    property border : Color?
+    property color : Color?
 
     # Styles are incomplete by default and inherit
     # from parents. If this is true, this style
@@ -101,33 +103,33 @@ module Tartrazine
       # The color assignments are adapted from
       # https://github.com/mohd-akram/base16-pygments/
 
-      theme.styles["Background"] = Style.new(color: t.palette["base05"], background: t.palette["base00"])
-      theme.styles["Text"] = Style.new(color: t.palette["base05"])
-      theme.styles["Error"] = Style.new(color: t.palette["base08"])
-      theme.styles["Comment"] = Style.new(color: t.palette["base03"])
-      theme.styles["CommentPreproc"] = Style.new(color: t.palette["base0F"])
-      theme.styles["CommentPreprocFile"] = Style.new(color: t.palette["base0B"])
-      theme.styles["Keyword"] = Style.new(color: t.palette["base0E"])
-      theme.styles["KeywordType"] = Style.new(color: t.palette["base08"])
-      theme.styles["NameAttribute"] = Style.new(color: t.palette["base0D"])
-      theme.styles["NameBuiltin"] = Style.new(color: t.palette["base08"])
-      theme.styles["NameBuiltinPseudo"] = Style.new(color: t.palette["base08"])
-      theme.styles["NameClass"] = Style.new(color: t.palette["base0D"])
-      theme.styles["NameConstant"] = Style.new(color: t.palette["base09"])
-      theme.styles["NameDecorator"] = Style.new(color: t.palette["base09"])
-      theme.styles["NameFunction"] = Style.new(color: t.palette["base0D"])
-      theme.styles["NameNamespace"] = Style.new(color: t.palette["base0D"])
-      theme.styles["NameTag"] = Style.new(color: t.palette["base0E"])
-      theme.styles["NameVariable"] = Style.new(color: t.palette["base0D"])
-      theme.styles["NameVariableInstance"] = Style.new(color: t.palette["base08"])
-      theme.styles["LiteralNumber"] = Style.new(color: t.palette["base09"])
-      theme.styles["Operator"] = Style.new(color: t.palette["base0C"])
-      theme.styles["OperatorWord"] = Style.new(color: t.palette["base0E"])
-      theme.styles["Literal"] = Style.new(color: t.palette["base0B"])
-      theme.styles["LiteralString"] = Style.new(color: t.palette["base0B"])
-      theme.styles["LiteralStringInterpol"] = Style.new(color: t.palette["base0F"])
-      theme.styles["LiteralStringRegex"] = Style.new(color: t.palette["base0C"])
-      theme.styles["LiteralStringSymbol"] = Style.new(color: t.palette["base09"])
+      theme.styles["Background"] = Style.new(color: t["base05"], background: t["base00"])
+      theme.styles["Text"] = Style.new(color: t["base05"])
+      theme.styles["Error"] = Style.new(color: t["base08"])
+      theme.styles["Comment"] = Style.new(color: t["base03"])
+      theme.styles["CommentPreproc"] = Style.new(color: t["base0F"])
+      theme.styles["CommentPreprocFile"] = Style.new(color: t["base0B"])
+      theme.styles["Keyword"] = Style.new(color: t["base0E"])
+      theme.styles["KeywordType"] = Style.new(color: t["base08"])
+      theme.styles["NameAttribute"] = Style.new(color: t["base0D"])
+      theme.styles["NameBuiltin"] = Style.new(color: t["base08"])
+      theme.styles["NameBuiltinPseudo"] = Style.new(color: t["base08"])
+      theme.styles["NameClass"] = Style.new(color: t["base0D"])
+      theme.styles["NameConstant"] = Style.new(color: t["base09"])
+      theme.styles["NameDecorator"] = Style.new(color: t["base09"])
+      theme.styles["NameFunction"] = Style.new(color: t["base0D"])
+      theme.styles["NameNamespace"] = Style.new(color: t["base0D"])
+      theme.styles["NameTag"] = Style.new(color: t["base0E"])
+      theme.styles["NameVariable"] = Style.new(color: t["base0D"])
+      theme.styles["NameVariableInstance"] = Style.new(color: t["base08"])
+      theme.styles["LiteralNumber"] = Style.new(color: t["base09"])
+      theme.styles["Operator"] = Style.new(color: t["base0C"])
+      theme.styles["OperatorWord"] = Style.new(color: t["base0E"])
+      theme.styles["Literal"] = Style.new(color: t["base0B"])
+      theme.styles["LiteralString"] = Style.new(color: t["base0B"])
+      theme.styles["LiteralStringInterpol"] = Style.new(color: t["base0F"])
+      theme.styles["LiteralStringRegex"] = Style.new(color: t["base0C"])
+      theme.styles["LiteralStringSymbol"] = Style.new(color: t["base09"])
       theme
     end
 
@@ -154,9 +156,9 @@ module Tartrazine
         s.underline = true if style.includes?("underline")
         s.underline = false if style.includes?("nounderline")
 
-        s.color = style.find(&.starts_with?("#")).try &.split("#").last
-        s.background = style.find(&.starts_with?("bg:#")).try &.split("#").last
-        s.border = style.find(&.starts_with?("border:#")).try &.split("#").last
+        s.color = style.find(&.starts_with?("#")).try { |v| Color.new v.split("#").last }
+        s.background = style.find(&.starts_with?("bg:#")).try { |v| Color.new v.split("#").last }
+        s.border = style.find(&.starts_with?("border:#")).try { |v| Color.new v.split("#").last }
 
         theme.styles[node["type"]] = s
       end

src/tartrazine.cr

@@ -12,7 +12,7 @@ require "xml"
 
 module Tartrazine
   extend self
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   Log = ::Log.for("tartrazine")