include/svtools/htmlkywd.hxx       |  228 ++++++++---------
 svtools/source/svhtml/htmlkywd.cxx |  472 +++++++++++++++++--------------------
 2 files changed, 341 insertions(+), 359 deletions(-)

New commits:
commit ff4a17454b1dad3b70021401e35226e5a5591cfc
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 12 20:01:05 2025 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jul 19 09:14:34 2025 +0200

    ensure aHTMLCharNameTab is sorted at compile time
    
    static_assert that its sorted instead of sorting at load time.
    
    them it can be made constexpr
    
    Change-Id: I5154f37a822201d1c193ae03766391c6ff91a239
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187784
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit d203f85c26ba763d5ce220745ef3bdb7916bcb79)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188041
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 36e853960feb..f4c24350bc55 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -147,167 +147,148 @@
 #define OOO_STRING_SVTOOLS_HTML_sdfield "sdfield"
 
 // names for all characters
-#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
-#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
-#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
-#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
-#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
+// _C_ for HTML < 4
+// _S_ for HTML >= 4
+#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig"
 #define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute"
-#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
 #define OOO_STRING_SVTOOLS_HTML_C_Acirc "Acirc"
-#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde"
+#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
+#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha"
 #define OOO_STRING_SVTOOLS_HTML_C_Aring "Aring"
+#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde"
 #define OOO_STRING_SVTOOLS_HTML_C_Auml "Auml"
-#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig"
+#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta"
 #define OOO_STRING_SVTOOLS_HTML_C_Ccedil "Ccedil"
+#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi"
+#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger"
+#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta"
+#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH"
 #define OOO_STRING_SVTOOLS_HTML_C_Eacute "Eacute"
-#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave"
 #define OOO_STRING_SVTOOLS_HTML_C_Ecirc "Ecirc"
+#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave"
+#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon"
+#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta"
 #define OOO_STRING_SVTOOLS_HTML_C_Euml "Euml"
+#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma"
 #define OOO_STRING_SVTOOLS_HTML_C_Iacute "Iacute"
-#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave"
 #define OOO_STRING_SVTOOLS_HTML_C_Icirc "Icirc"
+#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave"
+#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota"
 #define OOO_STRING_SVTOOLS_HTML_C_Iuml "Iuml"
-#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH"
+#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa"
+#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda"
+#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu"
 #define OOO_STRING_SVTOOLS_HTML_C_Ntilde "Ntilde"
+#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu"
+#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig"
 #define OOO_STRING_SVTOOLS_HTML_C_Oacute "Oacute"
-#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve"
 #define OOO_STRING_SVTOOLS_HTML_C_Ocirc "Ocirc"
+#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve"
+#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega"
+#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron"
+#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash"
 #define OOO_STRING_SVTOOLS_HTML_C_Otilde "Otilde"
 #define OOO_STRING_SVTOOLS_HTML_C_Ouml "Ouml"
-#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash"
+#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi"
+#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi"
+#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime"
+#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi"
+#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho"
+#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron"
+#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma"
+#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN"
+#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau"
+#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta"
 #define OOO_STRING_SVTOOLS_HTML_C_Uacute "Uacute"
-#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave"
 #define OOO_STRING_SVTOOLS_HTML_C_Ucirc "Ucirc"
+#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave"
+#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon"
 #define OOO_STRING_SVTOOLS_HTML_C_Uuml "Uuml"
+#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi"
 #define OOO_STRING_SVTOOLS_HTML_C_Yacute "Yacute"
-#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN"
-#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig"
+#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml"
+#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta"
 #define OOO_STRING_SVTOOLS_HTML_S_aacute "aacute"
-#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave"
 #define OOO_STRING_SVTOOLS_HTML_S_acirc "acirc"
-#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde"
-#define OOO_STRING_SVTOOLS_HTML_S_aring "aring"
-#define OOO_STRING_SVTOOLS_HTML_S_auml "auml"
-#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig"
-#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil"
-#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute"
-#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave"
-#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc"
-#define OOO_STRING_SVTOOLS_HTML_S_euml "euml"
-#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute"
-#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave"
-#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc"
-#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml"
-#define OOO_STRING_SVTOOLS_HTML_S_eth "eth"
-#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde"
-#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute"
-#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve"
-#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc"
-#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde"
-#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml"
-#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash"
-#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute"
-#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave"
-#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc"
-#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml"
-#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute"
-#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn"
-#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml"
 #define OOO_STRING_SVTOOLS_HTML_S_acute "acute"
