From 305c07b1935a22b100a8434dce77dc88261d3b9b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 8 Oct 2001 14:50:16 +0000 Subject: [PATCH] better latin3&4 support git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2848 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 5 + lib/kbd/iso8859-4.cdef | 157 ++++++++++++++++++++++++ lib/kbd/iso8859-9.cdef | 114 +++++++++++++++++ src/ChangeLog | 4 + src/frontends/qt2/ChangeLog | 5 + src/frontends/qt2/QDocument.C | 1 + src/frontends/qt2/ui/QDocumentDialog.ui | 8 ++ src/frontends/xforms/ChangeLog | 4 + src/frontends/xforms/FormDocument.C | 2 +- src/insets/ChangeLog | 4 + src/insets/insetquotes.C | 2 + src/lyxrc.C | 2 + src/lyxrc.h | 2 + 13 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 lib/kbd/iso8859-4.cdef create mode 100644 lib/kbd/iso8859-9.cdef diff --git a/lib/ChangeLog b/lib/ChangeLog index 08038141cf..bd7f258df7 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2001-10-07 Adrien Rebollo + + * kbd/iso8859-4.cdef: + * kbd/iso8859-9.cdef: new files + 2001-10-05 Adrien Rebollo * kbd/iso8859-3.cdef: new file diff --git a/lib/kbd/iso8859-4.cdef b/lib/kbd/iso8859-4.cdef new file mode 100644 index 0000000000..85261f447c --- /dev/null +++ b/lib/kbd/iso8859-4.cdef @@ -0,0 +1,157 @@ +# Character definition file for iso8859-4 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 "\k{A}" +#162 "\textcent{}" # with package "eurofont" +162 "\textkra{}" +#163 "\pounds{}" # pound sign +163 "\c{R}" +164 "\textcurrency{}" # with package "eurofont" +#165 "\textyen{}" # with package "eurofont" +165 "\~{I}" +#166 "\textbrokenbar{}" # with package "eurofont" +166 "\c{L}" +167 "\S{}" # paragraph +168 "\"{}" # umlaut +#169 "\copyright{}" +169 "\v{S}" +#170 "\textordfeminine{}" +170 "\={E}" +#171 "\guillemotleft{}" +171 "\c{G}" +#172 "$\lnot$" +172 "\textTstroke" +173 "\-{}" +#174 "\textregistered{}" +174 "\v{Z}" +175 "\={}" +176 "\textdegree{}" # circle +#177 "$\pm$" +177 "\k{a}" +#178 "$\mathtwosuperior$" +178 "\k{}" +#179 "$\maththreesuperior$" +179 "\c{r}" +180 "\'{}" # acute +#181 "$\mu$" +181 "\~{i}" +#182 "\P{}" +182 "\c{l}" +#183 "$\cdot$" +183 "\v{}" +184 "\c{}" # cedilla +#185 "$\mathonesuperior$" +185 "\v{s}" +#186 "\textordmasculine{}" +186 "\={e}" +#187 "\guillemotright{}" +187 "\c{g}" +#188 "\textonequarter{}" +188 "\texttstroke{}" +#189 "\textonehalf{}" +189 "\NG{}" +#190 "\textthreequarters{}" +190 "\v{z}" +#191 "\textquestiondown{}" +191 "\ng{}" +#192 "\`{A}" +192 "\={A}" +193 "\'{A}" +194 "\^{A}" +195 "\~{A}" +196 "\"{A}" +197 "\r{A}" # A with circle +198 "\AE{}" # AE cat'ed together +#199 "\c{C}" +199 "\k{I}" +#200 "\`{E}" +200 "\v{C}" +201 "\'{E}" +#202 "\^{E}" +202 "\k{E}" +203 "\"{E}" +#204 "\`{I}" +204 "\.{E}" +205 "\'{I}" +206 "\^{I}" +#207 "\"{I}" +207 "\={I}" +#208 "\DH{}" +208 "\DJ{}" +#209 "\~{N}" +209 "\c{N}" +#210 "\`{O}" +210 "\={O}" +#211 "\'{O}" +211 "\c{K}" +212 "\^{O}" +213 "\~{O}" +214 "\"{O}" +215 "$\times$" +216 "\O{}" +#217 "\`{U}" +217 "\k{U}" +218 "\'{U}" +219 "\^{U}" +220 "\"{U}" +#221 "\'{Y}" +221 "\~{U}" +#222 "\TH{}" +222 "\={U}" +223 "\ss{}" # German sharp S +#224 "\`{a}" +224 "\={a}" +225 "\'{a}" +226 "\^{a}" +227 "\~{a}" +228 "\"{a}" +229 "\r{a}" # a with circle +230 "\ae{}" +#231 "\c{c}" +231 "\k{i}" +#232 "\`{e}" +232 "\v{c}" +233 "\'{e}" +#234 "\^{e}" +234 "\k{e}" +235 "\"{e}" +#236 "\`{\i}" +236 "\.{\e}" +237 "\'{\i}" +238 "\^{\i}" +#239 "\"{\i}" +239 "\={\i}" +#240 "\dh{}" +240 "\dj{}" +#241 "\~{n}" +241 "\c{n}" +#242 "\`{o}" +242 "\={o}" +#243 "\'{o}" +243 "\c{k}" +244 "\^{o}" +245 "\~{o}" +246 "\"{o}" +247 "$\div$" +248 "\o{}" +#249 "\`{u}" +249 "\k{u}" +250 "\'{u}" +251 "\^{u}" +252 "\"{u}" +#253 "\'{y}" +253 "\~{u}" +#254 "\th{}" +254 "\={u}" +#255 "\"{y}" +255 "\.{}" diff --git a/lib/kbd/iso8859-9.cdef b/lib/kbd/iso8859-9.cdef new file mode 100644 index 0000000000..5ddbf45aed --- /dev/null +++ b/lib/kbd/iso8859-9.cdef @@ -0,0 +1,114 @@ +# +# Character definition file for iso8859-9 character set +# +# 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{}" +162 "\textcent{}" # with package "eurofont" +163 "\pounds{}" # pound sign +164 "\textcurrency{}" # with package "eurofont" +165 "\textyen{}" # with package "eurofont" +166 "\textbrokenbar{}" # with package "eurofont" +167 "\S{}" # paragraph +168 "\"{}" # umlaut +169 "\copyright{}" +170 "\textordfeminine{}" +171 "\guillemotleft{}" +172 "$\lnot$" +173 "\-{}" +174 "\textregistered{}" +175 "\={}" +176 "\textdegree{}" # circle +177 "$\pm$" +178 "$\mathtwosuperior$" +179 "$\maththreesuperior$" +180 "\'{}" # acute +181 "$\mu$" # micro +182 "\P{}" +183 "$\cdot$" # or \textperiodcentered +184 "\c{}" # cedilla +185 "$\mathonesuperior$" +186 "\textordmasculine{}" +187 "\guillemotright{}" +188 "\textonequarter{}" +189 "\textonehalf{}" +190 "\textthreequarters{}" # "0BE +191 "\textquestiondown{}" # mirrored ? +192 "\`{A}" +193 "\'{A}" +194 "\^{A}" +195 "\~{A}" +196 "\"{A}" +197 "\r{A}" # A with circle +198 "\AE{}" # 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{}" +208 "\u{G}" +209 "\~{N}" +210 "\`{O}" +211 "\'{O}" +212 "\^{O}" +213 "\~{O}" +214 "\"{O}" +215 "$\times$" +216 "\O{}" +217 "\`{U}" +218 "\'{U}" +219 "\^{U}" +220 "\"{U}" +#221 "\'{Y}" +221 "\.{I}" +#222 "\TH{}" +222 "\c{S}" +223 "\ss{}" # German sharp S +224 "\`{a}" +225 "\'{a}" +226 "\^{a}" +227 "\~{a}" +228 "\"{a}" +229 "\r{a}" # a with circle +230 "\ae{}" +231 "\c{c}" # c cedilla +232 "\`{e}" +233 "\'{e}" +234 "\^{e}" +235 "\"{e}" +236 "\`{\i}" +237 "\'{\i}" +238 "\^{\i}" +239 "\"{\i}" +#240 "\dh{}" +240 "\u{g}" +241 "\~{n}" +242 "\`{o}" +243 "\'{o}" +244 "\^{o}" +245 "\~{o}" +246 "\"{o}" +247 "$\div$" +248 "\o{}" +249 "\`{u}" +250 "\'{u}" +251 "\^{u}" +252 "\"{u}" +#253 "\'{y}" +253 "\i{}" +#254 "\th{}" +254 "\c{s}" +255 "\"{y}" diff --git a/src/ChangeLog b/src/ChangeLog index 71b2888ac3..903d6308de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-10-07 Adrien Rebollo + + * lyxrc.C (set_font_norm_type): support iso8859-4 + 2001-07-02 Claus Hentschel * LaTeX.C (deplog): add another regex for MikTeX diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 75cfc1bd38..10d3d6c673 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2001-10-07 Adrien Rebollo + + * ui/QDocumentDialog.ui: + * QDocument.C (build_dialog): support latin4 + 2001-10-05 Adrien Rebollo * ui/QDocumentDialog.ui: diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 61ce5b6132..920a7f2cc1 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -154,6 +154,7 @@ void QDocument::build_dialog() dialog->inputEncCO->insertItem( _( "latin1" ) ); dialog->inputEncCO->insertItem( _( "latin2" ) ); dialog->inputEncCO->insertItem( _( "latin3" ) ); + dialog->inputEncCO->insertItem( _( "latin4" ) ); 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 0d61bda66d..ee33debd4f 100644 --- a/src/frontends/qt2/ui/QDocumentDialog.ui +++ b/src/frontends/qt2/ui/QDocumentDialog.ui @@ -1479,6 +1479,13 @@ text latin3 + + + + text + latin4 + + text @@ -1490,6 +1497,7 @@ text latin9 + text diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 237c08cb1e..750e6b62cf 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2001-10-07 Adrien Rebollo + + * FormDocument.C (build): support latin4 + 2001-10-05 Adrien Rebollo * FormDocument.C (build): support latin3 diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 7e5bf6150c..30af0d0781 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|latin3|latin5|latin9" + "default|auto|latin1|latin2|latin3|latin4|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 78afcca3dc..b76c7c856d 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2001-10-07 Adrien Rebollo + + * insetquotes.C (dispString): handles latin3 and latin4 quotes + 2001-10-05 Jean-Marc Lasgouttes * insetquotes.C (dispString): fix handling of latin9 quotes diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index beb5887d0f..437b1d747f 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -153,6 +153,8 @@ 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_3 + || lyxrc.font_norm_type == LyXRC::ISO_8859_4 || lyxrc.font_norm_type == LyXRC::ISO_8859_9) { if (disp == "'") disp = "ยด"; diff --git a/src/lyxrc.C b/src/lyxrc.C index 8a6173fad1..f0d70852e3 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1652,6 +1652,8 @@ void LyXRC::set_font_norm_type() font_norm_type = ISO_8859_1; else if (font_norm == "iso8859-3") font_norm_type = ISO_8859_3; + else if (font_norm == "iso8859-4") + font_norm_type = ISO_8859_4; 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 33f76ffcf7..823c0f33ba 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -255,6 +255,8 @@ enum LyXRCTags { /// ISO_8859_3, /// + ISO_8859_4, + /// ISO_8859_6_8, /// ISO_8859_9, -- 2.39.2