\textcyr -> \textcyrillic

Use the command as defined by Babel. This allows us to use the (more
advanced) Babel command if provided instead of rolling our own.

I add a dummy file format change in case it turns out we need to
do something here for old documents (e.g. with user preamble definitions)

diff --git a/development/FORMAT b/development/FORMAT
index f16817dc777587588e129876ad229ee73e50e491..6f5ee2e48dcfe51ae2da98ba29d5539534232595 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,8 +7,12 @@ changes happened in particular if possible. A good example would be
 
 -----------------------
 
+2018-04-24  Jürgen Spitzmüller <spitz@lyx.org>
+       * format incremented to 549: change \textcyr to \textcyrillic.
+         Dummy format change for now (in case it turns out we need to do something).
+
 2018-04-18  Jürgen Spitzmüller <spitz@lyx.org>
-       * format incremented to 546: Add Landscape flex inset in Landscape module.
+       * format incremented to 548: Add Landscape flex inset in Landscape module.
          \begin{landscape}...\end{landscape} > \begin_inset Flex Landscape
 
 2018-03-14 Yuriy Skalko <yuriy.skalko@gmail.com>

diff --git a/lib/languages b/lib/languages
index 909043d3f18290daaef594c1773da778eb5afad2..451b1b866aee2661874135ea3eeea98e9ec75e5e 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -336,6 +336,7 @@ Language bulgarian
        Encoding         cp1251
        FontEncoding     T2A
        LangCode         bg_BG
+       Provides         textcyrillic
 End
 
 # not yet supported by polyglossia
@@ -854,6 +855,7 @@ Language macedonian
        Encoding         cp1251
        FontEncoding     T2A
        LangCode         mk_MK
+       Provides         textcyrillic
 End
 
 # not supported by babel
@@ -874,6 +876,7 @@ Language mongolian
        FontEncoding     T2A
        LangCode         mn_MN
        AsBabelOptions   true
+       Provides         textcyrillic
 End
 
 Language newzealand
@@ -988,6 +991,7 @@ Language russian
        Encoding         koi8-r
        FontEncoding     T2A
        LangCode         ru_RU
+       Provides         textcyrillic
 End
 
 Language samin
@@ -1177,6 +1181,7 @@ Language ukrainian
        Encoding         koi8-u
        FontEncoding     T2A
        LangCode         uk_UA
