From 94888109688fa73d31ce4268fd2d589d948dd9f8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 9 Jul 2015 01:17:33 +0000 Subject: Fix trailing white space in fluid .fl files (STR #3239). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10782 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ fluid/file.cxx | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index dc2506dc2..5abdb8955 100644 --- a/CHANGES +++ b/CHANGES @@ -39,6 +39,8 @@ CHANGES IN FLTK 1.3.4 RELEASED: ??? ?? ???? Bug fixes + - fluid doesn't output trailing white space in .fl files after + some statements anymore (STR #3239). - Several box types were not drawn correctly when deactivated. The background color for deactivated widgets is now correct: fl_inactive(color()) (STR #2907). diff --git a/fluid/file.cxx b/fluid/file.cxx index f4cf18c1c..92ab8925a 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -87,11 +87,13 @@ void write_word(const char *w) { putc('}', fout); } -// write an arbitrary formatted word, or a comment, etc: +// write an arbitrary formatted word, or a comment, etc. +// if needspace is set, then one space is written before the string +// unless the format starts with a newline character ('\n'): void write_string(const char *format, ...) { va_list args; va_start(args, format); - if (needspace) fputc(' ',fout); + if (needspace && *format != '\n') fputc(' ',fout); vfprintf(fout, format, args); va_end(args); needspace = !isspace(format[strlen(format)-1] & 255); -- cgit v1.2.3