#include "ParIterator.h"
#include "TexRow.h"
#include "Text.h"
+#include "Encoding.h"
#include "frontends/Application.h"
#include "frontends/alert.h"
#include "support/lstrings.h"
#include "support/regex.h"
+#include "support/textutils.h"
#include <map>
using namespace std;
namespace lyx {
+
+// Helper class for deciding what should be ignored
+class IgnoreFormats {
+ public:
+ ///
+ IgnoreFormats()
+ : ignoreFamily_(false), ignoreSeries_(false),
+ ignoreShape_(false), ignoreUnderline_(false),
+ ignoreMarkUp_(false), ignoreStrikeOut_(false),
+ ignoreSectioning_(false), ignoreFrontMatter_(false),
+ ignoreColor_(false), ignoreLanguage_(false) {}
+ ///
+ bool getFamily() { return ignoreFamily_; };
+ ///
+ bool getSeries() { return ignoreSeries_; };
+ ///
+ bool getShape() { return ignoreShape_; };
+ ///
+ bool getUnderline() { return ignoreUnderline_; };
+ ///
+ bool getMarkUp() { return ignoreMarkUp_; };
+ ///
+ bool getStrikeOut() { return ignoreStrikeOut_; };
+ ///
+ bool getSectioning() { return ignoreSectioning_; };
+ ///
+ bool getFrontMatter() { return ignoreFrontMatter_; };
+ ///
+ bool getColor() { return ignoreColor_; };
+ ///
+ bool getLanguage() { return ignoreLanguage_; };
+ ///
+ void setIgnoreFormat(string const & type, bool value);
+
+private:
+ ///
+ bool ignoreFamily_;
+ ///
+ bool ignoreSeries_;
+ ///
+ bool ignoreShape_;
+ ///
+ bool ignoreUnderline_;
+ ///
+ bool ignoreMarkUp_;
+ ///
+ bool ignoreStrikeOut_;
+ ///
+ bool ignoreSectioning_;
+ ///
+ bool ignoreFrontMatter_;
+ ///
+ bool ignoreColor_;
+ ///
+ bool ignoreLanguage_;
+};
+
+
+void IgnoreFormats::setIgnoreFormat(string const & type, bool value)
+{
+ if (type == "color") {
+ ignoreColor_ = value;
+ }
+ else if (type == "language") {
+ ignoreLanguage_ = value;
+ }
+ else if (type == "sectioning") {
+ ignoreSectioning_ = value;
+ ignoreFrontMatter_ = value;
+ }
+ else if (type == "font") {
+ ignoreSeries_ = value;
+ ignoreShape_ = value;
+ ignoreFamily_ = value;
+ }
+ else if (type == "series") {
+ ignoreSeries_ = value;
+ }
+ else if (type == "shape") {
+ ignoreShape_ = value;
+ }
+ else if (type == "family") {
+ ignoreFamily_ = value;
+ }
+ else if (type == "markup") {
+ ignoreMarkUp_ = value;
+ }
+ else if (type == "underline") {
+ ignoreUnderline_ = value;
+ }
+ else if (type == "strike") {
+ ignoreStrikeOut_ = value;
+ }
+}
+
+// The global variable that can be changed from outside
+IgnoreFormats ignoreFormats;
+
+
+void setIgnoreFormat(string const & type, bool value)
+{
+ ignoreFormats.setIgnoreFormat(type, value);
+}
+
+
namespace {
bool parse_bool(docstring & howto)
class MatchString : public binary_function<Paragraph, pos_type, int>
{
public:
- MatchString(docstring const & str, bool cs, bool mw)
- : str(str), case_sens(cs), whole_words(mw)
+ MatchString(docstring const & s, bool cs, bool mw)
+ : str(s), case_sens(cs), whole_words(mw)
{}
// returns true if the specified string is at the specified position
size_t new_pos = s.find("\\regexp{", pos);
if (new_pos == string::npos)
new_pos = s.size();
- LYXERR(Debug::FIND, "new_pos: " << new_pos);
- string t = apply_escapes(s.substr(pos, new_pos - pos), get_lyx_unescapes());
- LYXERR(Debug::FIND, "t [lyx]: " << t);
- t = apply_escapes(t, get_regexp_escapes());
- LYXERR(Debug::FIND, "t [rxp]: " << t);
- s.replace(pos, new_pos - pos, t);
- new_pos = pos + t.size();
- LYXERR(Debug::FIND, "Regexp after escaping: " << s);
- LYXERR(Debug::FIND, "new_pos: " << new_pos);
- if (new_pos == s.size())
- break;
+ string t;
+ if (new_pos > pos) {
+ LYXERR(Debug::FIND, "new_pos: " << new_pos);
+ t = apply_escapes(s.substr(pos, new_pos - pos), get_lyx_unescapes());
+ LYXERR(Debug::FIND, "t [lyx]: " << t);
+ t = apply_escapes(t, get_regexp_escapes());
+ LYXERR(Debug::FIND, "t [rxp]: " << t);
+ s.replace(pos, new_pos - pos, t);
+ new_pos = pos + t.size();
+ LYXERR(Debug::FIND, "Regexp after escaping: " << s);
+ LYXERR(Debug::FIND, "new_pos: " << new_pos);
+ if (new_pos == s.size())
+ break;
+ }
// Might fail if \\endregexp{} is preceeded by unexpected stuff (weird escapes)
size_t end_pos = s.find("\\endregexp{}}", new_pos + 8);
LYXERR(Debug::FIND, "end_pos: " << end_pos);
}
+class MatchResult {
+public:
+ int match_len;
+ int match2end;
+ int pos;
+ MatchResult(): match_len(0),match2end(0), pos(0) {};
+};
+
/** The class performing a match between a position in the document and the FindAdvOptions.
**/
class MatchStringAdv {
** @return
** The length of the matching text, or zero if no match was found.
**/
- int operator()(DocIterator const & cur, int len = -1, bool at_begin = true) const;
+ MatchResult operator()(DocIterator const & cur, int len = -1, bool at_begin = true) const;
public:
/// buffer
private:
/// Auxiliary find method (does not account for opt.matchword)
- int findAux(DocIterator const & cur, int len = -1, bool at_begin = true) const;
+ MatchResult findAux(DocIterator const & cur, int len = -1, bool at_begin = true) const;
/** Normalize a stringified or latexified LyX paragraph.
**
string par_as_string;
// regular expression to use for searching
lyx::regex regexp;
- // same as regexp, but prefixed with a ".*"
+ // same as regexp, but prefixed with a ".*?"
lyx::regex regexp2;
// leading format material as string
string lead_as_string;
static docstring buffer_to_latex(Buffer & buffer)
{
- OutputParams runparams(&buffer.params().encoding());
+ //OutputParams runparams(&buffer.params().encoding());
+ OutputParams runparams(encodings.fromLyXName("utf8"));
odocstringstream ods;
otexstream os(ods);
runparams.nice = true;
- runparams.flavor = OutputParams::LATEX;
- runparams.linelen = 100000; //lyxrc.plaintext_linelen;
+ runparams.flavor = OutputParams::XETEX;
+ runparams.linelen = 10000; //lyxrc.plaintext_linelen;
// No side effect of file copying and image conversion
runparams.dryrun = true;
runparams.for_search = true;
if (!opt.ignoreformat) {
str = buffer_to_latex(buffer);
} else {
- OutputParams runparams(&buffer.params().encoding());
+ // OutputParams runparams(&buffer.params().encoding());
+ OutputParams runparams(encodings.fromLyXName("utf8"));
runparams.nice = true;
- runparams.flavor = OutputParams::LATEX;
- runparams.linelen = 100000; //lyxrc.plaintext_linelen;
+ runparams.flavor = OutputParams::XETEX;
+ runparams.linelen = 10000; //lyxrc.plaintext_linelen;
runparams.dryrun = true;
runparams.for_search = true;
for (pos_type pit = pos_type(0); pit < (pos_type)buffer.paragraphs().size(); ++pit) {
// @TODO Support \item[text]
// Kornel: Added textsl, textsf, textit, texttt and noun
// + allow to search for colored text too
- while (regex_replace(t, t, REGEX_BOS "\\\\(((emph|noun|minisec|text(bf|sl|sf|it|tt))|((textcolor|foreignlanguage)\\{[a-z]+\\})|(u|uu)line|(s|x)out|uwave)|((sub)?(((sub)?section)|paragraph)|part|chapter)\\*?)\\{", "")
+ while (regex_replace(t, t, REGEX_BOS "\\\\(((footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge|emph|noun|minisec|text(bf|md|sl|sf|it|tt))|((textcolor|foreignlanguage|latexenvironment)\\{[a-z]+\\*?\\})|(u|uu)line|(s|x)out|uwave)|((sub)?(((sub)?section)|paragraph)|part|chapter)\\*?)\\{", "")
|| regex_replace(t, t, REGEX_BOS "\\$", "")
|| regex_replace(t, t, REGEX_BOS "\\\\\\[ ", "")
|| regex_replace(t, t, REGEX_BOS " ?\\\\item\\{[a-z]+\\}", "")
static Features identifyFeatures(string const & s)
{
- static regex const feature("\\\\(([a-z]+(\\{([a-z]+)\\}|\\*)?))\\{");
- static regex const valid("^(((emph|noun|text(bf|sl|sf|it|tt)|(textcolor|foreignlanguage|item)\\{[a-z]+\\})|(u|uu)line|(s|x)out|uwave)|((sub)?(((sub)?section)|paragraph)|part|chapter)\\*?)$");
+ static regex const feature("\\\\(([a-zA-Z]+(\\{([a-z]+\\*?)\\}|\\*)?))\\{");
+ static regex const valid("^("
+ "("
+ "(footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge|"
+ "emph|noun|text(bf|md|sl|sf|it|tt)|"
+ "(textcolor|foreignlanguage|item|listitem|latexenvironment)\\{[a-z]+\\*?\\})|"
+ "(u|uu)line|(s|x)out|uwave|"
+ "(sub|extra)?title|author|subject|publishers|dedication|(upper|lower)titleback|lyx(right)?address)|"
+ "((sub)?(((sub)?section)|paragraph)|part|chapter|lyxslide)\\*?)$");
smatch sub;
bool displ = true;
Features info;
}
}
}
- return(info);
+ return info;
}
/*
class KeyInfo {
public:
enum KeyType {
+ /* Char type with content discarded
+ * like \hspace{1cm} */
+ noContent,
+ /* Char, like \backslash */
isChar,
+ /* \part, \section*, ... */
isSectioning,
- isMain, /* for \\foreignlanguage */
+ /* title, author etc */
+ isTitle,
+ /* \foreignlanguage{ngerman}, ... */
+ isMain,
+ /* inside \code{}
+ * to discard language in content */
+ noMain,
isRegex,
+ /* \begin{eqnarray}...\end{eqnarray}, ... $...$ */
isMath,
+ /* fonts, colors, markups, ... */
isStandard,
+ /* footnotesize, ... large, ...
+ * Ignore all of them */
isSize,
invalid,
+ /* inputencoding, ...
+ * Discard also content, because they do not help in search */
doRemove,
+ /* twocolumns, ...
+ * like remove, but also all arguments */
+ removeWithArg,
+ /* item, listitem */
isList,
- isIgnored /* to be ignored by creating infos */
+ /* tex, latex, ... like isChar */
+ isIgnored,
+ /* like \lettrine[lines=5]{}{} */
+ cleanToStart,
+ /* End of arguments marker for lettrine,
+ * so that they can be ignored */
+ endArguments
};
KeyInfo()
: keytype(invalid),
head(""),
+ _tokensize(-1),
+ _tokenstart(-1),
+ _dataStart(-1),
+ _dataEnd(-1),
parenthesiscount(1),
disabled(false),
used(false)
{};
KeyInfo(KeyType type, int parcount, bool disable)
: keytype(type),
+ _tokensize(-1),
+ _tokenstart(-1),
+ _dataStart(-1),
+ _dataEnd(-1),
parenthesiscount(parcount),
disabled(disable),
used(false) {};
#define MAXOPENED 30
class Intervall {
- bool isPatternString;
- public:
- Intervall(bool isPattern) : isPatternString(isPattern), ignoreidx(-1), actualdeptindex(0) { depts[0] = 0;};
+ bool isPatternString_;
+public:
+ explicit Intervall(bool isPattern, string const & p) :
+ isPatternString_(isPattern), par(p), ignoreidx(-1), actualdeptindex(0),
+ hasTitle(false), langcount(0)
+ {
+ depts[0] = 0;
+ closes[0] = 0;
+ }
+
string par;
int ignoreidx;
+ static vector<Border> borders;
int depts[MAXOPENED];
int closes[MAXOPENED];
int actualdeptindex;
- Border borders[2*MAXOPENED];
- // int previousNotIgnored(int);
+ int previousNotIgnored(int);
int nextNotIgnored(int);
void handleOpenP(int i);
void handleCloseP(int i, bool closingAllowed);
void resetOpenedP(int openPos);
void addIntervall(int upper);
void addIntervall(int low, int upper); /* if explicit */
- void setForDefaultLang(int upTo);
- int findclosing(int start, int end, char up, char down);
+ void removeAccents();
+ void setForDefaultLang(KeyInfo &defLang);
+ int findclosing(int start, int end, char up, char down, int repeat);
void handleParentheses(int lastpos, bool closingAllowed);
+ bool hasTitle;
+ int langcount; // Number of disabled language specs up to current position in actual interval
+ int isOpeningPar(int pos);
+ string titleValue;
void output(ostringstream &os, int lastpos);
// string show(int lastpos);
};
-void Intervall::setForDefaultLang(int upTo)
+vector<Border> Intervall::borders = vector<Border>(30);
+
+int Intervall::isOpeningPar(int pos)
+{
+ if ((pos < 0) || (size_t(pos) >= par.size()))
+ return 0;
+ if (par[pos] != '{')
+ return 0;
+ if (size_t(pos) + 2 >= par.size())
+ return 1;
+ if (par[pos+2] != '}')
+ return 1;
+ if (par[pos+1] == '[' || par[pos+1] == ']')
+ return 3;
+ return 1;
+}
+
+void Intervall::setForDefaultLang(KeyInfo &defLang)
{
// Enable the use of first token again
if (ignoreidx >= 0) {
- if (borders[0].low < upTo)
- borders[0].low = upTo;
- if (borders[0].upper < upTo)
- borders[0].upper = upTo;
+ int value = defLang._tokenstart + defLang._tokensize;
+ if (value > 0) {
+ if (borders[0].low < value)
+ borders[0].low = value;
+ if (borders[0].upper < value)
+ borders[0].upper = value;
+ }
}
}
static void checkDepthIndex(int val)
{
static int maxdepthidx = MAXOPENED-2;
+ static int lastmaxdepth = 0;
+ if (val > lastmaxdepth) {
+ LYXERR0("Depth reached " << val);
+ lastmaxdepth = val;
+ }
if (val > maxdepthidx) {
maxdepthidx = val;
LYXERR0("maxdepthidx now " << val);
}
}
+#if 0
+// Not needed, because borders are now dynamically expanded
static void checkIgnoreIdx(int val)
{
- static int maxignoreidx = 2*MAXOPENED - 4;
- if (val > maxignoreidx) {
- maxignoreidx = val;
- LYXERR0("maxignoreidx now " << val);
+ static int lastmaxignore = -1;
+ if ((lastmaxignore < val) && (size_t(val+1) >= borders.size())) {
+ LYXERR0("IgnoreIdx reached " << val);
+ lastmaxignore = val;
}
}
+#endif
/*
* Expand the region of ignored parts of the input latex string
}
Border br(low, upper);
if (idx > ignoreidx) {
- borders[idx] = br;
+ if (borders.size() <= size_t(idx)) {
+ borders.push_back(br);
+ }
+ else {
+ borders[idx] = br;
+ }
ignoreidx = idx;
- checkIgnoreIdx(ignoreidx);
+ // checkIgnoreIdx(ignoreidx);
return;
}
else {
// We know here that br.low > borders[idx-1].upper
if (br.upper < borders[idx].low) {
// We have to insert at this pos
- for (int i = ignoreidx+1; i > idx; --i) {
+ if (size_t(ignoreidx+1) >= borders.size()) {
+ borders.push_back(borders[ignoreidx]);
+ }
+ else {
+ borders[ignoreidx+1] = borders[ignoreidx];
+ }
+ for (int i = ignoreidx; i > idx; --i) {
borders[i] = borders[i-1];
}
borders[idx] = br;
ignoreidx += 1;
- checkIgnoreIdx(ignoreidx);
+ // checkIgnoreIdx(ignoreidx);
return;
}
// Here we know, that we are overlapping
}
}
+typedef map<string, string> AccentsMap;
+static AccentsMap accents = map<string, string>();
+
+static void buildaccent(string n, string param, string values)
+{
+ stringstream s(n);
+ string name;
+ const char delim = '|';
+ while (getline(s, name, delim)) {
+ size_t start = 0;
+ for (size_t i = 0; i < param.size(); i++) {
+ string key = name + "{" + param[i] + "}";
+ // get the corresponding utf8-value
+ if ((values[start] & 0xc0) != 0xc0) {
+ // should not happen, utf8 encoding starts at least with 11xxxxxx
+ // but value for '\dot{i}' is 'i', which is ascii
+ if ((values[start] & 0x80) == 0) {
+ // is ascii
+ accents[key] = values.substr(start, 1);
+ // LYXERR0("" << key << "=" << accents[key]);
+ }
+ start++;
+ continue;
+ }
+ for (int j = 1; ;j++) {
+ if (start + j >= values.size()) {
+ accents[key] = values.substr(start, j);
+ start = values.size() - 1;
+ break;
+ }
+ else if ((values[start+j] & 0xc0) != 0x80) {
+ // This is the first byte of following utf8 char
+ accents[key] = values.substr(start, j);
+ start += j;
+ // LYXERR0("" << key << "=" << accents[key]);
+ break;
+ }
+ }
+ }
+ }
+}
+
+static void buildAccentsMap()
+{
+ accents["imath"] = "ı";
+ accents["i"] = "ı";
+ accents["jmath"] = "ȷ";
+ accents["lyxmathsym{ß}"] = "ß";
+ accents["text{ß}"] = "ß";
+ accents["ddot{\\imath}"] = "ï";
+ buildaccent("ddot", "aAeEhHiIioOtuUwWxXyY",
+ "äÄëËḧḦïÏïöÖẗüÜẅẄẍẌÿŸ"); // umlaut
+ buildaccent("dot|.", "aAbBcCdDeEfFGghHIimMnNoOpPrRsStTwWxXyYzZ",
+ "ȧȦḃḂċĊḋḊėĖḟḞĠġḣḢİİṁṀṅṄȯȮṗṖṙṘṡṠṫṪẇẆẋẊẏẎżŻ"); // dot{i} can only happen if ignoring case, but there is no lowercase of 'İ'
+ accents["acute{\\imath}"] = "í";
+ buildaccent("acute", "aAcCeEgGkKlLmMoOnNpPrRsSuUwWyYzZiI",
+ "áÁćĆéÉǵǴḱḰĺĹḿḾóÓńŃṕṔŕŔśŚúÚẃẂýÝźŹíÍ");
+ buildaccent("dacute|H|h", "oOuU", "őŐűŰ"); // double acute
+ buildaccent("mathring|r", "aAuUwy",
+ "åÅůŮẘẙ"); // ring
+ accents["check{\\imath}"] = "ǐ";
+ accents["check{\\jmath}"] = "ǰ";
+ buildaccent("check|v", "cCdDaAeEiIoOuUgGkKhHlLnNrRsSTtzZ",
+ "čČďĎǎǍěĚǐǏǒǑǔǓǧǦǩǨȟȞľĽňŇřŘšŠŤťžŽ"); // caron
+ accents["hat{\\imath}"] = "î";
+ accents["hat{\\jmath}"] = "ĵ";
+ buildaccent("hat|^", "aAcCeEgGhHiIjJoOsSuUwWyYzZ",
+ "âÂĉĈêÊĝĜĥĤîÎĵĴôÔŝŜûÛŵŴŷŶẑẐ"); // circ
+ accents["bar{\\imath}"] = "ī";
+ buildaccent("bar|=", "aAeEiIoOuUyY",
+ "āĀēĒīĪōŌūŪȳȲ"); // macron
+ accents["tilde{\\imath}"] = "ĩ";
+ buildaccent("tilde", "aAeEiInNoOuUvVyY",
+ "ãÃẽẼĩĨñÑõÕũŨṽṼỹỸ"); // tilde
+ accents["breve{\\imath}"] = "ĭ";
+ buildaccent("breve|u", "aAeEgGiIoOuU",
+ "ăĂĕĔğĞĭĬŏŎŭŬ"); // breve
+ accents["grave{\\imath}"] = "ì";
+ buildaccent("grave|`", "aAeEiIoOuUnNwWyY",
+ "àÀèÈìÌòÒùÙǹǸẁẀỳỲ"); // grave
+ buildaccent("subdot|d", "BbDdHhKkLlMmNnRrSsTtVvWwZzAaEeIiOoUuYy",
+ "ḄḅḌḍḤḥḲḳḶḷṂṃṆṇṚṛṢṣṬṭṾṿẈẉẒẓẠạẸẹỊịỌọỤụỴỵ"); // dot below
+ buildaccent("ogonek|k", "AaEeIiUuOo",
+ "ĄąĘęĮįŲųǪǫ"); // ogonek
+ buildaccent("cedilla|c", "CcGgKkLlNnRrSsTtEeDdHh",
+ "ÇçĢĢĶķĻļŅņŖŗŞşŢţȨȩḐḑḨḩ"); // cedilla
+ buildaccent("subring|textsubring", "Aa",
+ "Ḁḁ"); // subring
+ buildaccent("subhat|textsubcircum", "DdEeLlNnTtUu",
+ "ḒḓḘḙḼḽṊṋṰṱṶṷ"); // subcircum
+ buildaccent("subtilde|textsubtilde", "EeIiUu",
+ "ḚḛḬḭṴṵ"); // subtilde
+ accents["dgrave{\\imath}"] = "ȉ";
+ accents["textdoublegrave{\\i}"] = "ȉ";
+ buildaccent("dgrave|textdoublegrave", "AaEeIiOoRrUu",
+ "ȀȁȄȅȈȉȌȍȐȑȔȕ"); // double grave
+ accents["rcap{\\imath}"] = "ȉ";
+ accents["textroundcap{\\i}"] = "ȉ";
+ buildaccent("rcap|textroundcap", "AaEeIiOoRrUu",
+ "ȂȃȆȇȊȋȎȏȒȓȖȗ"); // inverted breve
+ buildaccent("slashed", "oO",
+ "øØ"); // slashed
+}
+
+/*
+ * Created accents in math or regexp environment
+ * are macros, but we need the utf8 equivalent
+ */
+void Intervall::removeAccents()
+{
+ if (accents.empty())
+ buildAccentsMap();
+ static regex const accre("\\\\(([\\S]|grave|breve|lyxmathsym|text|ddot|dot|acute|dacute|mathring|check|hat|bar|tilde|subdot|ogonek|cedilla|subring|textsubring|subhat|textsubcircum|subtilde|textsubtilde|dgrave|textdoublegrave|rcap|textroundcap|slashed)\\{[^\\{\\}]+\\}|(i|imath|jmath)(?![a-zA-Z]))");
+ smatch sub;
+ for (sregex_iterator itacc(par.begin(), par.end(), accre), end; itacc != end; ++itacc) {
+ sub = *itacc;
+ string key = sub.str(1);
+ if (accents.find(key) != accents.end()) {
+ string val = accents[key];
+ size_t pos = sub.position(size_t(0));
+ for (size_t i = 0; i < val.size(); i++) {
+ par[pos+i] = val[i];
+ }
+ addIntervall(pos+val.size(), pos + sub.str(0).size());
+ for (size_t i = pos+val.size(); i < pos + sub.str(0).size(); i++) {
+ // remove traces of any remaining chars
+ par[i] = ' ';
+ }
+ }
+ else {
+ LYXERR0("Not added accent for \"" << key << "\"");
+ }
+ }
+}
+
void Intervall::handleOpenP(int i)
{
actualdeptindex++;
closes[1] = -1;
}
-#if 0
int Intervall::previousNotIgnored(int start)
{
int idx = 0; /* int intervalls */
}
return start;
}
-#endif
int Intervall::nextNotIgnored(int start)
{
typedef vector< KeyInfo> Entries;
static KeysMap keys = map<string, KeyInfo>();
-class IgnoreFormats {
- static bool ignoreFamily;
- static bool ignoreSeries;
- static bool ignoreShape;
- static bool ignoreUnderline;
- static bool ignoreMarkUp;
- static bool ignoreStrikeOut;
- static bool ignoreSectioning;
- static bool ignoreFrontMatter;
- static bool ignoreColor;
- static bool ignoreLanguage;
- public:
- bool getFamily() { return ignoreFamily; };
- bool getSeries() { return ignoreSeries; };
- bool getShape() { return ignoreShape; };
- bool getUnderline() { return ignoreUnderline; };
- bool getMarkUp() { return ignoreMarkUp; };
- bool getStrikeOut() { return ignoreStrikeOut; };
- bool getSectioning() { return ignoreSectioning; };
- bool getFrontMatter() { return ignoreFrontMatter; };
- bool getColor() { return ignoreColor; };
- bool getLanguage() { return ignoreLanguage; };
-
- void setIgnoreFormat(string type, bool value);
-};
-
-bool IgnoreFormats::ignoreFamily = false;
-bool IgnoreFormats::ignoreSeries = false;
-bool IgnoreFormats::ignoreShape = false;
-bool IgnoreFormats::ignoreUnderline = false;
-bool IgnoreFormats::ignoreMarkUp = false;
-bool IgnoreFormats::ignoreStrikeOut = false;
-bool IgnoreFormats::ignoreSectioning = false;
-bool IgnoreFormats::ignoreFrontMatter= true;
-bool IgnoreFormats::ignoreColor = false;
-bool IgnoreFormats::ignoreLanguage = false;
-
-void IgnoreFormats::setIgnoreFormat(string type, bool value)
-{
- if (type == "color") {
- ignoreColor = value;
- }
- else if (type == "language") {
- ignoreLanguage = value;
- }
- else if (type == "sectioning") {
- ignoreSectioning = value;
- ignoreFrontMatter = value;
- }
- else if (type == "font") {
- ignoreSeries = value;
- ignoreShape = value;
- ignoreFamily = value;
- }
- else if (type == "series") {
- ignoreSeries = value;
- }
- else if (type == "shape") {
- ignoreShape = value;
- }
- else if (type == "family") {
- ignoreFamily = value;
- }
- else if (type == "markup") {
- ignoreMarkUp = value;
- }
- else if (type == "underline") {
- ignoreUnderline = value;
- }
- else if (type == "strike") {
- ignoreStrikeOut = value;
- }
-}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas"
-#pragma GCC diagnostic ignored "-Wunused"
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-#ifdef __GNUC__
-#define SUPPRESS_NOT_USED_WARN __attribute__ ((unused))
-#else
-#define SUPPRESS_NOT_USED_WARN
-#endif
-
-void SUPPRESS_NOT_USED_WARN setIgnoreFormat(string type, bool value)
-{
- IgnoreFormats().setIgnoreFormat(type, value);
-}
-#pragma GCC diagnostic pop
-
class LatexInfo {
private:
- int entidx;
- Entries entries;
- Intervall interval;
+ int entidx_;
+ Entries entries_;
+ Intervall interval_;
void buildKeys(bool);
void buildEntries(bool);
void makeKey(const string &, KeyInfo, bool isPatternString);
void processRegion(int start, int region_end); /* remove {} parts */
void removeHead(KeyInfo&, int count=0);
- IgnoreFormats f;
public:
- LatexInfo(string par, bool isPatternString) : interval(isPatternString) {
- interval.par = par;
+ LatexInfo(string const & par, bool isPatternString)
+ : entidx_(-1), interval_(isPatternString, par)
+ {
buildKeys(isPatternString);
- entries = vector<KeyInfo>();
+ entries_ = vector<KeyInfo>();
buildEntries(isPatternString);
};
int getFirstKey() {
- entidx = 0;
- if (entries.empty()) {
- return (-1);
+ entidx_ = 0;
+ if (entries_.empty()) {
+ return -1;
+ }
+ if (entries_[0].keytype == KeyInfo::isTitle) {
+ if (! entries_[0].disabled) {
+ interval_.hasTitle = true;
+ interval_.titleValue = entries_[0].head;
+ }
+ else {
+ interval_.hasTitle = false;
+ interval_.titleValue = "";
+ }
+ removeHead(entries_[0]);
+ if (entries_.size() > 1)
+ return 1;
+ else
+ return -1;
}
return 0;
};
int getNextKey() {
- entidx++;
- if (int(entries.size()) > entidx) {
- return entidx;
+ entidx_++;
+ if (int(entries_.size()) > entidx_) {
+ return entidx_;
}
else {
- return (-1);
+ return -1;
}
};
bool setNextKey(int idx) {
- if ((idx == entidx) && (entidx >= 0)) {
- entidx--;
+ if ((idx == entidx_) && (entidx_ >= 0)) {
+ entidx_--;
return true;
}
else
return false;
};
+ int find(int start, KeyInfo::KeyType keytype) {
+ if (start < 0)
+ return -1;
+ int tmpIdx = start;
+ while (tmpIdx < int(entries_.size())) {
+ if (entries_[tmpIdx].keytype == keytype)
+ return tmpIdx;
+ tmpIdx++;
+ }
+ return -1;
+ };
int process(ostringstream &os, KeyInfo &actual);
int dispatch(ostringstream &os, int previousStart, KeyInfo &actual);
// string show(int lastpos) { return interval.show(lastpos);};
- int nextNotIgnored(int start) { return interval.nextNotIgnored(start);};
+ int nextNotIgnored(int start) { return interval_.nextNotIgnored(start);};
KeyInfo &getKeyInfo(int keyinfo) {
static KeyInfo invalidInfo = KeyInfo();
- if ((keyinfo < 0) || ( keyinfo >= int(entries.size())))
+ if ((keyinfo < 0) || ( keyinfo >= int(entries_.size())))
return invalidInfo;
else
- return entries[keyinfo];
+ return entries_[keyinfo];
};
- void setForDefaultLang(int upTo) {interval.setForDefaultLang(upTo);};
+ void setForDefaultLang(KeyInfo &defLang) {interval_.setForDefaultLang(defLang);};
+ void addIntervall(int low, int up) { interval_.addIntervall(low, up); };
};
-int Intervall::findclosing(int start, int end, char up = '{', char down = '}')
+int Intervall::findclosing(int start, int end, char up = '{', char down = '}', int repeat = 1)
{
int skip = 0;
int depth = 0;
depth++;
}
else if (c == down) {
- if (depth == 0) return i;
+ repeat--;
+ if (depth == 0) {
+ if ((repeat <= 0) || (par[i+1] != up))
+ return i;
+ }
--depth;
}
}
size_t mathStart;
size_t mathSize;
};
- size_t actualIdx;
- vector<MathEntry> entries;
+ size_t actualIdx_;
+ vector<MathEntry> entries_;
public:
MathInfo() {
- actualIdx = 0;
+ actualIdx_ = 0;
}
- void insert(string wait, size_t start, size_t end) {
+ void insert(string const & wait, size_t start, size_t end) {
MathEntry m = MathEntry();
m.wait = wait;
m.mathStart = start;
m.mathEnd = end;
m.mathSize = end - start;
- entries.push_back(m);
- }
- bool evaluating(size_t pos) {
- while (actualIdx < entries.size()) {
- if (pos < entries[actualIdx].mathStart)
- return false;
- if (pos < entries[actualIdx].mathEnd)
- return true;
- actualIdx++;
- }
- return false;
+ entries_.push_back(m);
}
- bool empty() { return entries.empty(); };
+ bool empty() { return entries_.empty(); };
size_t getEndPos() {
- if (entries.empty() || (actualIdx >= entries.size())) {
+ if (entries_.empty() || (actualIdx_ >= entries_.size())) {
return 0;
}
- return entries[actualIdx].mathEnd;
+ return entries_[actualIdx_].mathEnd;
}
size_t getStartPos() {
- if (entries.empty() || (actualIdx >= entries.size())) {
+ if (entries_.empty() || (actualIdx_ >= entries_.size())) {
return 100000; /* definitely enough? */
}
- return entries[actualIdx].mathStart;
+ return entries_[actualIdx_].mathStart;
}
size_t getFirstPos() {
- actualIdx = 0;
+ actualIdx_ = 0;
return getStartPos();
}
size_t getSize() {
- if (entries.empty() || (actualIdx >= entries.size())) {
+ if (entries_.empty() || (actualIdx_ >= entries_.size())) {
return size_t(0);
}
- return entries[actualIdx].mathSize;
+ return entries_[actualIdx_].mathSize;
}
- void incrEntry() { actualIdx++; };
+ void incrEntry() { actualIdx_++; };
};
void LatexInfo::buildEntries(bool isPatternString)
{
- static regex const rmath("\\$|\\\\\\[|\\\\\\]|\\\\(begin|end)\\{((eqnarray|equation|flalign|gather|multiline|align)\\*?)\\}");
+ static regex const rmath("\\$|\\\\\\[|\\\\\\]|\\\\(begin|end)\\{((eqnarray|equation|flalign|gather|multline|align|alignat)\\*?)\\}");
static regex const rkeys("\\$|\\\\\\[|\\\\\\]|\\\\((([a-zA-Z]+\\*?)(\\{([a-z]+\\*?)\\}|=[0-9]+[a-z]+)?))");
static bool disableLanguageOverride = false;
smatch sub, submath;
bool evaluatingRegexp = false;
MathInfo mi;
bool evaluatingMath = false;
+ bool evaluatingCode = false;
+ size_t codeEnd = 0;
+ bool evaluatingOptional = false;
+ size_t optionalEnd = 0;
+ int codeStart = -1;
KeyInfo found;
bool math_end_waiting = false;
size_t math_pos = 10000;
string math_end;
- for (sregex_iterator itmath(interval.par.begin(), interval.par.end(), rmath), end; itmath != end; ++itmath) {
+ interval_.removeAccents();
+
+ for (sregex_iterator itmath(interval_.par.begin(), interval_.par.end(), rmath), end; itmath != end; ++itmath) {
submath = *itmath;
if (math_end_waiting) {
size_t pos = submath.position(size_t(0));
- if (math_end == "$") {
- if ((submath.str(0) == "$") && (interval.par[pos-1] != '\\')) {
- mi.insert("$", math_pos, pos + 1);
- math_end_waiting = false;
- }
+ if ((math_end == "$") &&
+ (submath.str(0) == "$") &&
+ (interval_.par[pos-1] != '\\')) {
+ mi.insert("$", math_pos, pos + 1);
+ math_end_waiting = false;
}
- else if (math_end == "\\]") {
- if (submath.str(0) == "\\]") {
- mi.insert("\\]", math_pos, pos + 2);
- math_end_waiting = false;
- }
+ else if ((math_end == "\\]") &&
+ (submath.str(0) == "\\]")) {
+ mi.insert("\\]", math_pos, pos + 2);
+ math_end_waiting = false;
}
else if ((submath.str(1).compare("end") == 0) &&
(submath.str(2).compare(math_end) == 0)) {
mi.insert(math_end, math_pos, pos + submath.str(0).length());
math_end_waiting = false;
}
+ else
+ continue;
}
else {
if (submath.str(1).compare("begin") == 0) {
}
else if (submath.str(0) == "$") {
size_t pos = submath.position(size_t(0));
- if ((pos == 0) || (interval.par[pos-1] != '\\')) {
+ if ((pos == 0) || (interval_.par[pos-1] != '\\')) {
math_end_waiting = true;
math_end = "$";
math_pos = pos;
}
}
math_pos = mi.getFirstPos();
- for (sregex_iterator it(interval.par.begin(), interval.par.end(), rkeys), end; it != end; ++it) {
+ for (sregex_iterator it(interval_.par.begin(), interval_.par.end(), rkeys), end; it != end; ++it) {
sub = *it;
string key = sub.str(3);
if (key == "") {
if (sub.str(0)[0] == '\\')
key = sub.str(0)[1];
- else
+ else {
key = sub.str(0);
+ if (key == "$") {
+ size_t k_pos = sub.position(size_t(0));
+ if ((k_pos > 0) && (interval_.par[k_pos - 1] == '\\')) {
+ // Escaped '$', ignoring
+ continue;
+ }
+ }
+ }
};
if (evaluatingRegexp) {
if (sub.str(1).compare("endregexp") == 0) {
found._dataStart = found._dataEnd;
found._tokensize = found._dataEnd - found._tokenstart;
found.parenthesiscount = 0;
+ found.head = interval_.par.substr(found._tokenstart, found._tokensize);
+ }
+ else {
+ continue;
}
}
else {
math_pos = mi.getStartPos();
}
if (keys.find(key) == keys.end()) {
- LYXERR(Debug::FIND, "Found unknown key " << sub.str(0));
- continue;
+ found = KeyInfo(KeyInfo::isStandard, 0, true);
+ if (isPatternString) {
+ found.keytype = KeyInfo::isChar;
+ found.disabled = false;
+ found.used = true;
+ }
+ keys[key] = found;
}
- found = keys[key];
+ else
+ found = keys[key];
if (key.compare("regexp") == 0) {
evaluatingRegexp = true;
found._tokenstart = sub.position(size_t(0));
found._dataEnd = found._tokenstart + found._tokensize;
found._dataStart = found._dataEnd;
found.parenthesiscount = 0;
+ found.head = interval_.par.substr(found._tokenstart, found._tokensize);
evaluatingMath = true;
}
- else
- continue;
+ else {
+ // begin|end of unknown env, discard
+ // First handle tables
+ // longtable|tabular
+ bool discardComment;
+ found = keys[key];
+ found.keytype = KeyInfo::doRemove;
+ if ((sub.str(5).compare("longtable") == 0) ||
+ (sub.str(5).compare("tabular") == 0)) {
+ discardComment = true; /* '%' */
+ }
+ else {
+ discardComment = false;
+ static regex const removeArgs("^(multicols|multipar|sectionbox|subsectionbox|tcolorbox)$");
+ smatch sub2;
+ string token = sub.str(5);
+ if (regex_match(token, sub2, removeArgs)) {
+ found.keytype = KeyInfo::removeWithArg;
+ }
+ }
+ // discard spaces before pos(0)
+ int pos = sub.position(size_t(0));
+ int count;
+ for (count = 0; pos - count > 0; count++) {
+ char c = interval_.par[pos-count-1];
+ if (discardComment) {
+ if ((c != ' ') && (c != '%'))
+ break;
+ }
+ else if (c != ' ')
+ break;
+ }
+ found._tokenstart = pos - count;
+ if (sub.str(1).compare(0, 5, "begin") == 0) {
+ size_t pos1 = pos + sub.str(0).length();
+ if (sub.str(5).compare("cjk") == 0) {
+ pos1 = interval_.findclosing(pos1+1, interval_.par.length()) + 1;
+ if ((interval_.par[pos1] == '{') && (interval_.par[pos1+1] == '}'))
+ pos1 += 2;
+ found.keytype = KeyInfo::isMain;
+ found._dataStart = pos1;
+ found._dataEnd = interval_.par.length();
+ found.disabled = keys["foreignlanguage"].disabled;
+ found.used = keys["foreignlanguage"].used;
+ found._tokensize = pos1 - found._tokenstart;
+ found.head = interval_.par.substr(found._tokenstart, found._tokensize);
+ }
+ else {
+ // Swallow possible optional params
+ while (interval_.par[pos1] == '[') {
+ pos1 = interval_.findclosing(pos1+1, interval_.par.length(), '[', ']')+1;
+ }
+ // Swallow also the eventual parameter
+ if (interval_.par[pos1] == '{') {
+ found._dataEnd = interval_.findclosing(pos1+1, interval_.par.length()) + 1;
+ }
+ else {
+ found._dataEnd = pos1;
+ }
+ found._dataStart = found._dataEnd;
+ found._tokensize = count + found._dataEnd - pos;
+ found.parenthesiscount = 0;
+ found.head = interval_.par.substr(found._tokenstart, found._tokensize);
+ found.disabled = true;
+ }
+ }
+ else {
+ // Handle "\end{...}"
+ found._dataStart = pos + sub.str(0).length();
+ found._dataEnd = found._dataStart;
+ found._tokensize = count + found._dataEnd - pos;
+ found.parenthesiscount = 0;
+ found.head = interval_.par.substr(found._tokenstart, found._tokensize);
+ found.disabled = true;
+ }
+ }
}
else if (found.keytype != KeyInfo::isRegex) {
found._tokenstart = sub.position(size_t(0));
if (found.parenthesiscount == 0) {
// Probably to be discarded
- char following = interval.par[sub.position(size_t(0)) + sub.str(3).length() + 1];
+ size_t following_pos = sub.position(size_t(0)) + sub.str(3).length() + 1;
+ char following = interval_.par[following_pos];
if (following == ' ')
found.head = "\\" + sub.str(3) + " ";
else if (following == '=') {
found._dataStart = found._dataEnd;
}
else {
+ int params = found._tokenstart + key.length() + 1;
+ if (evaluatingOptional) {
+ if (size_t(found._tokenstart) > optionalEnd) {
+ evaluatingOptional = false;
+ }
+ else {
+ found.disabled = true;
+ }
+ }
+ int optend = params;
+ while (interval_.par[optend] == '[') {
+ // discard optional parameters
+ optend = interval_.findclosing(optend+1, interval_.par.length(), '[', ']') + 1;
+ }
+ if (optend > params) {
+ key += interval_.par.substr(params, optend-params);
+ evaluatingOptional = true;
+ optionalEnd = optend;
+ }
+ string token = sub.str(5);
+ int closings = found.parenthesiscount;
if (found.parenthesiscount == 1) {
found.head = "\\" + key + "{";
}
- else if (found.parenthesiscount == 2) {
- found.head = sub.str(0) + "{";
+ else if (found.parenthesiscount > 1) {
+ if (token != "") {
+ found.head = sub.str(0) + "{";
+ closings = found.parenthesiscount - 1;
+ }
+ else {
+ found.head = "\\" + key + "{";
+ }
}
found._tokensize = found.head.length();
found._dataStart = found._tokenstart + found.head.length();
- found._dataEnd = interval.findclosing(found._dataStart, interval.par.length());
- if (isPatternString) {
- keys[key].used = true;
+ if (found.keytype == KeyInfo::doRemove) {
+ int endpar = 2 + interval_.findclosing(found._dataStart, interval_.par.length(), '{', '}', closings);
+ found._dataStart = endpar;
+ found._tokensize = found._dataStart - found._tokenstart;
+ closings = 1;
+ }
+ if (interval_.par.substr(found._dataStart-1, 15).compare("\\endarguments{}") == 0) {
+ found._dataStart += 15;
+ }
+ size_t endpos = interval_.findclosing(found._dataStart, interval_.par.length(), '{', '}', closings);
+ if (found.keytype == KeyInfo::isList) {
+ // Check if it really is list env
+ static regex const listre("^([a-z]+)$");
+ smatch sub2;
+ if (!regex_match(token, sub2, listre)) {
+ // Change the key of this entry. It is not in a list/item environment
+ found.keytype = KeyInfo::endArguments;
+ }
+ }
+ if (found.keytype == KeyInfo::noMain) {
+ evaluatingCode = true;
+ codeEnd = endpos;
+ codeStart = found._dataStart;
+ }
+ else if (evaluatingCode) {
+ if (size_t(found._dataStart) > codeEnd)
+ evaluatingCode = false;
+ else if (found.keytype == KeyInfo::isMain) {
+ // Disable this key, treate it as standard
+ found.keytype = KeyInfo::isStandard;
+ found.disabled = true;
+ if ((codeEnd == interval_.par.length()) &&
+ (found._tokenstart == codeStart)) {
+ // trickery, because the code inset starts
+ // with \selectlanguage ...
+ codeEnd = endpos;
+ if (entries_.size() > 1) {
+ entries_[entries_.size()-1]._dataEnd = codeEnd;
+ }
+ }
+ }
}
+ if ((endpos == interval_.par.length()) &&
+ (found.keytype == KeyInfo::doRemove)) {
+ // Missing closing => error in latex-input?
+ // therefore do not delete remaining data
+ found._dataStart -= 1;
+ found._dataEnd = found._dataStart;
+ }
+ else
+ found._dataEnd = endpos;
+ }
+ if (isPatternString) {
+ keys[key].used = true;
}
}
- entries.push_back(found);
+ entries_.push_back(found);
}
}
static bool keysBuilt = false;
if (keysBuilt && !isPatternString) return;
- // Know standard keys with 1 parameter.
+ // Known standard keys with 1 parameter.
// Split is done, if not at start of region
- makeKey("textsf|textss|texttt", KeyInfo(KeyInfo::isStandard, 1, f.getFamily()), isPatternString);
- makeKey("textbf", KeyInfo(KeyInfo::isStandard, 1, f.getSeries()), isPatternString);
- makeKey("textit|textsc|textsl", KeyInfo(KeyInfo::isStandard, 1, f.getShape()), isPatternString);
- makeKey("uuline|uline|uwave", KeyInfo(KeyInfo::isStandard, 1, f.getUnderline()), isPatternString);
- makeKey("emph|noun", KeyInfo(KeyInfo::isStandard, 1, f.getMarkUp()), isPatternString);
- makeKey("sout|xout", KeyInfo(KeyInfo::isStandard, 1, f.getStrikeOut()), isPatternString);
+ makeKey("textsf|textss|texttt", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getFamily()), isPatternString);
+ makeKey("textbf", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getSeries()), isPatternString);
+ makeKey("textit|textsc|textsl", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getShape()), isPatternString);
+ makeKey("uuline|uline|uwave", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getUnderline()), isPatternString);
+ makeKey("emph|noun", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getMarkUp()), isPatternString);
+ makeKey("sout|xout", KeyInfo(KeyInfo::isStandard, 1, ignoreFormats.getStrikeOut()), isPatternString);
makeKey("section|subsection|subsubsection|paragraph|subparagraph|minisec",
- KeyInfo(KeyInfo::isSectioning, 1, f.getSectioning()), isPatternString);
+ KeyInfo(KeyInfo::isSectioning, 1, ignoreFormats.getSectioning()), isPatternString);
makeKey("section*|subsection*|subsubsection*|paragraph*",
- KeyInfo(KeyInfo::isSectioning, 1, f.getSectioning()), isPatternString);
- makeKey("part|part*|chapter|chapter*", KeyInfo(KeyInfo::isSectioning, 1, f.getSectioning()), isPatternString);
- makeKey("title|subtitle|author|subject|publishers|dedication|uppertitleback|lowertitleback|extratitle|lyxaddress|lyxrightaddress", KeyInfo(KeyInfo::isSectioning, 1, f.getFrontMatter()), isPatternString);
+ KeyInfo(KeyInfo::isSectioning, 1, ignoreFormats.getSectioning()), isPatternString);
+ makeKey("part|part*|chapter|chapter*", KeyInfo(KeyInfo::isSectioning, 1, ignoreFormats.getSectioning()), isPatternString);
+ makeKey("title|subtitle|author|subject|publishers|dedication|uppertitleback|lowertitleback|extratitle|lyxaddress|lyxrightaddress", KeyInfo(KeyInfo::isTitle, 1, ignoreFormats.getFrontMatter()), isPatternString);
// Regex
makeKey("regexp", KeyInfo(KeyInfo::isRegex, 1, false), isPatternString);
// Split is done, if not at start of region
- makeKey("textcolor", KeyInfo(KeyInfo::isStandard, 2, f.getColor()), isPatternString);
+ makeKey("textcolor", KeyInfo(KeyInfo::isStandard, 2, ignoreFormats.getColor()), isPatternString);
+ makeKey("latexenvironment", KeyInfo(KeyInfo::isStandard, 2, false), isPatternString);
// Split is done always.
- makeKey("foreignlanguage", KeyInfo(KeyInfo::isMain, 2, f.getLanguage()), isPatternString);
+ makeKey("foreignlanguage", KeyInfo(KeyInfo::isMain, 2, ignoreFormats.getLanguage()), isPatternString);
- // Know charaters
+ // Known charaters
// No split
- makeKey("backslash|textbackslash|textasciicircum|textasciitilde", KeyInfo(KeyInfo::isChar, 1, false), isPatternString);
+ makeKey("backslash|textbackslash|slash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("textasciicircum|textasciitilde", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("textasciiacute|texemdash", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("dots|ldots", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ // Spaces
+ makeKey("quad|qquad|hfill|dotfill", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("textvisiblespace|nobreakspace", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("negthickspace|negmedspace|negthinspace", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ // Skip
+ // makeKey("enskip|smallskip|medskip|bigskip|vfill", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ // Custom space/skip, remove the content (== length value)
+ makeKey("vspace|vspace*|hspace|hspace*|mspace", KeyInfo(KeyInfo::noContent, 1, false), isPatternString);
// Found in fr/UserGuide.lyx
makeKey("og|fg", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
-
+ // quotes
+ makeKey("textquotedbl|quotesinglbase|lyxarrow", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("textquotedblleft|textquotedblright", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
// Known macros to remove (including their parameter)
// No split
- makeKey("inputencoding|shortcut|label|ref", KeyInfo(KeyInfo::doRemove, 1, false), isPatternString);
+ makeKey("input|inputencoding|label|ref|index|bibitem", KeyInfo(KeyInfo::doRemove, 1, false), isPatternString);
+ makeKey("addtocounter|setlength", KeyInfo(KeyInfo::noContent, 2, true), isPatternString);
+ // handle like standard keys with 1 parameter.
+ makeKey("url|href|vref|thanks", KeyInfo(KeyInfo::isStandard, 1, false), isPatternString);
+
+ // Ignore deleted text
+ makeKey("lyxdeleted", KeyInfo(KeyInfo::doRemove, 2, false), isPatternString);
+ // but preserve added text
+ makeKey("lyxadded", KeyInfo(KeyInfo::doRemove, 1, false), isPatternString);
// Macros to remove, but let the parameter survive
// No split
- makeKey("url|href|menuitem|footnote|code|index", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("menuitem|textmd|textrm", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+
+ // Remove language spec from content of these insets
+ makeKey("code", KeyInfo(KeyInfo::noMain, 1, false), isPatternString);
// Same effect as previous, parameter will survive (because there is no one anyway)
// No split
- makeKey("noindent", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
- // like ('tiny{}' or '\tiny ' ... }
- makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, true), isPatternString);
+ makeKey("noindent|textcompwordmark|maketitle", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
+ // Remove table decorations
+ makeKey("hline|tabularnewline|toprule|bottomrule|midrule", KeyInfo(KeyInfo::doRemove, 0, true), isPatternString);
+ // Discard shape-header.
+ // For footnote or shortcut too, because of lang settings
+ // and wrong handling if used 'KeyInfo::noMain'
+ makeKey("circlepar|diamondpar|heartpar|nutpar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("trianglerightpar|hexagonpar|starpar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("triangleuppar|triangledownpar|droppar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("triangleleftpar|shapepar|dropuppar", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("hphantom|vphantom|footnote|shortcut|include|includegraphics", KeyInfo(KeyInfo::isStandard, 1, true), isPatternString);
+ makeKey("parbox", KeyInfo(KeyInfo::doRemove, 1, true), isPatternString);
+ // like ('tiny{}' or '\tiny ' ... )
+ makeKey("footnotesize|tiny|scriptsize|small|large|Large|LARGE|huge|Huge", KeyInfo(KeyInfo::isSize, 0, false), isPatternString);
// Survives, like known character
- makeKey("lyx|latex|tex", KeyInfo(KeyInfo::isIgnored, 0, false), isPatternString);
- makeKey("item", KeyInfo(KeyInfo::isList, 1, false), isPatternString);
+ makeKey("lyx|LyX|latex|LaTeX|latexe|LaTeXe|tex|TeX", KeyInfo(KeyInfo::isChar, 0, false), isPatternString);
+ makeKey("item|listitem", KeyInfo(KeyInfo::isList, 1, false), isPatternString);
makeKey("begin|end", KeyInfo(KeyInfo::isMath, 1, false), isPatternString);
makeKey("[|]", KeyInfo(KeyInfo::isMath, 1, false), isPatternString);
makeKey("$", KeyInfo(KeyInfo::isMath, 1, false), isPatternString);
- makeKey("par|uldepth|ULdepth|protect", KeyInfo(KeyInfo::doRemove, 0, true), isPatternString);
-
+ makeKey("par|uldepth|ULdepth|protect|nobreakdash|medskip|relax", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
+ // Remove RTL/LTR marker
+ makeKey("l|r|textlr|textfr|textar|beginl|endl", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
+ makeKey("lettrine", KeyInfo(KeyInfo::cleanToStart, 0, true), isPatternString);
+ makeKey("lyxslide", KeyInfo(KeyInfo::isSectioning, 1, true), isPatternString);
+ makeKey("endarguments", KeyInfo(KeyInfo::endArguments, 0, true), isPatternString);
+ makeKey("twocolumn", KeyInfo(KeyInfo::removeWithArg, 2, true), isPatternString);
+ makeKey("tnotetext|ead|fntext|cortext|address", KeyInfo(KeyInfo::removeWithArg, 0, true), isPatternString);
+ makeKey("lyxend", KeyInfo(KeyInfo::isStandard, 0, true), isPatternString);
if (isPatternString) {
// Allow the first searched string to rebuild the keys too
keysBuilt = false;
string Intervall::show(int lastpos)
{
int idx = 0; /* int intervalls */
- int count = 0;
string s;
int i = 0;
for (idx = 0; idx <= ignoreidx; idx++) {
if (lastpos > i) {
s += par.substr(i, lastpos-i);
}
- return (s);
+ return s;
}
#endif
// get number of chars to output
int idx = 0; /* int intervalls */
int i = 0;
+ int printed = 0;
+ string startTitle = titleValue;
for (idx = 0; idx <= ignoreidx; idx++) {
if (i < lastpos) {
- int printsize;
if (i <= borders[idx].low) {
+ int printsize;
if (borders[idx].low > lastpos)
printsize = lastpos - i;
else
printsize = borders[idx].low - i;
- os << par.substr(i, printsize);
- i += printsize;
+ if (printsize > 0) {
+ os << startTitle << par.substr(i, printsize);
+ i += printsize;
+ printed += printsize;
+ startTitle = "";
+ }
handleParentheses(i, false);
if (i >= borders[idx].low)
i = borders[idx].upper;
break;
}
if (lastpos > i) {
- os << par.substr(i, lastpos-i);
+ os << startTitle << par.substr(i, lastpos-i);
+ printed += lastpos-i;
}
handleParentheses(lastpos, false);
- for (int i = actualdeptindex; i > 0; --i) {
+ int startindex;
+ if (keys["foreignlanguage"].disabled)
+ startindex = actualdeptindex-langcount;
+ else
+ startindex = actualdeptindex;
+ for (int i = startindex; i > 0; --i) {
os << "}";
}
- if (! isPatternString)
+ if (hasTitle && (printed > 0))
+ os << "}";
+ if (! isPatternString_)
os << "\n";
handleParentheses(lastpos, true); /* extra closings '}' allowed here */
}
void LatexInfo::processRegion(int start, int region_end)
{
while (start < region_end) { /* Let {[} and {]} survive */
- if ((interval.par[start] == '{') &&
- (interval.par[start+1] != ']') &&
- (interval.par[start+1] != '[')) {
+ int cnt = interval_.isOpeningPar(start);
+ if (cnt == 1) {
// Closing is allowed past the region
- int closing = interval.findclosing(start+1, interval.par.length());
- interval.addIntervall(start, start+1);
- interval.addIntervall(closing, closing+1);
+ int closing = interval_.findclosing(start+1, interval_.par.length());
+ interval_.addIntervall(start, start+1);
+ interval_.addIntervall(closing, closing+1);
}
- start = interval.nextNotIgnored(start+1);
+ else if (cnt == 3)
+ start += 2;
+ start = interval_.nextNotIgnored(start+1);
}
}
{
if (actual.parenthesiscount == 0) {
// "{\tiny{} ...}" ==> "{{} ...}"
- interval.addIntervall(actual._tokenstart-count, actual._tokenstart + actual._tokensize);
+ interval_.addIntervall(actual._tokenstart-count, actual._tokenstart + actual._tokensize);
}
else {
// Remove header hull, that is "\url{abcd}" ==> "abcd"
- interval.addIntervall(actual._tokenstart, actual._dataStart);
- interval.addIntervall(actual._dataEnd, actual._dataEnd+1);
+ interval_.addIntervall(actual._tokenstart - count, actual._dataStart);
+ interval_.addIntervall(actual._dataEnd, actual._dataEnd+1);
}
}
int nextKeyIdx = 0;
switch (actual.keytype)
{
+ case KeyInfo::isTitle: {
+ removeHead(actual);
+ nextKeyIdx = getNextKey();
+ break;
+ }
+ case KeyInfo::cleanToStart: {
+ actual._dataEnd = actual._dataStart;
+ nextKeyIdx = getNextKey();
+ // Search for end of arguments
+ int tmpIdx = find(nextKeyIdx, KeyInfo::endArguments);
+ if (tmpIdx > 0) {
+ for (int i = nextKeyIdx; i <= tmpIdx; i++) {
+ entries_[i].disabled = true;
+ }
+ actual._dataEnd = entries_[tmpIdx]._dataEnd;
+ }
+ while (interval_.par[actual._dataEnd] == ' ')
+ actual._dataEnd++;
+ interval_.addIntervall(0, actual._dataEnd+1);
+ interval_.actualdeptindex = 0;
+ interval_.depts[0] = actual._dataEnd+1;
+ interval_.closes[0] = -1;
+ break;
+ }
+ case KeyInfo::noContent: { /* char like "\hspace{2cm}" */
+ if (actual.disabled)
+ interval_.addIntervall(actual._tokenstart, actual._dataEnd);
+ else
+ interval_.addIntervall(actual._dataStart, actual._dataEnd);
+ }
+ // fall through
case KeyInfo::isChar: {
nextKeyIdx = getNextKey();
break;
}
case KeyInfo::isSize: {
- if (actual.disabled) {
- // Allways disabled
+ if (actual.disabled || (interval_.par[actual._dataStart] != '{') || (interval_.par[actual._dataStart-1] == ' ')) {
processRegion(actual._dataEnd, actual._dataEnd+1); /* remove possibly following {} */
- interval.addIntervall(actual._tokenstart, actual._dataEnd+1);
+ interval_.addIntervall(actual._tokenstart, actual._dataEnd+1);
nextKeyIdx = getNextKey();
} else {
+ // Here _dataStart points to '{', so correct it
+ actual._dataStart += 1;
+ actual._tokensize += 1;
+ actual.parenthesiscount = 1;
+ if (interval_.par[actual._dataStart] == '}') {
+ // Determine the end if used like '{\tiny{}...}'
+ actual._dataEnd = interval_.findclosing(actual._dataStart+1, interval_.par.length()) + 1;
+ interval_.addIntervall(actual._dataStart, actual._dataStart+1);
+ }
+ else {
+ // Determine the end if used like '\tiny{...}'
+ actual._dataEnd = interval_.findclosing(actual._dataStart, interval_.par.length()) + 1;
+ }
// Split on this key if not at start
- int start = interval.nextNotIgnored(previousStart);
+ int start = interval_.nextNotIgnored(previousStart);
if (start < actual._tokenstart) {
- interval.output(os, actual._tokenstart);
- interval.addIntervall(start, actual._tokenstart);
+ interval_.output(os, actual._tokenstart);
+ interval_.addIntervall(start, actual._tokenstart);
}
// discard entry if at end of actual
nextKeyIdx = process(os, actual);
}
break;
}
+ case KeyInfo::endArguments:
+ // Remove trailing '{}' too
+ actual._dataStart += 1;
+ actual._dataEnd += 1;
+ interval_.addIntervall(actual._tokenstart, actual._dataEnd+1);
+ nextKeyIdx = getNextKey();
+ break;
+ case KeyInfo::noMain:
+ // fall through
case KeyInfo::isStandard: {
if (actual.disabled) {
removeHead(actual);
processRegion(actual._dataStart, actual._dataStart+1);
nextKeyIdx = getNextKey();
} else {
- // Split on this key if not at start
- int start = interval.nextNotIgnored(previousStart);
+ // Split on this key if not at datastart of calling entry
+ int start = interval_.nextNotIgnored(previousStart);
if (start < actual._tokenstart) {
- interval.output(os, actual._tokenstart);
- interval.addIntervall(start, actual._tokenstart);
+ interval_.output(os, actual._tokenstart);
+ interval_.addIntervall(start, actual._tokenstart);
}
// discard entry if at end of actual
nextKeyIdx = process(os, actual);
}
break;
}
+ case KeyInfo::removeWithArg: {
+ nextKeyIdx = getNextKey();
+ // Search for end of arguments
+ int tmpIdx = find(nextKeyIdx, KeyInfo::endArguments);
+ if (tmpIdx > 0) {
+ for (int i = nextKeyIdx; i <= tmpIdx; i++) {
+ entries_[i].disabled = true;
+ }
+ actual._dataEnd = entries_[tmpIdx]._dataEnd;
+ }
+ interval_.addIntervall(actual._tokenstart, actual._dataEnd+1);
+ break;
+ }
case KeyInfo::doRemove: {
- // Remove the key with all parameters
- interval.addIntervall(actual._tokenstart, actual._dataEnd+1);
+ // Remove the key with all parameters and following spaces
+ size_t pos;
+ for (pos = actual._dataEnd+1; pos < interval_.par.length(); pos++) {
+ if ((interval_.par[pos] != ' ') && (interval_.par[pos] != '%'))
+ break;
+ }
+ // Remove also enclosing parentheses [] and {}
+ int numpars = 0;
+ int spaces = 0;
+ while (actual._tokenstart > numpars) {
+ if (interval_.par[pos+numpars] == ']' && interval_.par[actual._tokenstart-numpars-1] == '[')
+ numpars++;
+ else if (interval_.par[pos+numpars] == '}' && interval_.par[actual._tokenstart-numpars-1] == '{')
+ numpars++;
+ else
+ break;
+ }
+ if (numpars > 0) {
+ if (interval_.par[pos+numpars] == ' ')
+ spaces++;
+ }
+
+ interval_.addIntervall(actual._tokenstart-numpars, pos+numpars+spaces);
nextKeyIdx = getNextKey();
break;
}
// Discard space before _tokenstart
int count;
for (count = 0; count < actual._tokenstart; count++) {
- if (interval.par[actual._tokenstart-count-1] != ' ')
+ if (interval_.par[actual._tokenstart-count-1] != ' ')
break;
}
+ nextKeyIdx = getNextKey();
+ int tmpIdx = find(nextKeyIdx, KeyInfo::endArguments);
+ if (tmpIdx > 0) {
+ // Special case: \item is not a list, but a command (like in Style Author_Biography in maa-monthly.layout)
+ // with arguments
+ // How else can we catch this one?
+ for (int i = nextKeyIdx; i <= tmpIdx; i++) {
+ entries_[i].disabled = true;
+ }
+ actual._dataEnd = entries_[tmpIdx]._dataEnd;
+ }
+ else if (nextKeyIdx > 0) {
+ // Ignore any lang entries inside data region
+ for (int i = nextKeyIdx; i < int(entries_.size()) && entries_[i]._tokenstart < actual._dataEnd; i++) {
+ if (entries_[i].keytype == KeyInfo::isMain)
+ entries_[i].disabled = true;
+ }
+ }
if (actual.disabled) {
- interval.addIntervall(actual._tokenstart-count, actual._dataEnd+1);
+ interval_.addIntervall(actual._tokenstart-count, actual._dataEnd+1);
}
else {
- interval.addIntervall(actual._tokenstart-count, actual._tokenstart);
+ interval_.addIntervall(actual._tokenstart-count, actual._tokenstart);
}
- // Discard extra parentheses '[]'
- if (interval.par[actual._dataEnd+1] == '[') {
- int posdown = interval.findclosing(actual._dataEnd+2, interval.par.length(), '[', ']');
- if ((interval.par[actual._dataEnd+2] == '{') &&
- (interval.par[posdown-1] == '}')) {
- interval.addIntervall(actual._dataEnd+1,actual._dataEnd+3);
- interval.addIntervall(posdown-1, posdown+1);
+ if (interval_.par[actual._dataEnd+1] == '[') {
+ int posdown = interval_.findclosing(actual._dataEnd+2, interval_.par.length(), '[', ']');
+ if ((interval_.par[actual._dataEnd+2] == '{') &&
+ (interval_.par[posdown-1] == '}')) {
+ interval_.addIntervall(actual._dataEnd+1,actual._dataEnd+3);
+ interval_.addIntervall(posdown-1, posdown+1);
}
else {
- interval.addIntervall(actual._dataEnd+1, actual._dataEnd+2);
- interval.addIntervall(posdown, posdown+1);
+ interval_.addIntervall(actual._dataEnd+1, actual._dataEnd+2);
+ interval_.addIntervall(posdown, posdown+1);
}
- int blk = interval.nextNotIgnored(actual._dataEnd+1);
+ int blk = interval_.nextNotIgnored(actual._dataEnd+1);
if (blk > posdown) {
// Discard at most 1 space after empty item
int count;
for (count = 0; count < 1; count++) {
- if (interval.par[blk+count] != ' ')
+ if (interval_.par[blk+count] != ' ')
break;
}
if (count > 0)
- interval.addIntervall(blk, blk+count);
+ interval_.addIntervall(blk, blk+count);
}
}
- nextKeyIdx = getNextKey();
break;
}
case KeyInfo::isSectioning: {
- // Discard space before _tokenstart
+ // Discard spaces before _tokenstart
int count;
- for (count = 0; count < actual._tokenstart; count++) {
- if (interval.par[actual._tokenstart-count-1] != ' ')
+ int val = actual._tokenstart;
+ for (count = 0; count < actual._tokenstart;) {
+ val = interval_.previousNotIgnored(val-1);
+ if (interval_.par[val] != ' ')
break;
+ else {
+ count = actual._tokenstart - val;
+ }
}
if (actual.disabled) {
removeHead(actual, count);
nextKeyIdx = getNextKey();
} else {
- interval.addIntervall(actual._tokenstart-count, actual._tokenstart);
+ interval_.addIntervall(actual._tokenstart-count, actual._tokenstart);
nextKeyIdx = process(os, actual);
}
break;
break;
}
case KeyInfo::isMain: {
+ if (interval_.par.substr(actual._dataStart, 2) == "% ")
+ interval_.addIntervall(actual._dataStart, actual._dataStart+2);
+ if (actual._tokenstart > 0) {
+ int prev = interval_.previousNotIgnored(actual._tokenstart - 1);
+ if ((prev >= 0) && interval_.par[prev] == '%')
+ interval_.addIntervall(prev, prev+1);
+ }
if (actual.disabled) {
removeHead(actual);
- if ((interval.par.substr(actual._dataStart, 3) == " \\[") ||
- (interval.par.substr(actual._dataStart, 8) == " \\begin{")) {
+ interval_.langcount++;
+ if ((interval_.par.substr(actual._dataStart, 3) == " \\[") ||
+ (interval_.par.substr(actual._dataStart, 8) == " \\begin{")) {
// Discard also the space before math-equation
- interval.addIntervall(actual._dataStart, actual._dataStart+1);
+ interval_.addIntervall(actual._dataStart, actual._dataStart+1);
}
- interval.resetOpenedP(actual._dataStart-1);
+ nextKeyIdx = getNextKey();
+ // interval.resetOpenedP(actual._dataStart-1);
}
else {
- if (actual._tokenstart == 0) {
+ if (actual._tokenstart < 26) {
// for the first (and maybe dummy) language
- interval.setForDefaultLang(actual._tokenstart + actual._tokensize);
+ interval_.setForDefaultLang(actual);
}
- interval.resetOpenedP(actual._dataStart-1);
+ interval_.resetOpenedP(actual._dataStart-1);
}
break;
}
int LatexInfo::process(ostringstream &os, KeyInfo &actual )
{
- int end = interval.nextNotIgnored(actual._dataEnd);
+ int end = interval_.nextNotIgnored(actual._dataEnd);
int oldStart = actual._dataStart;
int nextKeyIdx = getNextKey();
while (true) {
if ((nextKeyIdx < 0) ||
- (entries[nextKeyIdx]._tokenstart >= actual._dataEnd) ||
- (entries[nextKeyIdx].keytype == KeyInfo::invalid)) {
+ (entries_[nextKeyIdx]._tokenstart >= actual._dataEnd) ||
+ (entries_[nextKeyIdx].keytype == KeyInfo::invalid)) {
if (oldStart <= end) {
processRegion(oldStart, end);
oldStart = end+1;
}
KeyInfo &nextKey = getKeyInfo(nextKeyIdx);
- if (nextKey.keytype == KeyInfo::isMain) {
+ if ((nextKey.keytype == KeyInfo::isMain) && !nextKey.disabled) {
(void) dispatch(os, actual._dataStart, nextKey);
end = nextKey._tokenstart;
break;
if (oldStart <= end) {
processRegion(oldStart, end);
}
- if (interval.par[end] == '}') {
+ if (interval_.par[end] == '}') {
end += 1;
// This is the normal case.
// But if using the firstlanguage, the closing may be missing
// get minimum of 'end' and 'actual._dataEnd' in case that the nextKey.keytype was 'KeyInfo::isMain'
int output_end;
if (actual._dataEnd < end)
- output_end = interval.nextNotIgnored(actual._dataEnd);
+ output_end = interval_.nextNotIgnored(actual._dataEnd);
else
- output_end = interval.nextNotIgnored(end);
- if (interval.nextNotIgnored(actual._dataStart) < output_end)
- interval.output(os, output_end);
- interval.addIntervall(actual._tokenstart, end);
+ output_end = interval_.nextNotIgnored(end);
+ if ((actual.keytype == KeyInfo::isMain) && actual.disabled) {
+ interval_.addIntervall(actual._tokenstart, actual._tokenstart+actual._tokensize);
+ }
+ // Remove possible empty data
+ int dstart = interval_.nextNotIgnored(actual._dataStart);
+ while (interval_.isOpeningPar(dstart) == 1) {
+ interval_.addIntervall(dstart, dstart+1);
+ int dend = interval_.findclosing(dstart+1, output_end);
+ interval_.addIntervall(dend, dend+1);
+ dstart = interval_.nextNotIgnored(dstart+1);
+ }
+ if (dstart < output_end)
+ interval_.output(os, output_end);
+ interval_.addIntervall(actual._tokenstart, end);
return nextKeyIdx;
}
-string splitOnKnownMacros(string par, bool isPatternString) {
+string splitOnKnownMacros(string par, bool isPatternString)
+{
ostringstream os;
LatexInfo li(par, isPatternString);
+ // LYXERR0("Berfore split: " << par);
KeyInfo DummyKey = KeyInfo(KeyInfo::KeyType::isMain, 2, true);
DummyKey.head = "";
DummyKey._tokensize = 0;
- DummyKey._tokenstart = 0;
DummyKey._dataStart = 0;
DummyKey._dataEnd = par.length();
DummyKey.disabled = true;
string s;
if (firstkeyIdx >= 0) {
KeyInfo firstKey = li.getKeyInfo(firstkeyIdx);
+ DummyKey._tokenstart = firstKey._tokenstart;
int nextkeyIdx;
if ((firstKey.keytype != KeyInfo::isMain) || firstKey.disabled) {
// Use dummy firstKey
firstKey = DummyKey;
(void) li.setNextKey(firstkeyIdx);
}
+ else {
+ if (par.substr(firstKey._dataStart, 2) == "% ")
+ li.addIntervall(firstKey._dataStart, firstKey._dataStart+2);
+ }
nextkeyIdx = li.process(os, firstKey);
while (nextkeyIdx >= 0) {
// Check for a possible gap between the last
firstKey._dataStart = datastart;
firstKey._dataEnd = par.length();
(void) li.setNextKey(nextkeyIdx);
- if (firstKey._tokensize > 0) {
- // Fake the last opened parenthesis
- li.setForDefaultLang(firstKey._tokensize);
- }
+ // Fake the last opened parenthesis
+ li.setForDefaultLang(firstKey);
nextkeyIdx = li.process(os, firstKey);
}
else {
firstKey._dataStart = datastart;
firstKey._dataEnd = nextKey._dataEnd+1;
(void) li.setNextKey(nextkeyIdx);
- if (firstKey._tokensize > 0)
- li.setForDefaultLang(firstKey._tokensize);
+ li.setForDefaultLang(firstKey);
nextkeyIdx = li.process(os, firstKey);
}
else {
// Check if ! empty
if ((firstKey._dataStart < firstKey._dataEnd) &&
(par[firstKey._dataStart] != '}')) {
- if (firstKey._tokensize > 0)
- li.setForDefaultLang(firstKey._tokensize);
+ li.setForDefaultLang(firstKey);
(void) li.process(os, firstKey);
}
s = os.str();
+ if (s.empty()) {
+ // return string definitelly impossible to match
+ s = "\\foreignlanguage{ignore}{ }";
+ }
}
else
s = par; /* no known macros found */
+ // LYXERR0("After split: " << s);
return s;
}
while ((parlen > 0) && (par[parlen-1] == '\n')) {
parlen--;
}
+ if (isPatternString && (parlen > 0) && (par[parlen-1] == '~')) {
+ // Happens to be there in case of description or labeling environment
+ parlen--;
+ }
string result;
if (withformat) {
// Split the latex input into pieces which
// can be digested by our search engine
LYXERR(Debug::FIND, "input: \"" << par << "\"");
- result = splitOnKnownMacros(par, isPatternString);
+ result = splitOnKnownMacros(par.substr(0,parlen), isPatternString);
LYXERR(Debug::FIND, "After split: \"" << result << "\"");
}
else
missed = 0;
if (withformat) {
regex_f = identifyFeatures(result);
- string features = "";
+ string features = "";
for (auto it = regex_f.cbegin(); it != regex_f.cend(); ++it) {
string a = it->first;
regex_with_format = true;
- features += " " + a;
+ features += " " + a;
// LYXERR0("Identified regex format:" << a);
}
- LYXERR(Debug::FIND, "Identified Features" << features);
+ LYXERR(Debug::FIND, "Identified Features" << features);
}
} else if (regex_with_format) {
if (b && ! info[a]) {
missed++;
LYXERR(Debug::FIND, "Missed(" << missed << " " << a <<", srclen = " << parlen );
- return("");
+ return "";
}
}
}
else {
// LYXERR0("No regex formats");
}
- return(result);
+ return result;
}
return open_braces;
}
+static int num_replaced = 0;
+static bool previous_single_replace = true;
MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions const & opt)
: p_buf(&buf), p_first_buf(&buf), opt(opt)
Buffer & find_buf = *theBufferList().getBuffer(FileName(to_utf8(opt.find_buf_name)), true);
docstring const & ds = stringifySearchBuffer(find_buf, opt);
use_regexp = lyx::to_utf8(ds).find("\\regexp{") != std::string::npos;
+ if (opt.replace_all && previous_single_replace) {
+ previous_single_replace = false;
+ num_replaced = 0;
+ }
+ else if (!opt.replace_all) {
+ num_replaced = 0; // count number of replaced strings
+ previous_single_replace = true;
+ }
// When using regexp, braces are hacked already by escape_for_regex()
par_as_string = normalize(ds, !use_regexp);
open_braces = 0;
++close_wildcards;
}
if (!opt.ignoreformat) {
- // Remove extra '\}' at end
- while ( regex_replace(par_as_string, par_as_string, "(.*)\\\\}$", "$1")) {
- open_braces++;
+ // Remove extra '\}' at end if not part of \{\.\}
+ size_t lng = par_as_string.size();
+ while(lng > 2) {
+ if (par_as_string.substr(lng-2, 2).compare("\\}") == 0) {
+ if (lng >= 6) {
+ if (par_as_string.substr(lng-6,3).compare("\\{\\") == 0)
+ break;
+ }
+ lng -= 2;
+ open_braces++;
+ }
+ else
+ break;
}
+ if (lng < par_as_string.size())
+ par_as_string = par_as_string.substr(0,lng);
/*
// save '\.'
regex_replace(par_as_string, par_as_string, "\\\\\\.", "_xxbdotxx_");
while (regex_replace(par_as_string, par_as_string, orig, dest));
}
regexp_str = "(" + lead_as_regexp + ")" + par_as_string;
- regexp2_str = "(" + lead_as_regexp + ").*" + par_as_string;
+ regexp2_str = "(" + lead_as_regexp + ").*?" + par_as_string;
}
LYXERR(Debug::FIND, "Setting regexp to : '" << regexp_str << "'");
regexp = lyx::regex(regexp_str);
}
-int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) const
+// Count number of characters in string
+// {]} ==> 1
+// \& ==> 1
+// --- ==> 1
+// \\[a-zA-Z]+ ==> 1
+static int computeSize(string s, int len)
+{
+ if (len == 0)
+ return 0;
+ int skip = 1;
+ int count = 0;
+ for (int i = 0; i < len; i += skip, count++) {
+ if (s[i] == '\\') {
+ skip = 2;
+ if (isalpha(s[i+1])) {
+ for (int j = 2; i+j < len; j++) {
+ if (! isalpha(s[i+j])) {
+ if (s[i+j] == ' ')
+ skip++;
+ else if ((s[i+j] == '{') && s[i+j+1] == '}')
+ skip += 2;
+ else if ((s[i+j] == '{') && (i + j + 1 >= len))
+ skip++;
+ break;
+ }
+ skip++;
+ }
+ }
+ }
+ else if (s[i] == '{') {
+ if (s[i+1] == '}')
+ skip = 2;
+ else
+ skip = 3;
+ }
+ else if (s[i] == '-') {
+ if (s[i+1] == '-') {
+ if (s[i+2] == '-')
+ skip = 3;
+ else
+ skip = 2;
+ }
+ else
+ skip = 1;
+ }
+ else {
+ skip = 1;
+ }
+ }
+ return count;
+}
+
+MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) const
{
+ MatchResult mres;
+
if (at_begin &&
(opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
- return 0;
+ return mres;
docstring docstr = stringifyFromForSearch(opt, cur, len);
string str = normalize(docstr, true);
if (!opt.ignoreformat) {
str = correctlanguagesetting(str, false, !opt.ignoreformat);
}
- if (str.empty()) return(-1);
+ if (str.empty()) {
+ mres.match_len = -1;
+ return mres;
+ }
LYXERR(Debug::FIND, "Matching against '" << lyx::to_utf8(docstr) << "'");
LYXERR(Debug::FIND, "After normalization: '" << str << "'");
}
sregex_iterator re_it(str.begin(), str.end(), *p_regexp, flags);
if (re_it == sregex_iterator())
- return 0;
+ return mres;
match_results<string::const_iterator> const & m = *re_it;
if (0) { // Kornel Benko: DO NOT CHECKK
// Check braces on the segment that matched the entire regexp expression,
// plus the last subexpression, if a (.*?) was inserted in the constructor.
if (!braces_match(m[0].first, m[0].second, open_braces))
- return 0;
+ return mres;
}
// Check braces on segments that matched all (.*?) subexpressions,
// except the last "padding" one inserted by lyx.
for (size_t i = 1; i < m.size() - 1; ++i)
if (!braces_match(m[i].first, m[i].second, open_braces))
- return 0;
+ return mres;
// Exclude from the returned match length any length
// due to close wildcards added at end of regexp
- // and also the length of the leading (e.g. '\emph{')
+ // and also the length of the leading (e.g. '\emph{}')
//
// Whole found string, including the leading: m[0].second - m[0].first
// Size of the leading string: m[1].second - m[1].first
if (m.size() > 1)
leadingsize = m[1].second - m[1].first;
int result;
- for (size_t i = 0; i < m.size(); i++) {
- LYXERR(Debug::FIND, "Match " << i << " is " << m[i].second - m[i].first << " long");
- }
+ for (size_t i = 0; i < m.size(); i++) {
+ LYXERR(Debug::FIND, "Match " << i << " is " << m[i].second - m[i].first << " long");
+ }
if (close_wildcards == 0)
result = m[0].second - m[0].first;
else
result = m[m.size() - close_wildcards].first - m[0].first;
+ size_t pos = m.position(size_t(0));
+ // Ignore last closing characters
+ while (result > 0) {
+ if (str[pos+result-1] == '}')
+ --result;
+ else
+ break;
+ }
if (result > leadingsize)
result -= leadingsize;
else
result = 0;
- return(result);
+ mres.match_len = computeSize(str.substr(pos+leadingsize,result), result);
+ mres.match2end = str.size() - pos - leadingsize;
+ mres.pos = pos+leadingsize;
+ return mres;
}
// else !use_regexp: but all code paths above return
if (at_begin) {
LYXERR(Debug::FIND, "size=" << par_as_string.size()
<< ", substr='" << str.substr(0, par_as_string.size()) << "'");
- if (str.substr(0, par_as_string.size()) == par_as_string)
- return par_as_string.size();
+ if (str.substr(0, par_as_string.size()) == par_as_string) {
+ mres.match_len = par_as_string.size();
+ mres.match2end = str.size();
+ mres.pos = 0;
+ return mres;
+ }
} else {
- size_t pos = str.find(par_as_string_nolead);
- if (pos != string::npos)
- return par_as_string.size();
+ // Start the search _after_ the leading part
+ size_t pos = str.find(par_as_string_nolead, lead_as_string.size());
+ if (pos != string::npos) {
+ mres.match_len = par_as_string.size();
+ mres.match2end = str.size() - pos;
+ mres.pos = pos;
+ return mres;
+ }
}
- return 0;
+ return mres;
}
-int MatchStringAdv::operator()(DocIterator const & cur, int len, bool at_begin) const
+MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at_begin) const
{
- int res = findAux(cur, len, at_begin);
+ MatchResult mres = findAux(cur, len, at_begin);
+ int res = mres.match_len;
LYXERR(Debug::FIND,
"res=" << res << ", at_begin=" << at_begin
<< ", matchword=" << opt.matchword
<< ", inTexted=" << cur.inTexted());
if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted())
- return res;
+ return mres;
+ if ((len > 0) && (res < len)) {
+ mres.match_len = 0;
+ return mres;
+ }
Paragraph const & par = cur.paragraph();
bool ws_left = (cur.pos() > 0)
? par.isWordSeparator(cur.pos() - 1)
: true;
- bool ws_right = (cur.pos() + res < par.size())
- ? par.isWordSeparator(cur.pos() + res)
+ bool ws_right = (cur.pos() + len < par.size())
+ ? par.isWordSeparator(cur.pos() + len)
: true;
LYXERR(Debug::FIND,
"cur.pos()=" << cur.pos() << ", res=" << res
<< ", separ: " << ws_left << ", " << ws_right
+ << ", len: " << len
<< endl);
- if (ws_left && ws_right)
- return res;
- return 0;
+ if (ws_left && ws_right) {
+ // Check for word separators inside the found 'word'
+ for (int i = 0; i < len; i++) {
+ if (par.isWordSeparator(cur.pos() + i)) {
+ mres.match_len = 0;
+ return mres;
+ }
+ }
+ return mres;
+ }
+ mres.match_len = 0;
+ return mres;
}
while (!t.empty() && t[t.size() - 1] == '\n')
t = t.substr(0, t.size() - 1);
size_t pos;
- // Replace all other \n with spaces
- while ((pos = t.find("\n")) != string::npos)
- t.replace(pos, 1, " ");
+ // Handle all other '\n'
+ while ((pos = t.find("\n")) != string::npos) {
+ if (pos > 1 && t[pos-1] == '\\' && t[pos-2] == '\\' ) {
+ // Handle '\\\n'
+ if (isAlnumASCII(t[pos+1])) {
+ t.replace(pos-2, 3, " ");
+ }
+ else {
+ t.replace(pos-2, 3, "");
+ }
+ }
+ else if (!isAlnumASCII(t[pos+1]) || !isAlnumASCII(t[pos-1])) {
+ // '\n' adjacent to non-alpha-numerics, discard
+ t.replace(pos, 1, "");
+ }
+ else {
+ // Replace all other \n with spaces
+ t.replace(pos, 1, " ");
+ }
+ }
// Remove stale empty \emph{}, \textbf{} and similar blocks from latexify
// Kornel: Added textsl, textsf, textit, texttt and noun
// + allow to seach for colored text too
// TODO Try adding a AS_STR_INSERTS as last arg
pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ?
int(par.size()) : cur.pos() + len;
- OutputParams runparams(&cur.buffer()->params().encoding());
+ // OutputParams runparams(&cur.buffer()->params().encoding());
+ OutputParams runparams(encodings.fromLyXName("utf8"));
runparams.nice = true;
- runparams.flavor = OutputParams::LATEX;
- runparams.linelen = 100000; //lyxrc.plaintext_linelen;
+ runparams.flavor = OutputParams::XETEX;
+ runparams.linelen = 10000; //lyxrc.plaintext_linelen;
// No side effect of file copying and image conversion
runparams.dryrun = true;
+ runparams.for_search = true;
LYXERR(Debug::FIND, "Stringifying with cur: "
<< cur << ", from pos: " << cur.pos() << ", end: " << end);
return par.asString(cur.pos(), end,
odocstringstream ods;
otexstream os(ods);
- OutputParams runparams(&buf.params().encoding());
+ //OutputParams runparams(&buf.params().encoding());
+ OutputParams runparams(encodings.fromLyXName("utf8"));
runparams.nice = false;
- runparams.flavor = OutputParams::LATEX;
+ runparams.flavor = OutputParams::XETEX;
runparams.linelen = 8000; //lyxrc.plaintext_linelen;
// No side effect of file copying and image conversion
runparams.dryrun = true;
d = cur.depth();
old_cur = cur;
cur.forwardPos();
- } while (cur && cur.depth() > d && match(cur) > 0);
+ } while (cur && cur.depth() > d && match(cur).match_len > 0);
cur = old_cur;
- if (match(cur) <= 0) return 0;
+ int max_match = match(cur).match_len; /* match valid only if not searching whole words */
+ if (max_match <= 0) return 0;
LYXERR(Debug::FIND, "Ok");
// Compute the match length
- int len = 1;
+ int len = 1;
if (cur.pos() + len > cur.lastpos())
- return 0;
- LYXERR(Debug::FIND, "verifying unmatch with len = " << len);
- while (cur.pos() + len <= cur.lastpos() && match(cur, len) <= 0) {
- ++len;
- LYXERR(Debug::FIND, "verifying unmatch with len = " << len);
- }
- // Length of matched text (different from len param)
- int old_len = match(cur, len);
- if (old_len < 0) old_len = 0;
- int new_len;
- // Greedy behaviour while matching regexps
- bool examining = true;
- while (examining) {
- examining = false;
- // Kornel: The loop is needed, since it looks like
- // incrementing 'cur.pos()' does not always lead to the following
- // char which we could then match.
- for (int count = 1; count < 5; ++count) {
- if (cur.pos() + len + count > cur.lastpos()) {
- break;
- }
- new_len = match(cur, len + count);
- if (new_len > old_len) {
- len += count;
- old_len = new_len;
- examining = true;
- break;
- }
- }
+ return 0;
+ if (match.opt.matchword) {
+ LYXERR(Debug::FIND, "verifying unmatch with len = " << len);
+ while (cur.pos() + len <= cur.lastpos() && match(cur, len).match_len <= 0) {
+ ++len;
+ LYXERR(Debug::FIND, "verifying unmatch with len = " << len);
+ }
+ // Length of matched text (different from len param)
+ int old_match = match(cur, len).match_len;
+ if (old_match < 0)
+ old_match = 0;
+ int new_match;
+ // Greedy behaviour while matching regexps
+ while ((new_match = match(cur, len + 1).match_len) > old_match) {
+ ++len;
+ old_match = new_match;
+ LYXERR(Debug::FIND, "verifying match with len = " << len);
+ }
+ if (old_match == 0)
+ len = 0;
+ }
+ else {
+ int minl = 1;
+ int maxl = cur.lastpos() - cur.pos();
+ // Greedy behaviour while matching regexps
+ while (maxl > minl) {
+ int actual_match = match(cur, len).match_len;
+ if (actual_match >= max_match) {
+ // actual_match > max_match _can_ happen,
+ // if the search area splits
+ // some following word so that the regex
+ // (e.g. 'r.*r\b' matches 'r' from the middle of the
+ // splitted word)
+ // This means, the len value is too big
+ maxl = len;
+ len = (int)((maxl + minl)/2);
+ }
+ else {
+ // (actual_match < max_match)
+ minl = len + 1;
+ len = (int)((maxl + minl)/2);
+ }
+ }
+ old_cur = cur;
+ // Search for real start of matched characters
+ while (len > 1) {
+ int actual_match;
+ do {
+ cur.forwardPos();
+ } while (cur.depth() > old_cur.depth()); /* Skip inner insets */
+ if (cur.depth() < old_cur.depth()) {
+ // Outer inset?
+ LYXERR0("cur.depth() < old_cur.depth(), this should never happen");
+ break;
+ }
+ if (cur.pos() != old_cur.pos()) {
+ // OK, forwarded 1 pos in actual inset
+ actual_match = match(cur, len-1).match_len;
+ if (actual_match == max_match) {
+ // Ha, got it! The shorter selection has the same match length
+ len--;
+ old_cur = cur;
+ }
+ else {
+ // OK, the shorter selection matches less chars, revert to previous value
+ cur = old_cur;
+ break;
+ }
+ }
+ else {
+ LYXERR0("cur.pos() == old_cur.pos(), this should never happen");
+ actual_match = match(cur, len).match_len;
+ if (actual_match == max_match)
+ old_cur = cur;
+ }
+ }
}
return len;
}
return 0;
while (!theApp()->longOperationCancelled() && cur) {
LYXERR(Debug::FIND, "findForwardAdv() cur: " << cur);
- int match_len = match(cur, -1, false);
+ MatchResult mres = match(cur, -1, false);
+ int match_len = mres.match_len;
LYXERR(Debug::FIND, "match_len: " << match_len);
+ if ((mres.pos > 100000) || (mres.match2end > 100000) || (match_len > 100000)) {
+ LYXERR0("BIG LENGTHS: " << mres.pos << ", " << match_len << ", " << mres.match2end);
+ match_len = 0;
+ }
if (match_len > 0) {
+ // Try to find the begin of searched string
+ int increment = mres.pos/2;
+ while (mres.pos > 5 && (increment > 5)) {
+ DocIterator old_cur = cur;
+ for (int i = 0; i < increment && cur; cur.forwardPos(), i++) {
+ }
+ if (! cur || (cur.pit() > old_cur.pit())) {
+ // Are we outside of the paragraph?
+ // This can happen if moving past some UTF8-encoded chars
+ cur = old_cur;
+ increment /= 2;
+ }
+ else {
+ MatchResult mres2 = match(cur, -1, false);
+ if ((mres2.match2end < mres.match2end) ||
+ (mres2.match_len < mres.match_len)) {
+ cur = old_cur;
+ increment /= 2;
+ }
+ else {
+ mres = mres2;
+ increment -= 2;
+ if (increment > mres.pos/2)
+ increment = mres.pos/2;
+ }
+ }
+ }
int match_len_zero_count = 0;
- for (; !theApp()->longOperationCancelled() && cur; cur.forwardPos()) {
+ for (int i = 0; !theApp()->longOperationCancelled() && cur; cur.forwardPos()) {
+ if (i++ > 10) {
+ int remaining_len = match(cur, -1, false).match_len;
+ if (remaining_len <= 0) {
+ // Apparently the searched string is not in the remaining part
+ break;
+ }
+ else {
+ i = 0;
+ }
+ }
LYXERR(Debug::FIND, "Advancing cur: " << cur);
- int match_len2 = match(cur);
+ int match_len3 = match(cur, 1).match_len;
+ if (match_len3 < 0)
+ continue;
+ int match_len2 = match(cur).match_len;
LYXERR(Debug::FIND, "match_len2: " << match_len2);
if (match_len2 > 0) {
// Sometimes in finalize we understand it wasn't a match
LYXERR(Debug::FIND, "findMostBackwards(): cur=" << cur);
DocIterator new_cur = cur;
new_cur.backwardPos();
- if (new_cur == cur || &new_cur.inset() != &inset || !match(new_cur))
+ if (new_cur == cur || &new_cur.inset() != &inset || !match(new_cur).match_len)
break;
int new_len = findAdvFinalize(new_cur, match);
if (new_len == len)
bool pit_changed = false;
do {
cur.pos() = 0;
- bool found_match = match(cur, -1, false);
+ bool found_match = (match(cur, -1, false).match_len > 0);
if (found_match) {
if (pit_changed)
LYXERR(Debug::FIND, "findBackAdv2: cur: " << cur);
DocIterator cur_prev_iter;
do {
- found_match = match(cur);
+ found_match = (match(cur).match_len > 0);
LYXERR(Debug::FIND, "findBackAdv3: found_match="
<< found_match << ", cur: " << cur);
if (found_match)
FindAndReplaceOptions::FindAndReplaceOptions(
- docstring const & find_buf_name, bool casesensitive,
- bool matchword, bool forward, bool expandmacros, bool ignoreformat,
- docstring const & repl_buf_name, bool keep_case,
- SearchScope scope, SearchRestriction restr)
- : find_buf_name(find_buf_name), casesensitive(casesensitive), matchword(matchword),
- forward(forward), expandmacros(expandmacros), ignoreformat(ignoreformat),
- repl_buf_name(repl_buf_name), keep_case(keep_case), scope(scope), restr(restr)
+ docstring const & _find_buf_name, bool _casesensitive,
+ bool _matchword, bool _forward, bool _expandmacros, bool _ignoreformat,
+ docstring const & _repl_buf_name, bool _keep_case,
+ SearchScope _scope, SearchRestriction _restr, bool _replace_all)
+ : find_buf_name(_find_buf_name), casesensitive(_casesensitive), matchword(_matchword),
+ forward(_forward), expandmacros(_expandmacros), ignoreformat(_ignoreformat),
+ repl_buf_name(_repl_buf_name), keep_case(_keep_case), scope(_scope), restr(_restr), replace_all(_replace_all)
{
}
} // namespace
///
-static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, MatchStringAdv & matchAdv)
+static int findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, MatchStringAdv & matchAdv)
{
Cursor & cur = bv->cursor();
if (opt.repl_buf_name == docstring()
|| theBufferList().getBuffer(FileName(to_utf8(opt.repl_buf_name)), true) == 0
|| theBufferList().getBuffer(FileName(to_utf8(opt.find_buf_name)), true) == 0)
- return;
+ return 0;
DocIterator sel_beg = cur.selectionBegin();
DocIterator sel_end = cur.selectionEnd();
if (&sel_beg.inset() != &sel_end.inset()
|| sel_beg.pit() != sel_end.pit()
|| sel_beg.idx() != sel_end.idx())
- return;
+ return 0;
int sel_len = sel_end.pos() - sel_beg.pos();
LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end
<< ", sel_len: " << sel_len << endl);
if (sel_len == 0)
- return;
- LASSERT(sel_len > 0, return);
+ return 0;
+ LASSERT(sel_len > 0, return 0);
- if (!matchAdv(sel_beg, sel_len))
- return;
+ if (!matchAdv(sel_beg, sel_len).match_len)
+ return 0;
// Build a copy of the replace buffer, adapted to the KeepCase option
Buffer & repl_buffer_orig = *theBufferList().getBuffer(FileName(to_utf8(opt.repl_buf_name)), true);
string lyx = oss.str();
Buffer repl_buffer("", false);
repl_buffer.setUnnamed(true);
- LASSERT(repl_buffer.readString(lyx), return);
+ LASSERT(repl_buffer.readString(lyx), return 0);
if (opt.keep_case && sel_len >= 2) {
LYXERR(Debug::FIND, "keep_case true: cur.pos()=" << cur.pos() << ", sel_len=" << sel_len);
if (cur.inTexted()) {
} else if (cur.inMathed()) {
odocstringstream ods;
otexstream os(ods);
- OutputParams runparams(&repl_buffer.params().encoding());
+ // OutputParams runparams(&repl_buffer.params().encoding());
+ OutputParams runparams(encodings.fromLyXName("utf8"));
runparams.nice = false;
- runparams.flavor = OutputParams::LATEX;
+ runparams.flavor = OutputParams::XETEX;
runparams.linelen = 8000; //lyxrc.plaintext_linelen;
runparams.dryrun = true;
TeXOnePar(repl_buffer, repl_buffer.text(), 0, os, runparams);
LYXERR(Debug::FIND, "After pos adj cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len);
bv->putSelectionAt(DocIterator(cur), sel_len, !opt.forward);
bv->processUpdateFlags(Update::Force);
+ return 1;
}
int length = bv->cursor().selectionEnd().pos() - bv->cursor().selectionBegin().pos();
if (length > 0)
bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward);
- findAdvReplace(bv, opt, matchAdv);
+ num_replaced += findAdvReplace(bv, opt, matchAdv);
cur = bv->cursor();
if (opt.forward)
match_len = findForwardAdv(cur, matchAdv);
}
if (match_len == 0) {
- bv->message(_("Match not found!"));
+ if (num_replaced > 0) {
+ switch (num_replaced)
+ {
+ case 1:
+ bv->message(_("One match has been replaced."));
+ break;
+ case 2:
+ bv->message(_("Two matches have been replaced."));
+ break;
+ default:
+ bv->message(bformat(_("%1$d matches have been replaced."), num_replaced));
+ break;
+ }
+ num_replaced = 0;
+ }
+ else {
+ bv->message(_("Match not found."));
+ }
return false;
}
- bv->message(_("Match found!"));
+ if (num_replaced > 0)
+ bv->message(_("Match has been replaced."));
+ else
+ bv->message(_("Match found."));
LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with len: " << match_len);
bv->putSelectionAt(cur, match_len, !opt.forward);
<< opt.forward << ' '
<< opt.expandmacros << ' '
<< opt.ignoreformat << ' '
+ << opt.replace_all << ' '
<< to_utf8(opt.repl_buf_name) << "\nEOSS\n"
<< opt.keep_case << ' '
<< int(opt.scope) << ' '
}
LYXERR(Debug::FIND, "file_buf_name: '" << s << "'");
opt.find_buf_name = from_utf8(s);
- is >> opt.casesensitive >> opt.matchword >> opt.forward >> opt.expandmacros >> opt.ignoreformat;
+ is >> opt.casesensitive >> opt.matchword >> opt.forward >> opt.expandmacros >> opt.ignoreformat >> opt.replace_all;
is.get(); // Waste space before replace string
s = "";
getline(is, line);
projects / lyx.git / blobdiff