From 370fe4e994e648b866ca5f3a2cd6e1dbc1b76a75 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 5 Oct 2001 16:25:34 +0000 Subject: [PATCH] latin3 support ; latin9 improvements git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2844 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 7 ++ lib/kbd/iso8859-1.cdef | 8 +- lib/kbd/iso8859-15.cdef | 10 +- lib/kbd/iso8859-3.cdef | 135 ++++++++++++++++++++++++ src/ChangeLog | 4 + src/frontends/qt2/ChangeLog | 5 + src/frontends/qt2/QDocument.C | 1 + src/frontends/qt2/ui/QDocumentDialog.ui | 10 ++ src/frontends/xforms/ChangeLog | 4 + src/frontends/xforms/FormDocument.C | 2 +- src/insets/ChangeLog | 4 + src/insets/insetquotes.C | 9 +- src/lyxrc.C | 2 + src/lyxrc.h | 2 + 14 files changed, 190 insertions(+), 13 deletions(-) create mode 100644 lib/kbd/iso8859-3.cdef diff --git a/lib/ChangeLog b/lib/ChangeLog index 6f7e90a53d..08038141cf 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2001-10-05 Adrien Rebollo + + * kbd/iso8859-3.cdef: new file + + * kbd/iso8859-1.cdef: + * kbd/iso8859-15.cdef: update + 2001-10-03 José Matos * layouts/linuxdoc.layout: diff --git a/lib/kbd/iso8859-1.cdef b/lib/kbd/iso8859-1.cdef index 795b0bf404..0f9891051d 100644 --- a/lib/kbd/iso8859-1.cdef +++ b/lib/kbd/iso8859-1.cdef @@ -8,11 +8,11 @@ 160 "\nobreakspace{}" 161 "\textexclamdown{}" -#162 "\textcent{}" +162 "\textcent{}" # with package "eurofont" 163 "\pounds{}" # pound sign -#164 "\textcurrency{}" -#165 "\textyen{}" -#166 "\textbrokenbar{}" +164 "\textcurrency{}" # with package "eurofont" +165 "\textyen{}" # with package "eurofont" +166 "\textbrokenbar{}" # with package "eurofont" 167 "\S{}" # paragraph 168 "\"{}" # umlaut 169 "\copyright{}" diff --git a/lib/kbd/iso8859-15.cdef b/lib/kbd/iso8859-15.cdef index 319db9017c..7ef87ad535 100644 --- a/lib/kbd/iso8859-15.cdef +++ b/lib/kbd/iso8859-15.cdef @@ -12,12 +12,12 @@ 160 "\nobreakspace{}" 161 "\textexclamdown{}" -162 "\cent{}" # cent sign, to use with package wasysym +162 "\textcent{}" # with package "eurofont" 163 "\pounds{}" # pound sign -#164 "\textcurrency{}" -164 "\euro{}" # euro sign, to use with package eurofont -165 "\yen{}" # yen sign, to use with package amssymb -#166 "\textbrokenbar{}" +#164 "\textcurrency{}" # with package "eurofont" +164 "\texteuro{}" # with package "eurofont" +165 "\textyen{}" # with package "eurofont" +#166 "\textbrokenbar{}" # with package "eurofont" 166 "\v{S}" 167 "\S{}" # paragraph #168 "\"{}" # umlaut diff --git a/lib/kbd/iso8859-3.cdef b/lib/kbd/iso8859-3.cdef new file mode 100644 index 0000000000..8b299d81cd --- /dev/null +++ b/lib/kbd/iso8859-3.cdef @@ -0,0 +1,135 @@ +# Character definition file for iso8859-3 character set +# +# File modified (c)2001 by Adrien Rebollo from : +# +# Character definition file for iso8859-1 character set +# +# (c)1996 by Ivan Schreter, schreter@ccsun.tuke.sk +# +# Any takers to complete the stuff? +# + +160 "\nobreakspace{}" +#161 "\textexclamdown{}" +161 "\textmalteseH{}" +#162 "\textcent{}" # with package "eurofont" +162 "\u{}" +163 "\pounds{}" # pound sign +164 "\textcurrency{}" # with package "eurofont" +#165 "\textyen{}" # with package "eurofont" +#166 "\textbrokenbar{}" # with package "eurofont" +166 "\^{H}" +167 "\S{}" # paragraph +168 "\"{}" # umlaut +#169 "\copyright{}" +169 "\.{I}" +#170 "\textordfeminine{}" +170 "\c{S}" +#171 "\guillemotleft{}" +171 "\u{G}" +#172 "$\lnot$" +172 "\^{J}" +173 "\-{}" +#174 "\textregistered{}" +#175 "\={}" +175 "\.{Z}" +176 "\textdegree{}" # circle +#177 "$\pm$" +177 "\textmalteseh{}" +178 "$\mathtwosuperior$" +179 "$\maththreesuperior$" +180 "\'{}" # acute +181 "$\mu$" # micro +#182 "\P{}" +182 "\^{h}" +183 "$\cdot$" # or \textperiodcentered +184 "\c{}" # cedilla +#185 "$\mathonesuperior$" +185 "\i{}" +#186 "\textordmasculine{}" +186 "\c{s}" +#187 "\guillemotright{}" +187 "\u{g}" +#188 "\textonequarter{}" +188 "\^{j}" +189 "\textonehalf{}" +#190 "\textthreequarters{}" # "0BE +#191 "\textquestiondown{}" # mirrored ? +191 "\.{z}" +192 "\`{A}" +193 "\'{A}" +194 "\^{A}" +#195 "\~{A}" +196 "\"{A}" +#197 "\r{A}" # A with circle +197 "\.{C}" # A with circle +#198 "\AE{}" # AE cat'ed together +198 "\^{C}" # AE cat'ed together +199 "\c{C}" # C cedilla +200 "\`{E}" +201 "\'{E}" +202 "\^{E}" +203 "\"{E}" +204 "\`{I}" +205 "\'{I}" +206 "\^{I}" +207 "\"{I}" +#208 "\DH{}" +209 "\~{N}" +210 "\`{O}" +211 "\'{O}" +212 "\^{O}" +#213 "\~{O}" +213 "\.{G}" +214 "\"{O}" +215 "$\times$" +#216 "\O{}" +216 "\^{G}" +217 "\`{U}" +218 "\'{U}" +219 "\^{U}" +220 "\"{U}" +#221 "\'{Y}" +221 "\u{U}" +#222 "\TH{}" +222 "\^{S}" +223 "\ss{}" # German sharp S +224 "\`{a}" +225 "\'{a}" +226 "\^{a}" +#227 "\~{a}" +228 "\"{a}" +#229 "\r{a}" # a with circle +229 "\.{c}" +#230 "\ae{}" +230 "\^{c}" +231 "\c{c}" # c cedilla +232 "\`{e}" +233 "\'{e}" +234 "\^{e}" +235 "\"{e}" +236 "\`{\i}" +237 "\'{\i}" +238 "\^{\i}" +239 "\"{\i}" +#240 "\dh{}" +241 "\~{n}" +242 "\`{o}" +243 "\'{o}" +244 "\^{o}" +#245 "\~{o}" +245 "\.{g}" +246 "\"{o}" +247 "$\div$" +#248 "\o{}" +248 "\^{g}" +249 "\`{u}" +250 "\'{u}" +251 "\^{u}" +252 "\"{u}" +#253 "\'{y}" +253 "\u{u}" +#254 "\th{}" +254 "\^{s}" +#255 "\"{y}" +255 "\.{}" diff --git a/src/ChangeLog b/src/ChangeLog index 6ece79c103..0cb42ed1bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Adrien Rebollo + + * lyxrc.C (set_font_norm_type): support iso8859-3 + 2001-10-04 Jean-Marc Lasgouttes * BufferView_pimpl.C (tripleClick): fix stupid logic error. diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index a94770d8e2..75cfc1bd38 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2001-10-05 Adrien Rebollo + + * ui/QDocumentDialog.ui: + * QDocument.C (build_dialog): support latin3 + 2001-09-27 Angus Leeming * Dialogs.C: remove splash dialog code. diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 12be14d60a..61ce5b6132 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -153,6 +153,7 @@ void QDocument::build_dialog() dialog->inputEncCO->insertItem( _( "auto" ) ); dialog->inputEncCO->insertItem( _( "latin1" ) ); dialog->inputEncCO->insertItem( _( "latin2" ) ); + dialog->inputEncCO->insertItem( _( "latin3" ) ); dialog->inputEncCO->insertItem( _( "latin5" ) ); dialog->inputEncCO->insertItem( _( "latin9" ) ); dialog->inputEncCO->insertItem( _( "koi8-r" ) ); diff --git a/src/frontends/qt2/ui/QDocumentDialog.ui b/src/frontends/qt2/ui/QDocumentDialog.ui index 93ba534f4e..0d61bda66d 100644 --- a/src/frontends/qt2/ui/QDocumentDialog.ui +++ b/src/frontends/qt2/ui/QDocumentDialog.ui @@ -1474,12 +1474,22 @@ latin2 + + + text + latin3 + text latin5 + + + text + latin9 + text diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 0215e84679..237c08cb1e 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Adrien Rebollo + + * FormDocument.C (build): support latin3 + 2001-10-04 Jean-Marc Lasgouttes * forms/form_aboutlyx.fd: use flat boxes for tabs. diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 660ef36229..7e5bf6150c 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -183,7 +183,7 @@ void FormDocument::build() // the document language form language_.reset(build_doc_language()); fl_addto_choice(language_->choice_inputenc, - "default|auto|latin1|latin2|latin5|latin9" + "default|auto|latin1|latin2|latin3|latin5|latin9" "|koi8-r|koi8-u|cp866|cp1251|iso88595"); // The language is a combo-box and has to be inserted manually diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index d20bde7c50..78afcca3dc 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Jean-Marc Lasgouttes + + * insetquotes.C (dispString): fix handling of latin9 quotes + 2001-10-03 Juergen Vigna * insetert.C: ditto diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index e4937eff2e..beb5887d0f 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -153,13 +153,16 @@ string const InsetQuotes::dispString(Language const * loclang) const disp += disp; if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 - || lyxrc.font_norm_type == LyXRC::ISO_8859_9 - || lyxrc.font_norm_type == LyXRC::ISO_8859_15) { + || lyxrc.font_norm_type == LyXRC::ISO_8859_9) { if (disp == "'") disp = "´"; else if (disp == "''") disp = "´´"; - else if (disp == "<<") + } + if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 + || lyxrc.font_norm_type == LyXRC::ISO_8859_9 + || lyxrc.font_norm_type == LyXRC::ISO_8859_15) { + if (disp == "<<") disp = '«'; else if (disp == ">>") disp = '»'; diff --git a/src/lyxrc.C b/src/lyxrc.C index ed126b1547..8a6173fad1 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1650,6 +1650,8 @@ void LyXRC::set_font_norm_type() font_norm_type = ISO_10646_1; else if (font_norm == "iso8859-1") font_norm_type = ISO_8859_1; + else if (font_norm == "iso8859-3") + font_norm_type = ISO_8859_3; else if (font_norm == "iso8859-6.8x") font_norm_type = ISO_8859_6_8; else if (font_norm == "iso8859-9") diff --git a/src/lyxrc.h b/src/lyxrc.h index 6481577b10..33f76ffcf7 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -253,6 +253,8 @@ enum LyXRCTags { /// ISO_8859_1, /// + ISO_8859_3, + /// ISO_8859_6_8, /// ISO_8859_9,