[LyX/master] Revert "Fix indentation"

commit 0ebd31d2411de8efc2a02a7093f29ca99ca2ded2
Author: Juergen Spitzmueller <[email protected]>
Date:   Sat May 2 13:54:37 2026 +0200

    Revert "Fix indentation"
    
    This reverts commit 099be6375cebce03af3f5878c5cfe8436f49dcf5.
    
    A better solution follows
---
 src/LaTeXFeatures.cpp | 169 +++++++++++++++++++++++++-------------------------
 1 file changed, 84 insertions(+), 85 deletions(-)

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index adc90775b1..8914b9fd2b 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -2653,40 +2653,40 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 		docstring const cnt = (tclass[*cit].latextype == LATEX_ITEM_ENVIRONMENT)
 				? tclass[*cit].counter + from_ascii("i")
 				: tclass[*cit].counter;
+						         tclass[*cit].needCrossrefDefs(),
+							 tclass[*cit].latexname(),
+							 tclass[*cit].isEnvironment()),
+						buffer().language(),
+						buffer().params().encoding(),
+						use_polyglossia, false));
 		snippets.insert(prepareI18nPreamble(getXRefDefs(tclass[*cit].refprefix, cnt,
-								tclass[*cit].needCrossrefDefs(),
-								tclass[*cit].latexname(),
-								tclass[*cit].isEnvironment()),
-						    buffer().language(),
-						    buffer().params().encoding(),
-						    use_polyglossia, false));
 		docstring xxref = getXRefI18nDefs(tclass[*cit].refprefix, cnt,
 						  !buffer().language()->supportedBy(xref_package));
 		if (!xxref.empty()) {
 			if (xref_package == "zref" && !buffer().language()->supportedBy(xref_package))
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
+						     buffer().language(),
+						     buffer().params().encoding(),
+						     use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			snippets.insert(prepareI18nPreamble(xxref,
-							    buffer().language(),
-							    buffer().params().encoding(),
-							    use_polyglossia, false));
 		}
 		docstring thmxref = getThmI18nDefs(tclass[*cit],
 						   !buffer().language()->supportedBy(xref_package));
 		if (!thmxref.empty()) {
 			if (xref_package == "zref" && !buffer().language()->supportedBy(xref_package))
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
+						     buffer().language(),
+						     buffer().params().encoding(),
+						     use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			snippets.insert(prepareI18nPreamble(thmxref,
-							    buffer().language(),
-							    buffer().params().encoding(),
-							    use_polyglossia, false));
 		}
 		// commands for language changing (for multilanguage documents)
 		if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
