Finish the transition to unicode of the kmap machinery and enable kmap files

again (bug 3304)

	* src/intl.C
	(Intl::initKeyMapper): Don't set the char set of trans anymore

	* src/chset.[Ch]: delete, no longer needed

	* lib/kbd/*.cdef: ditto

	* src/lyxrc.[Ch]: remove RC_SCREEN_FONT_ENCODING and font_norm,
	these are no longer needed

	* src/lyxfunc.C: adapt to lyxrc changes

	* src/Makefile.am: remove deleted files

	* lib/Makefile.am: ditto

	* development/scons/scons_manifest.py: ditto

	* src/text3.C
	(LyXText::dispatch): reenable the kmap mechanism

	* src/trans_mgr.[Ch]
	(TransManager::setCharset): remove, no longer needed
	(TransManager::insert): remove, since it would be identical to
	insertVerbatim now
	(TransManager::insertVerbatim): rename to insert


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17665 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2007-03-31 16:41:02 +00:00
parent 4712db615e
commit f2769c00c7
26 changed files with 2 additions and 1605 deletions

View File

@ -1071,7 +1071,6 @@ src_header_files = Split('''
bufferparams.h
bufferview_funcs.h
changes.h
chset.h
converter.h
coordcache.h
counters.h
@ -1185,7 +1184,6 @@ src_pre_files = Split('''
bufferparams.C
bufferview_funcs.C
changes.C
chset.C
converter.C
coordcache.C
counters.C
@ -2097,7 +2095,6 @@ lib_kbd_files = Split('''
bg-bds-1251.kmap
brazil.kmap
brazil2.kmap
cp1251.cdef
czech-prg.kmap
czech.kmap
european.kmap
@ -2108,19 +2105,7 @@ lib_kbd_files = Split('''
german.kmap
greek.kmap
hebrew.kmap
ibm866.cdef
iso8859-1.cdef
iso8859-15.cdef
iso8859-2.cdef
iso8859-3.cdef
iso8859-4.cdef
iso8859-7.cdef
iso8859-8.cdef
iso8859-9.cdef
koi8-r.cdef
koi8-r.kmap
koi8-t.cdef
koi8-u.cdef
koi8-u.kmap
latvian.kmap
magyar-2.kmap
@ -2138,7 +2123,6 @@ lib_kbd_files = Split('''
slovak.kmap
slovene.kmap
thai-kedmanee.kmap
tis620-0.cdef
transilvanian.kmap
turkish-f.kmap
turkish.kmap

View File

@ -825,7 +825,6 @@ dist_kbd_DATA = \
kbd/bg-bds-1251.kmap \
kbd/brazil.kmap \
kbd/brazil2.kmap \
kbd/cp1251.cdef \
kbd/czech-prg.kmap \
kbd/czech.kmap \
kbd/european.kmap \
@ -836,19 +835,7 @@ dist_kbd_DATA = \
kbd/german.kmap \
kbd/greek.kmap \
kbd/hebrew.kmap \
kbd/ibm866.cdef \
kbd/iso8859-1.cdef \
kbd/iso8859-15.cdef \
kbd/iso8859-2.cdef \
kbd/iso8859-3.cdef \
kbd/iso8859-4.cdef \
kbd/iso8859-7.cdef \
kbd/iso8859-8.cdef \
kbd/iso8859-9.cdef \
kbd/koi8-r.cdef \
kbd/koi8-r.kmap \
kbd/koi8-t.cdef \
kbd/koi8-u.cdef \
kbd/koi8-u.kmap \
kbd/latvian.kmap \
kbd/magyar-2.kmap \
@ -866,7 +853,6 @@ dist_kbd_DATA = \
kbd/slovak.kmap \
kbd/slovene.kmap \
kbd/thai-kedmanee.kmap \
kbd/tis620-0.cdef \
kbd/transilvanian.kmap \
kbd/turkish-f.kmap \
kbd/turkish.kmap \

View File

@ -1,103 +0,0 @@
#
# Character definition file for CP1251 character set
#
# Automatically converted from /usr/share/i18n/*
# with a simple script written by Andrew Zabolotny.
#
# CP1251 is the encoding for Cyrillic letters used in Windows
#
128 "€"
129 "<22>"
131 "ƒ"
138 "Š"
140 "Œ"
141 "<22>"
142 "Ž"
143 "<22>"
144 "<22>"
154 "š"
156 "œ"
157 "<22>"
158 "ž"
159 "Ÿ"
161 "¡"
162 "¢"
163 "£"
165 "¥"
168 "¨"
170 "ª"
175 "¯"
178 "²"
179 "³"
180 "´"
184 "¸"
186 "º"
188 "¼"
189 "½"
190 "¾"
191 "¿"
192 "À"
193 "Á"
194 "Â"
195 "Ã"
196 "Ä"
197 "Å"
198 "Æ"
199 "Ç"
200 "È"
201 "É"
202 "Ê"
203 "Ë"
204 "Ì"
205 "Í"
206 "Î"
207 "Ï"
208 "Ð"
209 "Ñ"
210 "Ò"
211 "Ó"
212 "Ô"
213 "Õ"
214 "Ö"
215 "×"
216 "Ø"
217 "Ù"
218 "Ú"
219 "Û"
220 "Ü"
221 "Ý"
222 "Þ"
223 "ß"
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å"
230 "æ"
231 "ç"
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"
248 "ø"
249 "ù"
250 "ú"
251 "û"
252 "ü"
253 "ý"
254 "þ"
255 "ÿ"

View File

@ -1,81 +0,0 @@
#
# Character definition file for IBM866 character set
#
# Automatically converted from /usr/share/i18n/*
# with a simple script written by Andrew Zabolotny.
#
# IBM866 is the encoding for Cyrillic letters used in MS-DOS
#
128 "€"
129 "<22>"
130 ""
131 "ƒ"
132 "„"
133 "…"
134 "†"
135 "‡"
136 "ˆ"
137 "‰"
138 "Š"
139 ""
140 "Œ"
141 "<22>"
142 "Ž"
143 "<22>"
144 "<22>"
145 ""
146 ""
147 "“"
148 "”"
149 "•"
150 ""
151 "—"
152 "˜"
153 "™"
154 "š"
155 ""
156 "œ"
157 "<22>"
158 "ž"
159 "Ÿ"
160 " "
161 "¡"
162 "¢"
163 "£"
164 "¤"
165 "¥"
166 "¦"
167 "§"
168 "¨"
169 "©"
170 "ª"
171 "«"
172 "¬"
173 "­"
174 "®"
175 "¯"
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å"
230 "æ"
231 "ç"
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"

View File

@ -1,104 +0,0 @@
#
# 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{}"
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}"
222 "\TH{}"
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{}"
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}"
254 "\th{}"
255 "\"{y}"

View File

@ -1,116 +0,0 @@
#
# Character definition file for iso8859-15 character set
# Modified (c)2001 by Adrien Rebollo, adrien.rebollo@gmx.fr
# 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"
164 "\texteuro{}" # with package "eurofont"
165 "\textyen{}" # with package "eurofont"
#166 "\textbrokenbar{}" # with package "eurofont"
166 "\v{S}"
167 "\S{}" # paragraph
#168 "\"{}" # umlaut
168 "\v{s}"
169 "\copyright{}"
170 "\textordfeminine{}"
171 "\guillemotleft{}"
172 "$\lnot$"
173 "\-{}"
174 "\textregistered{}"
175 "\={}"
176 "\textdegree{}" # circle
177 "$\pm$"
178 "$\mathtwosuperios$"
179 "$\maththreesuperior$"
#180 "\'{}" # acute
180 "\v{Z}"
181 "$\mu$" # micro
182 "\P{}"
183 "$\cdot$" #{[ or \textperiodcentered
#184 "\c{}" # cedilla # or "\c\ "
184 "\v{z}"
185 "$\mathonesuperior$"
186 "\textordmasculine{}"
187 "\guillemotright{}"
#188 "\textonequarter{}"
188 "\OE{}"
#189 "\textonehalf{}"
189 "\oe{}"
#190 "\textthreequarters{}" # "0BE
190 "\"{Y}"
191 "\textquestiondown{}" # mirrored ?
192 "\`{A}"
193 "\'{A}"
194 "\^{A}"
195 "\~{A}"
196 "\"{A}"
197 "\AA{}" # A with circle # or "\r{A}"
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{}"
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}"
222 "\TH{}"
223 "\ss{}" # German sharp S
224 "\`{a}"
225 "\'{a}"
226 "\^{a}"
227 "\~{a}"
228 "\"{a}"
229 "\aa{}" # a with circle # or "\r{a}"
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{}"
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}"
254 "\th{}"
255 "\"{y}"

View File

@ -1,101 +0,0 @@
#
# LaTeX codes for iso8859-2 character set.
#
# (c) 1996 by Petr Mejzlík, mejzlik@fi.muni.cz
# Modified by Asger Alstrup (not checked, but better)
161 "\c{A}" # A cedilla
162 "\u{}" # breve
163 "\L{}" # L slash
#164
165 "\q{L}" # L caron
166 "\'{S}" # S acute
167 "\S{}" # section mark
168 "\"{}" # umlaut
169 "\v{S}" # S caron
170 "\c{S}" # S cedilla
171 "\v{T}" # T caron
172 "\'{Z}" # Z acute
173 "\-{}" # dash
174 "\v{Z}" # Z caron
175 "\.{Z}" # Z dot
176 "\r{}" # circle
177 "\c{a}" # a cedilla
178 "\k{}" #
179 "\l{}" # l slash
180 "\'{}" # acute
181 "\q{l}" # l caron
182 "\'{s}" # s acute
183 "\v{}" # caron
184 "\c{}" # cedilla
185 "\v{s}" # s caron
186 "\c{s}" # s cedilla
187 "\q{t}" # t caron
188 "\'{z}" # z acute
189 "\H{}" # doubleacute or hungarian umlaut
190 "\v{z}" # z caron
191 "\.{z}" # z dot
192 "\'{R}" # R acute
193 "\'{A}" # A acute
194 "\^{A}" # A circumflex
195 "\u{A}" # A breve
196 "\"{A}" # A umlaut
197 "\'{L}" # L acute
198 "\'{C}" # C acute
199 "\c{C}" # C cedilla
200 "\v{C}" # C caron
201 "\'{E}" # E acute
202 "\k{E}"
203 "\"{E}" # E umlaut
204 "\v{E}" # E caron
205 "\'{I}" # I acute
206 "\^{I}" # I circumflex
207 "\v{D}" # D caron
208 "\DH{}" #
209 "\'{N}" # N acute
210 "\v{N}" # N caron
211 "\'{O}" # O acute
212 "\^{O}" # O circumflex
213 "\H{O}" #
214 "\"{O}" # O umlaut
215 "$\times$"
216 "\v{R}" # R caron
217 "\r{U}" # U circle
218 "\'{U}" # U acute
219 "\H{U}" #
220 "\"{U}" # U umlaut
221 "\'{Y}" # Y acute
222 "\c{T}" # T cedilla
223 "\ss{}" #
224 "\'{r}" # r acute
225 "\'{a}" # a acute
226 "\^{a}" # a circumflex
227 "\u{a}" # a breve
228 "\"{a}" # a umlaut
229 "\'{l}" # l acute
230 "\'{c}" # c acute
231 "\c{c}" # c cedilla
232 "\v{c}" # c caron
233 "\'{e}" # e acute
234 "\k{e}" #
235 "\"{e}" # e umlaut
236 "\v{e}" # e caron
237 "\'{\i}" # i acute
238 "\^{\i}" # i circumflex
239 "\q{d}" # d caron
240 "\dh{}" #
241 "\'{n}" # n acute
242 "\v{n}" # n caron
243 "\'{o}" # o acute
244 "\^{o}" # o caron
245 "\H{o}" #
246 "\"{o}" # o umlaut
247 "$\div$"
248 "\v{r}" # r caron
249 "\r{u}" # u circle
250 "\'{u}" # u acute
251 "\H{u}" #
252 "\"{u}" # u umlaut
253 "\'{y}" # y acute
254 "\c{t}" # t cedilla
255 "\.{}" # dot

View File

@ -1,135 +0,0 @@
# 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 "\.{}"

View File

@ -1,157 +0,0 @@
# 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 "\.{}"

View File

@ -1,78 +0,0 @@
#
# Character definition file for iso8859-7 character set
#
# (c)1997 by Alkis Polyzotis, npoly@dbnet.ece.ntua.gr
#
182 "\'{A}" # accented A
184 "\'{E}" # accented E
185 "\'{H}" # accented H
186 "\'{I}" # accented I
188 "\'{O}"
190 "\'{Y}" # accented Upsilon
191 "\'{V}" # accented Omega
192 "\'{\"{\i}}" # accented iota with dyalitika
192 "\"{\'{\i}}"
193 "A"
194 "B"
195 "G"
196 "D"
197 "E"
198 "Z"
199 "H"
200 "U"
201 "I"
202 "K"
203 "L"
204 "M"
205 "N"
206 "J"
207 "O"
208 "P"
209 "R"
210 "S"
211 "S"
212 "T"
213 "Y"
214 "F"
215 "X"
216 "C"
217 "V"
218 "\"{I}"
219 "\"{Y}"
220 "\'{a}" # accented alpha
221 "\'{e}"
222 "\'{h}"
223 "\'{\i}"
224 "\'{\"{y}}"
224 "\"{\'{y}}"
225 "a"
226 "b"
227 "g"
228 "d"
229 "e"
230 "z"
231 "h"
232 "u"
233 "i"
234 "k"
235 "l"
236 "m"
237 "n"
238 "j"
239 "o"
240 "p"
241 "r"
242 "w"
243 "s"
244 "t"
245 "y"
246 "f"
247 "x"
248 "c"
249 "v"
250 "\"{\i}"
251 "\"{y}"
252 "\'{o}"
253 "\'{y}"
254 "\'{v}"

View File

@ -1,106 +0,0 @@
#
# Character definition file for iso8859-8 character set
#
# By Tzafrir Cohen <tzafrir@technion.ac.il>
#
# Based on the iso8859-1 charset file:
# (c)1996 by Ivan Schreter, schreter@ccsun.tuke.sk
#
# Any takers to complete the stuff?
#
161 "!`" # mirrored !
#162 Cent sign?
163 "\pounds{}" # pound sign
#164 String sign?
#165 Yen sign?
#166 What's this?
167 "\S{}" # paragraph
168 "\"{}" # umlaut
169 "\copyright{}"
170 "\b{a}" # a macron
171 "\guillemotleft{}"
#172 What's this?
#173 horiz. line?
#174 Registered?
#175 horiz. line at the top?
176 "\b{}" # circle
#177 Plusminus?
#178 ^2?
#179 ^3?
180 "\'{}" # acute
181 "$\mu$" # micro
#182 Paragraph?
183 "$\cdot$"
184 "\c{}" # cedilla
185 "${^1}$"
186 "\b{o}" # o macron
187 "\guillemotright{}"
188 "\ensuremath{\frac14}"
189 "\ensuremath{\frac12}"
190 "\ensuremath{\frac34}" # "0BE
191 "?`" # mirrored ?
192 "\`{A}"
193 "\'{A}"
194 "\^{A}"
195 "\~{A}"
196 "\"{A}"
197 "\AA{}" # 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{}"
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}"
222 "\TH{}"
223 "\ss{}" # German sharp S
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å" # a with circle
230 "æ"
231 "ç" # c cedilla
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"
248 "ø"
249 "ù"
250 "ú"
251 "\^{u}"
252 "\"{u}"
253 "\'{y}"
254 "\th{}"
255 "\"{y}"

View File

@ -1,114 +0,0 @@
#
# 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}"

View File

@ -1,76 +0,0 @@
#
# Character definition file for KOI8-R character set
#
# Automatically converted from /usr/share/i18n/*
# with a simple script written by Andrew Zabolotny.
#
# KOI8-R is the encoding for Cyrillic letters
# used for Russian language in Unix
#
163 "£"
179 "³"
192 "À"
193 "Á"
194 "Â"
195 "Ã"
196 "Ä"
197 "Å"
198 "Æ"
199 "Ç"
200 "È"
201 "É"
202 "Ê"
203 "Ë"
204 "Ì"
205 "Í"
206 "Î"
207 "Ï"
208 "Ð"
209 "Ñ"
210 "Ò"
211 "Ó"
212 "Ô"
213 "Õ"
214 "Ö"
215 "×"
216 "Ø"
217 "Ù"
218 "Ú"
219 "Û"
220 "Ü"
221 "Ý"
222 "Þ"
223 "ß"
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å"
230 "æ"
231 "ç"
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"
248 "ø"
249 "ù"
250 "ú"
251 "û"
252 "ü"
253 "ý"
254 "þ"
255 "ÿ"

View File

@ -1,85 +0,0 @@
#
# Character definition file for KOI8-T character set
#
# Automatically converted from /usr/share/i18n/*
# with a simple script written by Andrew Zabolotny.
#
128 "€"
129 "<22>"
131 "ƒ"
138 "Š"
140 "Œ"
141 "<22>"
142 "Ž"
144 "<22>"
161 "¡"
162 "¢"
163 "£"
165 "¥"
179 "³"
181 "µ"
192 "À"
193 "Á"
194 "Â"
195 "Ã"
196 "Ä"
197 "Å"
198 "Æ"
199 "Ç"
200 "È"
201 "É"
202 "Ê"
203 "Ë"
204 "Ì"
205 "Í"
206 "Î"
207 "Ï"
208 "Ð"
209 "Ñ"
210 "Ò"
211 "Ó"
212 "Ô"
213 "Õ"
214 "Ö"
215 "×"
216 "Ø"
217 "Ù"
218 "Ú"
219 "Û"
220 "Ü"
221 "Ý"
222 "Þ"
223 "ß"
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å"
230 "æ"
231 "ç"
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"
248 "ø"
249 "ù"
250 "ú"
251 "û"
252 "ü"
253 "ý"
254 "þ"
255 "ÿ"

View File

@ -1,84 +0,0 @@
#
# Character definition file for KOI8-U character set
#
# Automatically converted from /usr/share/i18n/*
# with a simple script written by Andrew Zabolotny.
#
# KOI8-U is the encoding for Cyrillic letters
# used for Ukrainian language in Unix
#
163 "£"
164 "¤"
166 "¦"
167 "§"
173 "­"
179 "³"
180 "´"
182 "¶"
183 "·"
189 "½"
192 "À"
193 "Á"
194 "Â"
195 "Ã"
196 "Ä"
197 "Å"
198 "Æ"
199 "Ç"
200 "È"
201 "É"
202 "Ê"
203 "Ë"
204 "Ì"
205 "Í"
206 "Î"
207 "Ï"
208 "Ð"
209 "Ñ"
210 "Ò"
211 "Ó"
212 "Ô"
213 "Õ"
214 "Ö"
215 "×"
216 "Ø"
217 "Ù"
218 "Ú"
219 "Û"
220 "Ü"
221 "Ý"
222 "Þ"
223 "ß"
224 "à"
225 "á"
226 "â"
227 "ã"
228 "ä"
229 "å"
230 "æ"
231 "ç"
232 "è"
233 "é"
234 "ê"
235 "ë"
236 "ì"
237 "í"
238 "î"
239 "ï"
240 "ð"
241 "ñ"
242 "ò"
243 "ó"
244 "ô"
245 "õ"
246 "ö"
247 "÷"
248 "ø"
249 "ù"
250 "ú"
251 "û"
252 "ü"
253 "ý"
254 "þ"
255 "ÿ"

View File

@ -1,10 +0,0 @@
#
# Character definition file for tis620-0 character set
#
# Chanop Silpa-Anan <chanop@debian.org>
#
# It's a dummy almost empty file for now. It works like plain ascii.
# Seems to work with straight tis620-0 encoding.
#
160 "\nobreakspace"

View File

@ -130,8 +130,6 @@ lyx_SOURCES = \
bufferview_funcs.h \
changes.C \
changes.h \
chset.C \
chset.h \
config.h.in \
converter.C \
converter.h \

View File

@ -1,107 +0,0 @@
/**
* \file chset.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "chset.h"
#include "debug.h"
#include "support/convert.h"
#include "support/filetools.h"
#include <boost/regex.hpp>
#include <fstream>
namespace lyx {
using support::libFileSearch;
using boost::regex;
using boost::smatch;
using std::endl;
using std::getline;
using std::make_pair;
using std::ifstream;
using std::pair;
using std::string;
bool CharacterSet::loadFile(string const & fname)
{
map_.clear();
name_.erase();
// ascii 7-bit
if (fname.empty() || fname == "ascii")
return true;
// open definition file
lyxerr[Debug::KBMAP]
<< "Reading character set file " << fname << ".cdef" << endl;
support::FileName const filename = libFileSearch("kbd", fname, "cdef");
ifstream ifs(filename.toFilesystemEncoding().c_str());
if (!ifs) {
lyxerr << "Unable to open character set file" << endl;
return true; // no definition, use 7-bit ascii
}
name_ = fname;
string line;
// Ok, I'll be the first to admit that this is probably not
// the fastest way to parse the cdef files, but I though it
// was a bit neat. Anyway it is wrong to use the lyxlex parse
// without the use of a keyword table.
regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
while (getline(ifs, line)) {
smatch sub;
if (regex_match(line, sub, reg)) {
int const n = convert<int>(sub.str(1));
string const str = sub.str(2);
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Chardef: " << n
<< " to [" << str << ']' << endl;
map_[str] = n;
}
}
lyxerr[Debug::KBMAP] << "End of parsing of .cdef file." << endl;
return false;
}
pair<bool, int> const CharacterSet::encodeString(string const & str) const
{
lyxerr[Debug::KBMAP] << "Checking if we know [" << str << ']' << endl;
bool ret = false;
int val = 0;
Cdef::const_iterator cit = map_.find(str);
if (cit != map_.end()) {
ret = true;
val = cit->second;
}
lyxerr[Debug::KBMAP] << " "
<< (ret ? "yes we" : "no we don't")
<< " know [" << str << ']' << endl;
return make_pair(ret, val);
}
string const & CharacterSet::getName() const
{
return name_;
}
} // namespace lyx

View File

@ -1,55 +0,0 @@
// -*- C++ -*-
/**
* \file chset.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
*
* Full author contact details are available in file CREDITS.
*/
#ifndef CHSET_H
#define CHSET_H
#include <map>
#include <utility>
#include <string>
namespace lyx {
/// a class for mapping char strings such as "\^{A}" to the integer value
class CharacterSet {
public:
/**
* initialise this charset from the given .cdef file
* param charset the charset to look for
*
* Finds a .cdef file corresponding to the named charset
* and parses it. This function is only intended to be
* called once.
*/
bool loadFile(std::string const & charset);
/// return the name of the current charset
std::string const & getName() const;
/**
* Return the encoded charset value of the given string.
*
* The bool value is false if an encoding could not be found
* in this charset, and true otherwise.
*/
std::pair<bool, int> const encodeString(std::string const &) const;
private:
/// charset name
std::string name_;
///
typedef std::map<std::string, unsigned char> Cdef;
/// mapping from string representation to encoded value
Cdef map_;
};
} // namespace lyx
#endif

