diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 317e2d8f6b..8d7960c0cd 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -228,6 +228,7 @@ %%% Packages \TestPackage{accents} \TestPackage{algorithm} +\TestPackage{amstext} \TestPackage{array} \TestPackage{babel} \TestPackage{bibtopic} @@ -262,7 +263,6 @@ \TestPackage{pdfpages} \TestPackage{prettyref} \TestPackage{preview} -\TestPackage{relsize} \TestPackage{rotating} \TestPackage{rotfloat} \TestPackage{setspace} diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx index 18fcf661d2..2c7b866e9a 100644 --- a/lib/doc/LaTeXConfig.lyx +++ b/lib/doc/LaTeXConfig.lyx @@ -3537,14 +3537,14 @@ longtable \end_layout \begin_layout Subsection -relsize +amstext \end_layout \begin_layout Description Found: \begin_inset Info type "package" -arg "relsize" +arg "amstext" \end_inset @@ -3553,13 +3553,13 @@ arg "relsize" \begin_layout Description CTAN: \family typewriter -macros/latex/contrib/misc/ +macros/latex/required/amslatex/math/ \end_layout \begin_layout Description Notes: The package \family sans -relsize +amstext \family default is needed by LyX to correctly size unicode symbols used as super or subscripts in math. diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx index e151ce0a42..f398df9717 100644 --- a/lib/doc/ja/LaTeXConfig.lyx +++ b/lib/doc/ja/LaTeXConfig.lyx @@ -3277,14 +3277,14 @@ longtable \end_layout \begin_layout Subsection -relsize +amstext \end_layout \begin_layout Description 検出: \begin_inset Info type "package" -arg "relsize" +arg "amstext" \end_inset @@ -3293,13 +3293,13 @@ arg "relsize" \begin_layout Description CTAN: \family typewriter -macros/latex/contrib/misc/ +macros/latex/required/amslatex/math/ \end_layout \begin_layout Description 備考: \family sans -relsize +amstext \family default パッケージは、unicodeシンボルを数式内で上付きや下付き文字にする際、LyXが正しい寸法に調整するのに必要とします。 \end_layout diff --git a/lib/unicodesymbols b/lib/unicodesymbols index 35a09f1ece..6060a89401 100644 --- a/lib/unicodesymbols +++ b/lib/unicodesymbols @@ -810,102 +810,102 @@ # # Cyrillic # -0x0400 "\\textcyr{\\accent0\\char197}" "textcyr" "" # CYRILLIC CAPITAL LETTER IE WITH GRAVE -0x0401 "\\textcyr{\\char156}" "textcyr" "" # CYRILLIC CAPITAL LETTER IO -0x0402 "\\textcyr{\\char130}" "textcyr" "" # CYRILLIC CAPITAL LETTER DJE -0x0403 "\\textcyr{\\accent1\\char195}" "textcyr" "" # CYRILLIC CAPITAL LETTER GJE -0x0404 "\\textcyr{\\char153}" "textcyr" "" # CYRILLIC CAPITAL LETTER UKRAINIAN IE -0x0405 "\\textcyr{\\char143}" "textcyr" "" # CYRILLIC CAPITAL LETTER DZE -0x0406 "\\textcyr{I}" "textcyr" "" # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I -0x0407 "\\textcyr{\\char136}" "textcyr" "" # CYRILLIC CAPITAL LETTER YI -0x0408 "\\textcyr{J}" "textcyr" "" # CYRILLIC CAPITAL LETTER JE -0x0409 "\\textcyr{\\char135}" "textcyr" "" # CYRILLIC CAPITAL LETTER LJE -0x040a "\\textcyr{\\char155}" "textcyr" "" # CYRILLIC CAPITAL LETTER NJE -0x040b "\\textcyr{\\char131}" "textcyr" "" # CYRILLIC CAPITAL LETTER TSHE -0x040c "\\textcyr{\\accent1\\char202}" "textcyr" "" # CYRILLIC CAPITAL LETTER KJE -0x040d "\\textcyr{\\accent0\\char200}" "textcyr" "" # CYRILLIC CAPITAL LETTER I WITH GRAVE -0x040e "\\textcyr{\\char146}" "textcyr" "" # CYRILLIC CAPITAL LETTER SHORT U -0x040f "\\textcyr{\\char150}" "textcyr" "" # CYRILLIC CAPITAL LETTER DZHE -0x0410 "\\textcyr{\\char192}" "textcyr" "" # CYRILLIC CAPITAL LETTER A -0x0411 "\\textcyr{\\char193}" "textcyr" "" # CYRILLIC CAPITAL LETTER BE -0x0412 "\\textcyr{\\char194}" "textcyr" "" # CYRILLIC CAPITAL LETTER VE -0x0413 "\\textcyr{\\char195}" "textcyr" "" # CYRILLIC CAPITAL LETTER GHE -0x0414 "\\textcyr{\\char196}" "textcyr" "" # CYRILLIC CAPITAL LETTER DE -0x0415 "\\textcyr{\\char197}" "textcyr" "" # CYRILLIC CAPITAL LETTER IE -0x0416 "\\textcyr{\\char198}" "textcyr" "" # CYRILLIC CAPITAL LETTER ZHE -0x0417 "\\textcyr{\\char199}" "textcyr" "" # CYRILLIC CAPITAL LETTER ZE -0x0418 "\\textcyr{\\char200}" "textcyr" "" # CYRILLIC CAPITAL LETTER I -0x0419 "\\textcyr{\\char201}" "textcyr" "" # CYRILLIC CAPITAL LETTER SHORT I -0x041a "\\textcyr{\\char202}" "textcyr" "" # CYRILLIC CAPITAL LETTER KA -0x041b "\\textcyr{\\char203}" "textcyr" "" # CYRILLIC CAPITAL LETTER EL -0x041c "\\textcyr{\\char204}" "textcyr" "" # CYRILLIC CAPITAL LETTER EM -0x041d "\\textcyr{\\char205}" "textcyr" "" # CYRILLIC CAPITAL LETTER EN -0x041e "\\textcyr{\\char206}" "textcyr" "" # CYRILLIC CAPITAL LETTER O -0x041f "\\textcyr{\\char207}" "textcyr" "" # CYRILLIC CAPITAL LETTER PE -0x0420 "\\textcyr{\\char208}" "textcyr" "" # CYRILLIC CAPITAL LETTER ER -0x0421 "\\textcyr{\\char209}" "textcyr" "" # CYRILLIC CAPITAL LETTER ES -0x0422 "\\textcyr{\\char210}" "textcyr" "" # CYRILLIC CAPITAL LETTER TE -0x0423 "\\textcyr{\\char211}" "textcyr" "" # CYRILLIC CAPITAL LETTER U -0x0424 "\\textcyr{\\char212}" "textcyr" "" # CYRILLIC CAPITAL LETTER EF -0x0425 "\\textcyr{\\char213}" "textcyr" "" # CYRILLIC CAPITAL LETTER HA -0x0426 "\\textcyr{\\char214}" "textcyr" "" # CYRILLIC CAPITAL LETTER TSE -0x0427 "\\textcyr{\\char215}" "textcyr" "" # CYRILLIC CAPITAL LETTER CHE -0x0428 "\\textcyr{\\char216}" "textcyr" "" # CYRILLIC CAPITAL LETTER SHA -0x0429 "\\textcyr{\\char217}" "textcyr" "" # CYRILLIC CAPITAL LETTER SHCHA -0x042a "\\textcyr{\\char218}" "textcyr" "" # CYRILLIC CAPITAL LETTER HARD SIGN -0x042b "\\textcyr{\\char219}" "textcyr" "" # CYRILLIC CAPITAL LETTER YERU -0x042c "\\textcyr{\\char220}" "textcyr" "" # CYRILLIC CAPITAL LETTER SOFT SIGN -0x042d "\\textcyr{\\char221}" "textcyr" "" # CYRILLIC CAPITAL LETTER E -0x042e "\\textcyr{\\char222}" "textcyr" "" # CYRILLIC CAPITAL LETTER YU -0x042f "\\textcyr{\\char223}" "textcyr" "" # CYRILLIC CAPITAL LETTER YA -0x0430 "\\textcyr{\\char224}" "textcyr" "" # CYRILLIC SMALL LETTER A -0x0431 "\\textcyr{\\char225}" "textcyr" "" # CYRILLIC SMALL LETTER BE -0x0432 "\\textcyr{\\char226}" "textcyr" "" # CYRILLIC SMALL LETTER VE -0x0433 "\\textcyr{\\char227}" "textcyr" "" # CYRILLIC SMALL LETTER GHE -0x0434 "\\textcyr{\\char228}" "textcyr" "" # CYRILLIC SMALL LETTER DE -0x0435 "\\textcyr{\\char229}" "textcyr" "" # CYRILLIC SMALL LETTER IE -0x0436 "\\textcyr{\\char230}" "textcyr" "" # CYRILLIC SMALL LETTER ZHE -0x0437 "\\textcyr{\\char231}" "textcyr" "" # CYRILLIC SMALL LETTER ZE -0x0438 "\\textcyr{\\char232}" "textcyr" "" # CYRILLIC SMALL LETTER I -0x0439 "\\textcyr{\\char233}" "textcyr" "" # CYRILLIC SMALL LETTER SHORT I -0x043a "\\textcyr{\\char234}" "textcyr" "" # CYRILLIC SMALL LETTER KA -0x043b "\\textcyr{\\char235}" "textcyr" "" # CYRILLIC SMALL LETTER EL -0x043c "\\textcyr{\\char236}" "textcyr" "" # CYRILLIC SMALL LETTER EM -0x043d "\\textcyr{\\char237}" "textcyr" "" # CYRILLIC SMALL LETTER EN -0x043e "\\textcyr{\\char238}" "textcyr" "" # CYRILLIC SMALL LETTER O -0x043f "\\textcyr{\\char239}" "textcyr" "" # CYRILLIC SMALL LETTER PE -0x0440 "\\textcyr{\\char240}" "textcyr" "" # CYRILLIC SMALL LETTER ER -0x0441 "\\textcyr{\\char241}" "textcyr" "" # CYRILLIC SMALL LETTER ES -0x0442 "\\textcyr{\\char242}" "textcyr" "" # CYRILLIC SMALL LETTER TE -0x0443 "\\textcyr{\\char243}" "textcyr" "" # CYRILLIC SMALL LETTER U -0x0444 "\\textcyr{\\char244}" "textcyr" "" # CYRILLIC SMALL LETTER EF -0x0445 "\\textcyr{\\char245}" "textcyr" "" # CYRILLIC SMALL LETTER HA -0x0446 "\\textcyr{\\char246}" "textcyr" "" # CYRILLIC SMALL LETTER TSE -0x0447 "\\textcyr{\\char247}" "textcyr" "" # CYRILLIC SMALL LETTER CHE -0x0448 "\\textcyr{\\char248}" "textcyr" "" # CYRILLIC SMALL LETTER SHA -0x0449 "\\textcyr{\\char249}" "textcyr" "" # CYRILLIC SMALL LETTER SHCHA -0x044a "\\textcyr{\\char250}" "textcyr" "" # CYRILLIC SMALL LETTER HARD SIGN -0x044b "\\textcyr{\\char251}" "textcyr" "" # CYRILLIC SMALL LETTER YERU -0x044c "\\textcyr{\\char252}" "textcyr" "" # CYRILLIC SMALL LETTER SOFT SIGN -0x044d "\\textcyr{\\char253}" "textcyr" "" # CYRILLIC SMALL LETTER E -0x044e "\\textcyr{\\char254}" "textcyr" "" # CYRILLIC SMALL LETTER YU -0x044f "\\textcyr{\\char255}" "textcyr" "" # CYRILLIC SMALL LETTER YA -0x0450 "\\textcyr{\\accent0\\char229}" "textcyr" "" # CYRILLIC SMALL LETTER IE WITH GRAVE -0x0451 "\\textcyr{\\char188}" "textcyr" "" # CYRILLIC SMALL LETTER IO -0x0452 "\\textcyr{\\char162}" "textcyr" "" # CYRILLIC SMALL LETTER DJE -0x0453 "\\textcyr{\\accent1\\char227}" "textcyr" "" # CYRILLIC SMALL LETTER GJE -0x0454 "\\textcyr{\\char185}" "textcyr" "" # CYRILLIC SMALL LETTER UKRAINIAN IE -0x0455 "\\textcyr{\\char175}" "textcyr" "" # CYRILLIC SMALL LETTER DZE -0x0456 "\\textcyr{i}" "textcyr" "" # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -0x0457 "\\textcyr{\\char168}" "textcyr" "" # CYRILLIC SMALL LETTER YI -0x0458 "\\textcyr{j}" "textcyr" "" # CYRILLIC SMALL LETTER JE -0x0459 "\\textcyr{\\char167}" "textcyr" "" # CYRILLIC SMALL LETTER LJE -0x045a "\\textcyr{\\char187}" "textcyr" "" # CYRILLIC SMALL LETTER NJE -0x045b "\\textcyr{\\char163}" "textcyr" "" # CYRILLIC SMALL LETTER TSHE -0x045c "\\textcyr{\\accent1\\char234}" "textcyr" "" # CYRILLIC SMALL LETTER KJE -0x045d "\\textcyr{\\accent0\\char232}" "textcyr" "" # CYRILLIC SMALL LETTER I WITH GRAVE -0x045e "\\textcyr{\\char178}" "textcyr" "" # CYRILLIC SMALL LETTER SHORT U -0x045f "\\textcyr{\\char182}" "textcyr" "" # CYRILLIC SMALL LETTER DZHE +0x0400 "\\textcyr{\\accent0\\char197}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER IE WITH GRAVE +0x0401 "\\textcyr{\\char156}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER IO +0x0402 "\\textcyr{\\char130}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER DJE +0x0403 "\\textcyr{\\accent1\\char195}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER GJE +0x0404 "\\textcyr{\\char153}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER UKRAINIAN IE +0x0405 "\\textcyr{\\char143}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER DZE +0x0406 "\\textcyr{I}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I +0x0407 "\\textcyr{\\char136}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER YI +0x0408 "\\textcyr{J}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER JE +0x0409 "\\textcyr{\\char135}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER LJE +0x040a "\\textcyr{\\char155}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER NJE +0x040b "\\textcyr{\\char131}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER TSHE +0x040c "\\textcyr{\\accent1\\char202}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER KJE +0x040d "\\textcyr{\\accent0\\char200}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER I WITH GRAVE +0x040e "\\textcyr{\\char146}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER SHORT U +0x040f "\\textcyr{\\char150}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER DZHE +0x0410 "\\textcyr{\\char192}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER A +0x0411 "\\textcyr{\\char193}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER BE +0x0412 "\\textcyr{\\char194}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER VE +0x0413 "\\textcyr{\\char195}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER GHE +0x0414 "\\textcyr{\\char196}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER DE +0x0415 "\\textcyr{\\char197}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER IE +0x0416 "\\textcyr{\\char198}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER ZHE +0x0417 "\\textcyr{\\char199}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER ZE +0x0418 "\\textcyr{\\char200}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER I +0x0419 "\\textcyr{\\char201}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER SHORT I +0x041a "\\textcyr{\\char202}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER KA +0x041b "\\textcyr{\\char203}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER EL +0x041c "\\textcyr{\\char204}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER EM +0x041d "\\textcyr{\\char205}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER EN +0x041e "\\textcyr{\\char206}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER O +0x041f "\\textcyr{\\char207}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER PE +0x0420 "\\textcyr{\\char208}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER ER +0x0421 "\\textcyr{\\char209}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER ES +0x0422 "\\textcyr{\\char210}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER TE +0x0423 "\\textcyr{\\char211}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER U +0x0424 "\\textcyr{\\char212}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER EF +0x0425 "\\textcyr{\\char213}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER HA +0x0426 "\\textcyr{\\char214}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER TSE +0x0427 "\\textcyr{\\char215}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER CHE +0x0428 "\\textcyr{\\char216}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER SHA +0x0429 "\\textcyr{\\char217}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER SHCHA +0x042a "\\textcyr{\\char218}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER HARD SIGN +0x042b "\\textcyr{\\char219}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER YERU +0x042c "\\textcyr{\\char220}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER SOFT SIGN +0x042d "\\textcyr{\\char221}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER E +0x042e "\\textcyr{\\char222}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER YU +0x042f "\\textcyr{\\char223}" "textcyr" "mathalpha" # CYRILLIC CAPITAL LETTER YA +0x0430 "\\textcyr{\\char224}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER A +0x0431 "\\textcyr{\\char225}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER BE +0x0432 "\\textcyr{\\char226}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER VE +0x0433 "\\textcyr{\\char227}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER GHE +0x0434 "\\textcyr{\\char228}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER DE +0x0435 "\\textcyr{\\char229}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER IE +0x0436 "\\textcyr{\\char230}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER ZHE +0x0437 "\\textcyr{\\char231}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER ZE +0x0438 "\\textcyr{\\char232}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER I +0x0439 "\\textcyr{\\char233}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER SHORT I +0x043a "\\textcyr{\\char234}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER KA +0x043b "\\textcyr{\\char235}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER EL +0x043c "\\textcyr{\\char236}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER EM +0x043d "\\textcyr{\\char237}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER EN +0x043e "\\textcyr{\\char238}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER O +0x043f "\\textcyr{\\char239}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER PE +0x0440 "\\textcyr{\\char240}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER ER +0x0441 "\\textcyr{\\char241}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER ES +0x0442 "\\textcyr{\\char242}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER TE +0x0443 "\\textcyr{\\char243}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER U +0x0444 "\\textcyr{\\char244}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER EF +0x0445 "\\textcyr{\\char245}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER HA +0x0446 "\\textcyr{\\char246}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER TSE +0x0447 "\\textcyr{\\char247}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER CHE +0x0448 "\\textcyr{\\char248}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER SHA +0x0449 "\\textcyr{\\char249}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER SHCHA +0x044a "\\textcyr{\\char250}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER HARD SIGN +0x044b "\\textcyr{\\char251}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER YERU +0x044c "\\textcyr{\\char252}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER SOFT SIGN +0x044d "\\textcyr{\\char253}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER E +0x044e "\\textcyr{\\char254}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER YU +0x044f "\\textcyr{\\char255}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER YA +0x0450 "\\textcyr{\\accent0\\char229}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER IE WITH GRAVE +0x0451 "\\textcyr{\\char188}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER IO +0x0452 "\\textcyr{\\char162}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER DJE +0x0453 "\\textcyr{\\accent1\\char227}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER GJE +0x0454 "\\textcyr{\\char185}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER UKRAINIAN IE +0x0455 "\\textcyr{\\char175}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER DZE +0x0456 "\\textcyr{i}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +0x0457 "\\textcyr{\\char168}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER YI +0x0458 "\\textcyr{j}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER JE +0x0459 "\\textcyr{\\char167}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER LJE +0x045a "\\textcyr{\\char187}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER NJE +0x045b "\\textcyr{\\char163}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER TSHE +0x045c "\\textcyr{\\accent1\\char234}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER KJE +0x045d "\\textcyr{\\accent0\\char232}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER I WITH GRAVE +0x045e "\\textcyr{\\char178}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER SHORT U +0x045f "\\textcyr{\\char182}" "textcyr" "mathalpha" # CYRILLIC SMALL LETTER DZHE 0x0e3f "\\textbaht" "textcomp" "" # THAI CURRENCY SYMBOL BAHT # # Phonetic Extensions diff --git a/src/Encoding.cpp b/src/Encoding.cpp index 899d8e1786..9283e55fc8 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -601,7 +601,7 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed) } } if (for_mathed && isMathSym(c)) { - features.require("relsize"); + features.require("amstext"); features.require("lyxmathsym"); } #endif diff --git a/src/Encoding.h b/src/Encoding.h index f099280059..6a1e76ce9a 100644 --- a/src/Encoding.h +++ b/src/Encoding.h @@ -190,7 +190,7 @@ public: /** * Do we have to display in italics this character when in mathmode? * This is true if the "mathalpha" flag is set. We use this for - * accented characters that are output as math commands. + * letters and accented characters that are output as math commands. */ static bool isMathAlpha(char_type c); /** diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 2db3949352..99a7d811ef 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -202,11 +202,9 @@ static string const textcyr_def = "\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n"; static string const lyxmathsym_def = - "\\DeclareRobustCommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n" - " \\def\\rmorbf##1{\\ifx\\math@version\\b@ld\\textbf{##1}\\else\\textrm{##1}\\fi}\n" - " \\mathchoice{\\hbox{\\rmorbf{#1}}}{\\hbox{\\rmorbf{#1}}}\n" - " {\\hbox{\\smaller[2]\\rmorbf{#1}}}{\\hbox{\\smaller[3]\\rmorbf{#1}}}\n" - " \\endgroup\\else#1\\fi}\n"; + "\\newcommand{\\lyxmathsym}{\\@ifstar{\\lyxm@thsym\\textit}{\\lyxm@thsym\\textrm}}\n" + "\\newcommand{\\lyxm@thsym}[2]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n" + " #1{\\ifx\\math@version\\b@ld\\bfseries\\fi#2}\\endgroup\\else#2\\fi}\n"; static string const papersizedvi_def = "\\special{papersize=\\the\\paperwidth,\\the\\paperheight}\n"; @@ -514,7 +512,6 @@ char const * simplefeatures[] = { // listings is handled in BufferParams.cpp "bm", "pdfpages", - "relsize", "amscd", "slashed" }; @@ -586,9 +583,12 @@ string const LaTeXFeatures::getPackages() const && params_.use_esint == BufferParams::package_off && params_.use_amsmath != BufferParams::package_off)) { packages << "\\usepackage{amsmath}\n"; - } else if (mustProvide("amsbsy")) { - // amsbsy is already provided by amsmath - packages << "\\usepackage{amsbsy}\n"; + } else { + // amsbsy and amstext are already provided by amsmath + if (mustProvide("amsbsy")) + packages << "\\usepackage{amsbsy}\n"; + if (mustProvide("amstext")) + packages << "\\usepackage{amstext}\n"; } // wasysym is a simple feature, but it must be after amsmath if both diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp index 5dcd595d85..552124a143 100644 --- a/src/mathed/InsetMathString.cpp +++ b/src/mathed/InsetMathString.cpp @@ -114,6 +114,9 @@ void InsetMathString::write(WriteStream & os) const // We may already be inside an \ensuremath command. bool in_forced_mode = os.pendingBrace(); + // Track italic shape inside \lyxmathsym + bool mathalpha = false; + // We will take care of matching braces. os.pendingBrace(false); @@ -147,10 +150,22 @@ void InsetMathString::write(WriteStream & os) const os << '}'; in_forced_mode = false; } else { - os << "\\lyxmathsym{"; + mathalpha = Encodings::isMathAlpha(c); + if (mathalpha) + os << "\\lyxmathsym*{"; + else + os << "\\lyxmathsym{"; in_forced_mode = true; } os.textMode(true); + } else if (in_forced_mode && mathalpha != Encodings::isMathAlpha(c)) { + // we are already inside \lyxmathsym but + // have to change the output shape + mathalpha = !mathalpha; + if (mathalpha) + os << "}\\lyxmathsym*{"; + else + os << "}\\lyxmathsym{"; } os << command; // We may need a space if the command contains a macro diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp index 3845bbc8a3..673c293224 100644 --- a/src/mathed/MathParser.cpp +++ b/src/mathed/MathParser.cpp @@ -1639,6 +1639,9 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, else if (t.cs() == "lyxmathsym") { skipSpaces(); + if (nextToken().character() == '*') + getToken(); + skipSpaces(); if (getToken().cat() != catBegin) { error("'{' expected in \\" + t.cs()); return success_; @@ -1659,17 +1662,18 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, return success_; } docstring rem; - cmd = Encodings::fromLaTeXCommand(cmd, rem); - for (size_t i = 0; i < cmd.size(); ++i) - cell->push_back(MathAtom(new InsetMathChar(cmd[i]))); - if (rem.size()) { - MathAtom at = createInsetMath(t.cs()); - cell->push_back(at); - MathData ar; - if (!mathed_parse_cell(ar, '{' + rem + '}', mode_)) - success_ = false;; - cell->append(ar); - } + do { + cmd = Encodings::fromLaTeXCommand(cmd, rem); + for (size_t i = 0; i < cmd.size(); ++i) + cell->push_back(MathAtom(new InsetMathChar(cmd[i]))); + if (rem.size()) { + char_type c = rem[0]; + cell->push_back(MathAtom(new InsetMathChar(c))); + cmd = rem.substr(1); + rem.clear(); + } else + cmd.clear(); + } while (cmd.size()); } else if (t.cs().size()) {