@@ -5,9 +5,30 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
+import 'package:vector_graphics_compiler/src/svg/colors.dart';
+import 'package:vector_graphics_compiler/vector_graphics_compiler.dart';
 import 'package:vector_graphics_compiler/src/isolate_processor.dart';
 
 final ArgParser argParser = ArgParser()
+  ..addOption(
+    'current-color',
+    help: 'The value (in ARGB format or a named SVG color) of the '
+        '"currentColor" attribute.',
+    valueHelp: '0xFF000000',
+    defaultsTo: '0xFF000000',
+  )
+  ..addOption(
+    'font-size',
+    help: 'The basis for font size based values (i.e. em, ex).',
+    valueHelp: '14',
+    defaultsTo: '14',
+  )
+  ..addOption(
+    'x-height',
+    help: 'The x-height or corpus size of the font. If unspecified, defaults '
+        'to half of font-size.',
+    valueHelp: '7',
+  )
   ..addOption(
     'libtessellator',
     help: 'The path to a libtessellator dynamic library',
@@ -80,6 +101,21 @@ void validateOptions(ArgResults results) {
   }
 }
 
+SvgTheme _parseTheme(ArgResults results) {
+  Color? currentColor = namedColors[results['current-color']];
+  if (currentColor == null) {
+    final int? argbValue = int.tryParse(results['current-color'] as String);
+    currentColor = Color(argbValue ?? 0xFF000000);
+  }
+  return SvgTheme(
+    currentColor: currentColor,
+    fontSize: double.tryParse(results['font-size'] as String) ?? 14,
+    xHeight: results.wasParsed('x-height')
+        ? double.tryParse(results['x-height'] as String)
+        : null,
+  );
+}
+
 Future<void> main(List<String> args) async {
   final ArgResults results;
   try {
@@ -132,6 +168,7 @@ Future<void> main(List<String> args) async {
   );
   if (!await processor.process(
     pairs,
+    theme: _parseTheme(results),
     maskingOptimizerEnabled: maskingOptimizerEnabled,
     clippingOptimizerEnabled: clippingOptimizerEnabled,
     overdrawOptimizerEnabled: overdrawOptimizerEnabled,
 
@@ -29,6 +29,7 @@ class IsolateProcessor {
   /// Returns whether all requests were successful.
   Future<bool> process(
     List<Pair> pairs, {
+    SvgTheme theme = const SvgTheme(),
     required bool maskingOptimizerEnabled,
     required bool clippingOptimizerEnabled,
     required bool overdrawOptimizerEnabled,
@@ -42,6 +43,7 @@ class IsolateProcessor {
       for (Pair pair in pairs)
         _process(
           pair,
+          theme: theme,
           maskingOptimizerEnabled: maskingOptimizerEnabled,
           clippingOptimizerEnabled: clippingOptimizerEnabled,
           overdrawOptimizerEnabled: overdrawOptimizerEnabled,
@@ -87,6 +89,7 @@ class IsolateProcessor {
     required bool dumpDebug,
     required String? libpathops,
     required String? libtessellator,
+    SvgTheme theme = const SvgTheme(),
   }) async {
     PoolResource? resource;
     try {
@@ -104,6 +107,7 @@ class IsolateProcessor {
         final Uint8List bytes = await encodeSvg(
           xml: File(pair.inputPath).readAsStringSync(),
           debugName: pair.inputPath,
+          theme: theme,
           enableMaskingOptimizer: maskingOptimizerEnabled,
           enableClippingOptimizer: clippingOptimizerEnabled,
           enableOverdrawOptimizer: overdrawOptimizerEnabled,
 
@@ -1240,7 +1240,7 @@ class SvgParser {
   }
 
   /// Converts a SVG Color String (either a # prefixed color string or a named color) to a [Color].
-  Color? parseColor(String? colorString) {
+  Color? parseColor(String? colorString, {Color? currentColor}) {
     if (colorString == null || colorString.isEmpty) {
       return null;
     }
@@ -1250,7 +1250,7 @@ class SvgParser {
     }
 
     if (colorString.toLowerCase() == 'currentcolor') {
-      return null;
+      return currentColor ?? theme.currentColor;
     }
 
     // handle hex colors e.g. #fff or #ffffff.  This supports #RRGGBBAA
 
@@ -14,6 +14,7 @@ import 'src/paint.dart';
 import 'src/svg/theme.dart';
 import 'src/svg/parser.dart';
 import 'src/vector_instructions.dart';
+
 export 'src/geometry/basic_types.dart';
 export 'src/geometry/matrix.dart';
 export 'src/geometry/path.dart';
@@ -101,6 +102,7 @@ void _encodeShader(
 Future<Uint8List> encodeSvg({
   required String xml,
   required String debugName,
+  SvgTheme theme = const SvgTheme(),
   bool enableMaskingOptimizer = true,
   bool enableClippingOptimizer = true,
   bool enableOverdrawOptimizer = true,
@@ -110,6 +112,7 @@ Future<Uint8List> encodeSvg({
   final VectorInstructions instructions = await parse(
     xml,
     key: debugName,
+    theme: theme,
     enableMaskingOptimizer: enableMaskingOptimizer,
     enableClippingOptimizer: enableClippingOptimizer,
     enableOverdrawOptimizer: enableOverdrawOptimizer,
 
@@ -6,10 +6,38 @@ import 'dart:io';
 
 import 'package:test/test.dart';
 import 'package:vector_graphics_compiler/src/isolate_processor.dart';
+import '../bin/vector_graphics_compiler.dart' as cli;
 
 void main() {
+  final File output = File('test_data/example.vec');
+  final File outputDebug = File('test_data/example.vec.debug');
+
+  test('currentColor/font-size works', () async {
+    try {
+      await cli.main(<String>[
+        '-i',
+        'test_data/example.svg',
+        '-o',
+        output.path,
+        '--current-color',
+        'red',
+        '--font-size',
+        '12',
+        '--dump-debug',
+      ]);
+      expect(output.existsSync(), true);
+      expect(outputDebug.existsSync(), true);
+    } finally {
+      if (output.existsSync()) {
+        output.deleteSync();
+      }
+      if (outputDebug.existsSync()) {
+        outputDebug.deleteSync();
+      }
+    }
+  });
+
   test('Can run with isolate processor', () async {
-    final File output = File('test_data/example.vec');
     try {
       final IsolateProcessor processor = IsolateProcessor(null, null, 4);
       final bool result = await processor.process(
@@ -32,8 +60,6 @@ void main() {
   });
 
   test('Can dump debug format with isolate processor', () async {
-    final File output = File('test_data/example.vec');
-    final File outputDebug = File('test_data/example.vec.debug');
     try {
       final IsolateProcessor processor = IsolateProcessor(null, null, 4);
       final bool result = await processor.process(
Original file line number	Diff line number	Diff line change
`@@ -1240,7 +1240,7 @@ class SvgParser {`
`1240`	`1240`	`}`
`1241`	`1241`
`1242`	`1242`	`/// Converts a SVG Color String (either a # prefixed color string or a named color) to a [Color].`
`1243`		`- Color? parseColor(String? colorString) {`
	`1243`	`+ Color? parseColor(String? colorString, {Color? currentColor}) {`
`1244`	`1244`	`if (colorString == null \|\| colorString.isEmpty) {`
`1245`	`1245`	`return null;`
`1246`	`1246`	`}`
`@@ -1250,7 +1250,7 @@ class SvgParser {`
`1250`	`1250`	`}`
`1251`	`1251`
`1252`	`1252`	`if (colorString.toLowerCase() == 'currentcolor') {`
`1253`		`- return null;`
	`1253`	`+ return currentColor ?? theme.currentColor;`
`1254`	`1254`	`}`
`1255`	`1255`
`1256`	`1256`	`// handle hex colors e.g. #fff or #ffffff. This supports #RRGGBBAA`