-#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar"
-#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil"
-#define OOO_STRING_SVTOOLS_HTML_S_cent "cent"
-#define OOO_STRING_SVTOOLS_HTML_S_copy "copy"
-#define OOO_STRING_SVTOOLS_HTML_S_curren "curren"
-#define OOO_STRING_SVTOOLS_HTML_S_deg "deg"
-#define OOO_STRING_SVTOOLS_HTML_S_divide "divide"
-#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12"
-#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14"
-#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34"
-#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl"
-#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest"
-#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo"
-#define OOO_STRING_SVTOOLS_HTML_S_macr "macr"
-#define OOO_STRING_SVTOOLS_HTML_S_micro "micro"
-#define OOO_STRING_SVTOOLS_HTML_S_middot "middot"
-#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp"
-#define OOO_STRING_SVTOOLS_HTML_S_not "not"
-#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf"
-#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm"
-#define OOO_STRING_SVTOOLS_HTML_S_para "para"
-#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn"
-#define OOO_STRING_SVTOOLS_HTML_S_pound "pound"
-#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo"
-#define OOO_STRING_SVTOOLS_HTML_S_reg "reg"
-#define OOO_STRING_SVTOOLS_HTML_S_sect "sect"
-#define OOO_STRING_SVTOOLS_HTML_S_shy "shy"
-#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1"
-#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2"
-#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3"
-#define OOO_STRING_SVTOOLS_HTML_S_times "times"
-#define OOO_STRING_SVTOOLS_HTML_S_uml "uml"
-#define OOO_STRING_SVTOOLS_HTML_S_yen "yen"
-
-// HTML4
+#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig"
+#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave"
 #define OOO_STRING_SVTOOLS_HTML_S_alefsym "alefsym"
-#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha"
 #define OOO_STRING_SVTOOLS_HTML_S_alpha "alpha"
+#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
 #define OOO_STRING_SVTOOLS_HTML_S_and "and"
 #define OOO_STRING_SVTOOLS_HTML_S_ang "ang"
+#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
+#define OOO_STRING_SVTOOLS_HTML_S_aring "aring"
 #define OOO_STRING_SVTOOLS_HTML_S_asymp "asymp"
+#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde"
+#define OOO_STRING_SVTOOLS_HTML_S_auml "auml"
 #define OOO_STRING_SVTOOLS_HTML_S_bdquo "bdquo"
-#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta"
 #define OOO_STRING_SVTOOLS_HTML_S_beta "beta"
+#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar"
 #define OOO_STRING_SVTOOLS_HTML_S_bull "bull"
 #define OOO_STRING_SVTOOLS_HTML_S_cap "cap"
+#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil"
+#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil"
+#define OOO_STRING_SVTOOLS_HTML_S_cent "cent"
 #define OOO_STRING_SVTOOLS_HTML_S_chi "chi"
-#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi"
 #define OOO_STRING_SVTOOLS_HTML_S_circ "circ"
 #define OOO_STRING_SVTOOLS_HTML_S_clubs "clubs"
 #define OOO_STRING_SVTOOLS_HTML_S_cong "cong"
+#define OOO_STRING_SVTOOLS_HTML_S_copy "copy"
 #define OOO_STRING_SVTOOLS_HTML_S_crarr "crarr"
 #define OOO_STRING_SVTOOLS_HTML_S_cup "cup"
+#define OOO_STRING_SVTOOLS_HTML_S_curren "curren"
+#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr"
 #define OOO_STRING_SVTOOLS_HTML_S_dagger "dagger"
-#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger"
 #define OOO_STRING_SVTOOLS_HTML_S_darr "darr"
-#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr"
-#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta"
+#define OOO_STRING_SVTOOLS_HTML_S_deg "deg"
 #define OOO_STRING_SVTOOLS_HTML_S_delta "delta"
 #define OOO_STRING_SVTOOLS_HTML_S_diams "diams"
