anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small stuff + protected space

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@715 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-05-05 08:44:11 +00:00
parent b71f583af6
commit 3d097a163f
6 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2000-05-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/insets/insetspecialchar.C (Read): allow command == '~' for
PROTECTED_SEPARATOR
(Write): write '~' for PROTECTED_SEPARATOR
2000-05-04 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/lyxparagraph.h: add a friend struct matchIT after the struct
InsetTable.
* src/mathed/formula.C (drawStr): rename size to siz.
* src/insets/figinset.C (RestoreForm): rename pflags to piflags,
possibly fix a bug by not changing the pflags = flags to piflags =
flags.
2000-05-05 Juergen Vigna <jug@sad.it>
* src/insets/insetbib.C: moved using directive

10
src/insets/figinset.C
View File

@ -1919,11 +1919,11 @@ void InsetFig::RestoreForm()
fl_activate_object(form->Height);
}
int pflags = flags & 3;
fl_set_button(form->Wysiwyg0, (pflags == 0));
fl_set_button(form->Wysiwyg1, (pflags == 1));
fl_set_button(form->Wysiwyg2, (pflags == 2));
fl_set_button(form->Wysiwyg3, (pflags == 3));
int piflags = flags & 3;
fl_set_button(form->Wysiwyg0, (piflags == 0));
fl_set_button(form->Wysiwyg1, (piflags == 1));
fl_set_button(form->Wysiwyg2, (piflags == 2));
fl_set_button(form->Wysiwyg3, (piflags == 3));
fl_set_button(form->Frame, ((flags & 4) != 0));
fl_set_button(form->Translations, ((flags & 8) != 0));
fl_set_button(form->Subfigure, (subfigure != 0));

7
src/insets/insetspecialchar.C
View File

@ -150,7 +150,9 @@ void InsetSpecialChar::Write(ostream & os) const
case LDOTS: command = "\\ldots{}"; break;
case MENU_SEPARATOR: command = "\\menuseparator"; break;
case PROTECTED_SEPARATOR:
command = "\\protected_separator"; break;
//command = "\\protected_separator";
command = "~";
break;
}
os << "\\SpecialChar " << command << "\n";
}
@ -170,7 +172,8 @@ void InsetSpecialChar::Read(LyXLex & lex)
kind = LDOTS;
else if (command == "\\menuseparator")
kind = MENU_SEPARATOR;
else if (command == "\\protected_separator")
else if (command == "\\protected_separator"
|| command == "~")
kind = PROTECTED_SEPARATOR;
else
lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");

1
src/lyx_main.C
View File

@ -69,6 +69,7 @@ LyX::LyX(int * argc, char * argv[])
// Global bindings (this must be done as early as possible.) (Lgb)
toplevel_keymap = new kb_keymap;
// Fill the toplevel_keymap with some defaults
for (LyXRC::Bindings::const_iterator cit = lyxrc.bindings.begin();
cit != lyxrc.bindings.end(); ++cit) {

2
src/lyxparagraph.h
View File

@ -522,6 +522,8 @@ private:
InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
};
///
friend struct matchIT;
///
struct matchIT {
/// used by lower_bound
inline

4
src/mathed/formula.C
View File

@ -250,7 +250,7 @@ int mathed_char_height(short type, int size, byte c, int & asc, int & des)
// In a near future maybe we use a better fonts renderer
void MathedInset::drawStr(Painter & pain, short type, int size,
void MathedInset::drawStr(Painter & pain, short type, int siz,
int x, int y, byte const * s, int ls)
{
string st;
@ -261,7 +261,7 @@ void MathedInset::drawStr(Painter & pain, short type, int size,
} else {
st = string(reinterpret_cast<char const *>(s), ls);
}
LyXFont mf = mathed_get_font(type, size);
LyXFont mf = mathed_get_font(type, siz);
pain.text(x, y, st, mf);
}