Implement properly RichText.softWrap

@@ -5,6 +5,7 @@
 * Add SizedBox Widget
 * Add SizedBox Widget
 * Fix RichText Widget word spacing
 * Fix RichText Widget word spacing
 * Improve Theme and TextStyle
 * Improve Theme and TextStyle
+* Implement properly RichText.softWrap
 
 
 # 1.3.7
 # 1.3.7
 * Add Pdf Creation date
 * Add Pdf Creation date

@@ -98,11 +98,10 @@ class RichText extends Widget {
   RichText(
   RichText(
       {@required this.text,
       {@required this.text,
       this.textAlign = TextAlign.left,
       this.textAlign = TextAlign.left,
-      bool softWrap = true,
+      this.softWrap = true,
       this.textScaleFactor = 1.0,
       this.textScaleFactor = 1.0,
-      int maxLines})
-      : maxLines = !softWrap ? 1 : maxLines,
-        assert(text != null);
+      this.maxLines})
+      : assert(text != null);
 
 
   static const bool debug = false;
   static const bool debug = false;
 
 
@@ -112,6 +111,8 @@ class RichText extends Widget {
 
 
   final double textScaleFactor;
   final double textScaleFactor;
 
 
+  final bool softWrap;
+
   final int maxLines;
   final int maxLines;
 
 
   final List<_Word> _words = <_Word>[];
   final List<_Word> _words = <_Word>[];
@@ -183,7 +184,9 @@ class RichText extends Widget {
       final PdfFontMetrics space =
       final PdfFontMetrics space =
           font.stringMetrics(' ') * (style.fontSize * textScaleFactor);
           font.stringMetrics(' ') * (style.fontSize * textScaleFactor);
 
 
-      for (String word in span.text.split(RegExp(r'\s'))) {
+      final List<String> spanLines = span.text.split('\n');
+      for (int line = 0; line < spanLines.length; line++) {
+        for (String word in spanLines[line].split(RegExp(r'\s'))) {
           if (word.isEmpty) {
           if (word.isEmpty) {
             offsetX += space.advanceWidth * style.wordSpacing;
             offsetX += space.advanceWidth * style.wordSpacing;
             continue;
             continue;
@@ -201,7 +204,9 @@ class RichText extends Widget {
                     offsetX - space.advanceWidth * style.wordSpacing,
                     offsetX - space.advanceWidth * style.wordSpacing,
                     false,
                     false,
                     bottom));
                     bottom));
+
             lineStart += wCount;
             lineStart += wCount;
+
             if (maxLines != null && ++lines > maxLines) {
             if (maxLines != null && ++lines > maxLines) {
               break;
               break;
             }
             }
@@ -229,6 +234,38 @@ class RichText extends Widget {
               metrics.advanceWidth + space.advanceWidth * style.wordSpacing;
               metrics.advanceWidth + space.advanceWidth * style.wordSpacing;
         }
         }
 
 
+        if (softWrap && line < spanLines.length - 1) {
+          width = math.max(
+              width,
+              _realignLine(
+                  _words.sublist(lineStart),
+                  constraintWidth,
+                  offsetX - space.advanceWidth * style.wordSpacing,
+                  false,
+                  bottom));
+
+          lineStart += wCount;
+
+          if (maxLines != null && ++lines > maxLines) {
+            break;
+          }
+
+          offsetX = 0.0;
+          if (wCount > 0) {
+            offsetY += bottom - top + style.lineSpacing;
+          } else {
+            offsetY += space.ascent + space.descent + style.lineSpacing;
+          }
+          top = null;
+          bottom = null;
+
+          if (offsetY > constraintHeight) {
+            return false;
+          }
+          wCount = 0;
+        }
+      }
+
       offsetX -= space.advanceWidth * style.wordSpacing;
       offsetX -= space.advanceWidth * style.wordSpacing;
       return true;
       return true;
     }, defaultstyle);
     }, defaultstyle);