From: Enrico Forestieri Date: Thu, 19 Jun 2008 09:17:57 +0000 (+0000) Subject: Trust Andre' X-Git-Tag: 1.6.10~4334 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ab9a074f20f1b4b7d16115f86fcf58525f423ea6;p=features.git Trust Andre' git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25319 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 85d0be52b8..d567548787 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -337,7 +337,7 @@ MathData InsetMathNest::glue() const void InsetMathNest::write(WriteStream & os) const { ModeSpecifier specifier(os, currentMode()); - docstring const latex_name = name().c_str(); + docstring const latex_name = name(); os << '\\' << latex_name; for (size_t i = 0; i < nargs(); ++i) os << '{' << cell(i) << '}'; @@ -352,7 +352,7 @@ void InsetMathNest::write(WriteStream & os) const void InsetMathNest::normalize(NormalStream & os) const { - os << '[' << name().c_str(); + os << '[' << name(); for (size_t i = 0; i < nargs(); ++i) os << ' ' << cell(i); os << ']'; diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp index e889deb226..11b9ae90c6 100644 --- a/src/mathed/MathMacroTemplate.cpp +++ b/src/mathed/MathMacroTemplate.cpp @@ -1141,7 +1141,7 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons else os << "\\newcommandx"; - os << "\\" << name().c_str() + os << "\\" << name() << "[" << numargs_ << "]" << "[usedefault, addprefix=\\global"; for (int i = 0; i < optionals_; ++i) { @@ -1158,7 +1158,7 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons } else { // macros without optionals use standard _global_ \def macros: // \global\def\foo#1#2{#1,#2} - os << "\\global\\def\\" << name().c_str(); + os << "\\global\\def\\" << name(); docstring param = from_ascii("#0"); for (int i = 1; i <= numargs_; ++i) { param[1] = '0' + i; @@ -1173,7 +1173,7 @@ void MathMacroTemplate::write(WriteStream & os, bool overwriteRedefinition) cons os << "\\renewcommand"; else os << "\\newcommand"; - os << "{\\" << name().c_str() << '}'; + os << "{\\" << name() << '}'; if (numargs_ > 0) os << '[' << numargs_ << ']';