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

Do not add symbols twice to Encoding::symbolsList()

Browse Source 
Also sort the list properly.

Fixes #10644
This commit is contained in:
Juergen Spitzmueller 2017-05-01 17:34:25 +02:00
parent 24021a425e
commit 74c10e06aa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Encoding.cpp
View File

@ -264,11 +264,15 @@ vector<char_type> Encoding::symbolsList() const
vector<char_type> symbols;
for (char_type c = 0; c < start_encodable_; ++c)
symbols.push_back(c);
//add all encodable characters
// add all encodable characters
copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
// now the ones from the unicodesymbols file
for (pair<char_type, CharInfo> const & elem : unicodesymbols)
symbols.push_back(elem.first);
// now the ones from the unicodesymbols file that are not already there
for (pair<char_type, CharInfo> const & elem : unicodesymbols) {
if (find(symbols.begin(), symbols.end(), elem.first) == symbols.end())
symbols.push_back(elem.first);
}
// finally, sort the vector
sort(symbols.begin(), symbols.end());
return symbols;
}