adding new cell-level REFORMAT key: "escape" for LaTeX special characters

Author: bingmann

src/latex.cpp

@@ -66,10 +66,6 @@ class SpLatex
         return m_lines.scan_for_comment<comment_char>(ln, cprefix);
     }
 
-    //! escape special latex characters
-    static inline std::string
-    escape(const std::string& str);
-
     //! Process % SQL commands
     void sql(size_t ln, size_t indent, const std::string& cmdline);
 
@@ -104,23 +100,6 @@ class SpLatex
     SpLatex(TextLines& lines);
 };
 
-//! escape special latex characters
-inline std::string SpLatex::escape(const std::string& str)
-{
-    std::string out;
-    out.reserve(str.size());
-    for (std::string::const_iterator s = str.begin(); s != str.end(); ++s)
-    {
-        if (*s == '#' || *s == '$' || *s == '%' || *s == '^' || *s == '&' ||
-            *s == '{' || *s == '}' || *s == '_' || *s == '~' || *s == '\\')
-        {
-            out += '\\';
-        }
-        out += *s;
-    }
-    return out;
-}
-
 //! Process % SQL commands
 void SpLatex::sql(size_t /* ln */, size_t /* indent */, const std::string& cmdline)
 {
@@ -295,7 +274,8 @@ void SpLatex::multiplot(size_t ln, size_t indent, const std::string& cmdline)
                 std::ostringstream os;
                 for (size_t i = 0; i < groupcols.size(); ++i) {
                     if (i != 0) os << ',';
-                    os << escape(groupfields[i]) << '=' << escape(rowgroup[i]);
+                    os << escape_latex(groupfields[i])
+                       << '=' << escape_latex(rowgroup[i]);
                 }
                 legendlist.push_back(os.str());
             }

src/reformat.cpp

@@ -256,7 +256,12 @@ bool Reformat::Cell::parse_keyformat(const std::string& key,
                                      std::string::const_iterator& curr,
                                      const std::string::const_iterator& end)
 {
-    if (key == "floor")
+    if (key == "escape")
+    {
+        m_escape = true;
+        return true;
+    }
+    else if (key == "floor")
     {
         m_round = RD_FLOOR;
         return true;
@@ -742,6 +747,26 @@ std::string Reformat::format(int row, int col, const std::string& in_text) const
                 text = "\\emph{" + text + "}";
         }
     }
+    else
+    {
+        Line fmt = m_fmt;
+
+        {
+            linefmt_type::const_iterator rowfmt = m_rowfmt.find(row);
+            if (rowfmt != m_rowfmt.end())
+                fmt.apply(rowfmt->second);
+
+            linefmt_type::const_iterator colfmt = m_colfmt.find(col);
+            if (colfmt != m_colfmt.end())
+                fmt.apply(colfmt->second);
+        }
+
+        if (fmt.m_escape)
+        {
+            // escape special LaTeX characters
+            text = escape_latex(text);
+        }
+    }
 
     return text;
 }

src/reformat.h

@@ -34,6 +34,7 @@
  * Reformatting styles for text or double value cells.
  *
  * cell-level formats:
+ *  - escape (escape special LaTeX characters)
  *  - round=# (# = 'floor', 'ceil' or number of decimal digits)
  *  - precision=# (# = show decimal digits)
  *  - width=# (# = set width of output)
@@ -87,6 +88,9 @@ class Reformat
     //! Specifications for cell-level formats
     struct Cell
     {
+        //! escape special LaTeX characters
+        bool m_escape;
+
         //! round double numbers, options: floor, ceil, round, precision
         enum { RD_UNDEF, RD_FLOOR, RD_CEIL, RD_ROUND, RD_DIGITS } m_round;
 
@@ -107,7 +111,8 @@ class Reformat
 
         //! Initialize with sentinels
         Cell()
-            : m_round(RD_UNDEF),
+            : m_escape(false),
+              m_round(RD_UNDEF),
               m_round_digits(-1),
               m_reformat_precision(-1),
               m_reformat_width(-1),

src/strtools.h

@@ -385,4 +385,22 @@ simple_diff(const std::string& strA, const std::string& strB,
     }
 }
 
+//! escape special latex characters
+static inline std::string
+escape_latex(const std::string& str)
+{
+    std::string out;
+    out.reserve(str.size());
+    for (std::string::const_iterator s = str.begin(); s != str.end(); ++s)
+    {
+        if (*s == '#' || *s == '$' || *s == '%' || *s == '^' || *s == '&' ||
+            *s == '{' || *s == '}' || *s == '_' || *s == '~' || *s == '\\')
+        {
+            out += '\\';
+        }
+        out += *s;
+    }
+    return out;
+}
+
 #endif // STRTOOLS_HEADER