diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 1e1221897598c81b04262c1e2a3eca4e9a75f61c..75c7d6069146537962021fd4a1fc44d6bac37444 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -473,10 +473,21 @@ namespace cppcanvas
                 case LINESTYLE_DONTKNOW:
                     break;
 
-                case LINESTYLE_SMALLWAVE:     // TODO(F3): NYI
+                case LINESTYLE_DOUBLEWAVE:
+                    // FALLTHROUGH intended
+                case LINESTYLE_SMALLWAVE:
                     // FALLTHROUGH intended
-                case LINESTYLE_WAVE:          // TODO(F3): NYI
+                case LINESTYLE_BOLDWAVE:
                     // FALLTHROUGH intended
+                case LINESTYLE_WAVE:
+                    appendWaveline(
+                        aTextLinesPolyPoly,
+                        rStartPos,
+                        rTextLineInfo.mnUnderlineOffset,
+                        rLineWidth,
+                        rTextLineInfo.mnLineHeight,
+                        rTextLineInfo.mnUnderlineStyle);
+                    break;
                 case LINESTYLE_SINGLE:
                     appendRect(
                         aTextLinesPolyPoly,
@@ -497,8 +508,6 @@ namespace cppcanvas
                     // FALLTHROUGH intended
                 case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI
                     // FALLTHROUGH intended
-                case LINESTYLE_BOLDWAVE:      // TODO(F3): NYI
-                    // FALLTHROUGH intended
                 case LINESTYLE_BOLD:
                     appendRect(
                         aTextLinesPolyPoly,
@@ -509,8 +518,6 @@ namespace cppcanvas
                         rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight );
                     break;
 
-                case LINESTYLE_DOUBLEWAVE:    // TODO(F3): NYI
-                    // FALLTHROUGH intended
                 case LINESTYLE_DOUBLE:
                     appendRect(
                         aTextLinesPolyPoly,