View File

@ -84,7 +84,6 @@ void Intl::initKeyMapper(bool on)
prim_lang.erase();
if (trans.setSecondary(sec_lang) == -1)
sec_lang.erase();
trans.setCharset(lyxrc.font_norm);
if (prim_lang.empty() && sec_lang.empty())
keymapon = false;

View File

@ -2212,7 +2212,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_PRINT_COMMAND:
case LyXRC::RC_RTL_SUPPORT:
case LyXRC::RC_SCREEN_DPI:
case LyXRC::RC_SCREEN_FONT_ENCODING:
case LyXRC::RC_SCREEN_FONT_ROMAN:
case LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY:
case LyXRC::RC_SCREEN_FONT_SANS:

View File

@ -137,7 +137,6 @@ keyword_item lyxrcTags[] = {
{ "\\printer", LyXRC::RC_PRINTER },
{ "\\rtl", LyXRC::RC_RTL_SUPPORT },
{ "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
{ "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
{ "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN },
{ "\\screen_font_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
{ "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS },
@ -237,7 +236,6 @@ void LyXRC::setDefaults() {
roman_font_name = "";
sans_font_name = "";
typewriter_font_name = "";
font_norm = "iso8859-1";
autosave = 300;
auto_region_delete = true;
auto_reset_options = false;
@ -796,12 +794,6 @@ int LyXRC::read(LyXLex & lexrc)
}
break;
case RC_SCREEN_FONT_ENCODING:
if (lexrc.next()) {
font_norm = lexrc.getString();
}
break;
case RC_SET_COLOR:
{
string lyx_name, x11_name;
@ -1551,12 +1543,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
<< convert<string>(use_scalable_fonts)
<< '\n';
}
case RC_SCREEN_FONT_ENCODING:
if (ignore_system_lyxrc ||
font_norm != system_lyxrc.font_norm) {
os << "\\screen_font_encoding \"" << font_norm
<< "\"\n";
}
case RC_SCREEN_FONT_SIZES:
if (ignore_system_lyxrc ||
font_sizes[LyXFont::SIZE_TINY]
@ -2372,10 +2358,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
break;
case RC_SCREEN_FONT_ENCODING:
str = _("The encoding for the screen fonts.");
break;
case RC_SCREEN_FONT_ROMAN:
case RC_SCREEN_FONT_SANS:
case RC_SCREEN_FONT_TYPEWRITER:

View File

@ -110,7 +110,6 @@ public:
RC_PRINT_COMMAND,
RC_RTL_SUPPORT,
RC_SCREEN_DPI,
RC_SCREEN_FONT_ENCODING,
RC_SCREEN_FONT_ROMAN,
RC_SCREEN_FONT_ROMAN_FOUNDRY,
RC_SCREEN_FONT_SANS,
@ -273,8 +272,6 @@ public:
///
std::string typewriter_font_foundry;
///
std::string font_norm;
///
unsigned int autosave;
///
std::string plaintext_roff_command;

View File

@ -1136,12 +1136,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
docstring::const_iterator cit = cmd.argument().begin();
docstring::const_iterator end = cmd.argument().end();
for (; cit != end; ++cit)
#if 0
bv->getIntl().getTransManager().
translateAndInsert(*cit, this);
#else
insertChar(bv->cursor(), *cit);
#endif
translateAndInsert(*cit, this, cur);
cur.resetAnchor();
moveCursor(cur, false);

View File

@ -218,12 +218,6 @@ int TransManager::setSecondary(string const & language)
}
bool TransManager::setCharset(string const & str)
{
return chset_.loadFile(str);
}
void TransManager::enablePrimary()
{
if (t1_->isDefined())
@ -262,32 +256,13 @@ void TransManager::translateAndInsert(char_type c, LyXText * text, LCursor & cu
}
void TransManager::insertVerbatim(docstring const & str, LyXText * text, LCursor & cur)
void TransManager::insert(docstring const & str, LyXText * text, LCursor & cur)
{
for (string::size_type i = 0, n = str.size(); i < n; ++i)
text->insertChar(cur, str[i]);
}
void TransManager::insert(docstring const & str, LyXText * text, LCursor & cur)
{
// Go through the character encoding only if the current
// encoding (chset_->name()) matches the current font_norm
// (lyrxc->font_norm)
// Is false to speak about "only if" the current encoding will
// almost always be equal to font_norm.
pair<bool, int> enc = chset_.encodeString(to_utf8(str));
if (chset_.getName() != lyxrc.font_norm ||
!enc.first) {
// Could not find an encoding
insertVerbatim(str, text, cur);
return;
}
text->insertChar(cur, enc.second);
}
void TransManager::deadkey(char_type c, tex_accent accent, LyXText * t, LCursor & cur)
{
if (c == 0 && active_ != &default_) {

View File

@ -14,7 +14,6 @@
#ifndef TRANS_MANAGER_H
#define TRANS_MANAGER_H
#include "chset.h"
#include "trans_decl.h"
#include <boost/scoped_ptr.hpp>
@ -149,11 +148,7 @@ private:
///
static Trans default_;
///
CharacterSet chset_;
///
void insert(docstring const &, LyXText *, LCursor & cur);
///
void insertVerbatim(docstring const &, LyXText *, LCursor & cur);
public:
///
TransManager();
@ -170,8 +165,6 @@ public:
///
void disableKeymap();
///
bool setCharset(std::string const &);
///
bool backspace() {
return trans_fsm_.currentState->backspace();
}