Changeset 10278 for code/trunk

Timestamp:

Feb 18, 2015, 9:56:38 PM (10 years ago)

Author:

landauf

Message:

fixed issue with inline-lua-code. only add an extra space if there's actually a line-break at the beginning of the text-content. otherwise code like this: mesh="ast<?lua print(1) ?>.mesh" becomes mesh="ast1 .mesh" instead of mesh="ast1.mesh"

File:

• code/trunk/src/libraries/core/Loader.cc (modified) (1 diff)

code/trunk/src/libraries/core/Loader.cc

@@ -470 +470 @@
                     //A newline directly after square brackets is ignored. To make sure that the string is printed
                     //exactly as it is, including newlines at the beginning, insert a space after the brackets.
-                    output << "print([" + equalSigns + "[ " + temp + ']' + equalSigns +"])";
+                    bool needsExtraSpace = false;
+                    if (temp.size() > 0 && (temp[0] == '\n' || temp[0] == '\r')) // begins with \n or \r (a line break)
+                        needsExtraSpace = true;
+                    output << "print([" + equalSigns + (needsExtraSpace ? "[ " : "[") + temp + ']' + equalSigns +"])";
                     start = end + 5;
                 }