Fix underline on spans

@@ -5,6 +5,7 @@
 - Fix Type1 font widths
 - Fix Type1 font widths
 - Deprecate PdfArrayObject and PdfObjectDict
 - Deprecate PdfArrayObject and PdfObjectDict
 - Improve PdfArray and PdfDict constructors
 - Improve PdfArray and PdfDict constructors
+- Fix underline on spans [RomanIvn]
 
 
 ## 3.10.1
 ## 3.10.1
 
 

@@ -49,12 +49,14 @@ enum TextOverflow {
 }
 }
 
 
 abstract class _Span {
 abstract class _Span {
-  _Span(this.style);
+  _Span(this.style, this.realWidth);
 
 
   final TextStyle style;
   final TextStyle style;
 
 
   var offset = PdfPoint.zero;
   var offset = PdfPoint.zero;
 
 
+  double realWidth;
+
   double get left;
   double get left;
 
 
   double get top;
   double get top;
@@ -103,9 +105,13 @@ class _TextDecoration {
       return _box;
       return _box;
     }
     }
 
 
-    final x1 = spans[startSpan].offset.x + spans[startSpan].left;
-    final x2 =
-        spans[endSpan].offset.x + spans[endSpan].left + spans[endSpan].width;
+    final x1 = spans[startSpan].offset.x +
+        spans[startSpan].left +
+        spans[startSpan].realWidth;
+    final x2 = spans[endSpan].offset.x +
+        spans[endSpan].left +
+        spans[endSpan].width -
+        spans[endSpan].realWidth;
     var y1 = spans[startSpan].offset.y + spans[startSpan].top;
     var y1 = spans[startSpan].offset.y + spans[startSpan].top;
     var y2 = y1 + spans[startSpan].height;
     var y2 = y1 + spans[startSpan].height;
 
 
@@ -178,11 +184,13 @@ class _TextDecoration {
 
 
     if (style.decoration!.contains(TextDecoration.underline)) {
     if (style.decoration!.contains(TextDecoration.underline)) {
       final base = -font.descent * style.fontSize! * textScaleFactor / 2;
       final base = -font.descent * style.fontSize! * textScaleFactor / 2;
-
+      final l = box!.left;
+      final r = box.right;
+      final x = globalBox!.x;
       context.canvas.drawLine(
       context.canvas.drawLine(
-        globalBox!.x + box!.left,
+        x + l,
         globalBox.top + box.bottom + base,
         globalBox.top + box.bottom + base,
-        globalBox.x + box.right,
+        x + r,
         globalBox.top + box.bottom + base,
         globalBox.top + box.bottom + base,
       );
       );
       if (style.decorationStyle == TextDecorationStyle.double) {
       if (style.decorationStyle == TextDecorationStyle.double) {
@@ -257,7 +265,7 @@ class _Word extends _Span {
     this.text,
     this.text,
     TextStyle style,
     TextStyle style,
     this.metrics,
     this.metrics,
-  ) : super(style);
+  ) : super(style, metrics.advanceWidth);
 
 
   final String text;
   final String text;
 
 
@@ -323,7 +331,7 @@ class _Word extends _Span {
 }
 }
 
 
 class _WidgetSpan extends _Span {
 class _WidgetSpan extends _Span {
-  _WidgetSpan(this.widget, TextStyle style, this.baseline) : super(style);
+  _WidgetSpan(this.widget, TextStyle style, this.baseline) : super(style, 0);
 
 
   final Widget widget;
   final Widget widget;