X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=3d67128f58069129dc7ed13364339a6e55971729;hb=a8572c1358d5d2e66612e9f44329a6ffd33516a6;hp=4f3b87886cbe6f24d9d1b81f21748feab49b597a;hpb=8415041b1f4d7a2e436e3f407bccd9a7e6bcdd87;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 4f3b87886c..3d67128f58 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -924,11 +924,9 @@ bool LaTeXFeatures::hasOnlyPolyglossiaLanguages() const
 	if (params_.language->polyglossia().empty())
 		return false;
 	// now the secondary languages
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
-		if ((*cit)->polyglossia().empty())
+	for (auto const & lang : UsedLanguages_)
+	{
+		if (lang->polyglossia().empty())
 			return false;
 	}
 	return true;
@@ -941,11 +939,9 @@ bool LaTeXFeatures::hasPolyglossiaExclusiveLanguages() const
 	if (params_.language->isPolyglossiaExclusive())
 		return true;
 	// now the secondary languages
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
-		if ((*cit)->isPolyglossiaExclusive())
+	for (auto const & lang : UsedLanguages_)
+	{
+		if (lang->isPolyglossiaExclusive())
 			return true;
 	}
 	return false;
@@ -959,12 +955,10 @@ vector<string> LaTeXFeatures::getPolyglossiaExclusiveLanguages() const
 	if (params_.language->isPolyglossiaExclusive())
 		result.push_back(params_.language->display());
 	// now the secondary languages
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
-		if ((*cit)->isPolyglossiaExclusive())
-			result.push_back((*cit)->display());
+	for (auto const & lang : UsedLanguages_)
+	{
+		if (lang->isPolyglossiaExclusive())
+			result.push_back(lang->display());
 	}
 	return result;
 }
@@ -977,12 +971,10 @@ vector<string> LaTeXFeatures::getBabelExclusiveLanguages() const
 	if (params_.language->isBabelExclusive())
 		result.push_back(params_.language->display());
 	// now the secondary languages
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
-		if ((*cit)->isBabelExclusive())
-			result.push_back((*cit)->display());
+	for (auto const & lang : UsedLanguages_)
+	{
+		if (lang->isBabelExclusive())
+			result.push_back(lang->display());
 	}
 	return result;
 }
@@ -990,22 +982,19 @@ vector<string> LaTeXFeatures::getBabelExclusiveLanguages() const
 
 string LaTeXFeatures::getBabelLanguages() const
 {
-	ostringstream langs;
-
-	bool first = true;
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
-		if ((*cit)->babel().empty())
-			continue;
-		if (!first)
-			langs << ',';
-		else
-			first = false;
-		langs << (*cit)->babel();
+	vector<string> blangs;
+	for (auto const & lang : UsedLanguages_) {
+		if (!lang->babel().empty())
+			blangs.push_back(lang->babel());
 	}
-	return langs.str();
+
+	// Sort alphabetically to assure consistent order
+	// (the order itself does not matter apart from
+	// some exceptions, e.g. hebrew must come after
+	// arabic and farsi)
+	sort(blangs.begin(), blangs.end());
+
+	return getStringFromVector(blangs);
 }
 
 
@@ -1013,13 +1002,9 @@ set<string> LaTeXFeatures::getPolyglossiaLanguages() const
 {
 	set<string> langs;
 
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end();
-	     ++cit) {
+	for (auto const & lang : UsedLanguages_)
 		// We do not need the variants here
-		langs.insert((*cit)->polyglossia());
-	}
+		langs.insert(lang->polyglossia());
 	return langs;
 }
 
@@ -1030,10 +1015,8 @@ string LaTeXFeatures::getActiveChars() const
 	// first the main language
 	res += params_.language->activeChars();
 	// now the secondary languages
-	LanguageList::const_iterator const begin = UsedLanguages_.begin();
-	for (LanguageList::const_iterator cit = begin;
-	     cit != UsedLanguages_.end(); ++cit)
-		res += ((*cit)->activeChars());
+	for (auto const & lang : UsedLanguages_)
+		res += (lang->activeChars());
 	return res;
 }
 
@@ -1065,7 +1048,8 @@ void LaTeXFeatures::getFontEncodings(vector<string> & encs, bool const onlylangs
 			encs.insert(encs.begin(), "T2A");
 	}
 
-	for (auto const & lang : UsedLanguages_) {
+	for (auto const & lang : UsedLanguages_)
+	{
 		vector<string> extraencs =
 			getVectorFromString(lang->fontenc(buffer().masterParams()));
 		for (auto const & extra : extraencs) {
@@ -1807,7 +1791,7 @@ docstring const LaTeXFeatures::getBabelPresettings() const
 {
 	odocstringstream tmp;
 
-	for (Language const * lang : UsedLanguages_)
+	for (auto const & lang : UsedLanguages_)
 		if (!lang->babel_presettings().empty())
 			tmp << lang->babel_presettings() << '\n';
 	if (!params_.language->babel_presettings().empty())
@@ -1824,7 +1808,7 @@ docstring const LaTeXFeatures::getBabelPostsettings() const
 {
 	odocstringstream tmp;
 
-	for (Language const * lang : UsedLanguages_)
+	for (auto const & lang : UsedLanguages_)
 		if (!lang->babel_postsettings().empty())
 			tmp << lang->babel_postsettings() << '\n';
 	if (!params_.language->babel_postsettings().empty())