mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
Tiny things found while peering at chset code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@381 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b3bc8c1e71
commit
a320e34382
@ -1,3 +1,10 @@
|
|||||||
|
1999-12-15 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||||
|
|
||||||
|
* src/trans_mgr.C (insert): small cleanup
|
||||||
|
* src/chset.C (loadFile): ditto
|
||||||
|
|
||||||
|
* lib/kbd/iso8859-1.cdef: add missing backslashes
|
||||||
|
|
||||||
1999-12-15 Lars Gullik Bjønnes <larsbj@lyx.org>
|
1999-12-15 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||||
|
|
||||||
* src/insets/insetlatexaccent.C (Lbearing): new function, used to
|
* src/insets/insetlatexaccent.C (Lbearing): new function, used to
|
||||||
|
@ -14,9 +14,9 @@
|
|||||||
#166 What's this?
|
#166 What's this?
|
||||||
167 "\\S{}" # paragraph
|
167 "\\S{}" # paragraph
|
||||||
168 "\\\"{}" # umlaut
|
168 "\\\"{}" # umlaut
|
||||||
169 "\copyright{}"
|
169 "\\copyright{}"
|
||||||
170 "\\b{a}" # a macron
|
170 "\\b{a}" # a macron
|
||||||
171 "\guillemotleft{}"
|
171 "\\guillemotleft{}"
|
||||||
#172 What's this?
|
#172 What's this?
|
||||||
#173 horiz. line?
|
#173 horiz. line?
|
||||||
#174 Registered?
|
#174 Registered?
|
||||||
@ -32,10 +32,10 @@
|
|||||||
184 "\\c{}" # cedilla
|
184 "\\c{}" # cedilla
|
||||||
185 "${^1}$"
|
185 "${^1}$"
|
||||||
186 "\\b{o}" # o macron
|
186 "\\b{o}" # o macron
|
||||||
187 "\guillemotright{}"
|
187 "\\guillemotright{}"
|
||||||
188 "\ensuremath{\frac14}"
|
188 "\\ensuremath{\frac14}"
|
||||||
189 "\ensuremath{\frac12}"
|
189 "\\ensuremath{\frac12}"
|
||||||
190 "\ensuremath{\frac34}" # "0BE
|
190 "\\ensuremath{\frac34}" # "0BE
|
||||||
191 "?`" # mirrored ?
|
191 "?`" # mirrored ?
|
||||||
192 "\\`{A}"
|
192 "\\`{A}"
|
||||||
193 "\\'{A}"
|
193 "\\'{A}"
|
||||||
|
4795
po/lyx.pot
Normal file
4795
po/lyx.pot
Normal file
File diff suppressed because it is too large
Load Diff
@ -23,11 +23,11 @@ bool CharacterSet::loadFile(string const & fname)
|
|||||||
|
|
||||||
// open definition file
|
// open definition file
|
||||||
lyxerr[Debug::KBMAP]
|
lyxerr[Debug::KBMAP]
|
||||||
<< "Reading keymap file " << fname << ".cdef" << endl;
|
<< "Reading character set file " << fname << ".cdef" << endl;
|
||||||
string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
|
string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
|
||||||
ifstream ifs(filename.c_str());
|
ifstream ifs(filename.c_str());
|
||||||
if (!ifs) {
|
if (!ifs) {
|
||||||
lyxerr << "Unable to open keymap file" << endl;
|
lyxerr << "Unable to open character set file" << endl;
|
||||||
return true; // no definition, use 7-bit ascii
|
return true; // no definition, use 7-bit ascii
|
||||||
}
|
}
|
||||||
name_ = fname;
|
name_ = fname;
|
||||||
|
@ -302,14 +302,12 @@ void TransManager::insertVerbatim(string const & str, LyXText * text)
|
|||||||
|
|
||||||
void TransManager::insert(string str, LyXText * text)
|
void TransManager::insert(string str, LyXText * text)
|
||||||
{
|
{
|
||||||
string t = str;
|
|
||||||
|
|
||||||
// Go through the character encoding only if the current
|
// Go through the character encoding only if the current
|
||||||
// encoding (chset_->name()) matches the current font_norm
|
// encoding (chset_->name()) matches the current font_norm
|
||||||
// (lyrxc->font_norm
|
// (lyrxc->font_norm
|
||||||
|
|
||||||
if (chset_.getName() != lyxrc->font_norm ||
|
if (chset_.getName() != lyxrc->font_norm ||
|
||||||
chset_.encodeString(str) == false) {
|
! chset_.encodeString(str)) {
|
||||||
// Could not find an encoding
|
// Could not find an encoding
|
||||||
InsetLatexAccent ins(str);
|
InsetLatexAccent ins(str);
|
||||||
if (ins.CanDisplay()) {
|
if (ins.CanDisplay()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user