From f8e6ee64ef2aa6c2137280e374802665891e54ea Mon Sep 17 00:00:00 2001 From: Mino1289 Date: Mon, 1 Nov 2021 17:50:56 +0100 Subject: [PATCH] [apps/reader] Changement de nom de certaines lettres grecs, comme LaTeX --- apps/reader/tex_parser.cpp | 32 ++++++++++++++++---------------- apps/reader/tex_parser.h | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/reader/tex_parser.cpp b/apps/reader/tex_parser.cpp index ee4f3b3af..ac4e27d2b 100644 --- a/apps/reader/tex_parser.cpp +++ b/apps/reader/tex_parser.cpp @@ -326,10 +326,10 @@ Layout TexParser::popCommand() { return popNuCommand(); } } - else if (strncmp(k_KsiCommand, m_text, strlen(k_KsiCommand)) == 0) { - m_text += strlen(k_KsiCommand); + else if (strncmp(k_XiCommand, m_text, strlen(k_XiCommand)) == 0) { + m_text += strlen(k_XiCommand); if (*m_text == ' ' || *m_text == '\\' || *m_text == '$') { - return popKsiCommand(); + return popXiCommand(); } } else if (strncmp(k_PiCommand, m_text, strlen(k_PiCommand)) == 0) { @@ -374,10 +374,10 @@ Layout TexParser::popCommand() { return popPhiCommand(); } } - else if (strncmp(k_KhiCommand, m_text, strlen(k_KhiCommand)) == 0) { - m_text += strlen(k_KhiCommand); + else if (strncmp(k_ChiCommand, m_text, strlen(k_ChiCommand)) == 0) { + m_text += strlen(k_ChiCommand); if (*m_text == ' ' || *m_text == '\\' || *m_text == '$') { - return popKhiCommand(); + return popChiCommand(); } } else if (strncmp(k_PsiCommand, m_text, strlen(k_PsiCommand)) == 0) { @@ -470,10 +470,10 @@ Layout TexParser::popCommand() { return popnuCommand(); } } - else if (strncmp(k_ksiCommand, m_text, strlen(k_ksiCommand)) == 0) { - m_text += strlen(k_ksiCommand); + else if (strncmp(k_xiCommand, m_text, strlen(k_xiCommand)) == 0) { + m_text += strlen(k_xiCommand); if (*m_text == ' ' || *m_text == '\\' || *m_text == '$') { - return popksiCommand(); + return popxiCommand(); } } else if (strncmp(k_piCommand, m_text, strlen(k_piCommand)) == 0) { @@ -512,10 +512,10 @@ Layout TexParser::popCommand() { return popphiCommand(); } } - else if (strncmp(k_khiCommand, m_text, strlen(k_khiCommand)) == 0) { - m_text += strlen(k_khiCommand); + else if (strncmp(k_chiCommand, m_text, strlen(k_chiCommand)) == 0) { + m_text += strlen(k_chiCommand); if (*m_text == ' ' || *m_text == '\\' || *m_text == '$') { - return popkhiCommand(); + return popchiCommand(); } } else if (strncmp(k_psiCommand, m_text, strlen(k_psiCommand)) == 0) { @@ -700,7 +700,7 @@ Layout TexParser::popNuCommand(){ return CodePointLayout::Builder(CodePoint(0x39d)); } -Layout TexParser::popKsiCommand() { +Layout TexParser::popXiCommand() { return CodePointLayout::Builder(CodePoint(0x39e)); } @@ -732,7 +732,7 @@ Layout TexParser::popPhiCommand(){ return CodePointLayout::Builder(CodePoint(0x3a6)); } -Layout TexParser::popKhiCommand(){ +Layout TexParser::popChiCommand(){ return CodePointLayout::Builder(CodePoint(0x3a7)); } @@ -797,7 +797,7 @@ Layout TexParser::popnuCommand(){ return CodePointLayout::Builder(CodePoint(0x3bd)); } -Layout TexParser::popksiCommand(){ +Layout TexParser::popxiCommand(){ return CodePointLayout::Builder(CodePoint(0x3be)); } @@ -825,7 +825,7 @@ Layout TexParser::popphiCommand(){ return CodePointLayout::Builder(CodePoint(0x3c6)); } -Layout TexParser::popkhiCommand(){ +Layout TexParser::popchiCommand(){ return CodePointLayout::Builder(CodePoint(0x3c7)); } diff --git a/apps/reader/tex_parser.h b/apps/reader/tex_parser.h index be718a848..48fbe43ed 100644 --- a/apps/reader/tex_parser.h +++ b/apps/reader/tex_parser.h @@ -64,7 +64,7 @@ private: Layout popLambdaCommand(); Layout popMuCommand(); Layout popNuCommand(); - Layout popKsiCommand(); + Layout popXiCommand(); Layout popOmicronCommand(); Layout popPiCommand(); Layout popRhoCommand(); @@ -72,7 +72,7 @@ private: Layout popTauCommand(); Layout popUpsilonCommand(); Layout popPhiCommand(); - Layout popKhiCommand(); + Layout popChiCommand(); Layout popPsiCommand(); Layout popOmegaCommand(); @@ -90,14 +90,14 @@ private: Layout poplambdaCommand(); Layout popmuCommand(); Layout popnuCommand(); - Layout popksiCommand(); + Layout popxiCommand(); Layout poppiCommand(); Layout poprhoCommand(); Layout popsigmaCommand(); Layout poptauCommand(); Layout popupsilonCommand(); Layout popphiCommand(); - Layout popkhiCommand(); + Layout popchiCommand(); Layout poppsiCommand(); Layout popomegaCommand(); @@ -150,7 +150,7 @@ private: static constexpr char const * k_LambdaCommand = "Lambda"; static constexpr char const * k_MuCommand = "Mu"; static constexpr char const * k_NuCommand = "Nu"; - static constexpr char const * k_KsiCommand = "Ksi"; + static constexpr char const * k_XiCommand = "Xi"; static constexpr char const * k_OmicronCommand = "Omicron"; static constexpr char const * k_PiCommand = "Pi"; static constexpr char const * k_RhoCommand = "Rho"; @@ -158,7 +158,7 @@ private: static constexpr char const * k_TauCommand = "Tau"; static constexpr char const * k_UpsilonCommand = "Upsilon"; static constexpr char const * k_PhiCommand = "Phi"; - static constexpr char const * k_KhiCommand = "Khi"; + static constexpr char const * k_ChiCommand = "Chi"; static constexpr char const * k_PsiCommand = "Psi"; static constexpr char const * k_OmegaCommand = "Omega"; @@ -176,7 +176,7 @@ private: static constexpr char const * k_lambdaCommand = "lambda"; static constexpr char const * k_muCommand = "mu"; static constexpr char const * k_nuCommand = "nu"; - static constexpr char const * k_ksiCommand = "ksi"; + static constexpr char const * k_xiCommand = "xi"; // static constexpr char const * k_omicronCommand = "omicron"; // just write "o" static constexpr char const * k_piCommand = "pi"; static constexpr char const * k_rhoCommand = "rho"; @@ -184,7 +184,7 @@ private: static constexpr char const * k_tauCommand = "tau"; static constexpr char const * k_upsilonCommand = "upsilon"; static constexpr char const * k_phiCommand = "phi"; - static constexpr char const * k_khiCommand = "khi"; + static constexpr char const * k_chiCommand = "chi"; static constexpr char const * k_psiCommand = "psi"; static constexpr char const * k_omegaCommand = "omega";