[util] Separate shape_text_options_t from text_options_t
diff --git a/util/main-font-text.hh b/util/main-font-text.hh
index a2a4391..dabbd32 100644
--- a/util/main-font-text.hh
+++ b/util/main-font-text.hh
@@ -41,10 +41,8 @@
 
     this->init (this);
 
-    unsigned int line_len;
-    const char *line;
-    while ((line = this->get_line (&line_len)))
-      this->consume_line (line, line_len, this->text_before, this->text_after);
+    while (this->consume_line (*this))
+      ;
 
     this->finish (this);