anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Joao's patches

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6976 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-05-19 07:22:16 +00:00
parent ff98dcea08
commit c9095d82d5
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tex2lyx/ChangeLog
View File

@ -1,3 +1,6 @@
2003-05-17 Joao Luis M. Assirati <assirati@fma.if.usp.br>
* texparser.C: fix paragraph parsing after comment
2003-04-29 André Pönitz <poenitz@gmx.net> 2003-04-29 André Pönitz <poenitz@gmx.net>

3
src/tex2lyx/math.C
View File

@ -21,7 +21,8 @@ using std::vector;
bool is_math_env(string const & name) bool is_math_env(string const & name)
{ {
static char const * known_math_envs[] = { "equation", "equation*", static char const * known_math_envs[] = { "equation", "equation*",
"eqnarray", "eqnarray*", "align", "align*", 0}; "eqnarray", "eqnarray*", "align", "align*", "gather", "gather*",
"multline", "multline*", 0};
for (char const ** what = known_math_envs; *what; ++what) for (char const ** what = known_math_envs; *what; ++what)
if (*what == name) if (*what == name)

15
src/tex2lyx/texparser.C
View File

@ -218,7 +218,7 @@ string Parser::getArg(char left, char right)
string Parser::getOpt() string Parser::getOpt()
{ {
string res = getArg('[', ']'); string const res = getArg('[', ']');
return res.size() ? '[' + res + ']' : string(); return res.size() ? '[' + res + ']' : string();
} }
@ -252,14 +252,21 @@ void Parser::tokenize(istream & is)
break; break;
} }
/*
case catComment: { case catComment: {
push_back(Token(c, catComment));
while (is.get(c) && catcode(c) != catNewline) while (is.get(c) && catcode(c) != catNewline)
; push_back(Token(c, catLetter));
push_back(Token(c, catNewline));
++lineno_; ++lineno_;
is.get(c);
if (catcode(c) == catNewline) {
push_back(Token("par"));
++lineno_;
} else {
is.putback(c);
}
break; break;
} }
*/
case catEscape: { case catEscape: {
is.get(c); is.get(c);

9
src/tex2lyx/text.C
View File

@ -113,8 +113,10 @@ void handle_par(ostream & os)
return; return;
os << "\n\\layout "; os << "\n\\layout ";
string s = active_environment(); string s = active_environment();
if (s == "document" || s == "table" || s == "center") if (s == "document" || s == "table")
os << "Standard\n\n"; os << "Standard\n\n";
else if (s == "center")
os << "Standard\n\n\\align center\n";
else if (s == "lyxcode") else if (s == "lyxcode")
os << "LyX-Code\n\n"; os << "LyX-Code\n\n";
else if (s == "lyxlist") else if (s == "lyxlist")
@ -285,10 +287,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer)
parse_text(p, os, FLAG_END, outer); parse_text(p, os, FLAG_END, outer);
end_inset(os); end_inset(os);
} else if (name == "center") { } else if (name == "center") {
active_environments.pop_back(); handle_par(os);
handle_par(os);
active_environments.push_back(name);
os << "\\align center\n";
parse_text(p, os, FLAG_END, outer); parse_text(p, os, FLAG_END, outer);
} else if (name == "enumerate" || name == "itemize" } else if (name == "enumerate" || name == "itemize"
|| name == "lyxlist") { || name == "lyxlist") {