Fixing up gobbling of lines after DEFMACRO and adding test case.

Author: bingmann

src/latex.cpp

@@ -486,30 +486,29 @@ void SpLatex::defmacro(size_t ln, size_t indent, const std::string& cmdline)
     {
         for (unsigned int col = 0; col < count; ++col) {
             if (col != 0) oss << std::endl;
-            oss << "\\def \\"
+            oss << "\\def\\"
                 << str_reduce(sql->col_name(col))
-                << " {"
+                << "{"
                 << reformat.format(0, col, sql->text(0, col))
                 << "}";
         }
     }
 
     std::string output = oss.str();
 
-    // check whether line contains an \addplot command
+    // scan lines forward and gobble all lines containing \def commands
     static const boost::regex
-        re_defmacro("[[:blank:]]*(\\\\def \\\\[^}]+ \\{)[^}]+(\\}.*)");
+        re_defmacro("[[:blank:]]*\\\\def\\\\[^{]+\\{[^}]+\\}.*");
     boost::smatch rm;
 
-    if (ln + count < m_lines.size() &&
-        boost::regex_match(m_lines[ln], rm, re_defmacro))
-    {
-        m_lines.replace(ln, ln+count, indent, output, "DEFMACRO");
-    }
-    else
+    size_t eln = ln;
+    while (eln < m_lines.size() &&
+           boost::regex_match(m_lines[eln], rm, re_defmacro))
     {
-        m_lines.replace(ln, ln, indent, output, "DEFMACRO");
+        ++eln;
     }
+
+    m_lines.replace(ln, eln, indent, output, "DEFMACRO");
 }
 
 //! process line-based file in place

tests/latex/defmacro.out

@@ -0,0 +1,15 @@
+line
+%% DEFMACRO
+%% SELECT 42.005 AS a, 42.05 AS mc, 42.5 AS ABCD, 'hello' AS c
+\def\a{42.005}
+\def\mc{42.05}
+\def\ABCD{42.5}
+\def\c{hello}
+line
+%% DEFMACRO REFORMAT(round=0)
+%% SELECT 42.005 AS a, 42.05 AS mc, 42.5 AS ABCD, 'hello' AS c
+\def\a{42}
+\def\mc{42}
+\def\ABCD{43}
+\def\c{hello}
+line

tests/latex/defmacro.tex

@@ -0,0 +1,9 @@
+line
+%% DEFMACRO
+%% SELECT 42.005 AS a, 42.05 AS mc, 42.5 AS ABCD, 'hello' AS c
+\def\gobble{this}
+\def\andthis{...}
+line
+%% DEFMACRO REFORMAT(round=0)
+%% SELECT 42.005 AS a, 42.05 AS mc, 42.5 AS ABCD, 'hello' AS c
+line