anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backport r31439 (second part of #6142)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31464 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-09-25 12:43:09 +00:00
parent 49ed00e105
commit 7911dd2269
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/encodings
View File

@ -95,6 +95,7 @@ End
Encoding cp1251 cp1251 "Cyrillic (CP 1251)" CP1251 fixed inputenc Encoding cp1251 cp1251 "Cyrillic (CP 1251)" CP1251 fixed inputenc
End End
# "ansinew" is harcoded as a synonym of this (see Encodings::fromLaTeXName)
Encoding cp1252 cp1252 "Western European (CP 1252)" CP1252 fixed inputenc Encoding cp1252 cp1252 "Western European (CP 1252)" CP1252 fixed inputenc
End End

8
src/Encoding.cpp
View File

@ -696,8 +696,14 @@ Encoding const * Encodings::fromLyXName(string const & name) const
} }
Encoding const * Encodings::fromLaTeXName(string const & name) const Encoding const * Encodings::fromLaTeXName(string const & n) const
{ {
string name = n;
// FIXME: if we have to test for too many of these synonyms,
// we should instead extend the format of lib/encodings
if (n == "ansinew")
name = "cp1252";
// We don't use find_if because it makes copies of the pairs in // We don't use find_if because it makes copies of the pairs in
// the map. // the map.
// This linear search is OK since we don't have many encodings. // This linear search is OK since we don't have many encodings.

3
status.16x
View File

@ -80,6 +80,9 @@ What's new
- Fix a tex2lyx crash when importing a LaTeX file using an unknown encoding - Fix a tex2lyx crash when importing a LaTeX file using an unknown encoding
(bug 6142) (bug 6142)
- add encoding "ansinew" as a synonym of "cp1252" for the benefit of
tex2lyx (bug 6142)
- Fix support for polytonic Greek with multiple diacritics (bug 5976). - Fix support for polytonic Greek with multiple diacritics (bug 5976).
- Do not unnecessarily enquote brackets in the LaTeX output (bug 5988). - Do not unnecessarily enquote brackets in the LaTeX output (bug 5988).