* attempt to fix polytonic Greek (with mutli-accents) [bug 5976].

* add extended Greek chars to unicodesymbols [bug 4997].

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30619 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/languages b/lib/languages
index 73864154f0bf2d3ced1593c97260edf802868cae..42f812ccfb10bc3ae34977f629a2306cc6c98ea8 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -43,7 +43,7 @@ german      german    "German (old spelling)" false  iso8859-15 de_DE  ""
 ngerman     ngerman    "German"        false  iso8859-15 de_DE  ""
 german-ch   ngerman    "German (Switzerland)"  false  iso8859-15 de_CH  ""
 greek       greek      "Greek"         false  iso8859-7  el_GR  ""
-polutonikogreek polutonikogreek        "Greek (polytonic)"     false  iso8859-7  el_GR  "\makeatletter\let\lyx@tildeaccent\~\addto\extraspolutonikogreek{\bbl@deactivate{~}\let\~\lyx@tildeaccent}\addto\extrasgreek{\bbl@deactivate{~}\let\~\lyx@tildeaccent}\makeatother"
+polutonikogreek polutonikogreek        "Greek (polytonic)"     false  iso8859-7  el_GR  "\providecommand*{\perispomeni}{\char126}\addto\extraspolutonikogreek{\let\~\perispomeni}\addto\extrasgreek{\let\~\perispomeni}"
 hebrew      hebrew     "Hebrew"        true   cp1255     he_IL  ""
 # "hungarian" is a synonym for the "magyar" babel language option
 # "hungarian" might be used for special purposes, see http://www.math.bme.hu/latex/magyar_pre_tug2004.pdf

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index b8542b5986d497bfa02701d6d9cac980fb21ceba..dbdd05e0100cf9d49c787bd08be10d521ad48e8b 100644 (file)
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -762,8 +762,8 @@
 0x03a7 "\\textgreek{Q}"           "textgreek" "" # GREEK CAPITAL LETTER CHI
 0x03a8 "\\textgreek{Y}"           "textgreek" "" # GREEK CAPITAL LETTER PSI
 0x03a9 "\\textgreek{W}"           "textgreek" "" # GREEK CAPITAL LETTER OMEGA
-0x03aa "\\textgreek{\\char219}"   "textgreek" "" # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-0x03ab "\\textgreek{\\char223}"   "textgreek" "" # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+0x03aa "\\textgreek{\"I}"        "textgreek" "" # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+0x03ab "\\textgreek{\"U}"        "textgreek" "" # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
 0x03ac "\\textgreek{\\char136}"   "textgreek" "" # GREEK SMALL LETTER ALPHA WITH TONOS
 0x03ad "\\textgreek{\\char232}"   "textgreek" "" # GREEK SMALL LETTER EPSILON WITH TONOS
 0x03ae "\\textgreek{\\char160}"   "textgreek" "" # GREEK SMALL LETTER ETA WITH TONOS
@@ -794,8 +794,8 @@
 0x03c7 "\\textgreek{q}"           "textgreek" "" # GREEK SMALL LETTER CHI
 0x03c8 "\\textgreek{y}"           "textgreek" "" # GREEK SMALL LETTER PSI
 0x03c9 "\\textgreek{w}"           "textgreek" "" # GREEK SMALL LETTER OMEGA
-0x03ca "\\textgreek{\\char240}"   "textgreek" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0x03cb "\\textgreek{\\char244}"   "textgreek" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+0x03ca "\\textgreek{\"i}"        "textgreek" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA
+0x03cb "\\textgreek{\"u}"        "textgreek" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
 0x03cc "\\textgreek{\\char236}"   "textgreek" "" # GREEK SMALL LETTER OMICRON WITH TONOS
 0x03cd "\\textgreek{\\char212}"   "textgreek" "" # GREEK SMALL LETTER UPSILON WITH TONOS
 0x03ce "\\textgreek{\\char184}"   "textgreek" "" # GREEK SMALL LETTER OMEGA WITH TONOS
