Changeset 14be3a5 for text.c

Timestamp:

Jul 21, 2011, 5:06:19 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

6500907

Parents:

d8f22b6

git-author:

Jason Gross <jgross@mit.edu> (07/20/11 03:09:43)

git-committer:

Jason Gross <jgross@mit.edu> (07/21/11 17:06:19)

Message:

Give owl_text_indent an indent_first_line parameter

This is useful if you need to indent text that isn't broken into chunks
that end with newlines.

This is primarily in preparation for the next commit, where we need to
replace the indent on the first line by a prefix.  The other
(reasonable) option is to make owl_text_indent always prefix the string
it's given with an indent, even when it's given the empty string.  This
would break the nice property that indent(A + B) = indent(A) + indent(B)
whenever A ended with a newline.  After some discussion on zephyr and on
the github pull request, I decided to go with this option.

File:

• text.c (modified) (1 diff)

text.c

@@ -7 +7 @@
 /* Returns a copy of 'in' with each line indented 'n'
  * characters. Result must be freed with g_free. */
-CALLER_OWN char *owl_text_indent(const char *in, int n)
+CALLER_OWN char *owl_text_indent(const char *in, int n, bool indent_first_line)
 {
   const char *ptr1, *ptr2, *last;
   GString *out = g_string_new("");
   int i;
+  bool indent_this_line = indent_first_line;
 
   last=in+strlen(in)-1;
   ptr1=in;
   while (ptr1<=last) {
-    for (i=0; i<n; i++) {
-      g_string_append_c(out, ' ');
-    }
+    if (indent_this_line) {
+      for (i = 0; i < n; i++) {
+        g_string_append_c(out, ' ');
+      }
+    }
+    indent_this_line = true;
     ptr2=strchr(ptr1, '\n');
     if (!ptr2) {