+#define OOO_STRING_SVTOOLS_HTML_S_divide "divide"
+#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute"
+#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc"
+#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave"
 #define OOO_STRING_SVTOOLS_HTML_S_empty "empty"
 #define OOO_STRING_SVTOOLS_HTML_S_emsp "emsp"
 #define OOO_STRING_SVTOOLS_HTML_S_ensp "ensp"
-#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon"
 #define OOO_STRING_SVTOOLS_HTML_S_epsilon "epsilon"
 #define OOO_STRING_SVTOOLS_HTML_S_equiv "equiv"
-#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta"
 #define OOO_STRING_SVTOOLS_HTML_S_eta "eta"
+#define OOO_STRING_SVTOOLS_HTML_S_eth "eth"
+#define OOO_STRING_SVTOOLS_HTML_S_euml "euml"
 #define OOO_STRING_SVTOOLS_HTML_S_euro "euro"
 #define OOO_STRING_SVTOOLS_HTML_S_exist "exist"
 #define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof"
 #define OOO_STRING_SVTOOLS_HTML_S_forall "forall"
+#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12"
+#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14"
+#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34"
 #define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl"
-#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma"
 #define OOO_STRING_SVTOOLS_HTML_S_gamma "gamma"
 #define OOO_STRING_SVTOOLS_HTML_S_ge "ge"
-#define OOO_STRING_SVTOOLS_HTML_S_harr "harr"
+#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
 #define OOO_STRING_SVTOOLS_HTML_S_hArr "hArr"
+#define OOO_STRING_SVTOOLS_HTML_S_harr "harr"
 #define OOO_STRING_SVTOOLS_HTML_S_hearts "hearts"
 #define OOO_STRING_SVTOOLS_HTML_S_hellip "hellip"
+#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute"
+#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc"
+#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl"
+#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave"
 #define OOO_STRING_SVTOOLS_HTML_S_image "image"
 #define OOO_STRING_SVTOOLS_HTML_S_infin "infin"
 #define OOO_STRING_SVTOOLS_HTML_S_int "int"
-#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota"
 #define OOO_STRING_SVTOOLS_HTML_S_iota "iota"
+#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest"
 #define OOO_STRING_SVTOOLS_HTML_S_isin "isin"
-#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa"
+#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml"
 #define OOO_STRING_SVTOOLS_HTML_S_kappa "kappa"
-#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda"
+#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr"
 #define OOO_STRING_SVTOOLS_HTML_S_lambda "lambda"
 #define OOO_STRING_SVTOOLS_HTML_S_lang "lang"
+#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo"
 #define OOO_STRING_SVTOOLS_HTML_S_larr "larr"
-#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr"
 #define OOO_STRING_SVTOOLS_HTML_S_lceil "lceil"
 #define OOO_STRING_SVTOOLS_HTML_S_ldquo "ldquo"
 #define OOO_STRING_SVTOOLS_HTML_S_le "le"
@@ -317,60 +298,71 @@
 #define OOO_STRING_SVTOOLS_HTML_S_lrm "lrm"
 #define OOO_STRING_SVTOOLS_HTML_S_lsaquo "lsaquo"
 #define OOO_STRING_SVTOOLS_HTML_S_lsquo "lsquo"
+#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
+#define OOO_STRING_SVTOOLS_HTML_S_macr "macr"
 #define OOO_STRING_SVTOOLS_HTML_S_mdash "mdash"
+#define OOO_STRING_SVTOOLS_HTML_S_micro "micro"
+#define OOO_STRING_SVTOOLS_HTML_S_middot "middot"
 #define OOO_STRING_SVTOOLS_HTML_S_minus "minus"
-#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu"
 #define OOO_STRING_SVTOOLS_HTML_S_mu "mu"
 #define OOO_STRING_SVTOOLS_HTML_S_nabla "nabla"
+#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp"
 #define OOO_STRING_SVTOOLS_HTML_S_ndash "ndash"
 #define OOO_STRING_SVTOOLS_HTML_S_ne "ne"
 #define OOO_STRING_SVTOOLS_HTML_S_ni "ni"
+#define OOO_STRING_SVTOOLS_HTML_S_not "not"
 #define OOO_STRING_SVTOOLS_HTML_S_notin "notin"
 #define OOO_STRING_SVTOOLS_HTML_S_nsub "nsub"
-#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu"
+#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde"
 #define OOO_STRING_SVTOOLS_HTML_S_nu "nu"
-#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig"
+#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute"
+#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc"
 #define OOO_STRING_SVTOOLS_HTML_S_oelig "oelig"