@@ -1289,6 +1289,242 @@
 0x1ef8 "\\~{Y}"                   "" "mathalpha" "\\tilde{Y}" # LATIN CAPITAL LETTER Y WITH TILDE
 0x1ef9 "\\~{y}"                   "" "mathalpha" "\\tilde{y}" # LATIN SMALL LETTER Y WITH TILDE
 #
+# Greek extended
+#
+0x1f00 "\\textgreek{>a}"       "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI
+0x1f01 "\\textgreek{<a}"       "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA
+0x1f02 "\\textgreek{>`a}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+0x1f03 "\\textgreek{<`a}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+0x1f04 "\\textgreek{>'a}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+0x1f05 "\\textgreek{<'a}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+0x1f06 "\\textgreek{>\\~a}"    "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+0x1f07 "\\textgreek{<\\~a}"    "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+0x1f08 "\\textgreek{>A}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI
+0x1f09 "\\textgreek{<A}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA
+0x1f0a "\\textgreek{>`A}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+0x1f0b "\\textgreek{<`A}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+0x1f0c "\\textgreek{>'A}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+0x1f0d "\\textgreek{<'A}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+0x1f0e "\\textgreek{>\\~A}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+0x1f0f "\\textgreek{<\\~A}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+0x1f10 "\\textgreek{>e}"       "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH PSILI
+0x1f11 "\\textgreek{<e}"       "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH DASIA
+0x1f12 "\\textgreek{>`e}"      "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+0x1f13 "\\textgreek{<`e}"      "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+0x1f14 "\\textgreek{>'e}"      "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+0x1f15 "\\textgreek{<'e}"      "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+0x1f18 "\\textgreek{>E}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH PSILI
+0x1f19 "\\textgreek{<E}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH DASIA
+0x1f1a "\\textgreek{>`E}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+0x1f1b "\\textgreek{<`E}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+0x1f1c "\\textgreek{>'E}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+0x1f1d "\\textgreek{<'E}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+0x1f20 "\\textgreek{>h}"       "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI
+0x1f21 "\\textgreek{<h}"       "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA
+0x1f22 "\\textgreek{>`h}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+0x1f23 "\\textgreek{<`h}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+0x1f24 "\\textgreek{>'h}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+0x1f25 "\\textgreek{<'h}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+0x1f26 "\\textgreek{>\\~h}"    "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+0x1f27 "\\textgreek{<\\~h}"    "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+0x1f28 "\\textgreek{>H}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI
+0x1f29 "\\textgreek{<H}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA
+0x1f2a "\\textgreek{>`H}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+0x1f2b "\\textgreek{<`H}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+0x1f2c "\\textgreek{>'H}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+0x1f2d "\\textgreek{<'H}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+0x1f2e "\\textgreek{>\\~H}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+0x1f2f "\\textgreek{<\\~H}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+0x1f30 "\\textgreek{>i}"       "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH PSILI
+0x1f31 "\\textgreek{<i}"       "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DASIA
+0x1f32 "\\textgreek{>`i}"      "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+0x1f33 "\\textgreek{<`i}"      "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+0x1f34 "\\textgreek{>'i}"      "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+0x1f35 "\\textgreek{<'i}"      "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+0x1f36 "\\textgreek{>\\~i}"    "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+0x1f37 "\\textgreek{<\\~i}"    "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+0x1f38 "\\textgreek{>I}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH PSILI
+0x1f39 "\\textgreek{<I}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH DASIA
+0x1f3a "\\textgreek{>`I}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+0x1f3b "\\textgreek{<`I}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+0x1f3c "\\textgreek{>'I}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+0x1f3d "\\textgreek{<'I}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+0x1f3e "\\textgreek{>\\~I}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+0x1f3f "\\textgreek{<\\~I}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+0x1f40 "\\textgreek{>o}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH PSILI
+0x1f41 "\\textgreek{<o}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH DASIA
+0x1f42 "\\textgreek{>`o}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+0x1f43 "\\textgreek{<`o}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+0x1f44 "\\textgreek{>'o}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+0x1f45 "\\textgreek{<'o}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+0x1f48 "\\textgreek{>O}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH PSILI
+0x1f49 "\\textgreek{<O}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH DASIA
+0x1f4a "\\textgreek{>`O}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+0x1f4b "\\textgreek{<`O}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+0x1f4c "\\textgreek{>'O}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+0x1f4d "\\textgreek{<'O}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+0x1f50 "\\textgreek{>u}"       "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH PSILI
+0x1f51 "\\textgreek{<u}"       "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DASIA
+0x1f52 "\\textgreek{>`u}"      "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+0x1f53 "\\textgreek{<`u}"      "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+0x1f54 "\\textgreek{>'u}"      "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+0x1f55 "\\textgreek{<'u}"      "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+0x1f56 "\\textgreek{>\\~u}"    "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+0x1f57 "\\textgreek{<\\~u}"    "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+0x1f59 "\\textgreek{<U}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH DASIA
+0x1f5b "\\textgreek{<`U}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+0x1f5d "\\textgreek{<'U}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+0x1f5f "\\textgreek{<\\~U}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+0x1f60 "\\textgreek{>w}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI
+0x1f61 "\\textgreek{<w}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA
+0x1f62 "\\textgreek{>`w}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+0x1f63 "\\textgreek{<`w}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+0x1f64 "\\textgreek{>'w}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+0x1f65 "\\textgreek{<'w}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+0x1f66 "\\textgreek{>\\~w}"    "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+0x1f67 "\\textgreek{<\\~w}"    "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+0x1f68 "\\textgreek{>W}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI
+0x1f69 "\\textgreek{<W}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA
+0x1f6a "\\textgreek{>`W}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+0x1f6b "\\textgreek{<`W}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+0x1f6c "\\textgreek{>'W}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+0x1f6d "\\textgreek{<'W}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+0x1f6e "\\textgreek{>\\~W}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+0x1f6f "\\textgreek{<\\~W}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+0x1f70 "\\textgreek{`a}"       "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH VARIA
+0x1f71 "\\textgreek{'a}"       "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH OXIA
+0x1f72 "\\textgreek{`e}"       "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH VARIA
+0x1f73 "\\textgreek{'e}"       "textgreek" "" "" "" # GREEK SMALL LETTER EPSILON WITH OXIA
+0x1f74 "\\textgreek{`h}"       "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH VARIA
+0x1f75 "\\textgreek{'h}"       "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH OXIA
+0x1f76 "\\textgreek{`i}"       "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH VARIA
+0x1f77 "\\textgreek{'i}"       "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH OXIA
+0x1f78 "\\textgreek{`o}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH VARIA
+0x1f79 "\\textgreek{'o}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMICRON WITH OXIA
+0x1f7a "\\textgreek{`u}"       "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH VARIA
+0x1f7b "\\textgreek{'u}"       "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH OXIA
+0x1f7c "\\textgreek{`w}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH VARIA
+0x1f7d "\\textgreek{'w}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH OXIA
+0x1f80 "\\textgreek{>a|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+0x1f81 "\\textgreek{<a|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+0x1f82 "\\textgreek{>`a|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+0x1f83 "\\textgreek{<`a|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+0x1f84 "\\textgreek{>'a|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+0x1f85 "\\textgreek{<'a|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+0x1f86 "\\textgreek{>\\~a|}"   "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+0x1f87 "\\textgreek{<\\~a|}"   "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+0x1f88 "\\textgreek{>A|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+0x1f89 "\\textgreek{<A|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+0x1f8a "\\textgreek{>`A|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+0x1f8b "\\textgreek{<`A|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+0x1f8c "\\textgreek{>'A|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+0x1f8d "\\textgreek{<'A|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+0x1f8e "\\textgreek{>\\~A|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+0x1f8f "\\textgreek{<\\~A|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+0x1f90 "\\textgreek{>h|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+0x1f91 "\\textgreek{<h|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+0x1f92 "\\textgreek{>`h|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+0x1f93 "\\textgreek{<`h|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+0x1f94 "\\textgreek{>'h|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+0x1f95 "\\textgreek{<'h|}"     "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+0x1f96 "\\textgreek{>\\~h|}"   "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+0x1f97 "\\textgreek{<\\~h|}"   "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+0x1f98 "\\textgreek{>H|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+0x1f99 "\\textgreek{<H|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+0x1f9a "\\textgreek{>`H|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+0x1f9b "\\textgreek{<`H|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+0x1f9c "\\textgreek{>'H|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+0x1f9d "\\textgreek{<'H|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+0x1f9e "\\textgreek{>\\~H|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+0x1f9f "\\textgreek{<\\~H|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+0x1fa0 "\\textgreek{>w|}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+0x1fa1 "\\textgreek{<w|}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+0x1fa2 "\\textgreek{>`w|}"     "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+0x1fa3 "\\textgreek{<`w|}"     "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+0x1fa4 "\\textgreek{>'w|}"     "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+0x1fa5 "\\textgreek{<'w|}"     "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+0x1fa6 "\\textgreek{>\\~w|}"   "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+0x1fa7 "\\textgreek{<\\~w|}"   "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+0x1fa8 "\\textgreek{>W|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+0x1fa9 "\\textgreek{<W|}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+0x1faa "\\textgreek{>`W|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+0x1fab "\\textgreek{<`W|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+0x1fac "\\textgreek{>'W|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+0x1fad "\\textgreek{<'W|}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+0x1fae "\\textgreek{>\\~W|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+0x1faf "\\textgreek{<\\~W|}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+0x1fb0 "\\textgreek{\u{a}}"    "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH VRACHY
+0x1fb1 "\\textgreek{\=a}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH MACRON
+0x1fb2 "\\textgreek{`a|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+0x1fb3 "\\textgreek{a|}"       "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+0x1fb4 "\\textgreek{'a|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+0x1fb6 "\\textgreek{\\~a}"     "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+0x1fb7 "\\textgreek{\\~a|}"    "textgreek" "" "" "" # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+0x1fb8 "\\textgreek{\u{A}}"    "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH VRACHY
+0x1fb9 "\\textgreek{\=A}"      "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH MACRON
+0x1fba "\\textgreek{`A}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH VARIA
+0x1fbb "\\textgreek{'A}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH OXIA
+0x1fbc "\\textgreek{A|}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+0x1fbd "\\textgreek{>v}"       "textgreek" "" "" "" # GREEK KORONIS
+0x1fbe "\\textgreek{v|}"       "textgreek" "" "" "" # GREEK PROSGEGRAMMENI
+0x1fbf "\\textgreek{>v}"       "textgreek" "" "" "" # GREEK PSILI
+0x1fc0 "\\textgreek{\\~v}"     "textgreek" "" "" "" # GREEK PERISPOMENI
+0x1fc1 "\\textgreek{\"\\~v}"   "textgreek" "" "" "" # GREEK DIALYTIKA AND PERISPOMENI
+0x1fc2 "\\textgreek{`h|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+0x1fc3 "\\textgreek{h|}"       "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+0x1fc4 "\\textgreek{'h|}"      "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+0x1fc6 "\\textgreek{\\~h}"     "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PERISPOMENI
+0x1fc7 "\\textgreek{\\~h|}"    "textgreek" "" "" "" # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+0x1fc8 "\\textgreek{`E}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH VARIA
+0x1fc9 "\\textgreek{'E}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER EPSILON WITH OXIA
+0x1fca "\\textgreek{`H}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH VARIA
+0x1fcb "\\textgreek{'H}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH OXIA
+0x1fcc "\\textgreek{H|}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+0x1fcd "\\textgreek{>`v}"      "textgreek" "" "" "" # GREEK PSILI AND VARIA
+0x1fce "\\textgreek{>'v}"      "textgreek" "" "" "" # GREEK PSILI AND OXIA
+0x1fcf "\\textgreek{>\\~v}"    "textgreek" "" "" "" # GREEK PSILI AND PERISPOMENI
+0x1fd0 "\\textgreek{\\u{i}}"   "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH VRACHY
+0x1fd1 "\\textgreek{\\=i}"     "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH MACRON
+0x1fd2 "\\textgreek{\"`i}"     "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+0x1fd3 "\\textgreek{\"'i}"     "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+0x1fd6 "\\textgreek{\\~i}"     "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH PERISPOMENI
+0x1fd7 "\\textgreek{\"\\~i}"   "textgreek" "" "" "" # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+0x1fd8 "\\textgreek{\\u{I}}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH VRACHY
+0x1fd9 "\\textgreek{\\=I}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH MACRON
+0x1fda "\\textgreek{`I}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH VARIA
+0x1fdb "\\textgreek{'I}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER IOTA WITH OXIA
+0x1fdd "\\textgreek{<`v}"      "textgreek" "" "" "" # GREEK DASIA AND VARIA
+0x1fde "\\textgreek{<`v}"      "textgreek" "" "" "" # GREEK DASIA AND OXIA
+0x1fdf "\\textgreek{<\\~v}"    "textgreek" "" "" "" # GREEK DASIA AND PERISPOMENI
+0x1fe0 "\\textgreek{\\u{u}}"   "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH VRACHY
+0x1fe1 "\\textgreek{\\=u}"     "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH MACRON
+0x1fe2 "\\textgreek{\"`u}"     "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+0x1fe3 "\\textgreek{\"'u}"     "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
+0x1fe4 "\\textgreek{>r}"       "textgreek" "" "" "" # GREEK SMALL LETTER RHO WITH PSILI
+0x1fe5 "\\textgreek{<r}"       "textgreek" "" "" "" # GREEK SMALL LETTER RHO WITH DASIA
+0x1fe6 "\\textgreek{\\~u}"     "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+0x1fe7 "\\textgreek{\"\\~u}"   "textgreek" "" "" "" # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+0x1fe8 "\\textgreek{\\u{U}}"   "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH VRACHY
+0x1fe9 "\\textgreek{\\=U}"     "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH MACRON
+0x1fea "\\textgreek{`U}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH VARIA
+0x1feb "\\textgreek{'U}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER UPSILON WITH OXIA
+0x1fec "\\textgreek{<R}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER RHO WITH DASIA
+0x1fed "\\textgreek{\"`v}"     "textgreek" "" "" "" # GREEK DIALYTIKA AND VARIA
+0x1fee "\\textgreek{\"'v}"     "textgreek" "" "" "" # GREEK DIALYTIKA AND OXIA
+0x1fef "\\textgreek{`v}"       "textgreek" "" "" "" # GREEK VARIA
+0x1ff2 "\\textgreek{`w|}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+0x1ff3 "\\textgreek{w|}"       "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+0x1ff4 "\\textgreek{'w|}"      "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+0x1ff6 "\\textgreek{\\~w}"     "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+0x1ff7 "\\textgreek{\\~w|}"    "textgreek" "" "" "" # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+0x1ff8 "\\textgreek{`O}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH VARIA
+0x1ff9 "\\textgreek{'O}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMICRON WITH OXIA
+0x1ffa "\\textgreek{`W}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH VARIA
+0x1ffb "\\textgreek{'W}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH OXIA
+0x1ffc "\\textgreek{W|}"       "textgreek" "" "" "" # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+0x1ffd "\\textgreek{'v}"       "textgreek" "" "" "" # GREEK OXIA
+0x1ffe "\\textgreek{<v}"       "textgreek" "" "" "" # GREEK DASIA
+#
 # general punctuation
 #
 0x2010 "-"                        "" "" # HYPHEN # identic in LaTeX to FIGURE DASH

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index d612df3ec81ca406343f15f5c16aad9443843b77..8c04af2547189b3a665fcb9ac3e1e371c517850f 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -195,8 +195,11 @@ static docstring const changetracking_none_def = from_ascii(
        "\\newcommand{\\lyxdeleted}[3]{}\n");
 
 static docstring const textgreek_def = from_ascii(
-       "\\DeclareRobustCommand{\\greektext}{%\n"
-       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
+       "\\providecommand*{\\perispomeni}{\\char126}\n"
+       "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
+       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}\n"
+       "  \\renewcommand{\\~}{\\perispomeni}\n"
+       "}}\n"
        "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
        "\\DeclareFontEncoding{LGR}{}{}\n");
 

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 152a3bd72bb06b12014c52772dde6495c20715fb..5ca9092a4a15706860ef762d7ce92399be836dfe 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -95,7 +95,7 @@ public:
        /// Output the surrogate pair formed by \p c and \p next to \p os.
        /// \return the number of characters written.
        int latexSurrogatePair(odocstream & os, char_type c, char_type next,
-                              Encoding const &);
+                              OutputParams const &);
 
        /// Output a space in appropriate formatting (or a surrogate pair
        /// if the next character is a combining character).
@@ -544,7 +544,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
 
 
 int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c,
-               char_type next, Encoding const & encoding)
+               char_type next, OutputParams const & runparams)
 {
        // Writing next here may circumvent a possible font change between
        // c and next. Since next is only output if it forms a surrogate pair
@@ -553,12 +553,17 @@ int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c,
        // hopefully impossible to input.
        // FIXME: change tracking
        // Is this correct WRT change tracking?
+       Encoding const & encoding = *(runparams.encoding);
        docstring const latex1 = encoding.latexChar(next);
        docstring const latex2 = encoding.latexChar(c);
        if (docstring(1, next) == latex1) {
                // the encoding supports the combination
                os << latex2 << latex1;
                return latex1.length() + latex2.length();
+       } else if (runparams.local_font->language()->lang() == "polutonikogreek") {
+               // polutonikogreek only works without the brackets
+               os << latex1 << latex2;
+               return latex1.length() + latex2.length();
        } else
                os << latex1 << '{' << latex2 << '}';
        return latex1.length() + latex2.length() + 2;
@@ -578,9 +583,8 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
        if (i + 1 < int(text_.size())) {
                char_type next = text_[i + 1];
                if (Encodings::isCombiningChar(next)) {
-                       Encoding const & encoding = *(runparams.encoding);
                        // This space has an accent, so we must always output it.
-                       column += latexSurrogatePair(os, ' ', next, encoding) - 1;
+                       column += latexSurrogatePair(os, ' ', next, runparams) - 1;
                        return true;
                }
        }
@@ -962,7 +966,7 @@ void Paragraph::Private::latexSpecialChar(
                if (i + 1 < int(text_.size())) {
                        char_type next = text_[i + 1];
                        if (Encodings::isCombiningChar(next)) {
-                               column += latexSurrogatePair(os, c, next, encoding) - 1;
+                               column += latexSurrogatePair(os, c, next, runparams) - 1;
                                ++i;
                                break;
                        }

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 9a6b98495965dd8f991b3b99ef43caa1684d381a..bfdd68a39ad12669f7f94e8a98b74ee3bc785c2a 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -20,6 +20,7 @@
 #include "Dimension.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "Lexer.h"
@@ -534,7 +535,11 @@ int InsetSpace::latex(odocstream & os, OutputParams const & runparams) const
                os << (runparams.free_spacing ? " " : "\\ ");
                break;
        case InsetSpaceParams::PROTECTED:
-               os << (runparams.free_spacing ? ' ' : '~');
+               if (runparams.local_font->language()->lang() == "polutonikogreek")
+                       // in babel's polutonikogreek, ~ is active
+                       os << (runparams.free_spacing ? " " : "\\nobreakspace{}");
+               else
+                       os << (runparams.free_spacing ? ' ' : '~');
                break;
        case InsetSpaceParams::THIN:
                os << (runparams.free_spacing ? " " : "\\,");