Add more font drawing options

@@ -8,6 +8,7 @@
 - Fix Bullet widget styling
 - Fix Bullet widget styling
 - Fix HSV and HSL Color constructors
 - Fix HSV and HSL Color constructors
 - Add PageTheme.copyWith
 - Add PageTheme.copyWith
+- Add more font drawing options
 
 
 ## 1.4.1
 ## 1.4.1
 
 

@@ -20,6 +20,32 @@ part of pdf;
 
 
 enum PdfLineCap { joinMiter, joinRound, joinBevel }
 enum PdfLineCap { joinMiter, joinRound, joinBevel }
 
 
+enum PdfTextRenderingMode {
+  /// Fill text
+  fill,
+
+  /// Stroke text
+  stroke,
+
+  /// Fill, then stroke text
+  fillAndStroke,
+
+  /// Neither fill nor stroke text (invisible)
+  invisible,
+
+  /// Fill text and add to path for clipping
+  fillAndClip,
+
+  /// Stroke text and add to path for clipping
+  strokeAndClip,
+
+  /// Fill, then stroke text and add to path for clipping
+  fillStrokeAndClip,
+
+  /// Add text to path for clipping
+  clip
+}
+
 @immutable
 @immutable
 class _PdfGraphicsContext {
 class _PdfGraphicsContext {
   const _PdfGraphicsContext({@required this.ctm}) : assert(ctm != null);
   const _PdfGraphicsContext({@required this.ctm}) : assert(ctm != null);
@@ -213,7 +239,18 @@ class PdfGraphics {
   /// @param x coordinate
   /// @param x coordinate
   /// @param y coordinate
   /// @param y coordinate
   /// @param s String to draw
   /// @param s String to draw
-  void drawString(PdfFont font, double size, String s, double x, double y) {
+  void drawString(
+    PdfFont font,
+    double size,
+    String s,
+    double x,
+    double y, {
+    double charSpace = 0,
+    double wordSpace = 0,
+    double scale = 1,
+    PdfTextRenderingMode mode = PdfTextRenderingMode.fill,
+    double rise = 0,
+  }) {
     if (!page.fonts.containsKey(font.name)) {
     if (!page.fonts.containsKey(font.name)) {
       page.fonts[font.name] = font;
       page.fonts[font.name] = font;
     }
     }
@@ -223,8 +260,28 @@ class PdfGraphics {
     buf.putString(' Td ${font.name} ');
     buf.putString(' Td ${font.name} ');
     buf.putNum(size);
     buf.putNum(size);
     buf.putString(' Tf ');
     buf.putString(' Tf ');
+    if (charSpace != 0) {
+      buf.putNum(charSpace);
+      buf.putString(' Tc ');
+    }
+    if (wordSpace != 0) {
+      buf.putNum(wordSpace);
+      buf.putString(' Tw ');
+    }
+    if (scale != 1) {
+      buf.putNum(scale * 100);
+      buf.putString(' Tz ');
+    }
+    if (rise != 0) {
+      buf.putNum(rise);
+      buf.putString(' Ts ');
+    }
+    if (mode != PdfTextRenderingMode.fill) {
+      buf.putString('${mode.index} Tr ');
+    }
+    buf.putString('[');
     buf.putStream(font.putText(s));
     buf.putStream(font.putText(s));
-    buf.putString(' Tj ET\n');
+    buf.putString(']TJ ET\n');
   }
   }
 
 
   /// Sets the color for drawing
   /// Sets the color for drawing

@@ -20,11 +20,11 @@ part of pdf;
 
 
 class PdfTtfFont extends PdfFont {
 class PdfTtfFont extends PdfFont {
   /// Constructs a [PdfTtfFont]
   /// Constructs a [PdfTtfFont]
-  PdfTtfFont(PdfDocument pdfDocument, ByteData bytes)
+  PdfTtfFont(PdfDocument pdfDocument, ByteData bytes, {bool protect = false})
       : font = TtfParser(bytes),
       : font = TtfParser(bytes),
         super._create(pdfDocument, subtype: '/TrueType') {
         super._create(pdfDocument, subtype: '/TrueType') {
     file = PdfObjectStream(pdfDocument, isBinary: true);
     file = PdfObjectStream(pdfDocument, isBinary: true);
-    unicodeCMap = PdfUnicodeCmap(pdfDocument);
+    unicodeCMap = PdfUnicodeCmap(pdfDocument, protect);
     descriptor = PdfFontDescriptor(this, file);
     descriptor = PdfFontDescriptor(this, file);
     widthsObject = PdfArrayObject(pdfDocument, <String>[]);
     widthsObject = PdfArrayObject(pdfDocument, <String>[]);
   }
   }

@@ -19,12 +19,18 @@
 part of pdf;
 part of pdf;
 
 
 class PdfUnicodeCmap extends PdfObjectStream {
 class PdfUnicodeCmap extends PdfObjectStream {
-  PdfUnicodeCmap(PdfDocument pdfDocument) : super(pdfDocument);
+  PdfUnicodeCmap(PdfDocument pdfDocument, this.protect) : super(pdfDocument);
 
 
   final List<int> cmap = <int>[0];
   final List<int> cmap = <int>[0];
 
 
+  final bool protect;
+
   @override
   @override
   void _prepare() {
   void _prepare() {
+    if (protect) {
+      cmap.fillRange(1, cmap.length, 0x20);
+    }
+
     buf.putString('/CIDInit/ProcSet findresource begin\n'
     buf.putString('/CIDInit/ProcSet findresource begin\n'
         '12 dict begin\n'
         '12 dict begin\n'
         'begincmap\n'
         'begincmap\n'

@@ -144,13 +144,15 @@ class Font {
 }
 }
 
 
 class TtfFont extends Font {
 class TtfFont extends Font {
-  TtfFont(this.data);
+  TtfFont(this.data, {this.protect = false});
 
 
   final ByteData data;
   final ByteData data;
 
 
+  final bool protect;
+
   @override
   @override
   PdfFont buildFont(PdfDocument pdfDocument) {
   PdfFont buildFont(PdfDocument pdfDocument) {
-    return PdfTtfFont(pdfDocument, data);
+    return PdfTtfFont(pdfDocument, data, protect: protect);
   }
   }
 
 
   @override
   @override

@@ -222,7 +222,9 @@ class _Word extends _Span {
       style.fontSize * textScaleFactor,
       style.fontSize * textScaleFactor,
       text,
       text,
       point.x + offset.x,
       point.x + offset.x,
-        point.y + offset.y);
+      point.y + offset.y,
+      mode: style.renderingMode,
+    );
   }
   }
 
 
   @override
   @override

@@ -112,6 +112,7 @@ class TextStyle {
     this.decorationColor,
     this.decorationColor,
     this.decorationStyle,
     this.decorationStyle,
     this.decorationThickness,
     this.decorationThickness,
+    this.renderingMode,
   })  : assert(inherit || color != null),
   })  : assert(inherit || color != null),
         assert(inherit || fontNormal != null),
         assert(inherit || fontNormal != null),
         assert(inherit || fontBold != null),
         assert(inherit || fontBold != null),
@@ -127,6 +128,7 @@ class TextStyle {
         assert(inherit || decoration != null),
         assert(inherit || decoration != null),
         assert(inherit || decorationStyle != null),
         assert(inherit || decorationStyle != null),
         assert(inherit || decorationThickness != null),
         assert(inherit || decorationThickness != null),
+        assert(inherit || renderingMode != null),
         fontNormal = fontNormal ??
         fontNormal = fontNormal ??
             (fontStyle != FontStyle.italic && fontWeight != FontWeight.bold
             (fontStyle != FontStyle.italic && fontWeight != FontWeight.bold
                 ? font
                 ? font
@@ -163,6 +165,7 @@ class TextStyle {
       decorationColor: null,
       decorationColor: null,
       decorationStyle: TextDecorationStyle.solid,
       decorationStyle: TextDecorationStyle.solid,
       decorationThickness: 1,
       decorationThickness: 1,
+      renderingMode: PdfTextRenderingMode.fill,
     );
     );
   }
   }
 
 
@@ -210,6 +213,8 @@ class TextStyle {
 
 
   final double decorationThickness;
   final double decorationThickness;
 
 
+  final PdfTextRenderingMode renderingMode;
+
   TextStyle copyWith({
   TextStyle copyWith({
     PdfColor color,
     PdfColor color,
     Font font,
     Font font,
@@ -229,6 +234,7 @@ class TextStyle {
     PdfColor decorationColor,
     PdfColor decorationColor,
     TextDecorationStyle decorationStyle,
     TextDecorationStyle decorationStyle,
     double decorationThickness,
     double decorationThickness,
+    PdfTextRenderingMode renderingMode,
   }) {
   }) {
     return TextStyle(
     return TextStyle(
       inherit: inherit,
       inherit: inherit,
@@ -250,6 +256,7 @@ class TextStyle {
       decorationColor: decorationColor ?? this.decorationColor,
       decorationColor: decorationColor ?? this.decorationColor,
       decorationStyle: decorationStyle ?? this.decorationStyle,
       decorationStyle: decorationStyle ?? this.decorationStyle,
       decorationThickness: decorationThickness ?? this.decorationThickness,
       decorationThickness: decorationThickness ?? this.decorationThickness,
+      renderingMode: renderingMode ?? this.renderingMode,
     );
     );
   }
   }
 
 
@@ -342,6 +349,7 @@ class TextStyle {
       decorationColor: other.decorationColor,
       decorationColor: other.decorationColor,
       decorationStyle: other.decorationStyle,
       decorationStyle: other.decorationStyle,
       decorationThickness: other.decorationThickness,
       decorationThickness: other.decorationThickness,
+      renderingMode: other.renderingMode,
     );
     );
   }
   }
 
 
@@ -370,5 +378,5 @@ class TextStyle {
 
 
   @override
   @override
   String toString() =>
   String toString() =>
-      'TextStyle(color:$color font:$font size:$fontSize weight:$fontWeight style:$fontStyle letterSpacing:$letterSpacing wordSpacing:$wordSpacing lineSpacing:$lineSpacing height:$height background:$background decoration:$decoration decorationColor:$decorationColor decorationStyle:$decorationStyle decorationThickness:$decorationThickness)';
+      'TextStyle(color:$color font:$font size:$fontSize weight:$fontWeight style:$fontStyle letterSpacing:$letterSpacing wordSpacing:$wordSpacing lineSpacing:$lineSpacing height:$height background:$background decoration:$decoration decorationColor:$decorationColor decorationStyle:$decorationStyle decorationThickness:$decorationThickness, renderingMode:$renderingMode)';
 }
 }