#include "BufferParams.h"
#include "Bullet.h"
#include "Chktex.h"
+#include "ColorSet.h"
#include "Converter.h"
#include "Counters.h"
#include "Cursor.h"
params().fontcolor = RGBColor(0, 0, 0);
params().isfontcolor = false;
params().notefontcolor = RGBColor(0xCC, 0xCC, 0xCC);
+ params().isnotefontcolor = false;
params().boxbgcolor = RGBColor(0xFF, 0, 0);
+ params().isboxbgcolor = false;
params().html_latex_start.clear();
params().html_latex_end.clear();
params().html_math_img_scale = 1.0;
<< token << '\'');
string const result =
- params().readToken(lex, token, d->filename.onlyPath());
+ params().readToken(lex, token, d->filename);
if (!result.empty()) {
if (token == "\\textclass") {
d->layout_position = result;
params().shell_escape = theSession().shellescapeFiles().find(absFileName());
- params().makeDocumentClass();
+ params().makeDocumentClass(isClone(), isInternal());
return unknown_tokens;
}
// proper location once that has been done successfully. that
// way we preserve the original file if something goes wrong.
string const justname = fileName().onlyFileNameWithoutExt();
- auto tempfile = make_unique<TempFile>(fileName().onlyPath(),
+ auto tempfile = lyx::make_unique<TempFile>(fileName().onlyPath(),
justname + "-XXXXXX.lyx");
bool const symlink = fileName().isSymLink();
if (!symlink)
undo().recordUndoBufferParams(CursorData());
branch_list.add(branch_name);
branch = branch_list.find(branch_name);
- string const x11hexname = X11hexname(branch->color());
- docstring const str = branch_name + ' ' + from_ascii(x11hexname);
- lyx::dispatch(FuncRequest(LFUN_SET_COLOR, str));
+ branch->setColors("background", "background");
dr.setError(false);
dr.screenUpdate(Update::Force);
}
}
else if (ins && ins->isSpace())
++blank_count_;
+ else if (ins) {
+ pair<int, int> words = ins->isWords();
+ char_count_ += words.first;
+ word_count_ += words.second;
+ inword = false;
+ }
else {
char_type const c = par.getChar(pos);
if (isPrintableNonspace(c))