* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "MathStream.h"
-#include "InsetMath.h"
#include "MathData.h"
#include "MathExtern.h"
#include <algorithm>
#include <cstring>
+#include <ostream>
using namespace std;
WriteStream & operator<<(WriteStream & ws, docstring const & s)
{
- if (ws.pendingSpace() && s.length() > 0) {
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.pendingSpace(false);
+ ws.textMode(true);
+ } else if (ws.pendingSpace() && s.length() > 0) {
if (isAlphaASCII(s[0]))
ws.os() << ' ';
ws.pendingSpace(false);
}
-WriteStream::WriteStream(odocstream & os, bool fragile, bool latex)
+WriteStream::WriteStream(odocstream & os, bool fragile, bool latex, bool dryrun,
+ Encoding const * encoding)
: os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
- pendingspace_(false), line_(0)
+ dryrun_(dryrun), pendingspace_(false), pendingbrace_(false),
+ textmode_(false), line_(0), encoding_(encoding)
{}
WriteStream::WriteStream(odocstream & os)
: os_(os), fragile_(false), firstitem_(false), latex_(false),
- pendingspace_(false), line_(0)
+ dryrun_(false), pendingspace_(false), pendingbrace_(false),
+ textmode_(false), line_(0), encoding_(0)
{}
WriteStream::~WriteStream()
{
- if (pendingspace_)
+ if (pendingbrace_)
+ os_ << '}';
+ else if (pendingspace_)
os_ << ' ';
}
}
+void WriteStream::pendingBrace(bool brace)
+{
+ pendingbrace_ = brace;
+}
+
+
+void WriteStream::textMode(bool textmode)
+{
+ textmode_ = textmode;
+}
+
+
WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
{
at->write(ws);
WriteStream & operator<<(WriteStream & ws, char const * s)
{
- if (ws.pendingSpace() && strlen(s) > 0) {
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.pendingSpace(false);
+ ws.textMode(true);
+ } else if (ws.pendingSpace() && strlen(s) > 0) {
if (isAlphaASCII(s[0]))
ws.os() << ' ';
ws.pendingSpace(false);
WriteStream & operator<<(WriteStream & ws, char c)
{
- if (ws.pendingSpace()) {
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.pendingSpace(false);
+ ws.textMode(true);
+ } else if (ws.pendingSpace()) {
if (isAlphaASCII(c))
ws.os() << ' ';
ws.pendingSpace(false);
WriteStream & operator<<(WriteStream & ws, int i)
{
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.textMode(true);
+ }
ws.os() << i;
return ws;
}
WriteStream & operator<<(WriteStream & ws, unsigned int i)
{
+ if (ws.pendingBrace()) {
+ ws.os() << '}';
+ ws.pendingBrace(false);
+ ws.textMode(true);
+ }
ws.os() << i;
return ws;
}