+       Provides         textcyrillic
 End
 
 Language uppersorbian

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index c4b023b6057fcd96ba19cbf82b016b4c22bfa712..43542866c1f41baea30edb2c1fce156388aa3249 100644 (file)
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -191,10 +191,12 @@ convert = [
            [545, [convert_lst_literalparam]],
            [546, []],
            [547, []],
-           [548, []]
+           [548, []],
+           [549, []]
           ]
 
 revert =  [
+           [548, []],# dummy format change
            [547, [revert_lscape]],
            [546, [revert_xcharter]],
            [545, [revert_paratype]],

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 5664c652ca799bb2af10d3f124d410147faf98b5..29fdb1144459a6623525d213bd8d5d4e3638fc5a 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -887,154 +887,154 @@
 #
 # 9 Cyrillic
 #
-# "textcyr" selects LaTeX font encoding T2A
-0x0400 "\\textcyr{\\`\\CYRE}"     "textcyr" "" # CYRILLIC CAPITAL LETTER IE WITH GRAVE
-0x0401 "\\textcyr{\\CYRYO}"       "textcyr" "" # CYRILLIC CAPITAL LETTER IO
-0x0402 "\\textcyr{\\CYRDJE}"      "textcyr" "" # CYRILLIC CAPITAL LETTER DJE
-0x0403 "\\textcyr{\\`\\CYRG}"     "textcyr" "" # CYRILLIC CAPITAL LETTER GJE
-0x0404 "\\textcyr{\\CYRIE}"       "textcyr" "" # CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0x0405 "\\textcyr{\\CYRDZE}"      "textcyr" "" # CYRILLIC CAPITAL LETTER DZE
-0x0406 "\\textcyr{\\CYRII}"       "textcyr" "" # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0x0407 "\\textcyr{\\CYRYI}"       "textcyr" "" # CYRILLIC CAPITAL LETTER YI
-0x0408 "\\textcyr{\\CYRJE}"       "textcyr" "" # CYRILLIC CAPITAL LETTER JE
-0x0409 "\\textcyr{\\CYRLJE}"      "textcyr" "" # CYRILLIC CAPITAL LETTER LJE
-0x040a "\\textcyr{\\CYRNJE}"      "textcyr" "" # CYRILLIC CAPITAL LETTER NJE
-0x040b "\\textcyr{\\CYRTSHE}"     "textcyr" "" # CYRILLIC CAPITAL LETTER TSHE
-0x040c "\\textcyr{\\`\\CYRK}"     "textcyr" "" # CYRILLIC CAPITAL LETTER KJE
-0x040d "\\textcyr{\\`\\CYRI}"     "textcyr" "" # CYRILLIC CAPITAL LETTER I WITH GRAVE
-0x040e "\\textcyr{\\CYRUSHRT}"    "textcyr" "" # CYRILLIC CAPITAL LETTER SHORT U
-0x040f "\\textcyr{\\CYRDZHE}"     "textcyr" "" # CYRILLIC CAPITAL LETTER DZHE
-0x0410 "\\textcyr{\\CYRA}"        "textcyr" "" # CYRILLIC CAPITAL LETTER A
-0x0411 "\\textcyr{\\CYRB}"        "textcyr" "" # CYRILLIC CAPITAL LETTER BE
-0x0412 "\\textcyr{\\CYRV}"        "textcyr" "" # CYRILLIC CAPITAL LETTER VE
-0x0413 "\\textcyr{\\CYRG}"        "textcyr" "" # CYRILLIC CAPITAL LETTER GHE
-0x0414 "\\textcyr{\\CYRD}"        "textcyr" "" # CYRILLIC CAPITAL LETTER DE
-0x0415 "\\textcyr{\\CYRE}"        "textcyr" "" # CYRILLIC CAPITAL LETTER IE
-0x0416 "\\textcyr{\\CYRZH}"       "textcyr" "" # CYRILLIC CAPITAL LETTER ZHE
-0x0417 "\\textcyr{\\CYRZ}"        "textcyr" "" # CYRILLIC CAPITAL LETTER ZE
-0x0418 "\\textcyr{\\CYRI}"        "textcyr" "" # CYRILLIC CAPITAL LETTER I
-0x0419 "\\textcyr{\\CYRISHRT}"    "textcyr" "" # CYRILLIC CAPITAL LETTER SHORT I
-0x041a "\\textcyr{\\CYRK}"        "textcyr" "" # CYRILLIC CAPITAL LETTER KA
-0x041b "\\textcyr{\\CYRL}"        "textcyr" "" # CYRILLIC CAPITAL LETTER EL
-0x041c "\\textcyr{\\CYRM}"        "textcyr" "" # CYRILLIC CAPITAL LETTER EM
-0x041d "\\textcyr{\\CYRN}"        "textcyr" "" # CYRILLIC CAPITAL LETTER EN
-0x041e "\\textcyr{\\CYRO}"        "textcyr" "" # CYRILLIC CAPITAL LETTER O
-0x041f "\\textcyr{\\CYRP}"        "textcyr" "" # CYRILLIC CAPITAL LETTER PE
-0x0420 "\\textcyr{\\CYRR}"        "textcyr" "" # CYRILLIC CAPITAL LETTER ER
-0x0421 "\\textcyr{\\CYRS}"        "textcyr" "" # CYRILLIC CAPITAL LETTER ES
-0x0422 "\\textcyr{\\CYRT}"        "textcyr" "" # CYRILLIC CAPITAL LETTER TE
-0x0423 "\\textcyr{\\CYRU}"        "textcyr" "" # CYRILLIC CAPITAL LETTER U
-0x0424 "\\textcyr{\\CYRF}"        "textcyr" "" # CYRILLIC CAPITAL LETTER EF
-0x0425 "\\textcyr{\\CYRH}"        "textcyr" "" # CYRILLIC CAPITAL LETTER HA
-0x0426 "\\textcyr{\\CYRC}"        "textcyr" "" # CYRILLIC CAPITAL LETTER TSE
-0x0427 "\\textcyr{\\CYRCH}"       "textcyr" "" # CYRILLIC CAPITAL LETTER CHE
-0x0428 "\\textcyr{\\CYRSH}"       "textcyr" "" # CYRILLIC CAPITAL LETTER SHA
-0x0429 "\\textcyr{\\CYRSHCH}"     "textcyr" "" # CYRILLIC CAPITAL LETTER SHCHA
-0x042a "\\textcyr{\\CYRHRDSN}"    "textcyr" "" # CYRILLIC CAPITAL LETTER HARD SIGN
-0x042b "\\textcyr{\\CYRERY}"      "textcyr" "" # CYRILLIC CAPITAL LETTER YERU
-0x042c "\\textcyr{\\CYRSFTSN}"    "textcyr" "" # CYRILLIC CAPITAL LETTER SOFT SIGN
-0x042d "\\textcyr{\\CYREREV}"     "textcyr" "" # CYRILLIC CAPITAL LETTER E
-0x042e "\\textcyr{\\CYRYU}"       "textcyr" "" # CYRILLIC CAPITAL LETTER YU
-0x042f "\\textcyr{\\CYRYA}"       "textcyr" "" # CYRILLIC CAPITAL LETTER YA
-0x0430 "\\textcyr{\\cyra}"        "textcyr" "" # CYRILLIC SMALL LETTER A
-0x0431 "\\textcyr{\\cyrb}"        "textcyr" "" # CYRILLIC SMALL LETTER BE
-0x0432 "\\textcyr{\\cyrv}"        "textcyr" "" # CYRILLIC SMALL LETTER VE
-0x0433 "\\textcyr{\\cyrg}"        "textcyr" "" # CYRILLIC SMALL LETTER GHE
-0x0434 "\\textcyr{\\cyrd}"        "textcyr" "" # CYRILLIC SMALL LETTER DE
-0x0435 "\\textcyr{\\cyre}"        "textcyr" "" # CYRILLIC SMALL LETTER IE
-0x0436 "\\textcyr{\\cyrzh}"       "textcyr" "" # CYRILLIC SMALL LETTER ZHE
-0x0437 "\\textcyr{\\cyrz}"        "textcyr" "" # CYRILLIC SMALL LETTER ZE
-0x0438 "\\textcyr{\\cyri}"        "textcyr" "" # CYRILLIC SMALL LETTER I
-0x0439 "\\textcyr{\\cyrishrt}"    "textcyr" "" # CYRILLIC SMALL LETTER SHORT I
-0x043a "\\textcyr{\\cyrk}"        "textcyr" "" # CYRILLIC SMALL LETTER KA
-0x043b "\\textcyr{\\cyrl}"        "textcyr" "" # CYRILLIC SMALL LETTER EL
-0x043c "\\textcyr{\\cyrm}"        "textcyr" "" # CYRILLIC SMALL LETTER EM
-0x043d "\\textcyr{\\cyrn}"        "textcyr" "" # CYRILLIC SMALL LETTER EN
-0x043e "\\textcyr{\\cyro}"        "textcyr" "" # CYRILLIC SMALL LETTER O
-0x043f "\\textcyr{\\cyrp}"        "textcyr" "" # CYRILLIC SMALL LETTER PE
-0x0440 "\\textcyr{\\cyrr}"        "textcyr" "" # CYRILLIC SMALL LETTER ER
-0x0441 "\\textcyr{\\cyrs}"        "textcyr" "" # CYRILLIC SMALL LETTER ES
-0x0442 "\\textcyr{\\cyrt}"        "textcyr" "" # CYRILLIC SMALL LETTER TE
-0x0443 "\\textcyr{\\cyru}"        "textcyr" "" # CYRILLIC SMALL LETTER U
-0x0444 "\\textcyr{\\cyrf}"        "textcyr" "" # CYRILLIC SMALL LETTER EF
-0x0445 "\\textcyr{\\cyrh}"        "textcyr" "" # CYRILLIC SMALL LETTER HA
-0x0446 "\\textcyr{\\cyrc}"        "textcyr" "" # CYRILLIC SMALL LETTER TSE
-0x0447 "\\textcyr{\\cyrch}"       "textcyr" "" # CYRILLIC SMALL LETTER CHE
-0x0448 "\\textcyr{\\cyrsh}"       "textcyr" "" # CYRILLIC SMALL LETTER SHA
-0x0449 "\\textcyr{\\cyrshch}"     "textcyr" "" # CYRILLIC SMALL LETTER SHCHA
-0x044a "\\textcyr{\\cyrhrdsn}"    "textcyr" "" # CYRILLIC SMALL LETTER HARD SIGN
-0x044b "\\textcyr{\\cyrery}"      "textcyr" "" # CYRILLIC SMALL LETTER YERU
-0x044c "\\textcyr{\\cyrsftsn}"    "textcyr" "" # CYRILLIC SMALL LETTER SOFT SIGN
-0x044d "\\textcyr{\\cyrerev}"     "textcyr" "" # CYRILLIC SMALL LETTER E
-0x044e "\\textcyr{\\cyryu}"       "textcyr" "" # CYRILLIC SMALL LETTER YU
-0x044f "\\textcyr{\\cyrya}"       "textcyr" "" # CYRILLIC SMALL LETTER YA
-0x0450 "\\textcyr{\\`\\cyre}"     "textcyr" "" # CYRILLIC SMALL LETTER IE WITH GRAVE
-0x0451 "\\textcyr{\\cyryo}"       "textcyr" "" # CYRILLIC SMALL LETTER IO
-0x0452 "\\textcyr{\\cyrdje}"      "textcyr" "" # CYRILLIC SMALL LETTER DJE
-0x0453 "\\textcyr{\\`\\cyrg}"     "textcyr" "" # CYRILLIC SMALL LETTER GJE
-0x0454 "\\textcyr{\\cyrie}"       "textcyr" "" # CYRILLIC SMALL LETTER UKRAINIAN IE
-0x0455 "\\textcyr{\\cyrdze}"      "textcyr" "" # CYRILLIC SMALL LETTER DZE
-0x0456 "\\textcyr{\\cyrii}"       "textcyr" "" # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0x0457 "\\textcyr{\\cyryi}"       "textcyr" "" # CYRILLIC SMALL LETTER YI
-0x0458 "\\textcyr{\\cyrje}"       "textcyr" "" # CYRILLIC SMALL LETTER JE
-0x0459 "\\textcyr{\\cyrlje}"      "textcyr" "" # CYRILLIC SMALL LETTER LJE
-0x045a "\\textcyr{\\cyrnje}"      "textcyr" "" # CYRILLIC SMALL LETTER NJE
-0x045b "\\textcyr{\\cyrtshe}"     "textcyr" "" # CYRILLIC SMALL LETTER TSHE
-0x045c "\\textcyr{\\`\\cyrk}"     "textcyr" "" # CYRILLIC SMALL LETTER KJE
-0x045d "\\textcyr{\\`\\cyri}"     "textcyr" "" # CYRILLIC SMALL LETTER I WITH GRAVE
-0x045e "\\textcyr{\\cyrushrt}"    "textcyr" "" # CYRILLIC SMALL LETTER SHORT U
-0x045f "\\textcyr{\\cyrdzhe}"     "textcyr" "" # CYRILLIC SMALL LETTER DZHE
-0x0490 "\\textcyr{\\CYRGUP}"      "textcyr" "" # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0x0491 "\\textcyr{\\cyrgup}"      "textcyr" "" # CYRILLIC SMALL LETTER GHE WITH UPTURN
-0x0492 "\\textcyr{\\CYRGHCRS}"    "textcyr" "" # CYRILLIC CAPITAL LETTER GHE WITH STROKE
-0x0493 "\\textcyr{\\cyrghcrs}"    "textcyr" "" # CYRILLIC SMALL LETTER GHE WITH STROKE
+# "textcyrillic" selects LaTeX font encoding T2A
+0x0400 "\\textcyrillic{\\`\\CYRE}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER IE WITH GRAVE
+0x0401 "\\textcyrillic{\\CYRYO}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER IO
+0x0402 "\\textcyrillic{\\CYRDJE}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER DJE
+0x0403 "\\textcyrillic{\\`\\CYRG}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER GJE
+0x0404 "\\textcyrillic{\\CYRIE}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0x0405 "\\textcyrillic{\\CYRDZE}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER DZE
+0x0406 "\\textcyrillic{\\CYRII}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0x0407 "\\textcyrillic{\\CYRYI}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER YI
+0x0408 "\\textcyrillic{\\CYRJE}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER JE
+0x0409 "\\textcyrillic{\\CYRLJE}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER LJE
+0x040a "\\textcyrillic{\\CYRNJE}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER NJE
+0x040b "\\textcyrillic{\\CYRTSHE}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER TSHE
+0x040c "\\textcyrillic{\\`\\CYRK}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER KJE
+0x040d "\\textcyrillic{\\`\\CYRI}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER I WITH GRAVE
+0x040e "\\textcyrillic{\\CYRUSHRT}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER SHORT U
+0x040f "\\textcyrillic{\\CYRDZHE}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER DZHE
+0x0410 "\\textcyrillic{\\CYRA}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER A
+0x0411 "\\textcyrillic{\\CYRB}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER BE
+0x0412 "\\textcyrillic{\\CYRV}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER VE
+0x0413 "\\textcyrillic{\\CYRG}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER GHE
+0x0414 "\\textcyrillic{\\CYRD}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER DE
+0x0415 "\\textcyrillic{\\CYRE}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER IE
+0x0416 "\\textcyrillic{\\CYRZH}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZHE
+0x0417 "\\textcyrillic{\\CYRZ}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZE
+0x0418 "\\textcyrillic{\\CYRI}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER I
+0x0419 "\\textcyrillic{\\CYRISHRT}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER SHORT I
+0x041a "\\textcyrillic{\\CYRK}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER KA
+0x041b "\\textcyrillic{\\CYRL}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER EL
+0x041c "\\textcyrillic{\\CYRM}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER EM
+0x041d "\\textcyrillic{\\CYRN}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER EN
+0x041e "\\textcyrillic{\\CYRO}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER O
+0x041f "\\textcyrillic{\\CYRP}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER PE
+0x0420 "\\textcyrillic{\\CYRR}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER ER
+0x0421 "\\textcyrillic{\\CYRS}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER ES
+0x0422 "\\textcyrillic{\\CYRT}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER TE
+0x0423 "\\textcyrillic{\\CYRU}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER U
+0x0424 "\\textcyrillic{\\CYRF}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER EF
+0x0425 "\\textcyrillic{\\CYRH}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER HA
+0x0426 "\\textcyrillic{\\CYRC}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER TSE
+0x0427 "\\textcyrillic{\\CYRCH}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER CHE
+0x0428 "\\textcyrillic{\\CYRSH}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER SHA
+0x0429 "\\textcyrillic{\\CYRSHCH}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER SHCHA
+0x042a "\\textcyrillic{\\CYRHRDSN}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER HARD SIGN
+0x042b "\\textcyrillic{\\CYRERY}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER YERU
+0x042c "\\textcyrillic{\\CYRSFTSN}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER SOFT SIGN
+0x042d "\\textcyrillic{\\CYREREV}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER E
+0x042e "\\textcyrillic{\\CYRYU}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER YU
+0x042f "\\textcyrillic{\\CYRYA}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER YA
+0x0430 "\\textcyrillic{\\cyra}"        "textcyrillic" "" # CYRILLIC SMALL LETTER A
+0x0431 "\\textcyrillic{\\cyrb}"        "textcyrillic" "" # CYRILLIC SMALL LETTER BE
+0x0432 "\\textcyrillic{\\cyrv}"        "textcyrillic" "" # CYRILLIC SMALL LETTER VE
+0x0433 "\\textcyrillic{\\cyrg}"        "textcyrillic" "" # CYRILLIC SMALL LETTER GHE
+0x0434 "\\textcyrillic{\\cyrd}"        "textcyrillic" "" # CYRILLIC SMALL LETTER DE
+0x0435 "\\textcyrillic{\\cyre}"        "textcyrillic" "" # CYRILLIC SMALL LETTER IE
+0x0436 "\\textcyrillic{\\cyrzh}"       "textcyrillic" "" # CYRILLIC SMALL LETTER ZHE
+0x0437 "\\textcyrillic{\\cyrz}"        "textcyrillic" "" # CYRILLIC SMALL LETTER ZE
+0x0438 "\\textcyrillic{\\cyri}"        "textcyrillic" "" # CYRILLIC SMALL LETTER I
+0x0439 "\\textcyrillic{\\cyrishrt}"    "textcyrillic" "" # CYRILLIC SMALL LETTER SHORT I
+0x043a "\\textcyrillic{\\cyrk}"        "textcyrillic" "" # CYRILLIC SMALL LETTER KA
+0x043b "\\textcyrillic{\\cyrl}"        "textcyrillic" "" # CYRILLIC SMALL LETTER EL
+0x043c "\\textcyrillic{\\cyrm}"        "textcyrillic" "" # CYRILLIC SMALL LETTER EM
+0x043d "\\textcyrillic{\\cyrn}"        "textcyrillic" "" # CYRILLIC SMALL LETTER EN
+0x043e "\\textcyrillic{\\cyro}"        "textcyrillic" "" # CYRILLIC SMALL LETTER O
+0x043f "\\textcyrillic{\\cyrp}"        "textcyrillic" "" # CYRILLIC SMALL LETTER PE
+0x0440 "\\textcyrillic{\\cyrr}"        "textcyrillic" "" # CYRILLIC SMALL LETTER ER
+0x0441 "\\textcyrillic{\\cyrs}"        "textcyrillic" "" # CYRILLIC SMALL LETTER ES
+0x0442 "\\textcyrillic{\\cyrt}"        "textcyrillic" "" # CYRILLIC SMALL LETTER TE
+0x0443 "\\textcyrillic{\\cyru}"        "textcyrillic" "" # CYRILLIC SMALL LETTER U
+0x0444 "\\textcyrillic{\\cyrf}"        "textcyrillic" "" # CYRILLIC SMALL LETTER EF
+0x0445 "\\textcyrillic{\\cyrh}"        "textcyrillic" "" # CYRILLIC SMALL LETTER HA
+0x0446 "\\textcyrillic{\\cyrc}"        "textcyrillic" "" # CYRILLIC SMALL LETTER TSE
+0x0447 "\\textcyrillic{\\cyrch}"       "textcyrillic" "" # CYRILLIC SMALL LETTER CHE
+0x0448 "\\textcyrillic{\\cyrsh}"       "textcyrillic" "" # CYRILLIC SMALL LETTER SHA
+0x0449 "\\textcyrillic{\\cyrshch}"     "textcyrillic" "" # CYRILLIC SMALL LETTER SHCHA
+0x044a "\\textcyrillic{\\cyrhrdsn}"    "textcyrillic" "" # CYRILLIC SMALL LETTER HARD SIGN
+0x044b "\\textcyrillic{\\cyrery}"      "textcyrillic" "" # CYRILLIC SMALL LETTER YERU
+0x044c "\\textcyrillic{\\cyrsftsn}"    "textcyrillic" "" # CYRILLIC SMALL LETTER SOFT SIGN
+0x044d "\\textcyrillic{\\cyrerev}"     "textcyrillic" "" # CYRILLIC SMALL LETTER E
+0x044e "\\textcyrillic{\\cyryu}"       "textcyrillic" "" # CYRILLIC SMALL LETTER YU
+0x044f "\\textcyrillic{\\cyrya}"       "textcyrillic" "" # CYRILLIC SMALL LETTER YA
+0x0450 "\\textcyrillic{\\`\\cyre}"     "textcyrillic" "" # CYRILLIC SMALL LETTER IE WITH GRAVE
+0x0451 "\\textcyrillic{\\cyryo}"       "textcyrillic" "" # CYRILLIC SMALL LETTER IO
+0x0452 "\\textcyrillic{\\cyrdje}"      "textcyrillic" "" # CYRILLIC SMALL LETTER DJE
+0x0453 "\\textcyrillic{\\`\\cyrg}"     "textcyrillic" "" # CYRILLIC SMALL LETTER GJE
+0x0454 "\\textcyrillic{\\cyrie}"       "textcyrillic" "" # CYRILLIC SMALL LETTER UKRAINIAN IE
+0x0455 "\\textcyrillic{\\cyrdze}"      "textcyrillic" "" # CYRILLIC SMALL LETTER DZE
+0x0456 "\\textcyrillic{\\cyrii}"       "textcyrillic" "" # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0x0457 "\\textcyrillic{\\cyryi}"       "textcyrillic" "" # CYRILLIC SMALL LETTER YI
+0x0458 "\\textcyrillic{\\cyrje}"       "textcyrillic" "" # CYRILLIC SMALL LETTER JE
+0x0459 "\\textcyrillic{\\cyrlje}"      "textcyrillic" "" # CYRILLIC SMALL LETTER LJE
+0x045a "\\textcyrillic{\\cyrnje}"      "textcyrillic" "" # CYRILLIC SMALL LETTER NJE
+0x045b "\\textcyrillic{\\cyrtshe}"     "textcyrillic" "" # CYRILLIC SMALL LETTER TSHE
+0x045c "\\textcyrillic{\\`\\cyrk}"     "textcyrillic" "" # CYRILLIC SMALL LETTER KJE
+0x045d "\\textcyrillic{\\`\\cyri}"     "textcyrillic" "" # CYRILLIC SMALL LETTER I WITH GRAVE
+0x045e "\\textcyrillic{\\cyrushrt}"    "textcyrillic" "" # CYRILLIC SMALL LETTER SHORT U
+0x045f "\\textcyrillic{\\cyrdzhe}"     "textcyrillic" "" # CYRILLIC SMALL LETTER DZHE
+0x0490 "\\textcyrillic{\\CYRGUP}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0x0491 "\\textcyrillic{\\cyrgup}"      "textcyrillic" "" # CYRILLIC SMALL LETTER GHE WITH UPTURN
+0x0492 "\\textcyrillic{\\CYRGHCRS}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0x0493 "\\textcyrillic{\\cyrghcrs}"    "textcyrillic" "" # CYRILLIC SMALL LETTER GHE WITH STROKE
 #0x0494 ""                          "" "" "" # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
 #0x0495 ""                          "" "" "" # CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
-0x0496 "\\textcyr{\\CYRZHDSC}"    "textcyr" "" # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-0x0497 "\\textcyr{\\cyrzhdsc}"    "textcyr" "" # CYRILLIC SMALL LETTER ZHE WITH DESCENDER
-0x0498 "\\textcyr{\\CYRZDSC}"     "textcyr" "" # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-0x0499 "\\textcyr{\\cyrzdsc}"     "textcyr" "" # CYRILLIC SMALL LETTER ZE WITH DESCENDER
-0x049a "\\textcyr{\\CYRKDSC}"     "textcyr" "" # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-0x049b "\\textcyr{\\cyrkdsc}"     "textcyr" "" # CYRILLIC SMALL LETTER KA WITH DESCENDER
-0x049c "\\textcyr{\\CYRKVCRS}"    "textcyr" "" # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-0x049d "\\textcyr{\\cyrkvcrs}"    "textcyr" "" # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+0x0496 "\\textcyrillic{\\CYRZHDSC}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0x0497 "\\textcyrillic{\\cyrzhdsc}"    "textcyrillic" "" # CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+0x0498 "\\textcyrillic{\\CYRZDSC}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+0x0499 "\\textcyrillic{\\cyrzdsc}"     "textcyrillic" "" # CYRILLIC SMALL LETTER ZE WITH DESCENDER
+0x049a "\\textcyrillic{\\CYRKDSC}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+0x049b "\\textcyrillic{\\cyrkdsc}"     "textcyrillic" "" # CYRILLIC SMALL LETTER KA WITH DESCENDER
+0x049c "\\textcyrillic{\\CYRKVCRS}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+0x049d "\\textcyrillic{\\cyrkvcrs}"    "textcyrillic" "" # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
 #0x049e ""                          "" "" "" # CYRILLIC CAPITAL LETTER KA WITH STROKE
 #0x049f ""                          "" "" "" # CYRILLIC SMALL LETTER KA WITH STROKE
-0x04a0 "\\textcyr{\\CYRKBEAK}"    "textcyr" "" # CYRILLIC CAPITAL LETTER BASHKIR KA
-0x04a1 "\\textcyr{\\cyrkbeak}"    "textcyr" "" # CYRILLIC SMALL LETTER BASHKIR KA
-0x04a2 "\\textcyr{\\CYRNDSC}"     "textcyr" "" # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-0x04a3 "\\textcyr{\\cyrndsc}"     "textcyr" "" # CYRILLIC SMALL LETTER EN WITH DESCENDER
-0x04a4 "\\textcyr{\\CYRNG}"       "textcyr" "" # CYRILLIC CAPITAL LIGATURE EN GHE
-0x04a5 "\\textcyr{\\cyrng}"       "textcyr" "" # CYRILLIC SMALL LIGATURE EN GHE
+0x04a0 "\\textcyrillic{\\CYRKBEAK}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER BASHKIR KA
+0x04a1 "\\textcyrillic{\\cyrkbeak}"    "textcyrillic" "" # CYRILLIC SMALL LETTER BASHKIR KA
+0x04a2 "\\textcyrillic{\\CYRNDSC}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+0x04a3 "\\textcyrillic{\\cyrndsc}"     "textcyrillic" "" # CYRILLIC SMALL LETTER EN WITH DESCENDER
+0x04a4 "\\textcyrillic{\\CYRNG}"       "textcyrillic" "" # CYRILLIC CAPITAL LIGATURE EN GHE
+0x04a5 "\\textcyrillic{\\cyrng}"       "textcyrillic" "" # CYRILLIC SMALL LIGATURE EN GHE
 #0x04a6 ""                          "" "" "" # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
 #0x04a7 ""                          "" "" "" # CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
 #0x04a8 ""                          "" "" "" # CYRILLIC CAPITAL LETTER ABKHASIAN HA
 #0x04a9 ""                          "" "" "" # CYRILLIC SMALL LETTER ABKHASIAN HA
-0x04aa "\\textcyr{\\CYRSDSC}"     "textcyr" "" # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-0x04ab "\\textcyr{\\cyrsdsc}"     "textcyr" "" # CYRILLIC SMALL LETTER ES WITH DESCENDER
+0x04aa "\\textcyrillic{\\CYRSDSC}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+0x04ab "\\textcyrillic{\\cyrsdsc}"     "textcyrillic" "" # CYRILLIC SMALL LETTER ES WITH DESCENDER
 #0x04ac ""                          "" "" "" # CYRILLIC CAPITAL LETTER TE WITH DESCENDER
 #0x04ad ""                          "" "" "" # CYRILLIC SMALL LETTER TE WITH DESCENDER
-0x04ae "\\textcyr{\\CYRY}"        "textcyr" "" # CYRILLIC CAPITAL LETTER STRAIGHT U
-0x04af "\\textcyr{\\cyry}"        "textcyr" "" # CYRILLIC SMALL LETTER STRAIGHT U
-0x04b0 "\\textcyr{\\CYRYHCRS}"    "textcyr" "" # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-0x04b1 "\\textcyr{\\cyryhcrs}"    "textcyr" "" # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
-0x04b2 "\\textcyr{\\CYRHDSC}"     "textcyr" "" # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-0x04b3 "\\textcyr{\\cyrhdsc}"     "textcyr" "" # CYRILLIC SMALL LETTER HA WITH DESCENDER
-#0x04b4 ""                       "textcyr" "" # CYRILLIC CAPITAL LIGATURE TE TSE
-#0x04b5 ""                       "textcyr" "" # CYRILLIC SMALL LIGATURE TE TSE
-0x04b6 "\\textcyr{\\CYRCHRDSC}"   "textcyr" "" # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-0x04b7 "\\textcyr{\\cyrchrdsc}"   "textcyr" "" # CYRILLIC SMALL LETTER CHE WITH DESCENDER
-0x04b8 "\\textcyr{\\CYRCHVCRS}"   "textcyr" "" # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-0x04b9 "\\textcyr{\\cyrchvcrs}"   "textcyr" "" # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
-0x04ba "\\textcyr{\\CYRSHHA}"    "textcyr" "" # CYRILLIC CAPITAL LETTER SHHA
-0x04bb "\\textcyr{\\cyrshha}"     "textcyr" "" # CYRILLIC SMALL LETTER SHHA
+0x04ae "\\textcyrillic{\\CYRY}"        "textcyrillic" "" # CYRILLIC CAPITAL LETTER STRAIGHT U
+0x04af "\\textcyrillic{\\cyry}"        "textcyrillic" "" # CYRILLIC SMALL LETTER STRAIGHT U
+0x04b0 "\\textcyrillic{\\CYRYHCRS}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+0x04b1 "\\textcyrillic{\\cyryhcrs}"    "textcyrillic" "" # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+0x04b2 "\\textcyrillic{\\CYRHDSC}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+0x04b3 "\\textcyrillic{\\cyrhdsc}"     "textcyrillic" "" # CYRILLIC SMALL LETTER HA WITH DESCENDER
+#0x04b4 ""                       "textcyrillic" "" # CYRILLIC CAPITAL LIGATURE TE TSE
+#0x04b5 ""                       "textcyrillic" "" # CYRILLIC SMALL LIGATURE TE TSE
+0x04b6 "\\textcyrillic{\\CYRCHRDSC}"   "textcyrillic" "" # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+0x04b7 "\\textcyrillic{\\cyrchrdsc}"   "textcyrillic" "" # CYRILLIC SMALL LETTER CHE WITH DESCENDER
+0x04b8 "\\textcyrillic{\\CYRCHVCRS}"   "textcyrillic" "" # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+0x04b9 "\\textcyrillic{\\cyrchvcrs}"   "textcyrillic" "" # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+0x04ba "\\textcyrillic{\\CYRSHHA}"       "textcyrillic" "" # CYRILLIC CAPITAL LETTER SHHA
+0x04bb "\\textcyrillic{\\cyrshha}"     "textcyrillic" "" # CYRILLIC SMALL LETTER SHHA
 #0x04bc ""                          "" "" "" # CYRILLIC CAPITAL LETTER ABKHASIAN CHE
 #0x04bd ""                          "" "" "" # CYRILLIC SMALL LETTER ABKHASIAN CHE
 #0x04be ""                          "" "" "" # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
 #0x04bf ""                          "" "" "" # CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
-0x04c0 "\\textcyr{\\CYRpalochka}" "textcyr" "" # CYRILLIC LETTER PALOCHKA
-0x04c1 "\\textcyr{\\U\CYRZH}"     "textcyr" "" # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-0x04c2 "\\textcyr{\\U\cyrzh}"     "textcyr" "" # CYRILLIC SMALL LETTER ZHE WITH BREVE
+0x04c0 "\\textcyrillic{\\CYRpalochka}" "textcyrillic" "" # CYRILLIC LETTER PALOCHKA
+0x04c1 "\\textcyrillic{\\U\CYRZH}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+0x04c2 "\\textcyrillic{\\U\cyrzh}"     "textcyrillic" "" # CYRILLIC SMALL LETTER ZHE WITH BREVE
 #0x04c3 ""                          "" "" "" # CYRILLIC CAPITAL LETTER KA WITH HOOK
 #0x04c4 ""                          "" "" "" # CYRILLIC SMALL LETTER KA WITH HOOK
 #0x04c5 ""                          "" "" "" # CYRILLIC CAPITAL LETTER EL WITH TAIL
@@ -1048,48 +1048,48 @@
 #0x04cd ""                          "" "" "" # CYRILLIC CAPITAL LETTER EM WITH TAIL
 #0x04ce ""                          "" "" "" # CYRILLIC SMALL LETTER EM WITH TAIL
 #0x04cf ""                          "" "" "" # CYRILLIC SMALL LETTER PALOCHKA
-0x04d0 "\\textcyr{\\U\CYRA}"      "textcyr" "" # CYRILLIC CAPITAL LETTER A WITH BREVE
-0x04d1 "\\textcyr{\\U\cyra}"      "textcyr" "" # CYRILLIC SMALL LETTER A WITH BREVE
-0x04d2 "\\textcyr{\\\"\CYRA}"     "textcyr" "" # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-0x04d3 "\\textcyr{\\\"\cyra}"     "textcyr" "" # CYRILLIC SMALL LETTER A WITH DIAERESIS
-0x04d4 "\\textcyr{\\CYRAE}"       "textcyr" "" # CYRILLIC CAPITAL LIGATURE A IE
-0x04d5 "\\textcyr{\\cyrae}"       "textcyr" "" # CYRILLIC SMALL LIGATURE A IE
-0x04d6 "\\textcyr{\\U\CYRE}"      "textcyr" "" # CYRILLIC CAPITAL LETTER IE WITH BREVE
-0x04d7 "\\textcyr{\\U\cyre}"      "textcyr" "" # CYRILLIC SMALL LETTER IE WITH BREVE
-0x04d8 "\\textcyr{\\CYRSCHWA}"    "textcyr" "" # CYRILLIC CAPITAL LETTER SCHWA
-0x04d9 "\\textcyr{\\cyrschwa}"    "textcyr" "" # CYRILLIC SMALL LETTER SCHWA
-0x04da "\\textcyr{\\\"\CYRSCHWA}" "textcyr" "" # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-0x04db "\\textcyr{\\\"\cyrschwa}" "textcyr" "" # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
-0x04dc "\\textcyr{\\\"\CYRZH}"    "textcyr" "" # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-0x04dd "\\textcyr{\\\"\cyrzh}"    "textcyr" "" # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
-0x04de "\\textcyr{\\\"\CYRZ}"     "textcyr" "" # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-0x04df "\\textcyr{\\\"\cyrz}"     "textcyr" "" # CYRILLIC SMALL LETTER ZE WITH DIAERESIS
+0x04d0 "\\textcyrillic{\\U\CYRA}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER A WITH BREVE
+0x04d1 "\\textcyrillic{\\U\cyra}"      "textcyrillic" "" # CYRILLIC SMALL LETTER A WITH BREVE
+0x04d2 "\\textcyrillic{\\\"\CYRA}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+0x04d3 "\\textcyrillic{\\\"\cyra}"     "textcyrillic" "" # CYRILLIC SMALL LETTER A WITH DIAERESIS
+0x04d4 "\\textcyrillic{\\CYRAE}"       "textcyrillic" "" # CYRILLIC CAPITAL LIGATURE A IE
+0x04d5 "\\textcyrillic{\\cyrae}"       "textcyrillic" "" # CYRILLIC SMALL LIGATURE A IE
+0x04d6 "\\textcyrillic{\\U\CYRE}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER IE WITH BREVE
+0x04d7 "\\textcyrillic{\\U\cyre}"      "textcyrillic" "" # CYRILLIC SMALL LETTER IE WITH BREVE
+0x04d8 "\\textcyrillic{\\CYRSCHWA}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER SCHWA
+0x04d9 "\\textcyrillic{\\cyrschwa}"    "textcyrillic" "" # CYRILLIC SMALL LETTER SCHWA
+0x04da "\\textcyrillic{\\\"\CYRSCHWA}" "textcyrillic" "" # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+0x04db "\\textcyrillic{\\\"\cyrschwa}" "textcyrillic" "" # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+0x04dc "\\textcyrillic{\\\"\CYRZH}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+0x04dd "\\textcyrillic{\\\"\cyrzh}"    "textcyrillic" "" # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
+0x04de "\\textcyrillic{\\\"\CYRZ}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+0x04df "\\textcyrillic{\\\"\cyrz}"     "textcyrillic" "" # CYRILLIC SMALL LETTER ZE WITH DIAERESIS
 #0x04e0 ""                          "" "" "" # CYRILLIC CAPITAL LETTER ABKHASIAN DZE
 #0x04e1 ""                          "" "" "" # CYRILLIC SMALL LETTER ABKHASIAN DZE
-0x04e2 "\\textcyr{\\=\CYRI}"      "textcyr" "" # CYRILLIC CAPITAL LETTER I WITH MACRON
-0x04e3 "\\textcyr{\\=\cyri}"      "textcyr" "" # CYRILLIC SMALL LETTER I WITH MACRON
-0x04e4 "\\textcyr{\\\"\CYRI}"     "textcyr" "" # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-0x04e5 "\\textcyr{\\\"\cyri}"     "textcyr" "" # CYRILLIC SMALL LETTER I WITH DIAERESIS
-0x04e6 "\\textcyr{\\\"\CYRO}"     "textcyr" "" # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-0x04e7 "\\textcyr{\\\"\cyro}"     "textcyr" "" # CYRILLIC SMALL LETTER O WITH DIAERESIS
-0x04e8 "\\textcyr{\\CYROTLD}"     "textcyr" "" # CYRILLIC CAPITAL LETTER BARRED O
-0x04e9 "\\textcyr{\\cyrotld}"     "textcyr" "" # CYRILLIC SMALL LETTER BARRED O
+0x04e2 "\\textcyrillic{\\=\CYRI}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER I WITH MACRON
+0x04e3 "\\textcyrillic{\\=\cyri}"      "textcyrillic" "" # CYRILLIC SMALL LETTER I WITH MACRON
+0x04e4 "\\textcyrillic{\\\"\CYRI}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+0x04e5 "\\textcyrillic{\\\"\cyri}"     "textcyrillic" "" # CYRILLIC SMALL LETTER I WITH DIAERESIS
+0x04e6 "\\textcyrillic{\\\"\CYRO}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+0x04e7 "\\textcyrillic{\\\"\cyro}"     "textcyrillic" "" # CYRILLIC SMALL LETTER O WITH DIAERESIS
+0x04e8 "\\textcyrillic{\\CYROTLD}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER BARRED O
+0x04e9 "\\textcyrillic{\\cyrotld}"     "textcyrillic" "" # CYRILLIC SMALL LETTER BARRED O
 #0x04ea ""                          "" "" "" # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
 #0x04eb ""                          "" "" "" # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
-0x04ec "\\textcyr{\\\"\CYREREV}"  "textcyr" "" # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-0x04ed "\\textcyr{\\\"\cyrerev}"  "textcyr" "" # CYRILLIC SMALL LETTER E WITH DIAERESIS
-0x04ee "\\textcyr{\\=\CYRU}"      "textcyr" "" # CYRILLIC CAPITAL LETTER U WITH MACRON
-0x04ef "\\textcyr{\\=\cyru}"      "textcyr" "" # CYRILLIC SMALL LETTER U WITH MACRON
-0x04f0 "\\textcyr{\\\"\CYRU}"     "textcyr" "" # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-0x04f1 "\\textcyr{\\\"\cyru}"     "textcyr" "" # CYRILLIC SMALL LETTER U WITH DIAERESIS
-0x04f2 "\\textcyr{\\H\CYRU}"      "textcyr" "" # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-0x04f3 "\\textcyr{\\H\cyru}"      "textcyr" "" # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
-0x04f4 "\\textcyr{\\\"\CYRCH}"    "textcyr" "" # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-0x04f5 "\\textcyr{\\\"\cyrch}"    "textcyr" "" # CYRILLIC SMALL LETTER CHE WITH DIAERESIS
+0x04ec "\\textcyrillic{\\\"\CYREREV}"  "textcyrillic" "" # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+0x04ed "\\textcyrillic{\\\"\cyrerev}"  "textcyrillic" "" # CYRILLIC SMALL LETTER E WITH DIAERESIS
+0x04ee "\\textcyrillic{\\=\CYRU}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER U WITH MACRON
+0x04ef "\\textcyrillic{\\=\cyru}"      "textcyrillic" "" # CYRILLIC SMALL LETTER U WITH MACRON
+0x04f0 "\\textcyrillic{\\\"\CYRU}"     "textcyrillic" "" # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+0x04f1 "\\textcyrillic{\\\"\cyru}"     "textcyrillic" "" # CYRILLIC SMALL LETTER U WITH DIAERESIS
+0x04f2 "\\textcyrillic{\\H\CYRU}"      "textcyrillic" "" # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+0x04f3 "\\textcyrillic{\\H\cyru}"      "textcyrillic" "" # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
+0x04f4 "\\textcyrillic{\\\"\CYRCH}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+0x04f5 "\\textcyrillic{\\\"\cyrch}"    "textcyrillic" "" # CYRILLIC SMALL LETTER CHE WITH DIAERESIS
 #0x04f6 ""                          "" "" "" # CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
 #0x04f7 ""                          "" "" "" # CYRILLIC SMALL LETTER GHE WITH DESCENDER
-0x04f8 "\\textcyr{\\\"\CYRERY}"    "textcyr" "" # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-0x04f9 "\\textcyr{\\\"\cyrery}"    "textcyr" "" # CYRILLIC SMALL LETTER YERU WITH DIAERESIS
+0x04f8 "\\textcyrillic{\\\"\CYRERY}"    "textcyrillic" "" # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+0x04f9 "\\textcyrillic{\\\"\cyrery}"    "textcyrillic" "" # CYRILLIC SMALL LETTER YERU WITH DIAERESIS
 #
 # 31 Thai
 #

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 9966e710d8f8ed6201187079c1c923ce668b409a..0947c148c1e7f0dbd8b7c2c741a538c3179602f8 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -588,7 +588,8 @@ bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
        if (it == unicodesymbols.end())
                return false;
 
-       if (it->second.textpreamble() != "textgreek" && it->second.textpreamble() != "textcyr")
+       if (it->second.textpreamble() != "textgreek"
+           && it->second.textpreamble() != "textcyrillic")
                return false;
 
        if (preamble.empty()) {
@@ -603,7 +604,7 @@ bool Encodings::needsScriptWrapper(string const & script, string const & fontenc
 {
        if (script == "textgreek")
                return (fontenc != "LGR");
-       if (script == "textcyr") {
+       if (script == "textcyrillic") {
                return (fontenc != "T2A" && fontenc != "T2B"
                        && fontenc != "T2C" && fontenc != "X2");
        }

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 3627cc660c9b628b8ed16813a0f1c72e649937aa..e8d138707008b0586646517b05560a21990429dc 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -258,7 +258,7 @@ static docstring const textcyr_T2A_def = from_ascii(
 static docstring const textcyr_def = from_ascii(
        "\\DeclareRobustCommand{\\cyrtext}{%\n"
        "  \\fontencoding{T2A}\\selectfont\\def\\encodingdefault{T2A}}\n"
-       "\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n");
+       "\\DeclareRobustCommand{\\textcyrillic}[1]{\\leavevmode{\\cyrtext #1}}\n");
 
 static docstring const lyxmathsym_def = from_ascii(
        "\\newcommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
@@ -615,18 +615,13 @@ bool LaTeXFeatures::isRequired(string const & name) const
 
 bool LaTeXFeatures::isProvided(string const & name) const
 {
-       // \textgreek is provided by babel globally if a Greek
-       // language/variety is used in the document
+       // Currently, this is only features provided by babel languages
+       // (such as textgreek)
        if (provides_.find(name) != provides_.end())
                return true;
 
-       // FIXME: Analoguously, babel provides a command \textcyrillic, but
-       //        for some reason, we roll our own \textcyr definition
-       //        We should use \textcyrillic instead and only define it
-       //        if we do not use a respective language that features it (i.e.,
-       //        add "textcyrillic" to the test above.
        // FIXME: the "textbaltic" definitions are only needed if the context
-       //        font-encoding where the respective char is is not l7x.
+       //        font encoding of the respective char is not l7x.
        //        We cannot check this here as we have no context information.
 
        if (params_.useNonTeXFonts)
@@ -908,7 +903,7 @@ void LaTeXFeatures::getFontEncodings(vector<string> & encs, bool const onlylangs
                if (mustProvide("textgreek")
                    && find(encs.begin(), encs.end(), "LGR") == encs.end())
                        encs.insert(encs.begin(), "LGR");
-               if (mustProvide("textcyr")
+               if (mustProvide("textcyrillic")
                    && find(encs.begin(), encs.end(), "T2A") == encs.end())
                        encs.insert(encs.begin(), "T2A");
        }
@@ -1389,7 +1384,7 @@ TexString LaTeXFeatures::getMacros() const
                macros << textgreek_def << '\n';
        }
 
-       if (!usePolyglossia() && mustProvide("textcyr")) {
+       if (!usePolyglossia() && mustProvide("textcyrillic")) {
                // ensure T2A font encoding is set up also if fontenc is not loaded by LyX
                if (params_.main_font_encoding() == "default")
                        macros << textcyr_T2A_def;

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 14c9c9e6ed70b1eb60704a79fbe0af14faf1a97f..574a830690452919cb210b1510210c81ba5fa967 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -894,11 +894,11 @@ int Paragraph::Private::latexSurrogatePair(otexstream & os, char_type c,
                return latex1.length() + latex2.length();
        }
 
-       // Handle combining characters in "script" context (i.e., \textgreek and \textcyr)
+       // Handle combining characters in "script" context (i.e., \textgreek and \textcyrillic)
        docstring::size_type const brace1 = latex2.find_first_of(from_ascii("{"));
        docstring::size_type const brace2 = latex2.find_last_of(from_ascii("}"));
        string script = to_ascii(latex2.substr(1, brace1 - 1));
-       // "Script chars" need to embraced in \textcyr and \textgreek notwithstanding
+       // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
        // whether they are encodable or not (it only depends on the font encoding)
        if (!runparams.isFullUnicode())
                // This will get us a script value to deal with below
@@ -912,7 +912,7 @@ int Paragraph::Private::latexSurrogatePair(otexstream & os, char_type c,
                fontenc = runparams.main_fontenc;
        docstring scriptmacro;
        docstring cb;
-       if (script == "textgreek" || script == "textcyr") {
+       if (script == "textgreek" || script == "textcyrillic") {
                // We separate the script macro (\text[greek|cyr]) from the rest,
                // since we need to include the combining char in it (#6463).
                // This is "the rest":
@@ -1393,7 +1393,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                        fontenc = runparams.main_fontenc;
                else
                        fontenc = running_font.language()->fontenc();
-               // "Script chars" need to embraced in \textcyr and \textgreek notwithstanding
+               // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
                // whether they are encodable or not (it only depends on the font encoding)
                if (!runparams.isFullUnicode() && Encodings::isKnownScriptChar(c, script)) {
                        docstring const wrapper = from_ascii("\\" + script + "{");

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 2e8a64081957786f40dade6522d8b37f7cde3e78..af66c177b043314dfa2396acc5d62f17d20e0deb 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index a898e072178d6b7071a92f34d73f18291a10aca4..db163f93acf0b577861608def9a2a9bb0f64ced0 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index e572bcc163d79f02c2aa63df34183f681cddcbdd..0bde6877a751e1a3d63fa4fc04772572c8d3f773 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index 85b6788faefc7a8a2ff945c7c5bae5c96991ce30..d05127de420c064150913b1969e6e96f1e79914c 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 8c3023469ebd46acfc14a9c80e828f0c8f3a6afa..2db3c4eded9ff34599cdb3004e47a9b1e0b94248 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index f2cfc89a6add7f29fe316931cf9399a4c06d914c..281c1f3e1524882ec0e0e6b9a1001cd65080bf6c 100644 (file)
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx
index 0290d7f6b98e100faa222279b11cbc282ca5965f..cb6e33cb6b6cd2f2168703515bbadaefba1dafc9 100644 (file)
--- a/src/tex2lyx/test/beamer.lyx.lyx
+++ b/src/tex2lyx/test/beamer.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index dc0fee502ec340d3b4ea3ef3984fba5c0ea8d5c5..aaa4d5bc4948bc486914bc989ba2f9135fff66b6 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 6a89ac02dafb2d0232922be0a3b47adc98201965..420d04027f315d2b5a35b991f8427eb00811d2fb 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index f0446a1abd4d4defec2df33490f44a9cf0c22c99..8c5805e3817d0fc2fac45b7bed97d031abb58fb6 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index fbd30caaeacb9b2a8e604e52419b9ea28a5ad07c..7f43947b62c99abbb8576d26464bd65e3cc5e0be 100644 (file)
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/src/tex2lyx/test/test-memoir.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-minted.lyx.lyx b/src/tex2lyx/test/test-minted.lyx.lyx
index 6ae92dc36c501fa9acab49c1bbfe5a07ac9ca21b..c793421f7b26dfeb4e61094f0e1b24b1b01c4334 100644 (file)
--- a/src/tex2lyx/test/test-minted.lyx.lyx
+++ b/src/tex2lyx/test/test-minted.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index fac36de46e41b9c05a7e3e2851d8b63fc8376925..7002735d45eb56e7746ec907e10f73cf8c2e10f3 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 5b9672f7ff619907ad2415281c1ebf7eb3dc1c84..57cf22b2766aa40ff414ece9cb6a2195429462d5 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index ac105da9623b7646067b0d85536541cd250db2e3..30bbfff37a46ac906d95628cf9b17ba03a230099 100644 (file)
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index a4d2626eb50af89b3010e9e24dd67b068a34b728..b913ba189daccaca24825facd6cda344c922f8cb 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 7a2c88a1da4b633c0ff7e19050e9b7660329723a..3362e5152e7f7ff0cd4d1420c21ce761e138b4f0 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index d38a1b0cd75895ed71bf0f04cf9e43360cf11c3a..92d5ba90eeae03afc9d22414c35602aee1144e33 100644 (file)
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.4
-\lyxformat 547
+\lyxformat 549
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 68148cb8466f4436c6f24b578bd3206e26f24cba..b87e44d61d810e5ba9287247f6a8f804c8fd9ccb 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -5718,7 +5718,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                // and math commands may be invalid (bug 6797)
                string name = t.asInput();
                // handle the dingbats, cyrillic and greek
-               if (name == "\\ding" || name == "\\textcyr" ||
+               if (name == "\\textcyr")
+                       name = "\\textcyrillic";
+               if (name == "\\ding" || name == "\\textcyrillic" ||
                    (name == "\\textgreek" && !preamble.usePolyglossia()))
                        name = name + '{' + p.getArg('{', '}') + '}';
                // handle the ifsym characters

diff --git a/src/version.h b/src/version.h
index 4b5639f3b2e55ad3fd41d2367bdb6a483a2c50ca..291a093f43175e0477b78d75c937059ad64c59f4 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 548 // spitz: landscape module
-#define LYX_FORMAT_TEX2LYX 548
+#define LYX_FORMAT_LYX 549 // spitz: \textcyr -> \textcyrillic
+#define LYX_FORMAT_TEX2LYX 549
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER