From fd07a7753c52986b577fd2a09defc202d6a60535 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 17 Dec 2011 21:07:02 +0000 Subject: [PATCH] Backport fix for bug #7941 (Translation of theorem-like environment names fails if language and buffer encoding differ) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40514 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LaTeXFeatures.cpp | 2 +- status.20x | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index d3a3fc2c0b..aaae007564 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -1135,7 +1135,7 @@ docstring const getFloatI18nPreamble(docstring const & type, docstring const s2 = docstring(1, 0xF0001); docstring const translated = (langenc == bufenc) ? name : from_ascii("\\inputencoding{") + texenc + from_ascii("}") - + s1 + langenc + s2 + translated + s1 + bufenc + s2; + + s1 + langenc + s2 + name + s1 + bufenc + s2; odocstringstream os; os << "\\addto\\captions" << language diff --git a/status.20x b/status.20x index ea49385a3a..4472a12e0f 100644 --- a/status.20x +++ b/status.20x @@ -88,6 +88,9 @@ What's new - Do not allow user to over-write a file already open. Attempting to do so crashes LyX (bug 7921). +- Fix problem with translation of theorem environments when language and + buffer encoding differ (bug 7941). + * TEX2LYX -- 2.39.5