Fix Text decoration placements

@@ -10,6 +10,7 @@
 - Add PdfColor.shade
 - Add PdfColor.shade
 - Uniformize examples
 - Uniformize examples
 - Fix context painting empty Table
 - Fix context painting empty Table
+- Fix Text decoration placements
 
 
 ## 1.5.0
 ## 1.5.0
 
 

@@ -52,7 +52,9 @@ abstract class _Span {
 }
 }
 
 
 class _TextDecoration {
 class _TextDecoration {
-  _TextDecoration(this.style, this.annotation) : assert(style != null);
+  _TextDecoration(this.style, this.annotation, this.startSpan, this.endSpan)
+      : assert(startSpan <= endSpan),
+        assert(style != null);
 
 
   static const double _space = -0.15;
   static const double _space = -0.15;
 
 
@@ -60,13 +62,44 @@ class _TextDecoration {
 
 
   final AnnotationBuilder annotation;
   final AnnotationBuilder annotation;
 
 
-  PdfRect box = PdfRect.zero;
+  final int startSpan;
+
+  final int endSpan;
+
+  PdfRect _box;
+
+  PdfRect _getBox(List<_Span> spans) {
+    if (_box != null) {
+      return _box;
+    }
+    final double x1 = spans[startSpan].offset.x + spans[startSpan].left;
+    final double x2 =
+        spans[endSpan].offset.x + spans[endSpan].left + spans[endSpan].width;
+    double y1 = spans[startSpan].offset.y + spans[startSpan].top;
+    double y2 = y1 + spans[startSpan].height;
+
+    for (int n = startSpan + 1; n <= endSpan; n++) {
+      final double ny1 = spans[n].offset.y + spans[n].top;
+      final double ny2 = ny1 + spans[n].height;
+      y1 = math.min(y1, ny1);
+      y2 = math.max(y2, ny2);
+    }
+
+    _box = PdfRect.fromLTRB(x1, y1, x2, y2);
+    return _box;
+  }
+
+  _TextDecoration copyWith({int endSpan}) =>
+      _TextDecoration(style, annotation, startSpan, endSpan ?? this.endSpan);
 
 
   void backgroundPaint(
   void backgroundPaint(
     Context context,
     Context context,
     double textScaleFactor,
     double textScaleFactor,
     PdfRect globalBox,
     PdfRect globalBox,
+    List<_Span> spans,
   ) {
   ) {
+    final PdfRect box = _getBox(spans);
+
     if (annotation != null) {
     if (annotation != null) {
       final PdfRect spanBox = PdfRect(
       final PdfRect spanBox = PdfRect(
         globalBox.x + box.left,
         globalBox.x + box.left,
@@ -93,22 +126,25 @@ class _TextDecoration {
     Context context,
     Context context,
     double textScaleFactor,
     double textScaleFactor,
     PdfRect globalBox,
     PdfRect globalBox,
+    List<_Span> spans,
   ) {
   ) {
-    if (style.decoration != null) {
+    if (style.decoration == null) {
+      return;
+    }
+
+    final PdfRect box = _getBox(spans);
+
     final PdfFont font = style.font.getFont(context);
     final PdfFont font = style.font.getFont(context);
     final double space =
     final double space =
         _space * style.fontSize * textScaleFactor * style.decorationThickness;
         _space * style.fontSize * textScaleFactor * style.decorationThickness;
 
 
     context.canvas
     context.canvas
       ..setStrokeColor(style.decorationColor ?? style.color)
       ..setStrokeColor(style.decorationColor ?? style.color)
-        ..setLineWidth(style.decorationThickness *
-            style.fontSize *
-            textScaleFactor *
-            0.05);
+      ..setLineWidth(
+          style.decorationThickness * style.fontSize * textScaleFactor * 0.05);
 
 
     if (style.decoration.contains(TextDecoration.underline)) {
     if (style.decoration.contains(TextDecoration.underline)) {
-        final double base =
-            -font.descent * style.fontSize * textScaleFactor / 2;
+      final double base = -font.descent * style.fontSize * textScaleFactor / 2;
 
 
       context.canvas.drawLine(
       context.canvas.drawLine(
         globalBox.x + box.left,
         globalBox.x + box.left,
@@ -166,13 +202,15 @@ class _TextDecoration {
       context.canvas.strokePath();
       context.canvas.strokePath();
     }
     }
   }
   }
-  }
 
 
   void debugPaint(
   void debugPaint(
     Context context,
     Context context,
     double textScaleFactor,
     double textScaleFactor,
     PdfRect globalBox,
     PdfRect globalBox,
+    List<_Span> spans,
   ) {
   ) {
+    final PdfRect box = _getBox(spans);
+
     context.canvas
     context.canvas
       ..setLineWidth(.5)
       ..setLineWidth(.5)
       ..drawRect(
       ..drawRect(
@@ -197,13 +235,13 @@ class _Word extends _Span {
   double get left => metrics.left;
   double get left => metrics.left;
 
 
   @override
   @override
-  double get top => metrics.top;
+  double get top => metrics.descent;
 
 
   @override
   @override
   double get width => metrics.width;
   double get width => metrics.width;
 
 
   @override
   @override
-  double get height => metrics.height;
+  double get height => metrics.maxHeight;
 
 
   @override
   @override
   String toString() {
   String toString() {
@@ -464,14 +502,20 @@ class RichText extends Widget {
       span.offset = span.offset.translate(delta, -baseline);
       span.offset = span.offset.translate(delta, -baseline);
     }
     }
 
 
-    for (_TextDecoration decoration in decorations) {
-      decoration.box = PdfRect.fromPoints(
-        decoration.box.offset.translate(delta, -baseline),
-        decoration.box.size,
-      );
+    return totalWidth;
   }
   }
 
 
-    return totalWidth;
+  void _appendDecoration(bool append, _TextDecoration td) {
+    if (append && _decorations.isNotEmpty) {
+      final _TextDecoration last = _decorations.last;
+      if (last.style == td.style && last.annotation == td.annotation) {
+        _decorations[_decorations.length - 1] =
+            last.copyWith(endSpan: td.endSpan);
+        return;
+      }
+    }
+
+    _decorations.add(td);
   }
   }
 
 
   @override
   @override
@@ -568,16 +612,15 @@ class RichText extends Widget {
             _spans.add(wd);
             _spans.add(wd);
             spanCount++;
             spanCount++;
 
 
-            final _TextDecoration td = _TextDecoration(
+            _appendDecoration(
+              spanCount > 1,
+              _TextDecoration(
                 style,
                 style,
                 span.annotation,
                 span.annotation,
+                _spans.length - 1,
+                _spans.length - 1,
+              ),
             );
             );
-            td.box = PdfRect(
-                offsetX,
-                -offsetY + metrics.descent + baseline,
-                metrics.maxWidth + space.advanceWidth * style.wordSpacing,
-                metrics.maxHeight);
-            _decorations.add(td);
 
 
             offsetX +=
             offsetX +=
                 metrics.advanceWidth + space.advanceWidth * style.wordSpacing;
                 metrics.advanceWidth + space.advanceWidth * style.wordSpacing;
@@ -598,15 +641,6 @@ class RichText extends Widget {
             spanStart += spanCount;
             spanStart += spanCount;
             decorationStart = _decorations.length;
             decorationStart = _decorations.length;
 
 
-            if (_decorations.isNotEmpty) {
-              // remove the last space
-              _decorations.last.box = PdfRect.fromPoints(
-                _decorations.last.box.offset,
-                _decorations.last.box.size
-                    .translate(-space.advanceWidth * style.wordSpacing, 0),
-              );
-            }
-
             lines++;
             lines++;
             if (maxLines != null && lines > maxLines) {
             if (maxLines != null && lines > maxLines) {
               break;
               break;
@@ -683,12 +717,15 @@ class RichText extends Widget {
         _spans.add(ws);
         _spans.add(ws);
         spanCount++;
         spanCount++;
 
 
-        final _TextDecoration td = _TextDecoration(
+        _appendDecoration(
+          spanCount > 1,
+          _TextDecoration(
             style,
             style,
             span.annotation,
             span.annotation,
+            _spans.length - 1,
+            _spans.length - 1,
+          ),
         );
         );
-        td.box = PdfRect(offsetX, -offsetY + baseline, ws.width, ws.height);
-        _decorations.add(td);
 
 
         offsetX += ws.left + ws.width;
         offsetX += ws.left + ws.width;
       }
       }
@@ -732,7 +769,7 @@ class RichText extends Widget {
     for (_TextDecoration decoration in _decorations) {
     for (_TextDecoration decoration in _decorations) {
       assert(() {
       assert(() {
         if (Document.debug && RichText.debug) {
         if (Document.debug && RichText.debug) {
-          decoration.debugPaint(context, textScaleFactor, box);
+          decoration.debugPaint(context, textScaleFactor, box, _spans);
         }
         }
         return true;
         return true;
       }());
       }());
@@ -741,6 +778,7 @@ class RichText extends Widget {
         context,
         context,
         textScaleFactor,
         textScaleFactor,
         box,
         box,
+        _spans,
       );
       );
     }
     }
 
 
@@ -773,6 +811,7 @@ class RichText extends Widget {
         context,
         context,
         textScaleFactor,
         textScaleFactor,
         box,
         box,
+        _spans,
       );
       );
     }
     }
   }
   }