+#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve"
 #define OOO_STRING_SVTOOLS_HTML_S_oline "oline"
-#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega"
 #define OOO_STRING_SVTOOLS_HTML_S_omega "omega"
-#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron"
 #define OOO_STRING_SVTOOLS_HTML_S_omicron "omicron"
 #define OOO_STRING_SVTOOLS_HTML_S_oplus "oplus"
 #define OOO_STRING_SVTOOLS_HTML_S_or "or"
+#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf"
+#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm"
+#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash"
+#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde"
 #define OOO_STRING_SVTOOLS_HTML_S_otimes "otimes"
+#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml"
+#define OOO_STRING_SVTOOLS_HTML_S_para "para"
 #define OOO_STRING_SVTOOLS_HTML_S_part "part"
 #define OOO_STRING_SVTOOLS_HTML_S_permil "permil"
 #define OOO_STRING_SVTOOLS_HTML_S_perp "perp"
-#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi"
 #define OOO_STRING_SVTOOLS_HTML_S_phi "phi"
-#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi"
 #define OOO_STRING_SVTOOLS_HTML_S_pi "pi"
 #define OOO_STRING_SVTOOLS_HTML_S_piv "piv"
+#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn"
+#define OOO_STRING_SVTOOLS_HTML_S_pound "pound"
 #define OOO_STRING_SVTOOLS_HTML_S_prime "prime"
-#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime"
 #define OOO_STRING_SVTOOLS_HTML_S_prod "prod"
 #define OOO_STRING_SVTOOLS_HTML_S_prop "prop"
-#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi"
 #define OOO_STRING_SVTOOLS_HTML_S_psi "psi"
+#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
+#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr"
 #define OOO_STRING_SVTOOLS_HTML_S_radic "radic"
 #define OOO_STRING_SVTOOLS_HTML_S_rang "rang"
+#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo"
 #define OOO_STRING_SVTOOLS_HTML_S_rarr "rarr"
-#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr"
 #define OOO_STRING_SVTOOLS_HTML_S_rceil "rceil"
 #define OOO_STRING_SVTOOLS_HTML_S_rdquo "rdquo"
 #define OOO_STRING_SVTOOLS_HTML_S_real "real"
+#define OOO_STRING_SVTOOLS_HTML_S_reg "reg"
 #define OOO_STRING_SVTOOLS_HTML_S_rfloor "rfloor"
-#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho"
 #define OOO_STRING_SVTOOLS_HTML_S_rho "rho"
 #define OOO_STRING_SVTOOLS_HTML_S_rlm "rlm"
 #define OOO_STRING_SVTOOLS_HTML_S_rsaquo "rsaquo"
 #define OOO_STRING_SVTOOLS_HTML_S_rsquo "rsquo"
 #define OOO_STRING_SVTOOLS_HTML_S_sbquo "sbquo"
-#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron"
 #define OOO_STRING_SVTOOLS_HTML_S_scaron "scaron"
 #define OOO_STRING_SVTOOLS_HTML_S_sdot "sdot"
-#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma"
+#define OOO_STRING_SVTOOLS_HTML_S_sect "sect"
+#define OOO_STRING_SVTOOLS_HTML_S_shy "shy"
 #define OOO_STRING_SVTOOLS_HTML_S_sigma "sigma"
 #define OOO_STRING_SVTOOLS_HTML_S_sigmaf "sigmaf"
 #define OOO_STRING_SVTOOLS_HTML_S_sim "sim"
@@ -379,26 +371,34 @@
 #define OOO_STRING_SVTOOLS_HTML_S_sube "sube"
 #define OOO_STRING_SVTOOLS_HTML_S_sum "sum"
 #define OOO_STRING_SVTOOLS_HTML_S_sup "sup"
+#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1"
+#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2"
+#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3"
 #define OOO_STRING_SVTOOLS_HTML_S_supe "supe"
-#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau"
+#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig"
 #define OOO_STRING_SVTOOLS_HTML_S_tau "tau"
 #define OOO_STRING_SVTOOLS_HTML_S_there4 "there4"
-#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta"
 #define OOO_STRING_SVTOOLS_HTML_S_theta "theta"
 #define OOO_STRING_SVTOOLS_HTML_S_thetasym "thetasym"
 #define OOO_STRING_SVTOOLS_HTML_S_thinsp "thinsp"
