Avoid 11 from_ascii calls

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25282 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-06-16 18:52:54 +00:00
parent 6a56be232d
commit aace605564

View File

@ -73,7 +73,7 @@ using cap::cutSelection;
using cap::replaceSelection; using cap::replaceSelection;
using cap::selClearOrDel; using cap::selClearOrDel;
char const * text_commands[] = string const text_commands[] =
{ "text", "textrm", "textsf", "texttt", "textmd", "textbf", "textup", "textit", { "text", "textrm", "textsf", "texttt", "textmd", "textbf", "textup", "textit",
"textsl", "textsc", "textnormal" }; "textsl", "textsc", "textnormal" };
int const num_text_commands = sizeof(text_commands) / sizeof(*text_commands); int const num_text_commands = sizeof(text_commands) / sizeof(*text_commands);
@ -342,14 +342,14 @@ MathData InsetMathNest::glue() const
void InsetMathNest::write(WriteStream & os) const void InsetMathNest::write(WriteStream & os) const
{ {
bool textmode = os.textMode(); bool textmode = os.textMode();
docstring const latex_name = name().c_str(); string const latex_name = to_ascii(name());
for (int i = 0; i < num_text_commands; ++i) { for (int i = 0; i < num_text_commands; ++i) {
if (latex_name == from_ascii(text_commands[i])) { if (latex_name == text_commands[i]) {
os.textMode(true); os.textMode(true);
break; break;
} }
} }
os << '\\' << latex_name; os << '\\' << latex_name.c_str();
for (size_t i = 0; i < nargs(); ++i) for (size_t i = 0; i < nargs(); ++i)
os << '{' << cell(i) << '}'; os << '{' << cell(i) << '}';
if (nargs() == 0) if (nargs() == 0)