mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
in addition to the changes mentioned in ChangeLog, there is the usual batch of whitespace changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@344 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
01e639f666
commit
3227c66baf
54
ChangeLog
54
ChangeLog
@ -1,3 +1,57 @@
|
||||
1999-12-01 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/support/filetools.C (ExpandPath): removed an over eager
|
||||
Assert.
|
||||
(ReplaceEnvironmentPath): ditto
|
||||
|
||||
* src/toolbar.C (BubbleTimerCB): use C++ style casts. This clearly
|
||||
shows that we are doing something fishy in our code...
|
||||
(BubblePost): ditto
|
||||
(ToolbarCB): ditto
|
||||
|
||||
* src/lyxrc.C (read): use a double switch trick to get more help
|
||||
from the compiler. (the same trick is used in layout.C)
|
||||
(write): new function. opens a ofstream and pass that to output
|
||||
(output): new function, takes a ostream and writes the lyxrc
|
||||
elemts to it. uses a dummy switch to make sure no elements are
|
||||
forgotten.
|
||||
|
||||
* src/lyxlex.h: added a struct pushpophelper for use in functions
|
||||
with more than one exit point.
|
||||
|
||||
* src/lyxlex.[Ch] (GetInteger): made it const
|
||||
(GetFloat): ditto
|
||||
(GetBool): ditto
|
||||
|
||||
* src/lyxfunc.C (Dispatch): added case for LFUN_SAVEPREFERENCES
|
||||
|
||||
* src/layout.[hC] : LayoutTags splitted into several enums, new
|
||||
methods created, better error handling cleaner use of lyxlex. Read
|
||||
the diff.
|
||||
|
||||
* src/bmtable.[Ch]: change some member prototypes because of the
|
||||
image const changes.
|
||||
|
||||
* commandtags.h, src/LyXAction.C (init): new function:
|
||||
"preferences-save", saves the lyxrc entries into .lyx/preferences.
|
||||
This file is not read automatically but you can add \input
|
||||
preferences to your lyxrc if you want to. We need to discuss how
|
||||
to handle this.
|
||||
|
||||
* src/LaTeX.C (runBibTeX): use regex to match for the needed lines
|
||||
in .aux, also remove .bib and .bst files from dependencies when
|
||||
running bibtex.
|
||||
|
||||
* src/BufferView.C, src/LyXView.C: add const_cast several places
|
||||
because of changes to images.
|
||||
|
||||
* lib/images/*: same change as for images/*
|
||||
|
||||
* lib/lyxrc.example: Default for accept_compound is false not no.
|
||||
|
||||
* images/*: changed to be const, however I have som misgivings
|
||||
about this change so it might be changed back.
|
||||
|
||||
1999-11-26 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* lib/configure, po/POTFILES.in: regenerated
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define arrow_width 185
|
||||
#define arrow_height 143
|
||||
static unsigned char arrow_bits[] = {
|
||||
static unsigned char const arrow_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,
|
||||
@ -232,7 +232,7 @@ static unsigned char arrow_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe};
|
||||
#define darrow_width 73
|
||||
#define darrow_height 73
|
||||
static unsigned char darrow_bits[] = {
|
||||
static unsigned char const darrow_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,
|
||||
@ -284,7 +284,7 @@ static unsigned char darrow_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe};
|
||||
#define larrow_width 103
|
||||
#define larrow_height 126
|
||||
static unsigned char larrow_bits[] = {
|
||||
static unsigned char const larrow_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *banner[] = {
|
||||
static char const * banner[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 424 289 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define banner_bw_width 424
|
||||
#define banner_bw_height 289
|
||||
static unsigned char banner_bw_bits[] = {
|
||||
static unsigned char const banner_bw_bits[] = {
|
||||
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
||||
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * bold_xpm[] = {
|
||||
static char const * bold_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define bop_width 118
|
||||
#define bop_height 259
|
||||
static unsigned char bop_bits[] = {
|
||||
static unsigned char const bop_bits[] = {
|
||||
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,0xc0,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define brel_width 123
|
||||
#define brel_height 291
|
||||
static unsigned char brel_bits[] = {
|
||||
static unsigned char const brel_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *build_xpm[] = {
|
||||
static char const * build_xpm[] = {
|
||||
"20 20 4 1",
|
||||
". c black",
|
||||
" c #BFBFBFBFBFBF",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * close_xpm[] = {
|
||||
static char const * close_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #7B7B00000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * close_xpm[] = {
|
||||
static char const * close_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * copy_xpm[] = {
|
||||
static char const * copy_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c #000000000000",
|
||||
". c #BFBFBFBFBFBF",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * copy_xpm[] = {
|
||||
static char const * copy_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c black",
|
||||
". c #BFBFBFBFBFBF",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * cut_xpm[] = {
|
||||
static char const * cut_xpm[] = {
|
||||
"20 20 3 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * cut_xpm[] = {
|
||||
static char const * cut_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define deco_width 137
|
||||
#define deco_height 90
|
||||
static unsigned char deco_bits[] = {
|
||||
static unsigned char const deco_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, 0x01, 0x00, 0x00, 0x00,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * deco[] = {
|
||||
static char const * deco[] = {
|
||||
"20 20 3 1",
|
||||
" c #BEFBBEFBBEFB",
|
||||
". c #000000000000",
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define delim_width 164
|
||||
#define delim_height 136
|
||||
static unsigned char delim_bits[] = {
|
||||
static unsigned char const delim_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *delim[] = {
|
||||
static char const * delim[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 3 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *delim0[] = {
|
||||
static char const * delim0[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 31 31 2 1",
|
||||
/* colors */
|
||||
@ -10,8 +10,8 @@ static char *delim0[] = {
|
||||
"###############################",
|
||||
"###############################",
|
||||
"###############################",
|
||||
"#######a#######################",
|
||||
"######a#############aa#########",
|
||||
"#######a###########a###########",
|
||||
"######a#############a##########",
|
||||
"#####a###############a#########",
|
||||
"#####a################a########",
|
||||
"####a##################a#######",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * depth_xpm[] = {
|
||||
static char const * depth_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c gray60",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * depth_xpm[] = {
|
||||
static char const * depth_xpm[] = {
|
||||
"20 20 3 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define dots_width 72
|
||||
#define dots_height 18
|
||||
static unsigned char dots_bits[] = {
|
||||
static unsigned char const dots_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *down_xpm[] = {
|
||||
static char const * down_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 11 11 4 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * emph_xpm[] = {
|
||||
static char const * emph_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * emph_xpm[] = {
|
||||
static char const * emph_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *equation[] = {
|
||||
static char const * equation[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 3 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * fig_xpm[] = {
|
||||
static char const * fig_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c #000000000000",
|
||||
". c #FFFFFFFFFFFF",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * fig_xpm[] = {
|
||||
static char const * fig_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * foot_xpm[] = {
|
||||
static char const * foot_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c gray60",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *frac[] = {
|
||||
static char const * frac[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 3 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * free_xpm[] = {
|
||||
static char const * free_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * free_xpm[] = {
|
||||
static char const * free_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define Greek_width 182
|
||||
#define Greek_height 60
|
||||
static unsigned char Greek_bits[] = {
|
||||
static unsigned char const Greek_bits[] = {
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * layout_code_xpm[] = {
|
||||
static char const * layout_code_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c gray50",
|
||||
". c black",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * layout_latex_xpm[] = {
|
||||
static char const * layout_latex_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c gray60",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *layout_scrap_xpm[] = {
|
||||
static char const * layout_scrap_xpm[] = {
|
||||
" 20 20 3 1",
|
||||
". c gray30",
|
||||
" c #BFBFBFBFBFBF",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * layout_sec_xpm[] = {
|
||||
static char const * layout_sec_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c gray60",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * layout_std_xpm[] = {
|
||||
static char const * layout_std_xpm[] = {
|
||||
"20 20 3 1",
|
||||
" c gray50",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *lyx_xpm[] = {
|
||||
static char const * lyx_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 48 48 7 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * make_ascii_xpm[] = {
|
||||
static char const * make_ascii_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c black",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * make_latex_xpm[] = {
|
||||
static char const * make_latex_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c black",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * margin_xpm[] = {
|
||||
static char const * margin_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c gray60",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * margin_xpm[] = {
|
||||
static char const * margin_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * math_xpm[] = {
|
||||
static char const * math_xpm[] = {
|
||||
"20 20 4 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #242423238E8E",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * math_xpm[] = {
|
||||
static char const * math_xpm[] = {
|
||||
/**/
|
||||
"20 20 2 1",
|
||||
/*33333333333*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *matrix[] = {
|
||||
static char const * matrix[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * melt_xpm[] = {
|
||||
static char const * melt_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * melt_xpm[] = {
|
||||
static char const * melt_xpm[] = {
|
||||
/**/
|
||||
"20 20 2 1",
|
||||
/*33333333333*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define misc_width 150
|
||||
#define misc_height 193
|
||||
static unsigned char misc_bits[] = {
|
||||
static unsigned char const misc_bits[] = {
|
||||
0x00,0x00,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,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * noun_xpm[] = {
|
||||
static char const * noun_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * noun_xpm[] = {
|
||||
static char const * noun_xpm[] = {
|
||||
/**/
|
||||
"20 20 2 1",
|
||||
/*÷F¼÷FÃd÷FÄD÷FÆôges/delim.xbm*/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * open_xpm[] = {
|
||||
static char const * open_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c navy",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * open_xpm[] = {
|
||||
static char const * open_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * paste_xpm[] = {
|
||||
static char const * paste_xpm[] = {
|
||||
"20 20 6 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * paste_xpm[] = {
|
||||
static char const * paste_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * print1_xpm[] = {
|
||||
static char const * print1_xpm[] = {
|
||||
"24 20 7 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * print1_xpm[] = {
|
||||
static char const * print1_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"24 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *quit_xpm[] = {
|
||||
static char const * quit_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 7 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * quit_xpm[] = {
|
||||
static char const * quit_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * run_latex_xpm[] = {
|
||||
static char const * run_latex_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * sans_xpm[] = {
|
||||
static char const * sans_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * save_xpm[] = {
|
||||
static char const * save_xpm[] = {
|
||||
"20 20 5 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c black",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * save_xpm[] = {
|
||||
static char const * save_xpm[] = {
|
||||
/*€*/
|
||||
"20 20 2 1",
|
||||
/**/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * smallcaps_xpm[] = {
|
||||
static char const * smallcaps_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * smallcaps_xpm[] = {
|
||||
static char const * smallcaps_xpm[] = {
|
||||
/**/
|
||||
"20 20 2 1",
|
||||
/**/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * space_xpm[] = {
|
||||
static char const * space_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BEFBBEFBBEFB",
|
||||
". c #FBEE14514103",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *sqrt[] = {
|
||||
static char const * sqrt[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 3 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * tab_xpm[] = {
|
||||
static char const * tab_xpm[] = {
|
||||
"20 20 3 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * tab_xpm[] = {
|
||||
static char const * tab_xpm[] = {
|
||||
/*.e:*/
|
||||
"20 20 2 1",
|
||||
/**/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * tex_xpm[] = {
|
||||
static char const * tex_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BEFBBEFBBEFB",
|
||||
". c #7B7B00000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * tex_xpm[] = {
|
||||
static char const * tex_xpm[] = {
|
||||
/*.e:*/
|
||||
"20 20 2 1",
|
||||
/**/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * update_ps_xpm[] = {
|
||||
static char const * update_ps_xpm[] = {
|
||||
"20 20 3 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
".c navy",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * update_ps_xpm[] = {
|
||||
static char const * update_ps_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c black",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *unknown_xpm[] = {
|
||||
static char const * unknown_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 20 20 2 1",
|
||||
/* colors */
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * unknown_xpm[] = {
|
||||
static char const * unknown_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
"20 20 2 1",
|
||||
/**/
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *up_xpm[] = {
|
||||
static char const * up_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 11 11 4 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define varsz_width 110
|
||||
#define varsz_height 192
|
||||
static unsigned char varsz_bits[] = {
|
||||
static unsigned char const varsz_bits[] = {
|
||||
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,0xc0,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x00,0x00,0x00,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * view_dvi_xpm[] = {
|
||||
static char const * view_dvi_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * view_ps_xpm[] = {
|
||||
static char const * view_ps_xpm[] = {
|
||||
"20 20 2 1",
|
||||
" c #BFBFBFBFBFBF",
|
||||
". c #000000000000",
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define amssymb_width 264
|
||||
#define amssymb_height 174
|
||||
static char amssymb_bits[] = {
|
||||
static char const amssymb_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *amssymb[] = {
|
||||
static char const * amssymb[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define psnfss1_width 264
|
||||
#define psnfss1_height 174
|
||||
static char psnfss1_bits[] = {
|
||||
static char const psnfss1_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *psnfss1[] = {
|
||||
static char const * psnfss1[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define psnfss2_width 264
|
||||
#define psnfss2_height 174
|
||||
static char psnfss2_bits[] = {
|
||||
static char const psnfss2_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *psnfss2[] = {
|
||||
static char const * psnfss2[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define psnfss3_width 264
|
||||
#define psnfss3_height 174
|
||||
static char psnfss3_bits[] = {
|
||||
static char const psnfss3_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *psnfss3[] = {
|
||||
static char const * psnfss3[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define psnfss4_width 264
|
||||
#define psnfss4_height 174
|
||||
static char psnfss4_bits[] = {
|
||||
static char const psnfss4_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *psnfss4[] = {
|
||||
static char const * psnfss4[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -1,6 +1,6 @@
|
||||
#define standard_width 264
|
||||
#define standard_height 174
|
||||
static char standard_bits[] = {
|
||||
static char const standard_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,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char *standard[] = {
|
||||
static char const * standard[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 264 174 16 1",
|
||||
/* colors */
|
||||
|
@ -521,7 +521,7 @@
|
||||
#\spell_command aspell
|
||||
|
||||
# Consider run-together words, such as "notthe" for "not the", as legal
|
||||
# words? Default is no.
|
||||
# words? Default is false.
|
||||
#\accept_compound true
|
||||
|
||||
# Specify an alternate language. The default is to use the language of
|
||||
|
@ -437,7 +437,7 @@ void BufferView::create_view(int xpos, int ypos, int width, int height)
|
||||
fl_set_object_gravity(obj, NorthEastGravity, NorthEastGravity);
|
||||
fl_set_object_callback(obj, C_BufferView_UpCB, 0);
|
||||
obj->u_vdata = this;
|
||||
fl_set_pixmapbutton_data(obj, up_xpm);
|
||||
fl_set_pixmapbutton_data(obj, const_cast<char**>(up_xpm));
|
||||
|
||||
#if FL_REVISION > 85
|
||||
// Remove the blue feedback rectangle
|
||||
@ -473,7 +473,7 @@ void BufferView::create_view(int xpos, int ypos, int width, int height)
|
||||
fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
|
||||
fl_set_object_callback(obj, C_BufferView_DownCB, 0);
|
||||
obj->u_vdata = this;
|
||||
fl_set_pixmapbutton_data(obj, down_xpm);
|
||||
fl_set_pixmapbutton_data(obj, const_cast<char**>(down_xpm));
|
||||
fl_set_border_width(-bw);
|
||||
|
||||
#if FL_REVISION >85
|
||||
|
27
src/LaTeX.C
27
src/LaTeX.C
@ -379,14 +379,17 @@ bool LaTeX::runBibTeX(string const & file, DepTable & dep)
|
||||
ifstream ifs(file.c_str());
|
||||
string token;
|
||||
bool using_bibtex = false;
|
||||
LRegex reg1("\\\\bibdata{([^}]+)}");
|
||||
LRegex reg2("\\\\bibstyle{([^}]+)}");
|
||||
while (getline(ifs, token)) {
|
||||
if (contains(token, "\\bibdata{")) {
|
||||
if (reg1.exact_match(token)) {
|
||||
using_bibtex = true;
|
||||
string::size_type a = token.find("\\bibdata{") + 9;
|
||||
string::size_type b = token.find_first_of("}", a);
|
||||
string data = token.substr(a, b - a);
|
||||
LRegex::SubMatches const & sub = reg1.exec(token);
|
||||
string data = LSubstring(token, sub[1].first,
|
||||
sub[2].second);
|
||||
// data is now all the bib files separated by ','
|
||||
// get them one by one and pass them to the helper
|
||||
string::size_type b;
|
||||
do {
|
||||
b = data.find_first_of(',', 0);
|
||||
string l;
|
||||
@ -400,26 +403,26 @@ bool LaTeX::runBibTeX(string const & file, DepTable & dep)
|
||||
findtexfile(
|
||||
ChangeExtension(l, "bib", false),
|
||||
"bib");
|
||||
lyxerr << "data = `"
|
||||
<< full_l << "'" << endl;
|
||||
lyxerr[Debug::LATEX] << "Bibtex database: `"
|
||||
<< full_l << "'" << endl;
|
||||
if (!full_l.empty()) {
|
||||
// add full_l to the dep file.
|
||||
dep.insert(full_l, true);
|
||||
}
|
||||
} while (b != string::npos);
|
||||
} else if (contains(token, "\\bibstyle{")) {
|
||||
} else if (reg2.exact_match(token)) {
|
||||
using_bibtex = true;
|
||||
string::size_type a = token.find("\\bibstyle{") + 10;
|
||||
string::size_type b = token.find_first_of("}", a);
|
||||
string style = token.substr(a, b - a);
|
||||
LRegex::SubMatches const & sub = reg2.exec(token);
|
||||
string style = LSubstring(token, sub[1].first,
|
||||
sub[1].second);
|
||||
// token is now the style file
|
||||
// pass it to the helper
|
||||
string full_l =
|
||||
findtexfile(
|
||||
ChangeExtension(style, "bst", false),
|
||||
"bst");
|
||||
lyxerr << "style = `"
|
||||
<< full_l << "'" << endl;
|
||||
lyxerr[Debug::LATEX] << "Bibtex style: `"
|
||||
<< full_l << "'" << endl;
|
||||
if (!full_l.empty()) {
|
||||
// add full_l to the dep file.
|
||||
dep.insert(full_l, true);
|
||||
|
@ -138,8 +138,6 @@ void LyXAction::init()
|
||||
_("Export to"), ReadOnly);
|
||||
newFunc(LFUN_FAX,"buffer-fax",
|
||||
_("Fax"), ReadOnly);
|
||||
//newFunc(LFUN_INSERTFLOAT,"float-insert",
|
||||
// "", Noop);
|
||||
newFunc(LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop);
|
||||
newFunc(LFUN_IMPORT,"buffer-import",
|
||||
_("Import document"), NoBuffer);
|
||||
@ -153,8 +151,6 @@ void LyXAction::init()
|
||||
_("Open"), NoBuffer);
|
||||
newFunc(LFUN_PREVBUFFER,"buffer-previous",
|
||||
_("Switch to previous document"), ReadOnly);
|
||||
//newFunc(LFUN_SWITCHBUFFER,"buffer-switch",
|
||||
// _("Switch to an open document"), ReadOnly);
|
||||
newFunc(LFUN_MENUPRINT,"buffer-print",
|
||||
_("Print"), ReadOnly);
|
||||
newFunc(LFUN_MENURELOAD,"buffer-reload",
|
||||
@ -348,8 +344,6 @@ void LyXAction::init()
|
||||
"", Noop);
|
||||
newFunc(LFUN_MATH_MODE,"math-mode",
|
||||
_("Math mode"), Noop);
|
||||
//newFunc(LFUN_MATH_PANEL,"math-panel",
|
||||
// _("Math panel"), Noop);
|
||||
newFunc(LFUN_MATH_NONUMBER,"math-nonumber",
|
||||
"", Noop);
|
||||
newFunc(LFUN_MATH_NUMBER,"math-number",
|
||||
@ -379,8 +373,10 @@ void LyXAction::init()
|
||||
_("Select previous paragraph"), ReadOnly);
|
||||
newFunc(LFUN_PARENTINSERT,"parent-insert",
|
||||
"", Noop);
|
||||
newFunc( LFUN_PASTE,"paste",
|
||||
newFunc(LFUN_PASTE,"paste",
|
||||
_("Paste") , Noop);
|
||||
newFunc(LFUN_SAVEPREFERENCES, "preferences-save",
|
||||
"Save Preferences", NoBuffer);
|
||||
newFunc(LFUN_PASTESELECTION,"primary-selection-paste",
|
||||
"", Noop);
|
||||
newFunc(LFUN_PROTECTEDSPACE,"protected-space-insert",
|
||||
|
@ -232,7 +232,7 @@ FD_form_main * LyXView::create_form_form_main(int width, int height)
|
||||
unsigned int w, h;
|
||||
Pixmap lyx_p, lyx_mask;
|
||||
lyx_p = fl_create_from_pixmapdata(fl_root,
|
||||
lyx_xpm,
|
||||
const_cast<char**>(lyx_xpm),
|
||||
&w,
|
||||
&h,
|
||||
&lyx_mask,
|
||||
|
@ -224,10 +224,10 @@ extern "C" int handle_bitmaptable(FL_OBJECT *ob, int event, FL_Coord mx,
|
||||
*
|
||||
* The user could change these later. See below.
|
||||
*/
|
||||
void fl_set_bmtable_data(FL_OBJECT *ob, int nx, int ny, int bw, int bh,
|
||||
unsigned char * bdata)
|
||||
void fl_set_bmtable_data(FL_OBJECT * ob, int nx, int ny, int bw, int bh,
|
||||
unsigned char const * bdata)
|
||||
{
|
||||
BMTABLE_SPEC *sp = (BMTABLE_SPEC *)ob->spec;
|
||||
BMTABLE_SPEC * sp = (BMTABLE_SPEC *)ob->spec;
|
||||
if (sp) {
|
||||
sp->nx = nx;
|
||||
sp->ny = ny;
|
||||
@ -244,10 +244,10 @@ void fl_set_bmtable_data(FL_OBJECT *ob, int nx, int ny, int bw, int bh,
|
||||
}
|
||||
|
||||
|
||||
void fl_set_bmtable_pixmap_data(FL_OBJECT *ob, int nx, int ny,
|
||||
char **pdata)
|
||||
void fl_set_bmtable_pixmap_data(FL_OBJECT * ob, int nx, int ny,
|
||||
char ** pdata)
|
||||
{
|
||||
BMTABLE_SPEC *sp = (BMTABLE_SPEC *)ob->spec;
|
||||
BMTABLE_SPEC * sp = (BMTABLE_SPEC *)ob->spec;
|
||||
extern Colormap color_map;
|
||||
if (sp) {
|
||||
sp->nx = nx;
|
||||
|
@ -47,7 +47,7 @@ int fl_get_bmtable_numb(FL_OBJECT *ob);
|
||||
void fl_set_bmtable(FL_OBJECT *, int pushed, int pos);
|
||||
|
||||
/** Number of columns and rows, and the background bitmap */
|
||||
void fl_set_bmtable_data(FL_OBJECT *, int, int, int, int , unsigned char *);
|
||||
void fl_set_bmtable_data(FL_OBJECT *, int, int, int, int , unsigned char const *);
|
||||
///
|
||||
void fl_set_bmtable_pixmap_data(FL_OBJECT *, int, int, char **);
|
||||
///
|
||||
|
@ -200,13 +200,11 @@ void BufferParams::readPreamble(LyXLex & lex)
|
||||
|
||||
void BufferParams::readLanguage(LyXLex & lex)
|
||||
{
|
||||
string tmptok;
|
||||
string test;
|
||||
int n = 0;
|
||||
|
||||
if (!lex.next()) return;
|
||||
|
||||
tmptok = lex.GetString();
|
||||
string tmptok = lex.GetString();
|
||||
string test;
|
||||
int n = 0;
|
||||
// check if tmptok is part of tex_babel in tex-defs.h
|
||||
while (true) {
|
||||
test = tex_babel[n++];
|
||||
|
@ -237,10 +237,11 @@ enum kb_action {
|
||||
LFUN_URL, // CFO-G 971121
|
||||
LFUN_WORDFINDFORWARD, // Etienne 980216
|
||||
LFUN_WORDFINDBACKWARD, // Etienne 980220
|
||||
LFUN_APPENDIX, // ettrich 980505
|
||||
LFUN_APPENDIX, // ettrich 980505
|
||||
LFUN_IMPORT, // Asger 980724
|
||||
LFUN_MENU_SEPARATOR, // Asger 990220
|
||||
LFUN_SEQUENCE, // Andre' 991111
|
||||
LFUN_SEQUENCE, // Andre' 991111
|
||||
LFUN_SAVEPREFERENCES, // Lgb 991127
|
||||
LFUN_LASTACTION /* this marks the end of the table */
|
||||
};
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user