anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: make nested CJK parsing slightly less dumb.

Browse Source 
Fixes: #9562
(cherry picked from commit 0f4c902705)
This commit is contained in:
Juergen Spitzmueller 2018-03-10 14:58:55 +01:00
parent 590185d3ef
commit 624a6642e9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tex2lyx/text.cpp
View File

@ -343,6 +343,10 @@ bool minted_float_has_caption = false;
// The caption for non-floating minted listings // The caption for non-floating minted listings
string minted_nonfloat_caption = ""; string minted_nonfloat_caption = "";
// Characters that have to be escaped by \\ in LaTeX
char const * const known_escaped_chars[] = {
"&", "_", "$", "%", "#", "^", "{", "}"};
/// splits "x=z, y=b" into a map and an ordered keyword vector /// splits "x=z, y=b" into a map and an ordered keyword vector
void split_map(string const & s, map<string, string> & res, vector<string> & keys) void split_map(string const & s, map<string, string> & res, vector<string> & keys)
@ -521,9 +525,6 @@ bool skip_braces(Parser & p)
pair<bool, docstring> convert_unicodesymbols(docstring s) pair<bool, docstring> convert_unicodesymbols(docstring s)
{ {
bool res = true; bool res = true;
int const nchars_escape = 8;
static char_type const chars_escape[nchars_escape] = {
'&', '_', '$', '%', '#', '^', '{', '}'};
odocstringstream os; odocstringstream os;
for (size_t i = 0; i < s.size();) { for (size_t i = 0; i < s.size();) {
if (s[i] != '\\') { if (s[i] != '\\') {
@ -546,8 +547,8 @@ pair<bool, docstring> convert_unicodesymbols(docstring s)
i = 0; i = 0;
else { else {
res = false; res = false;
for (int k = 0; k < nchars_escape; k++) for (auto const & c : known_escaped_chars)
if (prefixIs(s, from_ascii("\\") + chars_escape[k])) if (prefixIs(s, from_ascii("\\") + c))
res = true; res = true;
i = 1; i = 1;
} }
@ -1719,10 +1720,10 @@ void parse_environment(Parser & p, ostream & os, bool outer,
// things like comments are completely wrong. // things like comments are completely wrong.
string const s = p.plainEnvironment("CJK"); string const s = p.plainEnvironment("CJK");
for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) { for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
if (*it == '\\') string snip;
output_ert_inset(os, "\\", parent_context); snip += *it;
else if (*it == '$') if (snip == "\\" || is_known(snip, known_escaped_chars))
output_ert_inset(os, "$", parent_context); output_ert_inset(os, snip, parent_context);
else if (*it == '\n' && it + 1 != et && s.begin() + 1 != it) else if (*it == '\n' && it + 1 != et && s.begin() + 1 != it)
os << "\n "; os << "\n ";
else else