From dbc9b2ad5bbd37417cdc83c332ae3b6eeeb93e2b Mon Sep 17 00:00:00 2001 From: ArthurSonzogni Date: Wed, 24 Jun 2020 01:13:21 +0200 Subject: [PATCH] Math. Fix the translted greek letters. This is related to issue: https://github.com/ArthurSonzogni/Diagon/issues/6 --- src/translator/math/Math.cpp | 30 ++++++++++++++- test/Math/variable/input | 51 ++++++++++++++++++++++++++ test/Math/variable/output | 51 ++++++++++++++++++++++++++ test/Math_style=ASCII/variable/input | 51 ++++++++++++++++++++++++++ test/Math_style=ASCII/variable/output | 51 ++++++++++++++++++++++++++ test/Math_style=Latex/variable/input | 51 ++++++++++++++++++++++++++ test/Math_style=Latex/variable/output | 53 ++++++++++++++++++++++++++- 7 files changed, 336 insertions(+), 2 deletions(-) diff --git a/src/translator/math/Math.cpp b/src/translator/math/Math.cpp index 1692d76..796663c 100644 --- a/src/translator/math/Math.cpp +++ b/src/translator/math/Math.cpp @@ -916,7 +916,35 @@ std::string Math::Translate(const std::string& input, style.integral_min_height = 2; } - if (options["transform_math_letters"] != "false") { + if (options["style"] == "Latex") { + style.variable_transform = { + {L"Alpha", L"\\Alpha"}, {L"alpha", L"\\alpha"}, + {L"Digamma", L"\\Digamma"}, {L"digamma", L"\\digamma"}, + {L"Kappa", L"\\Kappa"}, {L"kappa", L"\\kappa"}, + {L"Omicron", L"\\Omicron"}, {L"omicron", L"\\omicron"}, + {L"Upsilon", L"\\Upsilon"}, {L"upsilon", L"\\upsilon"}, + {L"Beta", L"\\Beta"}, {L"beta", L"\\beta"}, + {L"Zeta", L"\\Zeta"}, {L"zeta", L"\\zeta"}, + {L"Lambda", L"\\Lambda"}, {L"lambda", L"\\lambda"}, + {L"Pi", L"\\Pi"}, {L"pi", L"\\pi"}, + {L"Phi", L"\\Phi"}, {L"phi", L"\\phi"}, + {L"Gamma", L"\\Gamma"}, {L"gamma", L"\\gamma"}, + {L"Eta", L"\\Eta"}, {L"eta", L"\\eta"}, + {L"Mu", L"\\Mu"}, {L"mu", L"\\mu"}, + {L"Rho", L"\\Rho"}, {L"rho", L"\\rho"}, + {L"Chi", L"\\Chi"}, {L"chi", L"\\chi"}, + {L"Delta", L"\\Delta"}, {L"delta", L"\\delta"}, + {L"Theta", L"\\Theta"}, {L"theta", L"\\theta"}, + {L"Nu", L"\\Nu"}, {L"nu", L"\\nu"}, + {L"Sigma", L"\\Sigma"}, {L"sigma", L"\\sigma"}, + {L"Psi", L"\\Psi"}, {L"psi", L"\\psi"}, + {L"Epsilon", L"\\Epsilon"}, {L"epsilon", L"\\epsilon"}, + {L"Iota", L"\\Iota"}, {L"iota", L"\\iota"}, + {L"Xi", L"\\Xi"}, {L"xi", L"\\xi"}, + {L"Tau", L"\\Tau"}, {L"tau", L"\\tau"}, + {L"Omega", L"\\Omega"}, {L"omega", L"\\omega"}, + }; + } else if (options["transform_math_letters"] != "false") { style.variable_transform = { {L"Alpha", L"Α"}, {L"alpha", L"α"}, {L"Digamma", L"Ϝ"}, {L"digamma", L"ϝ"}, {L"Kappa", L"Κ"}, {L"kappa", L"ϰ"}, diff --git a/test/Math/variable/input b/test/Math/variable/input index 00de0e2..b70b2e7 100644 --- a/test/Math/variable/input +++ b/test/Math/variable/input @@ -7,3 +7,54 @@ a123456789°à@çè|#~#& 2_2m 2é8fsdmoiuuç + +Alpha +alpha +Digamma +digamma +Kappa +kappa +Omicron +omicron +Upsilon +upsilon +Beta +beta +Zeta +zeta +Lambda +lambda +Pi +pi +Phi +phi +Gamma +gamma +Eta +eta +Mu +mu +Rho +rho +Chi +chi +Delta +delta +Theta +theta +Nu +nu +Sigma +sigma +Psi +psi +Epsilon +epsilon +Iota +iota +Xi +xi +Tau +tau +Omega +omega diff --git a/test/Math/variable/output b/test/Math/variable/output index 86d7443..07da7bb 100644 --- a/test/Math/variable/output +++ b/test/Math/variable/output @@ -8,3 +8,54 @@ a123456789°à@çè|#~#& 2m 2é8fsdmoiuuç + +Α +α +Ϝ +ϝ +Κ +ϰ +Ο +ο +Υ +υ +Β +β +Ζ +ζ +Λ +λ +Π +π +ϕ +φ +Γ +γ +Η +η +Μ +μ +ρ +ϱ +Χ +χ +Δ +δ +θ +ϑ +Ν +ν +σ +ς +Ψ +ψ +ϵ +ε +Ι +ι +Ξ +ξ +Τ +τ +Ω +ω diff --git a/test/Math_style=ASCII/variable/input b/test/Math_style=ASCII/variable/input index 00de0e2..b70b2e7 100644 --- a/test/Math_style=ASCII/variable/input +++ b/test/Math_style=ASCII/variable/input @@ -7,3 +7,54 @@ a123456789°à@çè|#~#& 2_2m 2é8fsdmoiuuç + +Alpha +alpha +Digamma +digamma +Kappa +kappa +Omicron +omicron +Upsilon +upsilon +Beta +beta +Zeta +zeta +Lambda +lambda +Pi +pi +Phi +phi +Gamma +gamma +Eta +eta +Mu +mu +Rho +rho +Chi +chi +Delta +delta +Theta +theta +Nu +nu +Sigma +sigma +Psi +psi +Epsilon +epsilon +Iota +iota +Xi +xi +Tau +tau +Omega +omega diff --git a/test/Math_style=ASCII/variable/output b/test/Math_style=ASCII/variable/output index 86d7443..07da7bb 100644 --- a/test/Math_style=ASCII/variable/output +++ b/test/Math_style=ASCII/variable/output @@ -8,3 +8,54 @@ a123456789°à@çè|#~#& 2m 2é8fsdmoiuuç + +Α +α +Ϝ +ϝ +Κ +ϰ +Ο +ο +Υ +υ +Β +β +Ζ +ζ +Λ +λ +Π +π +ϕ +φ +Γ +γ +Η +η +Μ +μ +ρ +ϱ +Χ +χ +Δ +δ +θ +ϑ +Ν +ν +σ +ς +Ψ +ψ +ϵ +ε +Ι +ι +Ξ +ξ +Τ +τ +Ω +ω diff --git a/test/Math_style=Latex/variable/input b/test/Math_style=Latex/variable/input index 00de0e2..b70b2e7 100644 --- a/test/Math_style=Latex/variable/input +++ b/test/Math_style=Latex/variable/input @@ -7,3 +7,54 @@ a123456789°à@çè|#~#& 2_2m 2é8fsdmoiuuç + +Alpha +alpha +Digamma +digamma +Kappa +kappa +Omicron +omicron +Upsilon +upsilon +Beta +beta +Zeta +zeta +Lambda +lambda +Pi +pi +Phi +phi +Gamma +gamma +Eta +eta +Mu +mu +Rho +rho +Chi +chi +Delta +delta +Theta +theta +Nu +nu +Sigma +sigma +Psi +psi +Epsilon +epsilon +Iota +iota +Xi +xi +Tau +tau +Omega +omega diff --git a/test/Math_style=Latex/variable/output b/test/Math_style=Latex/variable/output index 120bbd3..4475fcd 100644 --- a/test/Math_style=Latex/variable/output +++ b/test/Math_style=Latex/variable/output @@ -6,4 +6,55 @@ a123456789°à@çè|#~#& \\ \\ 2_2m \\ \\ -2é8fsdmoiuuç +2é8fsdmoiuuç \\ +\\ +\Alpha \\ +\alpha \\ +\Digamma \\ +\digamma \\ +\Kappa \\ +\kappa \\ +\Omicron \\ +\omicron \\ +\Upsilon \\ +\upsilon \\ +\Beta \\ +\beta \\ +\Zeta \\ +\zeta \\ +\Lambda \\ +\lambda \\ +\Pi \\ +\pi \\ +\Phi \\ +\phi \\ +\Gamma \\ +\gamma \\ +\Eta \\ +\eta \\ +\Mu \\ +\mu \\ +\Rho \\ +\rho \\ +\Chi \\ +\chi \\ +\Delta \\ +\delta \\ +\Theta \\ +\theta \\ +\Nu \\ +\nu \\ +\Sigma \\ +\sigma \\ +\Psi \\ +\psi \\ +\Epsilon \\ +\epsilon \\ +\Iota \\ +\iota \\ +\Xi \\ +\xi \\ +\Tau \\ +\tau \\ +\Omega \\ +\omega