commit c8d1d0d33c0c899f17eca14c52a26e781cdc0204
Author: Guillaume Munch <[email protected]>
Date: Sat Dec 3 23:35:15 2016 +0100
GuiSymbols: put ASCII chars first
Having À before A was weird. This only affects GuiSymbols.
---
src/Encoding.cpp | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index acb91f6..e0b3b70 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -259,16 +259,15 @@ vector<char_type> Encoding::symbolsList() const
// assure the used encoding is properly initialized
init();
- // first all encodable characters
- vector<char_type> symbols(encodable_.begin(), encodable_.end());
- // add those below start_encodable_
+ // first all those below start_encodable_
+ vector<char_type> symbols;
for (char_type c = 0; c < start_encodable_; ++c)
symbols.push_back(c);
+ //add all encodable characters
+ copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
// now the ones from the unicodesymbols file
- CharInfoMap::const_iterator const end = unicodesymbols.end();
- CharInfoMap::const_iterator it = unicodesymbols.begin();
- for (; it != end; ++it)
- symbols.push_back(it->first);
+ for (pair<char_type, CharInfo> const & elem : unicodesymbols)
+ symbols.push_back(elem.first);
return symbols;
}