From e07b31a47d5e31b0d6c5485213669fb759ec845f Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 29 Jan 2002 12:31:24 +0000 Subject: [PATCH] Martin's changes to the space and style dialogs of the math panel. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3449 a592a061-630c-0410-9148-cb99ea01b6c8 --- images/ChangeLog | 5 + images/font.xbm | 272 ++++++++++++ images/style.xbm | 399 ++++++++++++++++++ src/frontends/xforms/ChangeLog | 15 + src/frontends/xforms/FormMathsSpace.C | 18 +- src/frontends/xforms/FormMathsSpace.h | 2 +- src/frontends/xforms/FormMathsStyle.C | 76 ++-- src/frontends/xforms/form_maths_space.C | 38 +- src/frontends/xforms/form_maths_space.h | 16 +- src/frontends/xforms/form_maths_style.C | 155 +------ src/frontends/xforms/form_maths_style.h | 27 +- .../xforms/forms/form_maths_space.fd | 122 ++---- .../xforms/forms/form_maths_style.fd | 365 +++------------- src/mathed/ChangeLog | 5 + src/mathed/math_support.C | 9 - 15 files changed, 891 insertions(+), 633 deletions(-) create mode 100644 images/font.xbm create mode 100644 images/style.xbm diff --git a/images/ChangeLog b/images/ChangeLog index 52d0dbd995..9f892438e2 100644 --- a/images/ChangeLog +++ b/images/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Martin Vermeer + + * style.xbm: + * font.xbm: new files. The bitmaps for the maths style dialog. + 2002-01-28 Martin Vermeer * deco.xbm: added math accents as a separate bitmap to the Decorations diff --git a/images/font.xbm b/images/font.xbm new file mode 100644 index 0000000000..f78b38a212 --- /dev/null +++ b/images/font.xbm @@ -0,0 +1,272 @@ + +#define font1_width 60 +#define font1_height 200 +static unsigned char const font1_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfe, 0x01, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0xfe, 0x01, 0x00, + 0x00, 0x3e, 0x0f, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x8f, 0x0f, 0x00, + 0x00, 0xf0, 0x01, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0x00, 0xf0, 0x01, 0x00, + 0x80, 0x07, 0x0f, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x80, 0x07, 0x07, 0x00, + 0x00, 0xf0, 0x01, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, + 0x80, 0x07, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x80, 0x07, 0x00, 0x00, + 0x00, 0xf0, 0x01, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0xf0, 0xf1, 0x01, + 0xf0, 0xff, 0x00, 0x00, 0x00, 0xf0, 0xfd, 0x0f, 0xf0, 0xff, 0x00, 0x00, + 0x00, 0xf0, 0x07, 0x3e, 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x7c, + 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x78, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0xf0, 0x01, 0xf8, 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, + 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, 0x81, 0x0f, 0x00, 0x00, + 0x00, 0xf0, 0x01, 0xf8, 0x81, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, + 0x81, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, 0x81, 0x0f, 0x00, 0x00, + 0x00, 0xf0, 0x01, 0xf8, 0x81, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, + 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0xf0, 0x01, 0x78, 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x7c, + 0x80, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x1e, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0x70, 0xfc, 0x0f, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x70, 0xf0, 0x01, + 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0xff, 0x07, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x1f, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1c, + 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x10, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x07, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7e, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc0, 0x1f, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1f, 0x1e, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xf0, 0xe7, 0xe1, 0xc7, 0x0f, 0xfe, 0x00, 0x00, + 0x00, 0x97, 0x03, 0x27, 0x18, 0xc3, 0x01, 0x00, 0x00, 0x8f, 0x03, 0x17, + 0xb8, 0x80, 0x03, 0x00, 0x00, 0x8f, 0x03, 0x0f, 0xf0, 0x80, 0x03, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, + 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, + 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, + 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, + 0x70, 0x80, 0x03, 0x00, 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x70, 0x80, 0x03, 0x00, 0xf0, 0x3f, 0xe0, 0x3f, + 0xff, 0xf3, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1e, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, + 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xff, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x20, 0x06, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x10, 0x06, + 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x06, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x07, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x07, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x03, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x03, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x1c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc0, 0x01, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x0c, 0x04, 0x00, 0x00, + 0x00, 0x00, 0xe0, 0x18, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x70, 0x08, + 0x0e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x70, 0x08, 0x0e, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x70, 0x04, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x02, + 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x03, + 0xff, 0xff, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x03, 0xff, 0xff, 0x00, 0x00, + 0x00, 0xfc, 0xff, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x06, 0xe0, 0x80, 0x01, 0x00, 0x00, 0x80, 0x03, 0x07, + 0xe0, 0xc0, 0x01, 0x00, 0x00, 0x80, 0x03, 0x07, 0xe0, 0xc0, 0x01, 0x00, + 0x00, 0x80, 0x03, 0x07, 0xe0, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x07, + 0xc0, 0xe3, 0x01, 0x00, 0x00, 0x00, 0xff, 0x03, 0xc0, 0xff, 0x00, 0x00, + 0x00, 0x00, 0xfc, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00}; + +#define font2_width 100 +#define font2_height 120 +static unsigned char const font2_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x00, + 0xf8, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, + 0x07, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, + 0xc3, 0x1c, 0x80, 0x31, 0xcc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x83, 0x31, 0x80, 0x31, 0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x03, 0x21, 0x80, 0x31, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x03, 0x63, 0x80, 0x31, 0x30, 0x06, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x03, 0x63, 0x80, 0x31, 0x30, 0x06, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x63, 0x80, 0x31, 0x30, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x63, 0x80, 0x31, 0x30, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x23, 0x80, 0x31, 0x30, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x31, 0x80, 0x31, + 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x83, 0x19, 0x80, + 0x31, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x0e, + 0x80, 0x31, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xff, + 0x03, 0x80, 0xf1, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, + 0xff, 0x1f, 0x80, 0xf1, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x83, 0x31, 0x80, 0x31, 0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x03, 0x63, 0x80, 0x31, 0x30, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x03, 0xc2, 0x80, 0x31, 0x20, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x80, 0x31, 0x60, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x81, 0x31, 0x60, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x81, 0x31, 0x60, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x81, 0x31, 0x60, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x81, 0x31, + 0x60, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0x86, 0x80, + 0x31, 0x60, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, 0xc2, + 0x80, 0x31, 0x20, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x03, + 0x73, 0x80, 0x31, 0x30, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, + 0x83, 0x3d, 0x80, 0x31, 0xd8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0xff, 0xff, 0x00, 0xf8, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x20, 0x0c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0xc3, + 0x3f, 0x08, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x80, + 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x61, 0x00, 0x00, + 0x00, 0x40, 0x00, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf9, 0x00, + 0x00, 0x00, 0x40, 0x00, 0xe6, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf5, + 0x00, 0x00, 0x00, 0x40, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0xe3, 0x01, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x02, 0x00, 0x80, 0x00, + 0xc0, 0xc1, 0x01, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x87, 0x03, 0xe0, + 0x33, 0xc0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x80, 0xcf, 0x03, + 0xf0, 0x3f, 0xc0, 0x61, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x80, 0xc0, 0xef, + 0x1f, 0xec, 0x3f, 0xc0, 0x21, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc1, 0x01, + 0x9e, 0x0f, 0x0f, 0x3e, 0xc0, 0x11, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, + 0x03, 0x0e, 0x07, 0x07, 0x1c, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0xf3, 0x03, 0x0e, 0x00, 0x07, 0x1c, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x8b, 0x01, 0x0e, 0x00, 0x07, 0x1c, 0xc0, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x07, 0x00, 0x0e, 0x00, 0x07, 0x1c, 0xc0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x0f, 0x00, 0x0e, 0x00, 0x07, 0x1c, 0xc0, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x0e, 0x80, 0x07, 0x1c, 0xc0, 0x01, + 0x00, 0x00, 0x00, 0xc0, 0x07, 0x1e, 0x00, 0x0e, 0x80, 0x07, 0x1c, 0xc0, + 0x01, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x3e, 0x00, 0x0e, 0x80, 0x07, 0x3c, + 0xc0, 0x01, 0x00, 0x00, 0x00, 0x80, 0x07, 0x3c, 0x00, 0x0e, 0x80, 0x07, + 0x3c, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x78, 0x00, 0x1e, 0x80, + 0x07, 0x3c, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x78, 0x00, 0x1e, + 0x80, 0x0f, 0x3e, 0xc0, 0x03, 0x01, 0x00, 0x00, 0x00, 0x07, 0x70, 0x00, + 0x3e, 0x86, 0x8f, 0x7f, 0xc1, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x07, 0x70, + 0x00, 0xfc, 0x01, 0xff, 0xfc, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x07, + 0x70, 0x00, 0xf8, 0x00, 0x7e, 0x78, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, + 0x07, 0x70, 0x00, 0x70, 0x00, 0x1c, 0x38, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x30, 0x00, 0x00, 0x00, 0x0c, 0x10, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x07, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x07, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, + 0xf0, 0x01, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x00, 0x00, 0x00, 0x07, 0x00, + 0x00, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x1c, 0x1e, 0x00, 0x00, 0x80, 0x07, + 0x00, 0x00, 0xe3, 0x03, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0xc0, + 0x07, 0x00, 0x80, 0xc1, 0x03, 0x00, 0x00, 0x80, 0x01, 0x1c, 0x00, 0x00, + 0xc0, 0x07, 0x00, 0xc0, 0xc0, 0x03, 0x00, 0x00, 0xc0, 0x00, 0x1c, 0x00, + 0x00, 0x60, 0x07, 0x00, 0xe0, 0xc0, 0x03, 0x00, 0x00, 0x60, 0x00, 0x0e, + 0x00, 0x00, 0x60, 0x07, 0x00, 0x70, 0xc0, 0x01, 0x00, 0x00, 0x70, 0x00, + 0x0e, 0x00, 0x00, 0x30, 0x07, 0x00, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x30, + 0x00, 0x07, 0x00, 0x00, 0x30, 0x07, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x03, 0x00, 0x00, 0x18, 0x07, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x07, 0x00, 0x3c, 0x00, 0x00, + 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x07, 0x00, 0x1c, 0x00, + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x00, 0x1c, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, + 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x03, + 0x0f, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x80, + 0x01, 0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, + 0x00, 0xc0, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, + 0x00, 0x00, 0x60, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, + 0x00, 0x00, 0x00, 0xa0, 0xff, 0x0f, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0f, 0x80, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x0f, 0x00, 0x08, 0x00, 0xf8, 0xff, 0x0f, 0x80, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x0f, 0x00, 0x06, 0x00, 0x1c, 0x00, 0x0e, 0xc0, 0x01, 0x00, + 0x08, 0x00, 0x00, 0x1f, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1e, 0xc0, 0x01, + 0x00, 0x0e, 0x00, 0x00, 0x1e, 0x00, 0x03, 0x04, 0x06, 0x00, 0x1e, 0xe0, + 0x0f, 0x00, 0x07, 0x00, 0x00, 0x3e, 0xc0, 0x01, 0x8e, 0x03, 0x00, 0x1e, + 0xe0, 0xff, 0x80, 0x03, 0x00, 0x00, 0xfc, 0x70, 0x00, 0xfe, 0x03, 0x00, + 0x1e, 0xf1, 0xff, 0x8f, 0x01, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0xfe, 0x01, + 0x00, 0xfc, 0x38, 0xf8, 0xff, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0xfe, + 0x00, 0x00, 0x7c, 0x0c, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/images/style.xbm b/images/style.xbm new file mode 100644 index 0000000000..1d8bbc37aa --- /dev/null +++ b/images/style.xbm @@ -0,0 +1,399 @@ + +#define style1_width 135 +#define style1_height 110 +static unsigned char const style1_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, + 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x78, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xe0, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0e, 0xc0, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x80, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x80, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, + 0x80, 0x03, 0x06, 0x80, 0x07, 0x38, 0x1c, 0x60, 0x00, 0x38, 0x00, 0x0c, + 0x10, 0x00, 0x00, 0x00, 0x07, 0x80, 0x83, 0x0d, 0xc0, 0x18, 0x6c, 0x73, + 0x60, 0x00, 0x6e, 0x03, 0x1b, 0x38, 0x00, 0x00, 0x00, 0x07, 0x80, 0x83, + 0x18, 0x60, 0x10, 0xe4, 0xe1, 0x70, 0x00, 0x83, 0x03, 0x31, 0x18, 0x00, + 0x00, 0x00, 0x03, 0x80, 0x43, 0x1c, 0x30, 0x18, 0xe6, 0xc0, 0x70, 0x80, + 0x81, 0x83, 0x38, 0x18, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x43, 0x0c, 0x70, + 0x18, 0x62, 0xc0, 0x30, 0xc0, 0x81, 0x81, 0x18, 0x1c, 0x00, 0x00, 0x80, + 0x03, 0xc0, 0x01, 0x0e, 0xf0, 0x03, 0x60, 0xe0, 0x30, 0xe0, 0x80, 0x01, + 0x1c, 0x1c, 0x00, 0x00, 0x80, 0x03, 0xc0, 0x01, 0x06, 0xe0, 0x0f, 0x70, + 0xe0, 0x38, 0xe0, 0xc0, 0x01, 0x1c, 0x0c, 0x00, 0x00, 0x80, 0x01, 0xe0, + 0x00, 0x06, 0xc0, 0x1f, 0x70, 0xe0, 0x38, 0xe0, 0xc0, 0x01, 0x0c, 0x0c, + 0x00, 0x00, 0xc0, 0x01, 0x60, 0x00, 0x07, 0x00, 0x1c, 0x30, 0xe0, 0x18, + 0xe0, 0xc0, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0xc0, 0x01, 0x30, 0x00, 0x23, + 0x1c, 0x18, 0x30, 0x70, 0x18, 0x61, 0xc0, 0x08, 0x0e, 0x0e, 0x00, 0x00, + 0xc0, 0x01, 0x18, 0x80, 0x23, 0x1c, 0x08, 0x38, 0x30, 0x1c, 0x61, 0xe0, + 0x0c, 0x0e, 0x06, 0x00, 0x00, 0xc0, 0x00, 0x0e, 0x80, 0x33, 0x04, 0x0c, + 0x38, 0x18, 0x98, 0xe0, 0xf0, 0x04, 0x0c, 0x07, 0x00, 0x00, 0xfc, 0xff, + 0x03, 0x00, 0x1b, 0x18, 0x07, 0xd8, 0x0e, 0xd8, 0xc0, 0xdd, 0x06, 0x9c, + 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0xf0, 0x01, 0x98, 0x03, + 0x70, 0x00, 0x87, 0x03, 0x70, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x87, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, + 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf8, 0x03, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x00, 0xe0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, + 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, + 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, + 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, + 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x0f, 0xfe, 0x83, 0x07, 0x0c, 0x0c, 0x80, 0x1f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x18, 0x30, 0xc0, 0x0c, 0x0c, 0x0c, + 0xe0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, + 0x30, 0x40, 0x0c, 0x0e, 0x0e, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x1c, 0x38, 0x20, 0x0c, 0x0e, 0x0e, 0x38, 0x30, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x38, 0x20, + 0x0e, 0x06, 0x06, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf0, 0x07, 0x18, 0x00, 0x06, 0x06, 0x06, 0xfc, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x18, 0x00, 0x07, 0x07, + 0x07, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0f, 0x1c, 0x00, 0x07, 0x07, 0x07, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x1c, 0x02, 0x03, 0x03, 0x23, 0x1c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0c, 0x0c, + 0x02, 0x03, 0x03, 0x23, 0x1c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0e, 0x0c, 0x0c, 0x01, 0x83, 0x83, 0x13, 0x18, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x8c, 0x00, 0xc7, + 0x03, 0x13, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf8, 0x03, 0x78, 0x00, 0xbe, 0x01, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc1, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + + +#define style2_width 135 +#define style2_height 165 +static unsigned char const style2_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1c, 0x1c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x0e, 0x18, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0e, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x0e, 0x18, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0x18, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x80, 0x01, 0x07, + 0x08, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, + 0xff, 0xff, 0x01, 0x00, 0x07, 0x00, 0xe0, 0x07, 0xf8, 0x3c, 0xfc, 0x0f, + 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x07, 0x00, 0x38, + 0x0c, 0x84, 0x63, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0xf0, + 0x01, 0x00, 0x07, 0x00, 0x1c, 0x08, 0x82, 0x63, 0xe0, 0x00, 0x00, 0x00, + 0x00, 0x78, 0x00, 0x00, 0xc0, 0x03, 0x80, 0x03, 0x00, 0x0e, 0x0c, 0x82, + 0x21, 0x60, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x03, 0x80, + 0x03, 0x00, 0x06, 0x06, 0x81, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0xf0, + 0x00, 0x00, 0x00, 0x02, 0x80, 0x03, 0x00, 0xff, 0x03, 0xc0, 0x01, 0x70, + 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x06, 0x80, 0x03, 0x00, + 0x07, 0x00, 0xc0, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x00, + 0x00, 0x04, 0xc0, 0x01, 0x00, 0x07, 0x00, 0xc0, 0x00, 0x30, 0x00, 0x00, + 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0x08, 0xc0, 0x01, 0x00, 0x07, 0x00, + 0xc0, 0x40, 0x30, 0x08, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, + 0xc0, 0x01, 0x00, 0x07, 0x10, 0xe3, 0x20, 0x38, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x0f, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x06, 0x08, 0xe3, 0x20, + 0x38, 0x06, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0xe0, 0x01, + 0x00, 0x0c, 0x06, 0xf3, 0x10, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x3e, + 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x00, 0xf8, 0x01, 0x9e, 0x0f, 0xf0, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, + 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x06, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + 0x00, 0x00, 0x04, 0xe0, 0x87, 0xff, 0xc1, 0x03, 0x06, 0x07, 0xc0, 0x0f, + 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x04, 0x30, 0x0c, 0x1c, 0x60, + 0x06, 0x06, 0x07, 0x70, 0x18, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, + 0x06, 0x18, 0x0c, 0x1c, 0x20, 0x06, 0x07, 0x03, 0x38, 0x10, 0x00, 0x00, + 0x00, 0x60, 0x00, 0x00, 0x00, 0x03, 0x18, 0x0e, 0x0c, 0x10, 0x06, 0x07, + 0x03, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x80, 0x03, 0x38, + 0x00, 0x0c, 0x10, 0x07, 0x83, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x10, + 0x00, 0x00, 0xe0, 0x03, 0xf8, 0x03, 0x0e, 0x00, 0x03, 0x83, 0x03, 0xfe, + 0x07, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0xfc, 0x01, 0xf0, 0x07, 0x0e, + 0x80, 0x83, 0x83, 0x01, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, + 0xff, 0x01, 0x80, 0x07, 0x06, 0x80, 0x83, 0x83, 0x01, 0x0e, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x01, 0x06, 0x06, 0x06, 0x81, 0x81, + 0xc1, 0x19, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, + 0x07, 0x06, 0x87, 0x80, 0x81, 0xc1, 0x09, 0x0e, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x06, 0xc7, 0x80, 0xc1, 0xc1, 0x08, + 0x0c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, + 0x46, 0x80, 0xe3, 0xc1, 0x04, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xfc, 0x01, 0x3e, 0x00, 0xdf, 0x80, 0x07, 0xf0, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x01, 0x00, + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, + 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x3c, 0x70, 0x1e, 0x30, 0xc0, + 0x79, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, + 0x43, 0xc8, 0x31, 0x68, 0x20, 0xc7, 0xc0, 0x00, 0x00, 0x80, 0xff, 0xff, + 0xff, 0x01, 0x00, 0x7c, 0x80, 0x61, 0xc8, 0x30, 0x64, 0x20, 0x83, 0xc1, + 0x00, 0x00, 0x00, 0x07, 0x00, 0xf0, 0x01, 0x00, 0xc0, 0xc0, 0x00, 0xc0, + 0x00, 0x60, 0x00, 0x83, 0xc1, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x80, 0x01, + 0x00, 0xc0, 0xe0, 0x00, 0x60, 0x00, 0x30, 0x80, 0xc1, 0xc1, 0x00, 0x00, + 0x00, 0x0e, 0x00, 0x00, 0x03, 0x10, 0xc0, 0x60, 0x00, 0x60, 0x00, 0x30, + 0x80, 0xc1, 0x60, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x02, 0x10, 0x40, + 0x60, 0x00, 0x60, 0x00, 0x30, 0x81, 0xc1, 0x60, 0x08, 0x00, 0x00, 0x38, + 0x00, 0x00, 0x04, 0x30, 0x20, 0xc0, 0x40, 0x60, 0x00, 0x90, 0x80, 0x61, + 0x60, 0x04, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 0xf0, 0x1f, 0x80, 0x3f, + 0x30, 0x00, 0xf0, 0xc0, 0x3e, 0xe0, 0x03, 0x00, 0x00, 0x70, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, + 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x80, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x80, 0x07, 0xff, 0xc0, 0x81, 0xc0, 0x00, 0x78, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x02, 0x40, 0x08, 0x18, + 0x20, 0xc3, 0xc0, 0x00, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, + 0x00, 0x03, 0x20, 0x0c, 0x18, 0x10, 0xc3, 0xc0, 0x00, 0x83, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x01, 0x60, 0x00, 0x0c, 0x90, 0xc1, + 0x60, 0x80, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf0, 0x01, + 0xc0, 0x07, 0x0c, 0x80, 0x61, 0x60, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0x01, 0x00, 0x0c, 0x0c, 0x80, 0x61, 0x60, 0x80, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x00, 0x10, 0x08, + 0x8c, 0x80, 0x60, 0x60, 0x82, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x04, 0x44, 0x80, 0x70, 0x20, 0x81, 0x81, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x3c, 0x80, + 0x3f, 0xe0, 0x01, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x30, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc0, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x80, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, + 0x3f, 0x78, 0x3f, 0x3c, 0xe0, 0x7d, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x84, 0x81, 0x61, 0xe4, 0x30, 0x32, 0xb0, 0xc3, 0xc0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xc0, 0x20, 0x64, + 0x10, 0x32, 0x90, 0xc1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x60, 0x00, 0x60, 0x00, 0x30, 0x80, 0xc1, 0x60, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x60, 0x00, 0x60, 0x00, 0x18, + 0x80, 0xc1, 0x60, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x7f, 0x00, 0x80, + 0x60, 0x00, 0x30, 0x00, 0x98, 0xc0, 0xc0, 0x60, 0x04, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0xe0, 0x00, 0x82, 0x60, 0x40, 0x30, 0x00, 0x8c, 0xc0, 0x60, + 0x30, 0x04, 0x00, 0x00, 0x00, 0x80, 0x01, 0x80, 0x00, 0x41, 0x40, 0x60, + 0x30, 0x00, 0x4c, 0xc0, 0x31, 0x30, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, + 0x00, 0x01, 0x3f, 0x80, 0x1f, 0x30, 0x00, 0x38, 0xc0, 0x0e, 0xe0, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x7c, 0x00, 0x3f, + 0xbc, 0x1f, 0x1c, 0xf0, 0x3e, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, + 0x00, 0x01, 0xc2, 0xc0, 0x30, 0x72, 0x18, 0x32, 0xd8, 0x61, 0x60, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x42, 0x60, 0x30, 0x32, 0x08, + 0x31, 0xc8, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, + 0x0e, 0x60, 0x00, 0x30, 0x00, 0x18, 0xc0, 0x60, 0x60, 0x00, 0x00, 0x00, + 0x00, 0x80, 0x00, 0xe0, 0x00, 0x78, 0x70, 0x00, 0x30, 0x00, 0x18, 0xc0, + 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0x40, 0x30, + 0x00, 0x18, 0x00, 0x8c, 0x60, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x41, 0x30, 0x40, 0x18, 0x00, 0x4c, 0x60, 0x30, 0x30, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x60, 0x30, 0x18, + 0x00, 0x4c, 0xe0, 0x18, 0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x1f, 0x80, 0x0f, 0x18, 0x00, 0x38, 0x60, 0x07, 0xe0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 03781d585d..f9aec7e963 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,18 @@ +2002-01-28 Martin Vermeer + + * FormMathsSpace.[Ch]: + * forms/form_maths_space.fd: + Changed the "Space" subpanel of the math panel into one of + ordinary buttons rather than radio buttons. They are now + self-applying so OK and Apply could go. + +2002-01-28 Martin Vermeer + + * FormMathsStyle.[Ch]: + * forms/form_maths_style.fd: + Patched to use button arrays. Buttons are self-applying, saving + one keystroke and the OK and Apply buttons. + 2002-01-27 Herbert Voss * FormGraphic.[Ch]: diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C index 1e8fa0d029..c8c9e9bb40 100644 --- a/src/frontends/xforms/FormMathsSpace.C +++ b/src/frontends/xforms/FormMathsSpace.C @@ -39,19 +39,16 @@ void FormMathsSpace::build() { dialog_.reset(build_maths_space()); - fl_set_button(dialog_->radio_thin, 1); - space_ = 1; + space_ = -1; - bc().setOK(dialog_->button_ok); - bc().setApply(dialog_->button_apply); bc().setCancel(dialog_->button_cancel); - bc().addReadOnly(dialog_->radio_thin); - bc().addReadOnly(dialog_->radio_medium); - bc().addReadOnly(dialog_->radio_thick); - bc().addReadOnly(dialog_->radio_negative); - bc().addReadOnly(dialog_->radio_quadratin); - bc().addReadOnly(dialog_->radio_twoquadratin); + bc().addReadOnly(dialog_->button_thin); + bc().addReadOnly(dialog_->button_medium); + bc().addReadOnly(dialog_->button_thick); + bc().addReadOnly(dialog_->button_negative); + bc().addReadOnly(dialog_->button_quadratin); + bc().addReadOnly(dialog_->button_twoquadratin); } @@ -67,6 +64,7 @@ bool FormMathsSpace::input(FL_OBJECT *, long data) if (data >= 0 && data < 6) { space_ = short(data); + apply(); } return true; } diff --git a/src/frontends/xforms/FormMathsSpace.h b/src/frontends/xforms/FormMathsSpace.h index 8fd3031fb6..19afd24e2e 100644 --- a/src/frontends/xforms/FormMathsSpace.h +++ b/src/frontends/xforms/FormMathsSpace.h @@ -28,7 +28,7 @@ struct FD_form_maths_space; class FormMathsSpace : public FormMathsSub { public: /// - FormMathsSpace(LyXView *, Dialogs *, FormMathsPanel const &); + FormMathsSpace(LyXView *, Dialogs * , FormMathsPanel const & ); private: /// Build the dialog diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C index 07b28a4c12..5b1f9daa5e 100644 --- a/src/frontends/xforms/FormMathsStyle.C +++ b/src/frontends/xforms/FormMathsStyle.C @@ -18,9 +18,23 @@ #include "FormMathsStyle.h" #include "form_maths_style.h" +#include "bmtable.h" + +#include "style.xbm" +#include "font.xbm" + +#include "debug.h" + +char const * latex_mathstyle[] = { + "displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle" +}; + +kb_action latex_mathfontcmds[] = { + LFUN_BOLD, LFUN_SANS, LFUN_ROMAN, LFUN_ITAL, LFUN_CODE, + LFUN_NOUN, LFUN_FRAK, LFUN_EMPH, LFUN_FREE, LFUN_DEFAULT +}; + -extern char * latex_mathstyle[]; -extern kb_action latex_mathfontcmds[]; FormMathsStyle::FormMathsStyle(LyXView * lv, Dialogs * d, FormMathsPanel const & p) @@ -41,44 +55,48 @@ void FormMathsStyle::build() { dialog_.reset(build_maths_style()); - fl_set_button(dialog_->radio_text, 1); - style_ = 1; + fl_set_bmtable_data(dialog_->bmtable_style1, 1, 1, + style1_width, style1_height, style1_bits); + fl_set_bmtable_maxitems(dialog_->bmtable_style1, 1); + bc().addReadOnly(dialog_->bmtable_style1); - bc().setOK(dialog_->button_ok); - bc().setApply(dialog_->button_apply); - bc().setCancel(dialog_->button_cancel); + fl_set_bmtable_data(dialog_->bmtable_style2, 1, 3, + style2_width, style2_height, style2_bits); + fl_set_bmtable_maxitems(dialog_->bmtable_style2, 3); + bc().addReadOnly(dialog_->bmtable_style2); - bc().addReadOnly(dialog_->radio_display); - bc().addReadOnly(dialog_->radio_text); - bc().addReadOnly(dialog_->radio_script); - bc().addReadOnly(dialog_->radio_scriptscript); - bc().addReadOnly(dialog_->radio_bold); - bc().addReadOnly(dialog_->radio_calligraphic); - bc().addReadOnly(dialog_->radio_roman); - bc().addReadOnly(dialog_->radio_typewriter); - bc().addReadOnly(dialog_->radio_sans); - bc().addReadOnly(dialog_->radio_italic); - bc().addReadOnly(dialog_->radio_bbbold); - bc().addReadOnly(dialog_->radio_fraktur); - bc().addReadOnly(dialog_->radio_textrm); - bc().addReadOnly(dialog_->radio_normal); -} + fl_set_bmtable_data(dialog_->bmtable_font1, 1, 5, + font1_width, font1_height, font1_bits); + fl_set_bmtable_maxitems(dialog_->bmtable_font1, 5); + bc().addReadOnly(dialog_->bmtable_font1); + + fl_set_bmtable_data(dialog_->bmtable_font2, 1, 3, + font2_width, font2_height, font2_bits); + fl_set_bmtable_maxitems(dialog_->bmtable_font2, 3); + bc().addReadOnly(dialog_->bmtable_font2); + + bc().setCancel(dialog_->button_cancel); + } void FormMathsStyle::apply() { - if ( (style_ >= 0) && (style_ < 4) ) + if ((style_ >= 0) && (style_ < 4)) parent_.insertSymbol(latex_mathstyle[style_]); else + if ((style_ >= 4) && (style_ < 14)) parent_.dispatchFunc(latex_mathfontcmds[style_ - 4]); } -bool FormMathsStyle::input(FL_OBJECT *, long data) +bool FormMathsStyle::input(FL_OBJECT * ob, long data) { - style_ = -1; - - if (data >= 0 && data < 14) { - style_ = short(data); - } + style_ = fl_get_bmtable(ob); + if (style_ < 0) return false; + //if (ob == dialog_->bmtable_style1) style_ += 0; + if (ob == dialog_->bmtable_style2) style_ += 1; + if (ob == dialog_->bmtable_font1) style_ += 4; + if (ob == dialog_->bmtable_font2) style_ += 9; + if (data >= 12) style_ = short(data); + apply(); return true; } diff --git a/src/frontends/xforms/form_maths_space.C b/src/frontends/xforms/form_maths_space.C index 7802db6eab..3f2a157730 100644 --- a/src/frontends/xforms/form_maths_space.C +++ b/src/frontends/xforms/form_maths_space.C @@ -22,78 +22,58 @@ FD_form_maths_space * FormMathsSpace::build_maths_space() FL_OBJECT *obj; FD_form_maths_space *fdui = new FD_form_maths_space; - fdui->form = fl_bgn_form(FL_NO_BOX, 280, 150); + fdui->form = fl_bgn_form(FL_NO_BOX, 259, 149); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 280, 150, ""); + obj = fl_add_box(FL_UP_BOX, 0, 0, 259, 149, ""); fdui->spaces = fl_bgn_group(); { char const * const dummy = N_("Thin|#T"); - fdui->radio_thin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 10, 120, 30, idex(_(dummy))); + fdui->button_thin = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 1); { char const * const dummy = N_("Medium|#M"); - fdui->radio_medium = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 40, 120, 30, idex(_(dummy))); + fdui->button_medium = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 2); { char const * const dummy = N_("Thick|#H"); - fdui->radio_thick = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 70, 120, 30, idex(_(dummy))); + fdui->button_thick = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 70, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 3); { char const * const dummy = N_("Negative|#N"); - fdui->radio_negative = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 10, 120, 30, idex(_(dummy))); + fdui->button_negative = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 10, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); { char const * const dummy = N_("Quadratin|#Q"); - fdui->radio_quadratin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 40, 120, 30, idex(_(dummy))); + fdui->button_quadratin = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 40, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 4); { char const * const dummy = N_("2Quadratin|#2"); - fdui->radio_twoquadratin = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 70, 120, 30, idex(_(dummy))); + fdui->button_twoquadratin = obj = fl_add_button(FL_NORMAL_BUTTON, 130, 70, 120, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 5); fl_end_group(); - fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 110, 80, 30, _("OK ")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0); - { - char const * const dummy = N_("Cancel|^["); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 190, 110, 80, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 92, 110, 80, 30, _("Close")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0); - { - char const * const dummy = N_("Apply|#A"); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 110, 80, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/form_maths_space.h b/src/frontends/xforms/form_maths_space.h index bd4e94d54b..4f36472e6f 100644 --- a/src/frontends/xforms/form_maths_space.h +++ b/src/frontends/xforms/form_maths_space.h @@ -6,9 +6,7 @@ /** Callbacks, globals and object handlers **/ extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long); -extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long); extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long); -extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long); /**** Forms and Objects ****/ @@ -17,15 +15,13 @@ struct FD_form_maths_space { FL_FORM *form; FL_OBJECT *spaces; - FL_OBJECT *radio_thin; - FL_OBJECT *radio_medium; - FL_OBJECT *radio_thick; - FL_OBJECT *radio_negative; - FL_OBJECT *radio_quadratin; - FL_OBJECT *radio_twoquadratin; - FL_OBJECT *button_ok; + FL_OBJECT *button_thin; + FL_OBJECT *button_medium; + FL_OBJECT *button_thick; + FL_OBJECT *button_negative; + FL_OBJECT *button_quadratin; + FL_OBJECT *button_twoquadratin; FL_OBJECT *button_cancel; - FL_OBJECT *button_apply; }; #endif /* FD_form_maths_space_h_ */ diff --git a/src/frontends/xforms/form_maths_style.C b/src/frontends/xforms/form_maths_style.C index ab29b725af..ff546e0164 100644 --- a/src/frontends/xforms/form_maths_style.C +++ b/src/frontends/xforms/form_maths_style.C @@ -2,6 +2,7 @@ #include #include "xforms_helpers.h" #include "gettext.h" +#include "bmtable.h" /* Form definition file generated with fdesign. */ @@ -22,149 +23,29 @@ FD_form_maths_style * FormMathsStyle::build_maths_style() FL_OBJECT *obj; FD_form_maths_style *fdui = new FD_form_maths_style; - fdui->form = fl_bgn_form(FL_NO_BOX, 373, 251); + fdui->form = fl_bgn_form(FL_NO_BOX, 321, 293); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 373, 251, ""); - { - char const * const dummy = N_("Apply|#A"); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 152, 212, 80, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0); - fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 62, 212, 80, 30, _("OK ")); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0); - { - char const * const dummy = N_("Cancel|^["); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 244, 212, 80, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } + obj = fl_add_box(FL_UP_BOX, 0, 0, 321, 293, ""); + fdui->bmtable_font2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 212, 10, 100, 120, ""); + fl_set_object_lcolor(obj, FL_BLUE); + fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); + fdui->bmtable_style1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 10, 134, 110, ""); + fl_set_object_lcolor(obj, FL_BLUE); + fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 190, 234, 80, 30, _("Close")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0); - - fdui->styles = fl_bgn_group(); - { - char const * const dummy = N_("Display|#D"); - fdui->radio_display = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 15, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_MEDIUM_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 1); - { - char const * const dummy = N_("Text|#T"); - fdui->radio_text = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 45, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fdui->bmtable_style2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 8, 120, 134, 164, ""); + fl_set_object_lcolor(obj, FL_BLUE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - fl_set_button(obj, 1); - { - char const * const dummy = N_("Script|#S"); - fdui->radio_script = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 75, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 2); - { - char const * const dummy = N_("Bold|#B"); - fdui->radio_bold = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 15, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 4); - { - char const * const dummy = N_("Calligraphy|#C"); - fdui->radio_calligraphic = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 45, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, 14); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 5); - { - char const * const dummy = N_("Roman|#m"); - fdui->radio_roman = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 75, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_TIMES_STYLE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 6); - { - char const * const dummy = N_("scriptscript|#p"); - fdui->radio_scriptscript = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 15, 105, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_TINY_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 3); - { - char const * const dummy = N_("Fixed|#x"); - fdui->radio_typewriter = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 105, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_FIXED_STYLE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 7); - { - char const * const dummy = N_("Italic|#I"); - fdui->radio_italic = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 165, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lstyle(obj, FL_TIMESITALIC_STYLE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 9); - { - char const * const dummy = N_("BB Bold|#o"); - fdui->radio_bbbold = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 260, 15, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 10); - { - char const * const dummy = N_("Fraktur|#F"); - fdui->radio_fraktur = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 260, 45, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 11); - { - char const * const dummy = N_("Reset|#R"); - fdui->radio_normal = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 260, 165, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fdui->bmtable_font1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 152, 10, 60, 200, ""); + fl_set_object_lcolor(obj, FL_BLUE); + fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); + fdui->button_reset = obj = fl_add_button(FL_NORMAL_BUTTON, 212, 170, 100, 40, _("Reset")); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 13); - { - char const * const dummy = N_("textrm|#e"); - fdui->radio_textrm = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 260, 105, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fdui->button_textrm = obj = fl_add_button(FL_NORMAL_BUTTON, 212, 130, 100, 40, _("textrm")); + fl_set_object_lstyle(obj, FL_FIXED_STYLE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 12); - { - char const * const dummy = N_("Sans Serif|#n"); - fdui->radio_sans = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 140, 135, 120, 30, idex(_(dummy))); - fl_set_button_shortcut(obj, scex(_(dummy)), 1); - } - fl_set_object_color(obj, FL_MCOL, FL_YELLOW); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 8); - fl_end_group(); - - obj = fl_add_frame(FL_ENGRAVED_FRAME, 136, 16, 226, 184, ""); - obj = fl_add_frame(FL_ENGRAVED_FRAME, 14, 16, 110, 124, ""); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/form_maths_style.h b/src/frontends/xforms/form_maths_style.h index 3e3a80d25b..414c3e76fb 100644 --- a/src/frontends/xforms/form_maths_style.h +++ b/src/frontends/xforms/form_maths_style.h @@ -5,10 +5,8 @@ #define FD_form_maths_style_h_ /** Callbacks, globals and object handlers **/ -extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long); -extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long); -extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long); extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long); +extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long); /**** Forms and Objects ****/ @@ -16,24 +14,13 @@ struct FD_form_maths_style { ~FD_form_maths_style(); FL_FORM *form; - FL_OBJECT *button_apply; - FL_OBJECT *button_ok; + FL_OBJECT *bmtable_font2; + FL_OBJECT *bmtable_style1; FL_OBJECT *button_cancel; - FL_OBJECT *styles; - FL_OBJECT *radio_display; - FL_OBJECT *radio_text; - FL_OBJECT *radio_script; - FL_OBJECT *radio_bold; - FL_OBJECT *radio_calligraphic; - FL_OBJECT *radio_roman; - FL_OBJECT *radio_scriptscript; - FL_OBJECT *radio_typewriter; - FL_OBJECT *radio_italic; - FL_OBJECT *radio_bbbold; - FL_OBJECT *radio_fraktur; - FL_OBJECT *radio_normal; - FL_OBJECT *radio_textrm; - FL_OBJECT *radio_sans; + FL_OBJECT *bmtable_style2; + FL_OBJECT *bmtable_font1; + FL_OBJECT *button_reset; + FL_OBJECT *button_textrm; }; #endif /* FD_form_maths_style_h_ */ diff --git a/src/frontends/xforms/forms/form_maths_space.fd b/src/frontends/xforms/forms/form_maths_space.fd index e2124a5e73..d680cc2832 100644 --- a/src/frontends/xforms/forms/form_maths_space.fd +++ b/src/frontends/xforms/forms/form_maths_space.fd @@ -9,14 +9,14 @@ SnapGrid: 2 =============== FORM =============== Name: form_maths_space -Width: 280 -Height: 150 -Number of Objects: 12 +Width: 259 +Height: 149 +Number of Objects: 10 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 280 150 +box: 0 0 259 149 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -50,11 +50,11 @@ callback: argument: -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 20 10 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 10 10 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -63,16 +63,16 @@ label: Thin|#T shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_thin +name: button_thin callback: C_FormBaseDeprecatedInputCB argument: 1 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 20 40 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 10 40 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -81,16 +81,16 @@ label: Medium|#M shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_medium +name: button_medium callback: C_FormBaseDeprecatedInputCB argument: 2 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 20 70 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 10 70 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -99,16 +99,16 @@ label: Thick|#H shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_thick +name: button_thick callback: C_FormBaseDeprecatedInputCB argument: 3 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 10 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 130 10 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -117,16 +117,16 @@ label: Negative|#N shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_negative +name: button_negative callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 40 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 130 40 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -135,16 +135,16 @@ label: Quadratin|#Q shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_quadratin +name: button_quadratin callback: C_FormBaseDeprecatedInputCB argument: 4 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 70 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 130 70 120 30 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE @@ -153,7 +153,7 @@ label: 2Quadratin|#2 shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_twoquadratin +name: button_twoquadratin callback: C_FormBaseDeprecatedInputCB argument: 5 @@ -178,56 +178,20 @@ argument: -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 10 110 80 30 +box: 92 110 80 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: OK +label: Close shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_ok -callback: C_FormBaseDeprecatedOKCB -argument: - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 190 110 80 30 -boxtype: FL_UP_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Cancel|^[ -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity name: button_cancel callback: C_FormBaseDeprecatedCancelCB -argument: - --------------------- -class: FL_BUTTON -type: NORMAL_BUTTON -box: 100 110 80 30 -boxtype: FL_UP_BOX -colors: FL_COL1 FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Apply|#A -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: button_apply -callback: C_FormBaseDeprecatedApplyCB -argument: +argument: 0 ============================== create_the_forms diff --git a/src/frontends/xforms/forms/form_maths_style.fd b/src/frontends/xforms/forms/form_maths_style.fd index 0b5b5ba108..7e51759359 100644 --- a/src/frontends/xforms/forms/form_maths_style.fd +++ b/src/frontends/xforms/forms/form_maths_style.fd @@ -9,14 +9,14 @@ SnapGrid: 2 =============== FORM =============== Name: form_maths_style -Width: 373 -Height: 251 -Number of Objects: 22 +Width: 321 +Height: 293 +Number of Objects: 8 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 373 251 +box: 0 0 321 293 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -33,52 +33,52 @@ argument: -------------------- class: FL_BUTTON -type: NORMAL_BUTTON -box: 152 212 80 30 +type: PUSH_BUTTON +box: 212 10 100 120 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Apply|#A +size: FL_DEFAULT_SIZE +lcol: FL_BLUE +label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_apply -callback: C_FormBaseDeprecatedApplyCB +name: bmtable_font2 +callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- class: FL_BUTTON -type: RETURN_BUTTON -box: 62 212 80 30 +type: PUSH_BUTTON +box: 8 10 134 110 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: OK -shortcut: ^M +size: FL_DEFAULT_SIZE +lcol: FL_BLUE +label: +shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: button_ok -callback: C_FormBaseDeprecatedOKCB +name: bmtable_style1 +callback: C_FormBaseDeprecatedInputCB argument: 0 -------------------- class: FL_BUTTON -type: NORMAL_BUTTON -box: 244 212 80 30 +type: RETURN_BUTTON +box: 190 234 80 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|^[ -shortcut: +label: Close +shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: button_cancel @@ -86,329 +86,76 @@ callback: C_FormBaseDeprecatedCancelCB argument: 0 -------------------- -class: FL_BEGIN_GROUP -type: 0 -box: 0 0 0 0 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_MCOL +class: FL_BUTTON +type: PUSH_BUTTON +box: 8 120 134 164 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE -lcol: FL_BLACK +lcol: FL_BLUE label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: styles -callback: -argument: - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 15 15 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_MEDIUM_SIZE -lcol: FL_BLACK -label: Display|#D -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_display -callback: C_FormBaseDeprecatedInputCB -argument: 1 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 15 45 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Text|#T -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_text +name: bmtable_style2 callback: C_FormBaseDeprecatedInputCB argument: 0 - value: 1 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 15 75 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: PUSH_BUTTON +box: 152 10 60 200 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: Script|#S -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_script -callback: C_FormBaseDeprecatedInputCB -argument: 2 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 15 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_BOLD_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Bold|#B -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_bold -callback: C_FormBaseDeprecatedInputCB -argument: 4 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 45 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: 14 -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Calligraphy|#C -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_calligraphic -callback: C_FormBaseDeprecatedInputCB -argument: 5 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 75 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_TIMES_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Roman|#m -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_roman -callback: C_FormBaseDeprecatedInputCB -argument: 6 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 15 105 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_TINY_SIZE -lcol: FL_BLACK -label: scriptscript|#p -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_scriptscript -callback: C_FormBaseDeprecatedInputCB -argument: 3 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 105 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_FIXED_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Fixed|#x -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_typewriter -callback: C_FormBaseDeprecatedInputCB -argument: 7 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 165 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_TIMESITALIC_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Italic|#I -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_italic -callback: C_FormBaseDeprecatedInputCB -argument: 9 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 260 15 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: BB Bold|#o -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_bbbold -callback: C_FormBaseDeprecatedInputCB -argument: 10 - --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 260 45 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Fraktur|#F +lcol: FL_BLUE +label: shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_fraktur +name: bmtable_font1 callback: C_FormBaseDeprecatedInputCB -argument: 11 +argument: 0 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 260 165 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 212 170 100 40 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE +size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Reset|#R +label: Reset shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_normal +name: button_reset callback: C_FormBaseDeprecatedInputCB argument: 13 -------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 260 105 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW +class: FL_BUTTON +type: NORMAL_BUTTON +box: 212 130 100 40 +boxtype: FL_UP_BOX +colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE +style: FL_FIXED_STYLE +size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: textrm|#e +label: textrm shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_textrm +name: button_textrm callback: C_FormBaseDeprecatedInputCB argument: 12 --------------------- -class: FL_ROUND3DBUTTON -type: RADIO_BUTTON -box: 140 135 120 30 -boxtype: FL_NO_BOX -colors: FL_MCOL FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Sans Serif|#n -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: radio_sans -callback: C_FormBaseDeprecatedInputCB -argument: 8 - --------------------- -class: FL_END_GROUP -type: 0 -box: 0 0 0 0 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 136 16 226 184 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_FRAME -type: ENGRAVED_FRAME -box: 14 16 110 124 -boxtype: FL_FRAME_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - ============================== create_the_forms diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 1dac93b366..8f23294ecf 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Martin Vermeer + + * math_support.C: removed the arrays latex_mathstyle[] and + latex_mathfontcmds[] to the frontends. + 2002-01-26 Dekel Tsur * math_macrotable.C (builtinMacros): Add macros for \models and \Join. diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index c76a6dc7d0..8f437afb68 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -778,15 +778,6 @@ char const * latex_mathspace[] = { }; -char const * latex_mathstyle[] = { - "textstyle", "displaystyle", "scriptstyle", "scriptscriptstyle" -}; - -kb_action latex_mathfontcmds[] = { - LFUN_BOLD, LFUN_EMPH, LFUN_ROMAN, LFUN_CODE, LFUN_SANS, - LFUN_ITAL, LFUN_NOUN, LFUN_FRAK, LFUN_FREE, LFUN_DEFAULT -}; - char const * math_font_name(MathTextCodes code) { -- 2.39.2