Make GraphicsConverter threadsafe

[lyx.git] / src / support / docstream.h

diff --git a/src/support/docstream.h b/src/support/docstream.h
index 920eafb5f58b529c579dbbe68247d0997c9a4aa7..e2f56f91c889b309a1b9c1e8b6d8d71cb0fce997 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -42,9 +42,9 @@ typedef std::basic_istream<char_type> idocstream;
     \endcode, not \code
     os << c;
     \endcode . The latter will not output the character, but the code point
-    as number. This is because we can't overload operator<< (our character
-    type is not a real type but a typedef). Narrow characters of type char
-    can be output as usual.
+    as number if USE_WCHAR_T is not defined. This is because we can't overload
+    operator<< (our character type is not always a real type but sometimes a
+    typedef). Narrow characters of type char can be output as usual.
  */
 typedef std::basic_ostream<char_type> odocstream;
 
@@ -80,9 +80,6 @@ public:
 /// UCS4 input stringstream
 typedef std::basic_istringstream<char_type> idocstringstream;
 
-/// UCS4 output stringstream
-typedef std::basic_ostringstream<char_type> odocstringstream;
-
 /// UCS4 output manipulator
 typedef odocstream & (*odocstream_manip)(odocstream &);
 
@@ -93,14 +90,16 @@ typedef odocstream & (*odocstream_manip)(odocstream &);
     they were iomanip's to ensure that the next output will start at the
     beginning of a line. Using "breakln", a '\n' char will be output if needed,
     while using "safebreakln", "%\n" will be output if needed.
+    The class also records the last output character and can tell whether
+    a paragraph break was just output.
   */
 
 class otexstream {
 public:
        ///
        otexstream(odocstream & os, TexRow & texrow)
-               : os_(os), texrow_(texrow),
-                 canbreakline_(false), protectspace_(false) {}
+               : os_(os), texrow_(texrow), canbreakline_(false),
+                 protectspace_(false), parbreak_(true), lastchar_(0) {}
        ///
        odocstream & os() { return os_; }
        ///
@@ -115,6 +114,17 @@ public:
        void protectSpace(bool protectspace) { protectspace_ = protectspace; }
        ///
        bool protectSpace() const { return protectspace_; }
+       ///
+       void lastChar(char_type const & c)
+       {
+               parbreak_ = (!canbreakline_ && c == '\n');
+               canbreakline_ = (c != '\n');
+               lastchar_ = c;
+       }
+       ///
+       char_type lastChar() const { return lastchar_; }
+       ///
+       bool afterParbreak() const { return parbreak_; }
 private:
        ///
        odocstream & os_;
@@ -124,6 +134,10 @@ private:
        bool canbreakline_;
        ///
        bool protectspace_;
+       ///
+       bool parbreak_;
+       ///
+       char_type lastchar_;
 };
 
 /// Helper structs for breaking a line
@@ -147,6 +161,8 @@ otexstream & operator<<(otexstream &, odocstream_manip);
 ///
 otexstream & operator<<(otexstream &, docstring const &);
 ///
+otexstream & operator<<(otexstream &, std::string const &);
+///
 otexstream & operator<<(otexstream &, char const *);
 ///
 otexstream & operator<<(otexstream &, char);