+#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn"
 #define OOO_STRING_SVTOOLS_HTML_S_tilde "tilde"
+#define OOO_STRING_SVTOOLS_HTML_S_times "times"
 #define OOO_STRING_SVTOOLS_HTML_S_trade "trade"
-#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr"
 #define OOO_STRING_SVTOOLS_HTML_S_uArr "uArr"
+#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute"
+#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr"
+#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc"
+#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave"
+#define OOO_STRING_SVTOOLS_HTML_S_uml "uml"
 #define OOO_STRING_SVTOOLS_HTML_S_upsih "upsih"
-#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon"
 #define OOO_STRING_SVTOOLS_HTML_S_upsilon "upsilon"
+#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml"
 #define OOO_STRING_SVTOOLS_HTML_S_weierp "weierp"
-#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi"
 #define OOO_STRING_SVTOOLS_HTML_S_xi "xi"
-#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml"
-#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta"
+#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute"
+#define OOO_STRING_SVTOOLS_HTML_S_yen "yen"
+#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml"
 #define OOO_STRING_SVTOOLS_HTML_S_zeta "zeta"
 #define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj"
 #define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj"
diff --git a/svtools/source/svhtml/htmlkywd.cxx 
b/svtools/source/svhtml/htmlkywd.cxx
index 434e1cb9e488..ad2689f0e907 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -42,7 +42,7 @@ struct TokenEntry
 }
 
 template<typename T>
-static bool sortCompare(const TokenEntry<T> & lhs, const TokenEntry<T> & rhs)
+static constexpr bool sortCompare(const TokenEntry<T> & lhs, const 
TokenEntry<T> & rhs)
 {
     return lhs.sToken < rhs.sToken;
 }
@@ -196,284 +196,266 @@ HtmlTokenId GetHTMLToken( std::u16string_view rName )
 
 using HTML_CharEntry = TokenEntry<sal_Unicode>;
 