@@ -2696,51 +2696,51 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 						buffer().params().encoding(),
 						use_polyglossia, false));
 			if (!thmxref.empty() && xref_package != "zref")
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							"\\addto\\captions$$lang{" + rtrim(thmxref, "\n") + "}\n",
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			if (!xxref.empty() && xref_package != "zref")
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							"\\addto\\captions$$lang{" + rtrim(xxref, "\n") + "}\n",
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			for (lang_it lit = lbeg; lit != lend; ++lit) {
 				thmxref = getThmI18nDefs(tclass[*cit],
 							 !(*lit)->supportedBy(xref_package));
 				if (!thmxref.empty()) {
 					if (xref_package == "zref" && !(*lit)->supportedBy(xref_package))
+									     *lit,
+									     buffer().params().encoding(),
+									     use_polyglossia, false));
+									     thmxref
+									   : "\\addto\\captions$$lang{" + rtrim(thmxref, "\n") + "}\n",
+								     *lit,
+								     buffer().params().encoding(),
+								     use_polyglossia, false));
 						snippets.insert(prepareI18nPreamble(
 									from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 					snippets.insert(prepareI18nPreamble(
 								xref_package == "zref" ?
-									thmxref
-								      : "\\addto\\captions$$lang{" + rtrim(thmxref, "\n") + "}\n",
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 				}
 				xxref = getXRefI18nDefs(tclass[*cit].refprefix, cnt,
 							!(*lit)->supportedBy(xref_package));
 				if (!xxref.empty()) {
 					if (xref_package == "zref" && !(*lit)->supportedBy(xref_package))
+									     *lit,
+									     buffer().params().encoding(),
+									     use_polyglossia, false));
+								xxref
+							      : "\\addto\\captions$$lang{" + rtrim(xxref, "\n") + "}\n",
+							*lit,
+							buffer().params().encoding(),
+							use_polyglossia, false));
 						snippets.insert(prepareI18nPreamble(
 									from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 					snippets.insert(prepareI18nPreamble(
 								xref_package == "zref" ?
-									xxref
-								      : "\\addto\\captions$$lang{" + rtrim(xxref, "\n") + "}\n",
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 				}
 				snippets.insert(prepareI18nPreamble(
 						tclass[*cit].babelpreamble(),
@@ -2763,21 +2763,21 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 			getXRefI18nDefs(from_ascii(fl.refPrefix()), from_ascii(fl.floattype()),
 					!buffer().language()->supportedBy(xref_package));
 		if (!float_defs.empty())
+					buffer().language(),
+					buffer().params().encoding(),
+					use_polyglossia, false));
 			snippets.insert(prepareI18nPreamble(float_defs,
-							    buffer().language(),
-							    buffer().params().encoding(),
-							    use_polyglossia, false));
 		if (!floats_l7n_defs.empty() && floats_l7n_defs != float_defs) {
 			if (xref_package == "zref" && !buffer().language()->supportedBy(xref_package))
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
+					buffer().language(),
+					buffer().params().encoding(),
+					use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			snippets.insert(prepareI18nPreamble(floats_l7n_defs,
-							    buffer().language(),
-							    buffer().params().encoding(),
-							    use_polyglossia, false));
 		}
 		if (!UsedLanguages_.empty() && (use_babel || use_polyglossia)) {
 			docstring const type = from_ascii(fl.floattype());
@@ -2786,11 +2786,10 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 			// only request translation if we have a real translation
 			// (that differs from the source)
 			if (flname != name)
-				snippets.insert(getFloatI18nPreamble(type,
-								     name,
-								     buffer().language(),
-								     buffer().params().encoding(),
-								     use_polyglossia));
+				snippets.insert(getFloatI18nPreamble(
+						type, name, buffer().language(),
+						buffer().params().encoding(),
+						use_polyglossia));
 			for (lang_it lit = lbeg; lit != lend; ++lit) {
 				string const code = (*lit)->code();
 				name = (*lit)->translateLayout(fl.name());
@@ -2810,18 +2809,18 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 								   !(*lit)->supportedBy(xref_package));
 				if (!floats_l7n_defs.empty()) {
 					if (xref_package == "zref" && !(*lit)->supportedBy(xref_package))
+									     *lit,
+									     buffer().params().encoding(),
+									     use_polyglossia, false));
+									     floats_l7n_defs
+									   : "\\addto\\captions$$lang{" + rtrim(floats_l7n_defs, "\n") + "}\n",
+								     *lit,
+								     buffer().params().encoding(),
+								     use_polyglossia, false));
 						snippets.insert(prepareI18nPreamble(
 									from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 					snippets.insert(prepareI18nPreamble(
 								xref_package == "zref" ?
-									floats_l7n_defs
-								      : "\\addto\\captions$$lang{" + rtrim(floats_l7n_defs, "\n") + "}\n",
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 				}
 			}
 		}
@@ -2845,30 +2844,30 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 		  			buffer().params().encoding().package() != Encoding::japanese &&
 					it->second.fixedwidthpreambleencoding();
 		// language dependent commands (once per document)
+						buffer().language(),
+						buffer().params().encoding(),
+						use_polyglossia, need_fixedwidth));
+							 it->second.needCrossrefDefs(),
+							 it->second.latexname(),
+							 it->second.latextype() == InsetLaTeXType::ENVIRONMENT),
+						buffer().language(),
+						buffer().params().encoding(),
+						use_polyglossia, false));
 		snippets.insert(prepareI18nPreamble(it->second.langpreamble(),
-						    buffer().language(),
-						    buffer().params().encoding(),
-						    use_polyglossia, need_fixedwidth));
 		snippets.insert(prepareI18nPreamble(getXRefDefs(it->second.refprefix(), it->second.counter(),
-								it->second.needCrossrefDefs(),
-								it->second.latexname(),
-								it->second.latextype() == InsetLaTeXType::ENVIRONMENT),
-						    buffer().language(),
-						    buffer().params().encoding(),
-						    use_polyglossia, false));
 		docstring xxref = getXRefI18nDefs(it->second.refprefix(), it->second.counter(),
 						   !buffer().language()->supportedBy(xref_package));
 		if (!xxref.empty()) {
 			if (xref_package == "zref" && !buffer().language()->supportedBy(xref_package))
+							     buffer().language(),
+							     buffer().params().encoding(),
+							     use_polyglossia, false));
+						     buffer().language(),
+						     buffer().params().encoding(),
+						     use_polyglossia, false));
 				snippets.insert(prepareI18nPreamble(
 							from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-							buffer().language(),
-							buffer().params().encoding(),
-							use_polyglossia, false));
 			snippets.insert(prepareI18nPreamble(xxref,
-							    buffer().language(),
-							    buffer().params().encoding(),
-							    use_polyglossia, false));
 		}
 		// commands for language changing (for multilanguage documents)
 		if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
@@ -2887,18 +2886,18 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 							!(*lit)->supportedBy(xref_package));
 				if (!xxref.empty()) {
 					if (xref_package == "zref" && !(*lit)->supportedBy(xref_package))
+									     *lit,
+									     buffer().params().encoding(),
+									     use_polyglossia, false));
+									     xxref
+									   : "\\addto\\captions$$lang{" + rtrim(xxref, "\n") + "}\n",
+							*lit,
+							buffer().params().encoding(),
+							use_polyglossia, false));
 						snippets.insert(prepareI18nPreamble(
 									from_ascii("\\zcDeclareLanguage{$$lang}\n"),
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 					snippets.insert(prepareI18nPreamble(
 								xref_package == "zref" ?
-									xxref
-								      : "\\addto\\captions$$lang{" + rtrim(xxref, "\n") + "}\n",
-									*lit,
-									buffer().params().encoding(),
-									use_polyglossia, false));
 				}
 			}
 		}
-- 
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs