Remove overshoot

Author: gzotti

src/core/StelObject.cpp

@@ -1039,6 +1039,7 @@ void StelObject::postProcessInfoString(QString& str, const InfoStringGroup& flag
 
 	if (flags&PlainText)
 	{
+		static const QRegularExpression h2Re("<h2[^>]*>");
 		static const QRegularExpression brRe2("<br(\\s*/)?>\\s*");
 		static const QRegularExpression tdRe1("<td\\s*>");
 		static const QRegularExpression tdRe2("<td \\w+='[^']*'>"); // Seen: style, align, colspan, rowspan. Always only one expression.
@@ -1048,7 +1049,7 @@ void StelObject::postProcessInfoString(QString& str, const InfoStringGroup& flag
 		static const QRegularExpression tableRe4("<table style=\"[^\"]*\">");
 		str.replace("<b>", "");
 		str.replace("</b>", "");
-		str.replace("<h2>", "");
+		str.replace(h2Re, "");
 		str.replace("</h2>", "\n");
 		str.replace(brRe2, "\n");
 		str.replace("<tr>", "");

src/core/StelSkyCultureMgr.cpp

@@ -977,8 +977,6 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 					       const QString &commonNameI18n,
 					       const QString &abbrevI18n) const
 {
-	// rtl tracks the right-to-left status of the text in the current position.
-	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
 	// Each element may be in an RTL language (e.g. Arab). However,
 	// - for most (left-to-right) languages we want a canonical order of left to right elements.
 	// - for Arab and other right-to-left user languages, we set a canonical order of right-to-left elements.
@@ -1016,7 +1014,7 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	// If native contains non-Latin glyphs, pronounce or transliteration is mandatory.
 	QString pronounceStr=(lName.pronounceI18n.isEmpty() ? lName.pronounce : lName.pronounceI18n);
 	QString nativeOrPronounce = (lName.native.isEmpty() ? lName.pronounceI18n : lName.native);
-	QString pronounceOrNative = (lName.pronounceI18n.isEmpty() ? lName.native : lName.pronounceI18n);
+	QString pronounceOrNative = (pronounceStr.isEmpty() ? lName.native : pronounceStr);
 	QString translitOrPronounce = (lName.transliteration.isEmpty() ? pronounceStr : lName.transliteration);
 
 	// If you call this with an actual argument abbrevI18n, you really only want a short label.
@@ -1090,19 +1088,13 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	if (!braced.isEmpty())
 	{
 		QString pronTrans=QString(" %1%3%2").arg(QChar(0x2997), QChar(0x2998), braced.join(", "+ZWS));
-		if (rtl)
-			label.prepend(pronTrans+ZWS);
-		else
 			label.append(pronTrans+ZWS);
 	}
 
 	// Add IPA (where possible)
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::IPA)) && (!lName.IPA.isEmpty()) && (label != lName.IPA))
 	{
 		QString ipa=QString(" [%1]").arg(lName.IPA);
-		if (rtl)
-			label.prepend(ipa+ZWS);
-		else
 			label.append(ipa+ZWS);
 	}
 
@@ -1124,9 +1116,6 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	if (!bracketed.isEmpty())
 	{
 		QString transBy=QString(" (%1)").arg(bracketed.join(", "+ZWS));
-		if (rtl)
-			label.prepend(transBy+ZWS);
-		else
 			label.append(transBy+ZWS);
 	}
 
@@ -1135,9 +1124,6 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::Modern)) && (!commonNameI18n.isEmpty()) && (!label.startsWith(lCommonNameI18n)) && (lCommonNameI18n!=lName.translatedI18n))
 	{
 		QString modern=QString(" %1%3%2").arg(QChar(0x29FC), QChar(0x29FD), lCommonNameI18n);
-		if (rtl)
-			label.prepend(modern+ZWS);
-		else
 			label.append(modern+ZWS);
 	}
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::Modern)) && label.isEmpty()) // if something went wrong?

src/core/modules/MinorPlanet.cpp

@@ -22,6 +22,7 @@
 #include "MinorPlanet.hpp"
 #include "Orbit.hpp"
 #include "StelCore.hpp"
+#include "StelLocaleMgr.hpp"
 #include "StelTranslator.hpp"
 
 #include <QRegularExpression>
@@ -169,10 +170,12 @@ QString MinorPlanet::getNameI18n() const
 QString MinorPlanet::getInfoStringName(const StelCore *core, const InfoStringGroup& flags) const
 {
 	Q_UNUSED(core) Q_UNUSED(flags)
+	// rtl tracks the right-to-left status of the text in the current position.
+	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
 	QString str;
 	QTextStream oss(&str);
 
-	oss << "<h2>";
+	oss << (rtl ? "<h2 dir=\"rtl\">" : "<h2 dir=\"ltr\">");
 	if (nameIsIAUDesignation)
 	{
 		if (minorPlanetNumber)

src/core/modules/Nebula.cpp

@@ -22,6 +22,7 @@
 #include "Nebula.hpp"
 #include "NebulaMgr.hpp"
 #include "Planet.hpp"
+#include "StelLocaleMgr.hpp"
 #include "StelTexture.hpp"
 
 #include "StelUtils.hpp"
@@ -240,12 +241,14 @@ QStringList Nebula::getCultureLabels(StelObject::CulturalDisplayStyle style) con
 
 QString Nebula::getInfoString(const StelCore *core, const InfoStringGroup& flags) const
 {
+	// rtl tracks the right-to-left status of the text in the current position.
+	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
 	QString str;
 	QTextStream oss(&str);
 	bool withDecimalDegree = StelApp::getInstance().getFlagShowDecimalDegrees();
 
 	if ((flags&Name) || (flags&CatalogNumber))
-		oss << "<h2>";
+		oss << (rtl ? "<h2 dir=\"rtl\">" : "<h2 dir=\"ltr\">");
 
 	if (!culturalNames.isEmpty() && flags&Name)
 		oss << getInfoLabel() << "<br/>";

src/core/modules/Planet.cpp

@@ -501,9 +501,10 @@ QString Planet::getScreenLabel() const
 }
 QString Planet::getInfoLabel() const
 {
+	static const QString ZWS{"\u200b"}; // zero-width space (we use them to combine cultural label groups)
 	static StelSkyCultureMgr *scMgr=GETSTELMODULE(StelSkyCultureMgr);
 	QStringList list=getCultureLabels(scMgr->getInfoLabelStyle());
-	return list.isEmpty() ? getNameI18n() : list.join(" - ");
+	return list.isEmpty() ? getNameI18n() : list.join(ZWS + " - " + ZWS);
 }
 
 QStringList Planet::getCultureLabels(StelObject::CulturalDisplayStyle style) const
@@ -532,9 +533,11 @@ QStringList Planet::getCultureLabels(StelObject::CulturalDisplayStyle style) con
 QString Planet::getInfoStringName(const StelCore *core, const InfoStringGroup& flags) const
 {
 	Q_UNUSED(core) Q_UNUSED(flags)
+	// rtl tracks the right-to-left status of the text in the current position.
+	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
 	QString str;
 	QTextStream oss(&str);
-	oss << "<h2 dir=\"ltr\">";
+	oss << (rtl ? "<h2 dir=\"rtl\">" : "<h2 dir=\"ltr\">");
 
 	// NOTE: currently only moons have an IAU designation
 	if (!iauMoonNumber.isEmpty())

src/core/modules/StarMgr.cpp

@@ -2501,9 +2501,10 @@ QString StarMgr::getCulturalScreenLabel(StarId hip)
 //! When dealing with foreign skycultures, many users will want this to be longer, with more name components.
 QString StarMgr::getCulturalInfoLabel(StarId hip)
 {
+	static const QString ZWS{"\u200b"}; // zero-width space (we use them to combine cultural label groups)
 	static StelSkyCultureMgr *scMgr=GETSTELMODULE(StelSkyCultureMgr);
 	QStringList list=getCultureLabels(hip, scMgr->getInfoLabelStyle());
-	return list.isEmpty() ? "" : list.join(" - ");
+	return list.isEmpty() ? "" : list.join(ZWS + " - " + ZWS);
 }
 
 QStringList StarMgr::getCultureLabels(StarId hip, StelObject::CulturalDisplayStyle style)

src/core/modules/StarWrapper.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "StarWrapper.hpp"
+#include "StelLocaleMgr.hpp"
 #include "ZoneArray.hpp"
 
 #include "StelUtils.hpp"
@@ -149,6 +150,8 @@ QString StarWrapper1::getObjectTypeI18n() const
 
 QString StarWrapper1::getInfoString(const StelCore *core, const InfoStringGroup& flags) const
 {
+	// rtl tracks the right-to-left status of the text in the current position.
+	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
 	QString str;
 	QTextStream oss(&str);
 	double az_app, alt_app;
@@ -172,7 +175,7 @@ QString StarWrapper1::getInfoString(const StelCore *core, const InfoStringGroup&
 	const int vMm = StarMgr::getGcvsMM(star_id);
 
 	if ((flags&Name) || (flags&CatalogNumber))
-		oss << "<h2 dir=\"ltr\">";
+		oss << (rtl ? "<h2 dir=\"rtl\">" : "<h2 dir=\"ltr\">");
 
 	const QString commonNameI18 = StarMgr::getCommonNameI18n(star_id);
 	const QString culturalInfoName=StarMgr::getCulturalInfoLabel(star_id);