-// Flag: RTF token table has already been sorted
-static bool bSortCharKeyWords = false;
-
-static HTML_CharEntry aHTMLCharNameTab[] = {
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt),             60},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt),             62},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp),        38},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_apos),        39},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot),       34},
-
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),        192},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aacute),        193},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Acirc),     194},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Atilde),        195},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Auml),      196},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aring),     197},
+constexpr HTML_CharEntry aHTMLCharNameTab[] = {
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_AElig),     198},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ccedil),        199},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Egrave),        200},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Eacute),        201},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ecirc),     202},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Euml),      203},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Igrave),        204},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iacute),        205},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Icirc),     206},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iuml),      207},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_ETH),       208},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ntilde),        209},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ograve),        210},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oacute),        211},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ocirc),     212},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Otilde),        213},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ouml),      214},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oslash),        216},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ugrave),        217},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uacute),        218},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ucirc),     219},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uuml),      220},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Yacute),        221},
-
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_THORN),     222},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_szlig),     223},
-
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_agrave),        224},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aacute),        225},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acirc),     226},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_atilde),        227},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_auml),      228},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aring),     229},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aelig),     230},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ccedil),        231},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_egrave),        232},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eacute),        233},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ecirc),     234},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euml),      235},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_igrave),        236},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iacute),        237},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_icirc),     238},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iuml),      239},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eth),       240},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ntilde),        241},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ograve),        242},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oacute),        243},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ocirc),     244},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otilde),        245},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ouml),      246},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oslash),        248},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ugrave),        249},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uacute),        250},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ucirc),     251},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uuml),      252},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yacute),        253},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thorn),     254},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yuml),      255},
-
-// special characters
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acute),     180},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_brvbar),    166},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cedil),      184},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cent),       162},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_copy),      169},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_curren),     164},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_deg),        176},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_divide),     247},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac12),     189},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac14),     188},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac34),     190},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iexcl),      161},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iquest),     191},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_laquo),      171},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_macr),       175},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_micro),      181},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_middot),     183},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_not),        172},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordf),       170},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordm),       186},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_para),       182},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_plusmn),     177},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pound),      163},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_raquo),      187},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_reg),       174},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sect),       167},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup1),       185},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup2),       178},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup3),       179},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_times),      215},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uml),        168},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yen),        165},
-
-// special characters), which will be converted to tokens !!!
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nbsp),      1},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_shy),       2},
-
-
-// HTML4
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_OElig),     338},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oelig),     339},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Scaron),        352},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_scaron),        353},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Yuml),      376},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_fnof),      402},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_circ),      710},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tilde),     732},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aacute),    193},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Acirc),     194},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),    192},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Alpha),     913},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aring),     197},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Atilde),    195},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Auml),      196},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Beta),      914},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Gamma),     915},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ccedil),    199},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Chi),       935},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Dagger),    8225},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Delta),     916},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_ETH),       208},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Eacute),    201},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ecirc),     202},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Egrave),    200},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Epsilon),   917},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Zeta),      918},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Eta),       919},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Theta),     920},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Euml),      203},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Gamma),     915},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iacute),    205},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Icirc),     206},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Igrave),    204},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Iota),      921},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iuml),      207},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Kappa),     922},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Lambda),        923},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Mu),            924},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Nu),            925},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Xi),            926},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Lambda),    923},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Mu),        924},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ntilde),    209},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Nu),        925},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_OElig),     338},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oacute),    211},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ocirc),     212},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ograve),    210},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Omega),     937},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Omicron),   927},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Pi),            928},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oslash),    216},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Otilde),    213},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ouml),      214},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Phi),       934},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Pi),        928},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Prime),     8243},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Psi),       936},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Rho),       929},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Scaron),    352},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Sigma),     931},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_THORN),     222},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Tau),       932},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Theta),     920},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uacute),    218},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ucirc),     219},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ugrave),    217},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Upsilon),   933},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Phi),       934},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Chi),       935},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Psi),       936},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Omega),     937},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uuml),      220},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Xi),        926},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Yacute),    221},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Yuml),      376},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Zeta),      918},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aacute),    225},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acirc),     226},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acute),     180},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aelig),     230},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_agrave),    224},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_alefsym),   8501},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_alpha),     945},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp),       38},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_and),       8743},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ang),       8736},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_apos),      39},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aring),     229},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_atilde),    227},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_auml),      228},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bdquo),     8222},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_beta),      946},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_gamma),     947},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_brvbar),    166},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bull),      8226},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cap),       8745},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ccedil),    231},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cedil),     184},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cent),      162},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_chi),       967},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_circ),      710},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_clubs),     9827},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cong),      8773},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_copy),      169},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_crarr),     8629},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cup),       8746},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_curren),    164},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dArr),      8659},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dagger),    8224},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_darr),      8595},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_deg),       176},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_delta),     948},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_diams),     9830},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_divide),    247},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eacute),    233},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ecirc),     234},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_egrave),    232},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_empty),     8709},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_emsp),      8195},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ensp),      8194},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_epsilon),   949},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zeta),      950},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_equiv),     8801},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eta),       951},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_theta),     952},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eth),       240},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euml),      235},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euro),      8364},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_exist),     8707},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_fnof),      402},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_forall),    8704},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac12),    189},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac14),    188},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac34),    190},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frasl),     8260},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_gamma),     947},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ge),        8805},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt),        62},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hArr),      8660},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_harr),      8596},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hearts),    9829},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hellip),    8230},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iacute),    237},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_icirc),     238},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iexcl),     161},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_igrave),    236},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_image),     8465},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_infin),     8734},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_int),       8747},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iota),      953},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iquest),    191},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_isin),      8712},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iuml),      239},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_kappa),     954},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lambda),        955},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mu),            956},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nu),            957},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_xi),            958},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omicron),   959},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pi),            960},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rho),       961},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigmaf),        962},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigma),     963},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tau),       964},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsilon),   965},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_phi),       966},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_chi),       967},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_psi),       968},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omega),     969},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thetasym),  977},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsih),     978},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_piv),       982},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ensp),      8194},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_emsp),      8195},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thinsp),        8201},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwnj),      8204},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwj),       8205},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lArr),      8656},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lambda),    955},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lang),      9001},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_laquo),     171},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_larr),      8592},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lceil),     8968},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ldquo),     8220},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_le),        8804},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lfloor),    8970},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lowast),    8727},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_loz),       9674},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lrm),       8206},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rlm),       8207},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ndash),     8211},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mdash),     8212},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lsaquo),    8249},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lsquo),     8216},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsquo),     8217},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sbquo),     8218},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ldquo),     8220},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rdquo),     8221},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bdquo),     8222},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dagger),        8224},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Dagger),        8225},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bull),      8226},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hellip),        8230},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_permil),        8240},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prime),     8242},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Prime),     8243},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lsaquo),        8249},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsaquo),        8250},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oline),     8254},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frasl),     8260},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euro),      8364},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_image),     8465},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_weierp),        8472},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_real),      8476},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_trade),     8482},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_alefsym),   8501},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_larr),      8592},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uarr),      8593},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rarr),      8594},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_darr),      8595},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_harr),      8596},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_crarr),     8629},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lArr),      8656},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uArr),      8657},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rArr),      8658},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dArr),      8659},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hArr),      8660},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_forall),        8704},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_part),      8706},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_exist),     8707},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_empty),     8709},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt),        60},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_macr),      175},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mdash),     8212},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_micro),     181},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_middot),    183},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_minus),     8722},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mu),        956},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nabla),     8711},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_isin),      8712},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nbsp),      1},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ndash),     8211},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ne),        8800},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ni),        8715},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_not),       172},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_notin),     8713},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ni),            8715},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nsub),      8836},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ntilde),    241},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nu),        957},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oacute),    243},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ocirc),     244},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oelig),     339},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ograve),    242},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oline),     8254},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omega),     969},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omicron),   959},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oplus),     8853},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_or),        8744},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordf),      170},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordm),      186},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oslash),    248},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otilde),    245},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otimes),    8855},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ouml),      246},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_para),      182},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_part),      8706},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_permil),    8240},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_perp),      8869},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_phi),       966},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pi),        960},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_piv),       982},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_plusmn),    177},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pound),     163},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prime),     8242},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prod),      8719},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sum),       8721},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_minus),     8722},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lowast),        8727},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_radic),     8730},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prop),      8733},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_infin),     8734},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ang),       8736},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_and),       8743},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_or),            8744},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cap),       8745},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cup),       8746},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_int),       8747},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_there4),        8756},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_psi),       968},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot),      34},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rArr),      8658},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_radic),     8730},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rang),      9002},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_raquo),     187},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rarr),      8594},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rceil),     8969},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rdquo),     8221},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_real),      8476},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_reg),       174},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rfloor),    8971},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rho),       961},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rlm),       8207},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsaquo),    8250},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsquo),     8217},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sbquo),     8218},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_scaron),    353},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sdot),      8901},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sect),      167},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_shy),       2},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigma),     963},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigmaf),    962},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sim),       8764},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cong),      8773},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_asymp),     8776},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ne),            8800},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_equiv),     8801},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_le),            8804},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ge),            8805},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_spades),    9824},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sub),       8834},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup),       8835},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nsub),      8836},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sube),      8838},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sum),       8721},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup),       8835},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup1),      185},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup2),      178},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup3),      179},
     {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_supe),      8839},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oplus),     8853},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otimes),        8855},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_perp),      8869},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sdot),      8901},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lceil),     8968},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rceil),     8969},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lfloor),        8970},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rfloor),        8971},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lang),      9001},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rang),      9002},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_loz),       9674},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_spades),        9824},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_clubs),     9827},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hearts),        9829},
-    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_diams),     9830}
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_szlig),     223},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tau),       964},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_there4),    8756},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_theta),     952},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thetasym),  977},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thinsp),    8201},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thorn),     254},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tilde),     732},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_times),     215},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_trade),     8482},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uArr),      8657},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uacute),    250},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uarr),      8593},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ucirc),     251},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ugrave),    249},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uml),       168},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsih),     978},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsilon),   965},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uuml),      252},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_weierp),    8472},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_xi),        958},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yacute),    253},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yen),       165},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yuml),      255},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zeta),      950},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwj),       8205},
+    {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwnj),      8204}
 };
 
+static_assert(std::is_sorted(std::begin(aHTMLCharNameTab), 
std::end(aHTMLCharNameTab),
+                             sortCompare<sal_Unicode>));
+
 sal_Unicode GetHTMLCharName( std::u16string_view rName )
 {
-    if( !bSortCharKeyWords )
-    {
-        std::sort( std::begin(aHTMLCharNameTab), std::end(aHTMLCharNameTab),
-                              sortCompare<sal_Unicode> );
-        bSortCharKeyWords = true;
-    }
-
     return search<sal_Unicode>( aHTMLCharNameTab, rName, 0);
 }
 

Reply via email to