Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 12:19:46AM +0100, John Levon wrote: There's no point having unused files in CVS, and there are several points against. Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? There a a couple of things that might be interesting later and on systems like mine they tend to die rather sooner than later... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:23:13AM +0200, Andre Poenitz wrote: Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? There a a couple of things that might be interesting later and on systems like mine they tend to die rather sooner than later... It's called the CVS repository ... regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 07:28:24AM +0100, John Levon wrote: Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? There a a couple of things that might be interesting later and on systems like mine they tend to die rather sooner than later... It's called the CVS repository ... ? Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Using xforms 0.999 with lyx-1.2
On Thu, 23 May 2002, John Levon wrote: I'm the lyx maintainer in NetBSD pkgsrc collection (http://www.pkgsrc.org/) and I'm trying the new 1.2.0 pre5. The compilation is okay but the linking fails because of unresolved references to fl_xxx() functions: Please try 1.2.0rc1 (it might only be on the developer's ftp site ftp.devel.lyx.org) I could compile pre5 now :-) I had to patch configure (not configure.in as I don't want to force people to install autoconf) with the following patch: - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) - detect xforms-0.9* (it's still missing detection of the future xforms-1.*) This has been tested on NetBSD/i386, NetBSD/macppc and NetBSD/sparc. Feel free to take that changes to configure.in. --- configure.orig Fri May 3 22:53:34 2002 +++ configure Tue May 21 12:15:00 2002 @@ -9743,7 +9743,7 @@ echo $ac_n (cached) $ac_c 16 else ac_save_LIBS=$LIBS -LIBS=-lforms $LIBS +LIBS=-lforms -ljpeg -lXpm $LIBS cat conftest.$ac_ext EOF #line 9749 configure #include confdefs.h @@ -9774,7 +9774,7 @@ fi if eval test \`echo '$ac_cv_lib_'$ac_lib_var`\ = yes; then echo $ac_tyes 16 - XFORMS_LIB=-lforms + XFORMS_LIB=-lforms -ljpeg -lXpm else echo $ac_tno 16 echo $ac_n checking for fl_initialize in -lxforms... $ac_c 16 @@ -9954,6 +9954,7 @@ lyx_warning=yes ;; 0.89*) ;; +0.9*) ;; *) lyx_warning_txt=$lyx_warning_txt == Version $lyx_cv_xfversion of xforms might not be compatible with LyX, @@ -10159,7 +10160,7 @@ echo $ac_n (cached) $ac_c 16 else ac_save_LIBS=$LIBS -LIBS=-lforms $LIBS +LIBS=-lforms -ljpeg -lXpm $LIBS cat conftest.$ac_ext EOF #line 10165 configure #include confdefs.h @@ -10190,7 +10191,7 @@ fi if eval test \`echo '$ac_cv_lib_'$ac_lib_var`\ = yes; then echo $ac_tyes 16 - XFORMS_LIB=-lforms + XFORMS_LIB=-lforms -ljpeg -lXpm else echo $ac_tno 16 echo $ac_n checking for fl_initialize in -lxforms... $ac_c 16 Martti --- Martti Kuparinen [EMAIL PROTECTED] NetBSD - No media hype http://www.iki.fi/kuparine/ http://www.netbsd.org/
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:44:09AM +0200, Andre Poenitz wrote: It's called the CVS repository ... ? Well I don't understand what you are asking for. All removed code is available forever in the CVS repository (catastrophic losses aside) regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: Using xforms 0.999 with lyx-1.2
On Thu, May 23, 2002 at 09:45:40AM +0300, Martti Kuparinen wrote: - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) Does your config/lyxinclude.m4 have LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG ? As for Xpm, I suppose it's pretty rare for it to be shared library first in the search path. We probably need to improve the detection logic, but it's not a priority until a new stable xforms release is done - detect xforms-0.9* (it's still missing detection of the future xforms-1.*) It was intentional not to do this yet, so the warning warns the users :) Glad you got it working though regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
[PATCH] guii-1: move Painter,PainterBase
Take 2. This one will actually produce a useful diff for the next stage. Again, no logic changes. Please apply to trunk thanks john -- This is playing, not work, therefore it's not a waste of time. - Zath paintermove2.diff.bz2 Description: Binary data
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 07:47:47AM +0100, John Levon wrote: It's called the CVS repository ... ? Well I don't understand what you are asking for. All removed code is available forever in the CVS repository (catastrophic losses aside) I am asking for a safe place to put patches that are not yet ready or never will be ready but contain interesting ideas. I.e. stuff that has never been in CVS. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 09:05:51AM +0200, Andre Poenitz wrote: I am asking for a safe place to put patches that are not yet ready or never will be ready but contain interesting ideas. I.e. stuff that has never been in CVS. Oh I see. A branch ? ftp.devel.lyx.org/contrib ? regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:07:51AM +0100, John Levon wrote: I.e. stuff that has never been in CVS. Oh I see. A branch ? ftp.devel.lyx.org/contrib ? It does not need to be synced with the main branch... contrib ... hm... this is supposed to be useful for most people, isn't it? I think something similar to lyxdoc (lyxtrash ?) should be appropriate... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: compile problem
Kayvan A. Sylvan [EMAIL PROTECTED] writes: | Latest CVS, ./configure --with-included-string: | g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I./../ -I../.. -I../../boost -isystem | +/usr/X11R6/include -O2 -m486 -fno-strength-reduce -W -Wall -c insetgraphics.C | +-Wp,-MD,.deps/insetgraphics.TPlo | In file included from ../../src/insets/inset.h:19, | from ../../src/insets/insetgraphics.h:23, | from insetgraphics.C:78: | ../../src/LString.h:24: #error The string header has been included before | +LString.h | make[4]: *** [insetgraphics.lo] Error 1 Why --with-included-string? The more third party libraries we use the more problems we will have with lyxstring. What compiler is this? i.e. are you using libstc++ v2 or v3. -- Lgb
Re: Wednesday
John Levon [EMAIL PROTECTED] writes: | It's release day ... so ... ?? I went sailing... -- Lgb
Re: Wednesday
On Thu, May 23, 2002 at 09:45:11AM +0200, Lars Gullik Bjønnes wrote: I went sailing... LyX 1.2.0 - the Bowling Drake release ? :) john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] use template for undo stack
John Levon [EMAIL PROTECTED] writes: | Also some minor cleanups, and one not-so-minor: now when createUndo | returns 0, it is not added to the undostack. As I understand it, this | led to us adding to the stack sizeof(Undo *) on every character the user | added. | Please apply (can applier add limited_stack.h to support/Makefile.am | themselves also) Can you do this with out using a bald pointer in the stack? limited_stackshared_ptrUndo XX; or something? And instead of disallowing non-pointer value-types, disallow pointer types and allow just non-pointers? I am planning to work hard to get rid of as meny bald pointers as possible, end the best place to start is with new code. -- Lgb
Re: [PATCH] use template for undo stack
On Thu, May 23, 2002 at 09:51:04AM +0200, Lars Gullik Bjønnes wrote: Can you do this with out using a bald pointer in the stack? I can but try. limited_stackshared_ptrUndo XX; or something? So what do I do in overflow case ? ~T(); call the dtor directly ? I am planning to work hard to get rid of as meny bald pointers as possible, end the best place to start is with new code. Sounds sensible regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: 1.2.0pre5 CVS (vc-register)
John Levon writes: On Tue, May 14, 2002 at 11:50:26AM +0200, Nabil Hathout wrote: It seems that vc-register does not work in 1.2.0pre5. Nothing happens when it is invoqued. You need to save the file first (in future, the output from lyx -dbg ... is useful) I've opened bug 416 on this problem Thank you. I will send a debug log next time. regards, --Nabil Hathout
Re: Using xforms 0.999 with lyx-1.2
On Thu, 23 May 2002, John Levon wrote: - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) Does your config/lyxinclude.m4 have LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG ? Yes it does (the AC_DEFUN defination). Without my -ljpeg -lXpm patch (but with the 0.9* detection patch) configure stops like this (before call to LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG): checking xpm header version... 4.11 checking for fl_initialize in -lforms... no checking for fl_initialize in -lxforms... no checking for X11/forms.h... yes checking xforms header version... 0..0 [...] Configuration Host type: i386--netbsdelf Special build flags:included-libsigc C Compiler: cc C Compiler flags: -O2 C++ Compiler: c++ (2.95.3) C++ Compiler flags: -O2 Linker flags:-L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/lib Frontend: xforms libXpm version: 4.11 libforms version: 0..0 LyX binary dir: /usr/pkg/bin LyX files dir: /usr/pkg/share/lyx The following problems have been detected by configure. Please check the messages below before running 'make'. (see the section 'Problems' in the INSTALL file) ** Cannot find libforms or libxforms. Please check that the xforms library is correctly installed on your system. The relevant config.log part (I can provide full config.log if needed): configure:9562: checking for XpmCreateBufferFromImage in -lXpm configure:9584: c++ -o conftest -O2 -I/usr/X11R6/include/X11 -isystem /usr/X1 1R6/include -L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/ pkg/lib -L/usr/pkg/lib conftest.C -lXpm -lSM -lICE -lc -lm -L/usr/X11R6/lib -lX11 15 configure:9615: checking for X11/xpm.h configure:9625: c++ -E -I/usr/X11R6/include/X11 -isystem /usr/X11R6/include c onftest.C /dev/null 2conftest.out configure:9697: checking xpm header version configure:9741: checking for fl_initialize in -lforms configure:9763: c++ -o conftest -O2 -I/usr/X11R6/include/X11 -isystem /usr/X1 1R6/include -L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/ pkg/lib -L/usr/pkg/lib conftest.C -lforms -lSM -lICE -lc -lm -L/usr/X11R6/li b -lX11 15 /usr/X11R6/lib/libforms.so: undefined reference to `XpmCreatePixmapFromData' /usr/X11R6/lib/libforms.so: undefined reference to `jpeg_read_scanlines' Please note that there was no test for libjpeg before these lines. So it means we have to check libforms/libxforms AND if it needs Xpm and jpeg. We probably need to improve the detection logic, but it's not a priority until a new stable xforms release is done That's okay, it works now... Martti --- Martti Kuparinen [EMAIL PROTECTED] NetBSD - No media hype http://www.iki.fi/kuparine/ http://www.netbsd.org/
Re: [PATCH] guii-1: move Painter,PainterBase
On Thursday 23 May 2002 7:55 am, John Levon wrote: Take 2. This one will actually produce a useful diff for the next stage. Again, no logic changes. Please apply to trunk thanks john THis is a bit lazy isn't it: diff -N src/frontends/Painter.h ... +#ifndef PAINTERBASE_H +#define PAINTERBASE_H The file has been renamed, so so should the ifdef... Ditto diff -N src/frontends/xforms/XPainter.h ... +#ifndef PAINTER_H +#define PAINTER_H And while you're at it, I thought you were the one requesting the new-style headers. Angus (who's grumpy because he is completely unable to compile cvs at all as his compiler doesn't support tempatised return types and boost uses them extensively on purpose to piss him off. Request for new compiler please.)
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: Take 2. This one will actually produce a useful diff for the next stage. Take heed of this comment ... THis is a bit lazy isn't it: No. This diff is /only/ so that the /real/ changes produce a useful diff that shows the actual changes I've made to Painter/PainterBase in stark details. I will also do something similar with the other files I've moved, one step at a time And while you're at it, I thought you were the one requesting the new-style headers. Which the real new versions also have :) regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon [EMAIL PROTECTED] writes: | also some minor cleanup This looks ok to me, apply it. -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: Request for new compiler please. I've heard of gcc running on toasters... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: defaults
On Wed, 22 May 2002 04:14:54 -0700 (PDT) wrote [EMAIL PROTECTED]: I've searched high and low for reference to /$UserDir/templates/defaults.lyx which I finally figured out is how to set my document defaults. There's lots of data about templates and the lyxrc file but I can't find this one. Is this eluding me, deprecated, or is it not in the documentation? Seems like a documentation bug. (I learned about defaults.lyx only accidentially by regularly reading the lyx-users mailing list.) In the Customization guide, either in Section 2.1.2 directories or in the section 6.4 Creating Templates, a hint that defaults.lyx is the template used with FileNew would be nice. BTW: In my (1.1.6) de_Customization.lyx, the Section 2.1.2 Verzeichnisse (Directories) doesnot list the templates/ directory (the English version does). Günter -- [EMAIL PROTECTED]
Re: defaults
Date: Thu, 23 May 2002 10:02:50 +0200 (CEST) From: Guenter Milde [EMAIL PROTECTED] Subject: Re: defaults To: LyX users [EMAIL PROTECTED], [EMAIL PROTECTED] On Wed, 22 May 2002 04:14:54 -0700 (PDT) wrote [EMAIL PROTECTED]: I've searched high and low for reference to /$UserDir/templates/defaults.lyx which I finally figured out is how to set my document defaults. There's lots of data about templates and the lyxrc file but I can't find this one. Is this eluding me, deprecated, or is it not in the documentation? Seems like a documentation bug. (I learned about defaults.lyx only accidentially by regularly reading the lyx-users mailing list.) In the Customization guide, either in Section 2.1.2 directories or in the section 6.4 Creating Templates, a hint that defaults.lyx is the template used with FileNew would be nice. BTW: In my (1.1.6) de_Customization.lyx, the Section 2.1.2 Verzeichnisse (Directories) doesnot list the templates/ directory (the English version does). Günter -- [EMAIL PROTECTED] I remember having used a « Save as default » tag in the File, Edit or Layout menu, I don't find it any more. Is this the reason of misunderstanding ? I guess this replaced the default.lyx by the current template: if the function in on the deskset, you don't need any more to know where the file is located :-) -- Jean-Pierre
Re: defaults
Jean-Pierre.Chretien wrote: I remember having used a « Save as default » tag in the File, Edit or Layout menu, I don't find it any more. Is this the reason of misunderstanding ? I guess this replaced the default.lyx by the current template: if the function in on the deskset, you don't need any more to know where the file is located :-) In 1.1.6, this was in the menue under Layout. In 1.2.0, it has been moved into the document dialog: Layout - Document - Save as Class Defaults Juergen
contribution: Elsevier preprint class support
I have made up a basic LyX layout file and template to support the Elsevier preprint class (elsart.cls). They're online at http://www.physics.usyd.edu.au/~matthewa/lyx/ There are comments inside the files. Thanks for LyX. Cheers, Matthew.
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:36:10AM +0200, Lars Gullik Bjønnes wrote:
This looks ok to me, apply it.
Applier needs this file too, sorry.
(frontends/Painter.C)
john
--
This is playing, not work, therefore it's not a waste of time.
- Zath
/* This file is part of
* ==
*
* LyX, The Document Processor
*
* Copyright 1998-2001 The LyX Team
*
*==*/
#include config.h
#ifdef __GNUG__
#pragma implementation
#endif
#include Painter.h
#include lyxfont.h
#include WorkArea.h
#include font.h
int PainterBase::paperMargin() const
{
return 20;
}
int PainterBase::paperWidth() const
{
return owner.workWidth();
}
int PainterBase::paperHeight() const
{
return owner.height();
}
PainterBase PainterBase::circle(int x, int y, unsigned int d,
LColor::color col)
{
return ellipse(x, y, d, d, col);
}
PainterBase PainterBase::ellipse(int x, int y,
unsigned int w, unsigned int h,
LColor::color col)
{
return arc(x, y, w, h, 0, 0, col);
}
PainterBase PainterBase::button(int x, int y, int w, int h)
{
fillRectangle(x, y, w, h, LColor::buttonbg);
buttonFrame(x, y, w, h);
return * this;
}
PainterBase PainterBase::buttonFrame(int x, int y, int w, int h)
{
// Width of a side of the button
int d = 2;
fillRectangle(x, y, w, d, LColor::top);
fillRectangle(x, (y+h-d), w, d, LColor::bottom);
// Now a couple of trapezoids
int x1[4], y1[4];
x1[0] = x + d; y1[0] = y + d;
x1[1] = x + d; y1[1] = (y + h - d);
x1[2] = x; y1[2] = y + h;
x1[3] = x; y1[3] = y;
fillPolygon(x1, y1, 4, LColor::left);
x1[0] = (x + w - d); y1[0] = y + d;
x1[1] = (x + w - d); y1[1] = (y + h - d);
x1[2] = x + w; y1[2] = (y + h - d);
x1[3] = x + w; y1[3] = y;
fillPolygon(x1, y1, 4, LColor::right);
return *this;
}
PainterBase PainterBase::rectText(int x, int baseline,
string const str,
LyXFont const font,
LColor::color back,
LColor::color frame)
{
int width;
int ascent;
int descent;
lyxfont::rectText(str, font, width, ascent, descent);
rectangle(x, baseline - ascent, width, ascent + descent, frame);
fillRectangle(x + 1, baseline - ascent + 1, width - 1,
ascent + descent - 1, back);
text(x + 3, baseline, str, font);
return *this;
}
PainterBase PainterBase::buttonText(int x, int baseline,
string const str,
LyXFont const font)
{
int width;
int ascent;
int descent;
lyxfont::buttonText(str, font, width, ascent, descent);
button(x, baseline - ascent, width, descent + ascent);
text(x + 4, baseline, str, font);
return *this;
}
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon [EMAIL PROTECTED] writes: | Take 2. This one will actually produce a useful diff for the next stage. | Again, no logic changes. Please apply to trunk --- src/ColorHandler.h 22 May 2002 01:16:35 - 1.10 +++ src/ColorHandler.h 23 May 2002 06:25:55 - @@ -15,7 +15,7 @@ #pragma interface #endif -#include PainterBase.h +#include frontends/Painter.h #include boost/scoped_ptr.hpp Why this? Why does PainterBase.h not cut it? Why move PainterBase? And this XPainter stuff? That is new right? -- Lgb
Re: [PATCH] use template for undo stack
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 09:51:04AM +0200, Lars Gullik Bjønnes wrote: Can you do this with out using a bald pointer in the stack? | I can but try. limited_stackshared_ptrUndo XX; or something? | So what do I do in overflow case ? | ~T(); | call the dtor directly ? You just throw the shared_ptr away? Or perhaps I do not understand you completely... -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thursday 23 May 2002 9:41 am, Andre Poenitz wrote: On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: Request for new compiler please. I've heard of gcc running on toasters... Andre' I have bad experiences of gcc on a DEC. It's the linking stage that fails and unfortunalely GNU ld has historically not supported the DEC. I do have access to a Linux Alpha machine here, so may move my LyX tree there. However, I shall try and get cxx upgraded to version 6.2 (Jean-Marc's version), as this does support templatised return types. Anyway, holding off is no bad thing. It's not as if there isn't going to be enough muddying of the waters in the patch-frenzy that is starting to ramp up... Angus
Re: [PATCH] guii-1: move Painter,PainterBase
Angus Leeming [EMAIL PROTECTED] writes: | On Thursday 23 May 2002 7:55 am, John Levon wrote: Take 2. This one will actually produce a useful diff for the next stage. Again, no logic changes. Please apply to trunk thanks john | THis is a bit lazy isn't it: | diff -N src/frontends/Painter.h | ... | +#ifndef PAINTERBASE_H | +#define PAINTERBASE_H | The file has been renamed, so so should the ifdef... Aaahhh... so there was a rename | Angus (who's grumpy because he is completely unable to compile cvs at all as | his compiler doesn't support tempatised return types and boost uses them | extensively on purpose to piss him off. Request for new compiler please.) And gcc does not exist for this system? -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 10:36:10AM +0200, Lars Gullik Bjønnes wrote: This looks ok to me, apply it. | Applier needs this file too, sorry. do it yourself. -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: -#include PainterBase.h +#include frontends/Painter.h #include boost/scoped_ptr.hpp Why this? Why does PainterBase.h not cut it? Haven't we been over this before ? If you want to use PainterBase, then everywhere in the source that currently refers to Painter needs to be changed to use PainterBase . Why move PainterBase? Because it describes a base class for something that must be implemented by a frontend. And it is particularly a frontend property. IMO the name PainterBase is wrong for the following reasons : 1. It is unnecessarily long 2. It exposes a fact that should be private to frontends/ to all core code (namely that Painter is an inheritance hierarchy). This is a small encapsulation violation IMHO 3. It means more code has to be changed un-necessarily And this XPainter stuff? That is new right? Painter becomes the base class. XPainter is the xforms version. QtPainter is the Qt version, etc. Why prefer : PainterBase | || | QtPainterXPainter GnomePainter ?? It just means that the most sensible and obvious name Painter is no longer used anywhere. Painter | || | QtPainterXPainter GnomePainter ... seems nicer to me. The patch sent does not make things very clear, merely because it just moves files, and doesn't really show how things work (perhaps I should put the full GUII patch up for reading again ?) So, is this OK ? regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: | Again, no logic changes. Please apply to trunk -ENOKARMA Access denied: Insufficient Karma (levon|lyx-devel/src) cvs server: Pre-commit check failed I feel like the Lawnmower Man john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: | Again, no logic changes. Please apply to trunk | -ENOKARMA | Access denied: Insufficient Karma (levon|lyx-devel/src) | cvs server: Pre-commit check failed BS! -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 11:15:44AM +0200, Lars Gullik Bjønnes wrote: BS! Ha ! You think you can hide your error with scatology ?? john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 11:15:44AM +0200, Lars Gullik Bjønnes wrote: BS! | Ha ! You think you can hide your error with scatology ?? Go eat scearn! -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 11:44:51AM +0200, Lars Gullik Bjønnes wrote: Go eat scearn! Well you learn a new word every day. My father still reads the dictionary every day. He says that your life depends on your power to master words. - Arthur Scargill Must be why I crapped up mine then ! john -- This is playing, not work, therefore it's not a waste of time. - Zath
Big GUII patch
Against current CVS (modulo removed file clashes I still haven't fixed) : http://movementarian.org/q8.diff.bz2 19,000 lines of diff ... yipes I've written a short summary below of what the patch has done so far. I'm not sure what I should merge next - there are still some move this things to be done, but they get more tricky ... 1. Move Painter/PainterBase into frontends, and make various changes to allow GUII [PART MERGED] 2. s/LyXScreen/LScreen/ There was some grumbling about this, I'm happy to change it back if really wanted. Also move it into frontends, and make some changes to allow GUII (now a base class). xscreen implemented in xforms, plus qscreen. BV now takes a reference for screen, we do not re-create the object at any time 3. Add a screen factory for GUII virtual constructor idiom. Do same for WorkArea 4. WorkArea become a base class and has been GUIIzed to some degree. Fairly major re-workings 5. bv re-working to push weirdo scrollbar logic into xforms frontend. GUII interface is now simple and clean(ish). Also remove a few seemingly junk methods in bv + elsewhere 6. ColorHandler moved to xforms. A couple of warts (graphics/) that still rely on this, to be fixed later 7. FontInfo moved as its xforms only 8. FontLoader become xfont_loader as Qt has its own loader thankyouverymuch 9. add font_loader/xfont_loader /qfont_loader hierarchy instead 10. LyXView moved into frontends/. It only really contains frontends logic, which is why I moved it, and it forms the base class for existing (modified XFormsView) and QtView. 11. font.[Ch] now font_metrics.h / xfont_metrics.h / qfont_metrics.h. Better name, in a namespace, etc. 12. kbmap has been altered to store strings not X symbol numbers. Has to happen. 13. lyxlookup moved to xforms - obvious reasons 14. some minor GUIRunTime changes. 15. event_states.h for handling button presses etc. - GUII virtualisation 16. lkey.h - same for keypresses, now passed as strings. 17. new Qt implementations of various of these things regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: Big GUII patch
John Levon [EMAIL PROTECTED] writes: | Against current CVS (modulo removed file clashes I still haven't | fixed) : | http://movementarian.org/q8.diff.bz2 | 19,000 lines of diff ... yipes Are you able to break this one up? It is a tiny bit larger than what I am confortable with. breaking into say ... 17 patches would be good. -- Lgb
Re: Big GUII patch
On Thu, May 23, 2002 at 12:22:16PM +0200, Lars Gullik Bjønnes wrote: Are you able to break this one up? It is a tiny bit larger than what I am confortable with. breaking into say ... 17 patches would be good. If it works you don't win by splitting... Does it work, John? Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Big GUII patch
On Thu, May 23, 2002 at 12:22:16PM +0200, Lars Gullik Bjønnes wrote: | 19,000 lines of diff ... yipes Are you able to break this one up? Heh, I'm not being very clear today am I. The URL is just for reference, not a patch submission. It is a tiny bit larger than what I am confortable with. no kidding :) breaking into say ... 17 patches would be good. Bits are coming. I'm compiling this part now : mv LyXView.* frontends mv XFormsView.* frontends/xforms/ No logical changes. OK to commit this ? Once the big file moves are done, I can start splitting it into logical changes. That's when a temporary branch might come in useful so people can help with this. regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: Big GUII patch
On Thu, May 23, 2002 at 12:26:47PM +0200, Andre Poenitz wrote: Does it work, John? Not really. And it will be split. Angus is dead right that it must be done in small logical changes, compiling all the time. It will triple the work load but it is the only honest way. If Al Viro can rewrite the vfs and you can rewrite mathed, I can make some reasonably trivial changes bit-by-bit too :) regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: Big GUII patch
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 12:22:16PM +0200, Lars Gullik Bjønnes wrote: | 19,000 lines of diff ... yipes Are you able to break this one up? | Heh, I'm not being very clear today am I. The URL is just for reference, | not a patch submission. It is a tiny bit larger than what I am confortable with. | no kidding :) breaking into say ... 17 patches would be good. | Bits are coming. I'm compiling this part now : | mv LyXView.* frontends I am not sure I am in complete agreement with this one... but perhaps ... | mv XFormsView.* frontends/xforms/ | No logical changes. OK to commit this ? send the patch for a lookee.. | Once the big file moves are done, I can start splitting it into logical | changes. That's when a temporary branch might come in useful so people | can help with this. And we get one humongous merge into head later on... eh... -- Lgb
Re: Big GUII patch
On Thu, May 23, 2002 at 12:34:15PM +0200, Lars Gullik Bjønnes wrote:
I am not sure I am in complete agreement with this one...
I think there needs to be some refactoring done here anyway. Many
of the accessors never made much sense to me. But I feel really queasy
about a setWindowTitle() method in core code, and the fact that it will
be the only case in a simple GUII inheritance hierarchy where the
toolkit-specific versions inherit from something in core code. Source
discoverability is good, and code to update the environment combo truly
belongs in frontends/
The important thing to note is that this is of course a first iteration.
It's not meant to be perfectly factored, and it certainly isn't.
send the patch for a lookee..
Attached. Boring huh ? Shout if you want a look at the proper GUII
LyXView files too (iirc they're not that different)
And we get one humongous merge into head later on... eh...
Actually I was thinking of the exact opposite. We create a branch, apply
the huge patch to it, fix stuff up, then merge bit by bit back to the
trunk.
regards
john
--
This is playing, not work, therefore it's not a waste of time.
- Zath
Index: src/BufferView2.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView2.C,v
retrieving revision 1.127
diff -u -r1.127 BufferView2.C
--- src/BufferView2.C 15 May 2002 23:49:06 - 1.127
+++ src/BufferView2.C 23 May 2002 10:35:22 -
-14,7 +14,7
#include buffer.h
#include lyxcursor.h
#include lyxtext.h
-#include LyXView.h
+#include frontends/LyXView.h
#include bufferlist.h
#include lyxscreen.h
#include LaTeX.h
Index: src/BufferView_pimpl.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.239
diff -u -r1.239 BufferView_pimpl.C
--- src/BufferView_pimpl.C 15 May 2002 23:49:06 - 1.239
+++ src/BufferView_pimpl.C 23 May 2002 10:35:27 -
-10,7 +10,7
#include lyxtext.h
#include lyxrow.h
#include paragraph.h
-#include LyXView.h
+#include frontends/LyXView.h
#include commandtags.h
#include lyxfunc.h
#include debug.h
-378,9 +378,9
bv_-theLockingInset(the_locking_inset);
}
+ // this will scroll the screen such that the cursor becomes visible
bv_-text-first_y = screen_-topCursorVisible(bv_-text);
- // this will scroll the screen such that the cursor becomes visible
updateScrollbar();
redraw();
Index: src/FontLoader.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/FontLoader.C,v
retrieving revision 1.39
diff -u -r1.39 FontLoader.C
--- src/FontLoader.C21 Mar 2002 17:25:07 - 1.39
+++ src/FontLoader.C23 May 2002 10:35:27 -
-21,7 +21,7
#include debug.h
#include lyxrc.h // lyxrc.font_*
#include BufferView.h
-#include LyXView.h
+#include frontends/LyXView.h
#include frontends/GUIRunTime.h
using std::endl;
Index: src/LyXView.C
===
RCS file: src/LyXView.C
diff -N src/LyXView.C
--- src/LyXView.C 21 Mar 2002 17:25:08 - 1.70
+++ /dev/null 1 Jan 1970 00:00:00 -
-1,247 +0,0
-/* This file is part of
- * ==
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * == */
-
-#include config.h
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include LyXView.h
-#include minibuffer.h
-#include debug.h
-#include intl.h
-#include lyxrc.h
-#include lyxtext.h
-#include buffer.h
-#include MenuBackend.h
-#include bufferview_funcs.h // CurrentState()
-#include gettext.h
-#include lyxfunc.h
-#include BufferView.h
-#include lyxtextclasslist.h
-
-#include frontends/Dialogs.h
-#include frontends/Toolbar.h
-#include frontends/Timeout.h
-#include frontends/Menubar.h
-
-#include support/filetools.h// OnlyFilename()
-
-#include sys/time.h
-#include unistd.h
-
-using std::endl;
-
-extern void AutoSave(BufferView *);
-extern void QuitLyX();
-
-string current_layout;
-
-
-LyXView::LyXView()
-{
- lyxerr[Debug::INIT] Initializing LyXFunc endl;
- lyxfunc = new LyXFunc(this);
-
- intl = new Intl;
-
- // Give the timeout some default sensible value.
- autosave_timeout = new Timeout(5000);
-
- dialogs_ = new Dialogs(this);
- Dialogs::redrawGUI.connect(SigC::slot(this, LyXView::redraw));
-}
-
-
-LyXView::~LyXView()
-{
- delete menubar;
- delete toolbar;
- delete bufferview;
- delete minibuffer;
- delete lyxfunc;
- delete intl;
- delete autosave_timeout;
- delete dialogs_;
-}
-
-
-void LyXView::resize()
-{
-
Re: Big GUII patch
On Thursday 23 May 2002 11:06 am, John Levon wrote: http://movementarian.org/q8.diff.bz2 I've written a short summary below of what the patch has done so far. I'm not sure what I should merge next - there are still some move this things to be done, but they get more tricky ... 2. s/LyXScreen/LScreen/ of course, if you used namespace front, then you could even rename it as Screen... A
Re: Big GUII patch
On Thu, May 23, 2002 at 12:21:03PM +0100, Angus Leeming wrote: of course, if you used namespace front, then you could even rename it as Screen... , true... john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: Big GUII patch
John Levon [EMAIL PROTECTED] writes: | On Thu, May 23, 2002 at 12:34:15PM +0200, Lars Gullik Bjønnes wrote: I am not sure I am in complete agreement with this one... | I think there needs to be some refactoring done here anyway. Many | of the accessors never made much sense to me. But I feel really queasy | about a setWindowTitle() method in core code, and the fact that it will | be the only case in a simple GUII inheritance hierarchy where the | toolkit-specific versions inherit from something in core code. Source | discoverability is good, and code to update the environment combo truly | belongs in frontends/ | The important thing to note is that this is of course a first iteration. | It's not meant to be perfectly factored, and it certainly isn't. send the patch for a lookee.. | Attached. Boring huh ? Shout if you want a look at the proper GUII | LyXView files too (iirc they're not that different) And we get one humongous merge into head later on... eh... | Actually I was thinking of the exact opposite. We create a branch, apply | the huge patch to it, fix stuff up, then merge bit by bit back to the | trunk. Yes, that sounds ok. and just apply this patch. -- Lgb
[PATCH] guii3
Another in the thrilling installment. This one moves WorkArea into
frontends/ in preparation for its GUIIsation.
OK to apply ?
thanks
john
--
This is playing, not work, therefore it's not a waste of time.
- Zath
Index: src/BufferView_pimpl.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.240
diff -u -r1.240 BufferView_pimpl.C
--- src/BufferView_pimpl.C 23 May 2002 12:08:32 - 1.240
+++ src/BufferView_pimpl.C 23 May 2002 12:49:44 -
-5,7 +5,7
#endif
#include BufferView_pimpl.h
-#include WorkArea.h
+#include frontends/WorkArea.h
#include lyxscreen.h
#include lyxtext.h
#include lyxrow.h
Index: src/BufferView_pimpl.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.h,v
retrieving revision 1.50
diff -u -r1.50 BufferView_pimpl.h
--- src/BufferView_pimpl.h 22 May 2002 01:16:34 - 1.50
+++ src/BufferView_pimpl.h 23 May 2002 12:49:45 -
-6,7 +6,8
#include BufferView.h
#include commandtags.h
#include frontends/Timeout.h
-#include WorkArea.h
+// FIXME remove me
+#include frontends/WorkArea.h
#include box.h
#include insets/insetspecialchar.h
#include support/types.h
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.123
diff -u -r1.123 Makefile.am
--- src/Makefile.am 23 May 2002 12:13:06 - 1.123
+++ src/Makefile.am 23 May 2002 12:49:48 -
-91,8 +91,6
Thesaurus.h \
ToolbarDefaults.C \
ToolbarDefaults.h \
- WorkArea.C \
- WorkArea.h \
box.h \
box.C \
broken_headers.h \
-214,8 +212,6
undo.h \
undo_funcs.C \
undo_funcs.h \
- undostack.C \
- undostack.h \
vc-backend.C \
vc-backend.h \
version.C \
Index: src/WorkArea.C
===
RCS file: src/WorkArea.C
diff -N src/WorkArea.C
--- src/WorkArea.C 23 May 2002 12:08:33 - 1.69
+++ /dev/null 1 Jan 1970 00:00:00 -
-1,625 +0,0
-/* This file is part of
- * ==
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * == */
-
-#include config.h
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include WorkArea.h
-#include debug.h
-#include frontends/LyXView.h
-#include lyxrc.h // lyxrc.show_banner
-#include version.h // lyx_version
-
-#if FL_REVISION 89 || (FL_REVISION == 89 FL_FIXLEVEL 5)
-#include lyxlookup.h
-#endif
-
-#include support/filetools.h // LibFileSearch
-#include support/lstrings.h
-#include support/LAssert.h
-
-#include cmath
-#include cctype
-
-// xforms doesn't define this (but it should be in forms.h).
-extern C
-FL_APPEVENT_CB fl_set_preemptive_callback(Window, FL_APPEVENT_CB, void *);
-
-using std::endl;
-using std::abs;
-using std::hex;
-
-namespace {
-
-inline
-void waitForX()
-{
- XSync(fl_get_display(), 0);
-}
-
-} // anon namespace
-
-
-extern C {
- // Just a bunch of C wrappers around static members of WorkArea
- static
- void C_WorkArea_scroll_cb(FL_OBJECT * ob, long buf)
- {
- WorkArea::scroll_cb(ob, buf);
- }
-
-
- static
- int C_WorkArea_work_area_handler(FL_OBJECT * ob, int event,
-FL_Coord, FL_Coord,
-int key, void * xev)
- {
- return WorkArea::work_area_handler(ob, event,
- 0, 0, key, xev);
- }
-
- static
- int C_WorkAreaEventCB(FL_FORM * form, void * xev) {
- WorkArea * wa = static_castWorkArea*(form-u_vdata);
- return wa-event_cb(static_castXEvent*(xev));
- }
-}
-
-
-WorkArea::WorkArea(int xpos, int ypos, int width, int height)
- : splash_(0), splash_text_(0), workareapixmap(0), painter_(*this)
-{
- fl_freeze_all_forms();
-
- if (lyxerr.debugging(Debug::WORKAREA))
- lyxerr Creating work area: +
- xpos '+' ypos ' '
- width 'x' height endl;
- //
- FL_OBJECT * obj;
- int const bw = int(abs(fl_get_border_width()));
-
- // a box
- if (lyxerr.debugging(Debug::WORKAREA))
- lyxerr \tbackground box: +
- xpos '+' ypos ' '
- width - 15 'x' height endl;
- backgroundbox = obj = fl_add_box(FL_BORDER_BOX,
-xpos, ypos,
-width - 15,
-
Re: [PATCH] guii3
On Thu, May 23, 2002 at 01:57:57PM +0100, John Levon wrote: Another in the thrilling installment. This one moves WorkArea into frontends/ in preparation for its GUIIsation. And I have done the same : lyxscreen.h - frontends/screen.h screen.C - frontends/screen.C lyxlookup - frontends/xforms/lyxlookup Are these bits OK too ? Do you want to see the patch (they are just as boring, the closest CVS + c++ get to mv(1) After that I plan : ColorHandler - frontends/xforms FontInfo - frontends/xforms FontLoader - frontends/font_loader regards john
website
any timeline for the website coming back to life ? thanks john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii3
On Thu, May 23, 2002 at 02:13:57PM +0100, John Levon wrote: lyxscreen.h - frontends/screen.h screen.C - frontends/screen.C lyxlookup - frontends/xforms/lyxlookup Why do you keep the 'lyx' prefix here? Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [PATCH] guii3
On Thu, May 23, 2002 at 03:29:16PM +0200, Andre Poenitz wrote: lyxlookup - frontends/xforms/lyxlookup Why do you keep the 'lyx' prefix here? a) because it's still lyx's lookup mechanism not X's b) because this file needs to die as soon as possible c) because I'm dead lazy regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: [PATCH] guii3
John Levon [EMAIL PROTECTED] writes: | Another in the thrilling installment. This one moves WorkArea into | frontends/ in preparation for its GUIIsation. | OK to apply ? Yes. -- Lgb
Re: website
John Levon [EMAIL PROTECTED] writes: | any timeline for the website coming back to life ? What do you mean? As far as I can see nothing has been down, and the webserver not restarted. -- Lgb
link problems
Does current cvs link for anybody? iI am getting 100s of undefined references starting with BufferView.o: In function `BufferView::workWidth(void) const': /usr/src/lyx/lyx-devel/src/BufferView.C:221: undefined reference to `WorkArea::workWidth(void) const' BufferView.o: In function `BufferView::getClipboard(void) const': /usr/src/lyx/lyx-devel/src/BufferView.C:269: undefined reference to `WorkArea::getClipboard(void) const' BufferView2.o: In function `BufferView::menuUndo(void)': /usr/src/lyx/lyx-devel/src/BufferView2.C:339: undefined reference to `LyXView::message(basic_stringchar, string_char_traitschar, __default_alloc_templatetrue, 0 const )' /usr/src/lyx/lyx-devel/src/BufferView2.C:344: undefined reference to `LyXView::message(basic_stringchar, string_char_traitschar, __default_alloc_templatetrue, 0 const )' BufferView2.o: In function `BufferView::menuRedo(void)': /usr/src/lyx/lyx-devel/src/BufferView2.C:362: undefined reference to `LyXView::message(basic_stringchar, string_char_traitschar, __default_alloc_templatetrue, 0 const )' /usr/src/lyx/lyx-devel/src/BufferView2.C:367: undefined reference to `LyXView::message(basic_stringchar, string_char_traitschar, __default_alloc_templatetrue, 0 const )' Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: link problems
On Thu, May 23, 2002 at 06:19:20PM +0200, Andre Poenitz wrote: Does current cvs link for anybody? Dependencies are screwed. Things to try : touch src/frontends/WorkArea.C touch src/frontends/Makefile.am Make sure to remove .lo files if any files have been removed in sub-dirs too (ughhh...) regards john -- This is playing, not work, therefore it's not a waste of time. - Zath
Re: website
On Thu, May 23, 2002 at 04:37:23PM +0200, Lars Gullik Bjønnes wrote: As far as I can see nothing has been down, and the webserver not restarted. Sorry, it's fine ... must be temporary problem here john -- This is playing, not work, therefore it's not a waste of time. - Zath
Patch for lyx.spec.in for 1.3.0cvs
Since we are in a forward-moving mood in the CVS, here is my small
contribution to the future death of lyxstring.
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | crown of her husband | Robin Gregory (2/28/92)
Index: development/ChangeLog
===
RCS file: /cvs/lyx/lyx-devel/development/ChangeLog,v
retrieving revision 1.15
diff -u -u -r1.15 ChangeLog
--- development/ChangeLog 2001/12/03 17:41:26 1.15
+++ development/ChangeLog 2002/05/23 17:18:18
@@ -1,3 +1,8 @@
+2002-05-23 Kayvan A. Sylvan [EMAIL PROTECTED]
+
+ * lyx.spec.in: Remove --with-included-string for 1.3.0cvs and
+ beyond.
+
2001-12-03 André Pönitz [EMAIL PROTECTED]
* Code_rules/Recommendations: add note about long conditions
Index: development/lyx.spec.in
===
RCS file: /cvs/lyx/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.14
diff -u -u -r1.14 lyx.spec.in
--- development/lyx.spec.in 2001/11/04 07:29:40 1.14
+++ development/lyx.spec.in 2002/05/23 17:18:18
@@ -38,7 +38,7 @@
CXXFLAGS=$RPM_OPT_FLAGS CFLAGS=$RPM_OPT_FLAGS \
./configure --prefix=%{_prefix} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
- --without-warnings --with-included-string
+ --without-warnings
make
%install
msg38313/pgp0.pgp
Description: PGP signature
auto correction
See attached patch. -gives \rightarrow -space gives - (what ever that should mean) I think I'll change the format of lib/autocorrect at some point of time, so this is not finished there. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson) Index: lib/ChangeLog === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v retrieving revision 1.212 diff -u -p -r1.212 ChangeLog --- lib/ChangeLog 3 May 2002 18:34:48 - 1.212 +++ lib/ChangeLog 23 May 2002 17:39:31 - @@ -1,3 +1,8 @@ + +2002-05-23 André Pönitz [EMAIL PROTECTED] + + * lib/autocorrect: new file + 2002-05-03 Claus Hindsgaul [EMAIL PROTECTED] * examples/da_splash.lyx: revised Index: lib/autocorrect === RCS file: lib/autocorrect diff -N lib/autocorrect --- /dev/null 1 Jan 1970 00:00:00 - +++ lib/autocorrect 23 May 2002 17:39:31 - @@ -0,0 +1,352 @@ + +# +# Idea of autocorrection and parts of this file are shamelessly stolen +# from TeXMacs (they give [EMAIL PROTECTED] as contact) +# +# We do it a bit differently and allow corrections only to combine a symbol +# and a char to a new symbol. +# +# + +| ,\lfloor +\lfloor *|, +| '\lceil +\lceil*|' +, |\rfloor +\rfloor *,| +' |\rceil +\rceil*'| +\llbracket*[[* +\rrbracket*]]* + +\cap *\sqcap +\cup *\sqcup +\vee *\curlyvee +\curlyvee *\curlyveeuparrow +\curlyveeuparrow *\curlyveedownarrow + + /\nless + /\ngtr + =\leqslant + =\geqslant +\leqslant /\nleqslant +\geqslant /\ngeqslant +\leqslant *\leq +\geslant *\geq +\leq /\nleq +\geq /\ngeq + \ll +\ll \lll + \gg +\gg \ggg +\ll =\lleq +\lll =\llleq +\gg =\ggeq +\ggg =\gggeq +\ll /\nll +\lll /\nlll +\gg /\ngg +\ggg /\nggg +\lleq /\nlleq +\llleq/\nllleq +\ggeq /\nggeq +\gggeq/\ngggeq + .\lessdot +. \gtrdot +\leqslant .\lesseqdot +\gtrdot =\gtreqdot + + *\prec + *\succ +\prec /\nprec +\succ /\nsucc +\prec =\preccurlyeq +\succ =\succcurlyeq +\preccurlyeq /\npreccurlyeq +\succcurlyeq /\nsucccurlyeq +\preccurlyeq *\preceq +\succcurlyeq *\succeq +\preceq /\npreceq +\succeq /\nsucceq +\npreceq *\precneqq +\nsucceq *\succneqq +\ll *\precprec +\precprec *\precprecprec +\gg *\succsucc +\succsucc *\succsuccsucc +\precprec =\precpreceq +\lll *\precprecprec +\precprecprec =\precprecpreceq +\succsucc =\succsucceq +\ggg =\succsuccsucc +\succsuccsucc =\succsuccsucceq +\precprec /\nprecprec +\precprecprec /\nprecprecprec +\succsucc /\nsuccsucc +\succsuccsucc /\nsuccsuccsucc +\precpreceq /\nprecpreceq +\precprecpreceq /\nprecprecpreceq +\succsucceq /\nsuccsucceq +\succsuccsucceq /\nsuccsuccsucceq + +\prec .\precdot +\succ .\dotsucc +\precdot .\preceqdot +\dotsucc .\dotsucceq +\precprec *\llangle +\succsucc *\rrangle + + \lessgtr + \gtrless + ~\lesssim +\lesssim ~\lessapprox +\prec ~\precsim +\precsim ~\precapprox + ~\gtrsim +\gtrsim ~\gtrapprox +\succ ~\gtrsim +\gtrsim ~\gtrapprox +\leq *\leqq +\geq *\geqq +\leq \lesseqgtr +\geq \gtrqless + +- \rightarrow + -\leftarrow +\leftarrow\leftrightarrow +\rightarrow -\longrightarrow +\leftarrow-\longleftarrow +\longleftarrow\longleftrightarrow += \Rightarrow + + +@ *\circ +\circ /\varnothing +\circ
[PATCH] guii - font_metrics
This one prepares for GUII font metrics stuff, so ignore the weird
forwarding of frontends/font_metrics.h for now
I got very confused when first looking at font stuff, I think
font_metrics is a much better name for the namespace
OK to apply ?
The good news: there is only the unsigned int -event_states::button
change to go then insets/ and mathed/ are almost entirely done (this
is a good indication of how far GUII had already got without anybody
noticing)
thanks
john
--
This is playing, not work, therefore it's not a waste of time.
- Zath
Index: src/BufferView_pimpl.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.241
diff -u -r1.241 BufferView_pimpl.C
--- src/BufferView_pimpl.C 23 May 2002 15:43:25 - 1.241
+++ src/BufferView_pimpl.C 23 May 2002 17:40:58 -
@@ -14,7 +14,6 @@
#include commandtags.h
#include lyxfunc.h
#include debug.h
-#include font.h
#include bufferview_funcs.h
#include TextCache.h
#include bufferlist.h
Index: src/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.721
diff -u -r1.721 ChangeLog
--- src/ChangeLog 23 May 2002 15:48:42 - 1.721
+++ src/ChangeLog 23 May 2002 17:41:17 -
@@ -1,5 +1,16 @@
2002-05-23 John Levon [EMAIL PROTECTED]
+ * LColor.C: remove spurious X include
+
+ * BufferView_pimpl.C:
+ * Makefile.am:
+ * font.h:
+ * font.C:
+ * text.C:
+ * text2.C: move font metrics to frontends/
+
+2002-05-23 John Levon [EMAIL PROTECTED]
+
* BufferView_pimpl.C:
* BufferView_pimpl.h:
* Makefile.am:
Index: src/LColor.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LColor.C,v
retrieving revision 1.31
diff -u -r1.31 LColor.C
--- src/LColor.C21 Mar 2002 17:25:07 - 1.31
+++ src/LColor.C23 May 2002 17:41:17 -
@@ -13,8 +13,6 @@
#pragma implementation
#endif
-#include X11/Xlib.h
-
#include debug.h
#include LColor.h
#include support/LAssert.h
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.124
diff -u -r1.124 Makefile.am
--- src/Makefile.am 23 May 2002 15:43:25 - 1.124
+++ src/Makefile.am 23 May 2002 17:41:20 -
@@ -114,8 +114,6 @@
encoding.h \
exporter.C \
exporter.h \
- font.C \
- font.h \
gettext.C \
gettext.h \
importer.C \
diff -N src/font.C
--- src/font.C 22 May 2002 01:16:35 - 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,236 +0,0 @@
-/* This file is part of
- * ==
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * == */
-
-#include config.h
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include support/lstrings.h
-#include font.h
-#include FontLoader.h
-#include lyxrc.h
-#include encoding.h
-#include language.h
-
-#include boost/scoped_array.hpp
-
-namespace {
-
-inline
-XFontStruct * getXFontstruct(LyXFont const f)
-{
- return fontloader.load(f.family(), f.series(),
- f.realShape(), f.size());
-}
-
-
-inline
-XID getFontID(LyXFont const f)
-{
- return getXFontstruct(f)-fid;
-}
-
-} // namespace anon
-
-int lyxfont::maxAscent(LyXFont const f)
-{
- return getXFontstruct(f)-ascent;
-}
-
-
-int lyxfont::maxDescent(LyXFont const f)
-{
- return getXFontstruct(f)-descent;
-}
-
-
-int lyxfont::ascent(char c, LyXFont const f)
-{
- XFontStruct * finfo = getXFontstruct(f);
- unsigned int uc = static_castunsigned char(c);
- if (finfo-per_char
-uc = finfo-min_char_or_byte2
-uc = finfo-max_char_or_byte2+256*finfo-max_byte1)
- return finfo-per_char[uc - finfo-min_char_or_byte2].ascent;
- else
- return finfo-ascent;
-}
-
-
-int lyxfont::descent(char c, LyXFont const f)
-{
- XFontStruct * finfo = getXFontstruct(f);
- unsigned int uc = static_castunsigned char(c);
- if (finfo-per_char
-uc = finfo-min_char_or_byte2
-uc = finfo-max_char_or_byte2+256*finfo-max_byte1)
- return finfo-per_char[uc - finfo-min_char_or_byte2].descent;
- else
- return finfo-descent;
-}
-
-
-int lyxfont::lbearing(char c, LyXFont const f)
-{
- XFontStruct * finfo = getXFontstruct(f);
- unsigned int uc = static_castunsigned char(c);
- if (finfo-per_char
-uc = finfo-min_char_or_byte2
-uc =
Re: defaults
On Thu, 23 May 2002, Jean-Pierre.Chretien wrote: I remember having used a « Save as default » tag in the File, Edit or Layout menu, I don't find it any more. Is this the reason of misunderstanding ? I guess this replaced the default.lyx by the current template: if the function in on the deskset, you don't need any more to know where the file is located :-) Yes, but at least we know how to do it since it's not. Would be nice to be able to save a default template (the function /templates/defaults.lyx serves) within LyX. Not that big of a deal -- we can still do it in LyX. Just don't know why they took out the automatic saving of a complete template as a default for when desired. jf
Re: defaults
[EMAIL PROTECTED] wrote: Just don't know why they took out the automatic saving of a complete template as a default for when desired. Again: no one took out that feature - it was never there. We decided to move the function to the document dialog, because it should be much clearer now what it does and what not. The function itself has not changed as far as I remember. The Save as Default function saves the settings of the class - those in the document dialog. Preambles et al do not belong to the class settings. We have the template stuff for that. But you can fill out a feature request on bugzilla ;-) Juergen.
Insert Sourcecode GUI
the attached patch gives support for the listings-package
to insert Source-code. it's avilable via
insert-insert file-Dourcecode formatted
a view of the gui: http://www.lyx.org/~voss/listings.gif
please apply
Herbert
--
http://www.lyx.org/help/
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.212
diff -u -r1.212 ChangeLog
--- lib/ChangeLog 3 May 2002 18:34:48 - 1.212
+++ lib/ChangeLog 23 May 2002 20:07:17 -
@@ -1,3 +1,9 @@
+2002-05-23 Herbert Voss [EMAIL PROTECTED]
+
+ * doc/LaTeXconfig.lyx.in:
+ * doc/LyXconfig.lyx.in: package listings
+ * ui/default.ui: item for insert sourcecode
+
2002-05-03 Claus Hindsgaul [EMAIL PROTECTED]
* examples/da_splash.lyx: revised
Index: lib/doc/LaTeXConfig.lyx.in
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/LaTeXConfig.lyx.in,v
retrieving revision 1.24
diff -u -r1.24 LaTeXConfig.lyx.in
--- lib/doc/LaTeXConfig.lyx.in 11 Apr 2002 13:18:18 - 1.24
+++ lib/doc/LaTeXConfig.lyx.in 23 May 2002 20:07:18 -
@@ -1765,4 +1765,25 @@
url
\family default
is needed by LyX to be able to output url's corrently.
+
+\layout Subsection
+
+listings
+\layout Description
+
+Found: @chk_listings@
+\layout Description
+
+CTAN:
+\family typewriter
+macros/latex/contrib/other/misc/listings.sty
+\layout Description
+
+Notes: The package
+\family sans
+listings
+\family default
+ is needed by LyX to be able to output program listings
+
+
\the_end
Index: lib/doc/LyXConfig.lyx.in
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/LyXConfig.lyx.in,v
retrieving revision 1.3
diff -u -r1.3 LyXConfig.lyx.in
--- lib/doc/LyXConfig.lyx.in8 Mar 2002 13:53:30 - 1.3
+++ lib/doc/LyXConfig.lyx.in23 May 2002 20:07:18 -
@@ -1376,6 +1376,26 @@
is needed by LyX to be able to output url's corrently.
\layout Subsection
+listings
+\layout Description
+
+Found: @chk_listings@
+\layout Description
+
+CTAN:
+\family typewriter
+macros/latex/contrib/other/misc/listings.sty
+\layout Description
+
+Notes: The package
+\family sans
+listings
+\family default
+ is needed by LyX to be able to output program listings
+
+
+\layout Subsection
+
prettyref
\layout Description
Index: lib/layouts/seminar.layout
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/seminar.layout,v
retrieving revision 1.1
diff -u -r1.1 seminar.layout
--- lib/layouts/seminar.layout 6 Mar 2000 02:42:37 - 1.1
+++ lib/layouts/seminar.layout 23 May 2002 20:07:18 -
@@ -12,6 +12,7 @@
ClassOptions
FontSize 8|9|10|11|12|14|17
Other slidesec
+ PageSizedefault // controlled by class
End
# There are no chapters in an article.
Index: lib/ui/default.ui
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ui/default.ui,v
retrieving revision 1.85
diff -u -r1.85 default.ui
--- lib/ui/default.ui 20 Mar 2002 12:36:14 - 1.85
+++ lib/ui/default.ui 23 May 2002 20:07:18 -
@@ -242,6 +242,8 @@
Item LyX Document...|X file-insert
Item Ascii as Lines...|L file-insert-ascii
Item Ascii as Paragraphs...|P file-insert-ascii-para
+ Separator
+ Item Sourcecode formatted|S listing-insert
End
#
Index: src/BufferView_pimpl.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.241
diff -u -r1.241 BufferView_pimpl.C
--- src/BufferView_pimpl.C 23 May 2002 15:43:25 - 1.241
+++ src/BufferView_pimpl.C 23 May 2002 20:07:20 -
@@ -36,6 +36,7 @@
#include insets/insetbib.h
#include insets/insettext.h
#include insets/inseturl.h
+#include insets/insetlisting.h
#include insets/insetlatexaccent.h
#include insets/insettoc.h
#include insets/insetref.h
@@ -2910,6 +2911,28 @@
}
break;
+ case LFUN_INSERT_LISTING:
+ {
+// if (!packageAvailable(listings))
+// Alert::alert(_(Sorry, but package listings is not installed\n),
+// _(try to get it from http://www.ctan.org;));
+// else
+ if (!argument.empty()) {
+ InsetCommandParams p;
+ p.setFromString(argument);
+
+ InsetListing * inset = new InsetListing(p);
+ if (!insertInset(inset))
+ delete inset;
+ else
+ updateInset(inset, true);
+ } else {
+ InsetCommandParams p(lstinputlisting);
LyX can't quit properly when graphics loading is in progress !?!?
Hi, When I quit LyX before the graphics has finished it's loading processes, LyX pops up a window that says: Error! Couldn't delete temporary directory: /tmp/lyx_tmpdir1234vud Directory not empty LyX quits when clicked on the [OK] of this error window, though the temp dir remains in /tmp. Something is going wrong here. Shouldn't some graphics-subprocesses being killed and cleaned up, so that LyX can quit properly? Regards, Rob.
ÏëÌý×îHIGHµÄDJÇëµ½º×¸ÚDJÁªÃËÀ´£¡
»¶Ó¹âÁٺ׸ÚDJÁªÃË£¬ÎÒÃǵÄÍøÕ¾ÊÇ£º http://okdj.51.net http://okdj.51.net/main.htm ÕâÀïÓÐ×îHIGHµÄDJ£¬×îˬµÄÒ¡Í·ÎèÇú¡£ ---ÒÔÉÏÓʼþÄÚÈÝÓëÖÐ×ÊÔ´ÍøÂç¼°Èí¼þ¿ª·¢ÉÌÎÞ¹Ø--- --- ÖÐ×ÊÔ´ÍøÂç--ÓòÃûÏÈ×¢²áºó¸¶¿î;Ö÷»úÏÈ¿ªÍ¨ºóÊÕ·Ñ¡£ ÉêÇë100MÐéÄâÖ÷»ú350Ôª/Ä꣬Ë͹ú¼ÊÓòÃû+5¸öÐÅÏä http://www.263nic.com/ --- ±¾Óʼþ²ÉÓÃËÑÒס°ÎÞÐèSMTP¶à··¢ËÍÆ÷¡±Èí¼þ·¢ËÍ¡£ ¸ßÖÊÁ¿£ºPCÖÕ¶Ë×Ô½¨SMTP£¬¶Ôÿ¸öÓÊÖ·ÌØ¿ìרµÝ·¢ËÍ¡£ ¸ßËٶȣº¶àÏß³Ìͬ²½¸ßËÙ·¢ËÍ£¬²»´æÔÚÓʼþ´«ÊäÑÓ³Ù¡£ Ò»Á÷ÉÌÎñÈí¼þÕ¾µã http://seekeasy.onchina.net ---
ÏëÌý×îHIGHµÄDJÇëµ½º×¸ÚDJÁªÃËÀ´£¡
»¶Ó¹âÁٺ׸ÚDJÁªÃË£¬ÎÒÃǵÄÍøÕ¾ÊÇ£º http://okdj.51.net http://okdj.51.net/main.htm ÕâÀïÓÐ×îHIGHµÄDJ£¬×îˬµÄÒ¡Í·ÎèÇú¡£ ---ÒÔÉÏÓʼþÄÚÈÝÓëÖÐ×ÊÔ´ÍøÂç¼°Èí¼þ¿ª·¢ÉÌÎÞ¹Ø--- --- ÖÐ×ÊÔ´ÍøÂç--ÓòÃûÏÈ×¢²áºó¸¶¿î;Ö÷»úÏÈ¿ªÍ¨ºóÊÕ·Ñ¡£ ÉêÇë100MÐéÄâÖ÷»ú350Ôª/Ä꣬Ë͹ú¼ÊÓòÃû+5¸öÐÅÏä http://www.263nic.com/ --- ±¾Óʼþ²ÉÓÃËÑÒס°ÎÞÐèSMTP¶à··¢ËÍÆ÷¡±Èí¼þ·¢ËÍ¡£ ¸ßÖÊÁ¿£ºPCÖÕ¶Ë×Ô½¨SMTP£¬¶Ôÿ¸öÓÊÖ·ÌØ¿ìרµÝ·¢ËÍ¡£ ¸ßËٶȣº¶àÏß³Ìͬ²½¸ßËÙ·¢ËÍ£¬²»´æÔÚÓʼþ´«ÊäÑÓ³Ù¡£ Ò»Á÷ÉÌÎñÈí¼þÕ¾µã http://seekeasy.onchina.net ---
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 12:19:46AM +0100, John Levon wrote: > There's no point having unused files in CVS, and there are several > points against. Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? There a a couple of things that might be interesting "later" and on systems like mine they tend to die rather sooner than later... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:23:13AM +0200, Andre Poenitz wrote: > Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? > There a a couple of things that might be interesting "later" and on systems > like mine they tend to die rather sooner than later... It's called "the CVS repository" ... regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 07:28:24AM +0100, John Levon wrote: > > Could we have some thrash corner in CVS than, maybe seperatly like lyxdoc? > > There a a couple of things that might be interesting "later" and on systems > > like mine they tend to die rather sooner than later... > > It's called "the CVS repository" ... ? Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: Using xforms 0.999 with lyx-1.2
On Thu, 23 May 2002, John Levon wrote: > > I'm the lyx maintainer in NetBSD pkgsrc collection (http://www.pkgsrc.org/) > > and I'm trying the new 1.2.0 pre5. The compilation is okay but the linking > > fails because of unresolved references to fl_xxx() functions: > > Please try 1.2.0rc1 (it might only be on the developer's ftp site > ftp.devel.lyx.org) I could compile pre5 now :-) I had to patch configure (not configure.in as I don't want to force people to install autoconf) with the following patch: - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) - detect xforms-0.9* (it's still missing detection of the future xforms-1.*) This has been tested on NetBSD/i386, NetBSD/macppc and NetBSD/sparc. Feel free to take that changes to configure.in. --- configure.orig Fri May 3 22:53:34 2002 +++ configure Tue May 21 12:15:00 2002 @@ -9743,7 +9743,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lforms $LIBS" +LIBS="-lforms -ljpeg -lXpm $LIBS" cat > conftest.$ac_ext <&6 - XFORMS_LIB="-lforms" + XFORMS_LIB="-lforms -ljpeg -lXpm" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6 @@ -9954,6 +9954,7 @@ " lyx_warning=yes ;; 0.89*) ;; +0.9*) ;; *) lyx_warning_txt="$lyx_warning_txt == Version $lyx_cv_xfversion of xforms might not be compatible with LyX, @@ -10159,7 +10160,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lforms $LIBS" +LIBS="-lforms -ljpeg -lXpm $LIBS" cat > conftest.$ac_ext <&6 - XFORMS_LIB="-lforms" + XFORMS_LIB="-lforms -ljpeg -lXpm" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6 Martti --- Martti Kuparinen <[EMAIL PROTECTED]> NetBSD - No media hype http://www.iki.fi/kuparine/ http://www.netbsd.org/
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:44:09AM +0200, Andre Poenitz wrote: > > It's called "the CVS repository" ... > > ? Well I don't understand what you are asking for. All removed code is available forever in the CVS repository (catastrophic losses aside) regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: Using xforms 0.999 with lyx-1.2
On Thu, May 23, 2002 at 09:45:40AM +0300, Martti Kuparinen wrote: > - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) Does your config/lyxinclude.m4 have LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG ? As for Xpm, I suppose it's pretty rare for it to be shared library first in the search path. We probably need to improve the detection logic, but it's not a priority until a new stable xforms release is done > - detect xforms-0.9* (it's still missing detection of the future xforms-1.*) It was intentional not to do this yet, so the warning warns the users :) Glad you got it working though regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
[PATCH] guii-1: move Painter,PainterBase
Take 2. This one will actually produce a useful diff for the next stage. Again, no logic changes. Please apply to trunk thanks john -- "This is playing, not work, therefore it's not a waste of time." - Zath paintermove2.diff.bz2 Description: Binary data
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 07:47:47AM +0100, John Levon wrote: > > > It's called "the CVS repository" ... > > > > ? > > Well I don't understand what you are asking for. All removed code is > available forever in the CVS repository (catastrophic losses aside) I am asking for a safe place to put patches that are "not yet ready" or "never will be ready but contain interesting ideas". I.e. stuff that has never been in CVS. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 09:05:51AM +0200, Andre Poenitz wrote: > I am asking for a safe place to put patches that are "not yet ready" or > "never will be ready but contain interesting ideas". > > I.e. stuff that has never been in CVS. Oh I see. A branch ? ftp.devel.lyx.org/contrib ? regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] remove dead files, add some srcdoc
On Thu, May 23, 2002 at 08:07:51AM +0100, John Levon wrote: > > I.e. stuff that has never been in CVS. > > Oh I see. A branch ? ftp.devel.lyx.org/contrib ? It does not need to be synced with the main branch... contrib ... hm... this is supposed to be useful for most people, isn't it? I think something similar to lyxdoc (lyxtrash ?) should be appropriate... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: compile problem
"Kayvan A. Sylvan" <[EMAIL PROTECTED]> writes: | Latest CVS, ./configure --with-included-string: > | g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I./../ -I../.. -I../../boost -isystem | +/usr/X11R6/include -O2 -m486 -fno-strength-reduce -W -Wall -c insetgraphics.C | +-Wp,-MD,.deps/insetgraphics.TPlo | In file included from ../../src/insets/inset.h:19, | from ../../src/insets/insetgraphics.h:23, | from insetgraphics.C:78: | ../../src/LString.h:24: #error The header has been included before | +LString.h | make[4]: *** [insetgraphics.lo] Error 1 Why "--with-included-string"? The more third party libraries we use the more problems we will have with lyxstring. What compiler is this? i.e. are you using libstc++ v2 or v3. -- Lgb
Re: Wednesday
John Levon <[EMAIL PROTECTED]> writes: | It's release day ... so ... ?? I went sailing... -- Lgb
Re: Wednesday
On Thu, May 23, 2002 at 09:45:11AM +0200, Lars Gullik Bjønnes wrote: > I went sailing... LyX 1.2.0 - the Bowling Drake release ? :) john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] use template for undo stack
John Levon <[EMAIL PROTECTED]> writes: | Also some minor cleanups, and one not-so-minor: now when createUndo | returns 0, it is not added to the undostack. As I understand it, this | led to us adding to the stack sizeof(Undo *) on every character the user | added. > | Please apply (can applier add limited_stack.h to support/Makefile.am | themselves also) Can you do this with out using a bald pointer in the stack? limited_stackXX; or something? And instead of disallowing non-pointer value-types, disallow pointer types and allow just non-pointers? I am planning to work hard to get rid of as meny bald pointers as possible, end the best place to start is with new code. -- Lgb
Re: [PATCH] use template for undo stack
On Thu, May 23, 2002 at 09:51:04AM +0200, Lars Gullik Bjønnes wrote: > Can you do this with out using a bald pointer in the stack? I can but try. > limited_stackXX; > > or something? So what do I do in overflow case ? ~T(); call the dtor directly ? > I am planning to work hard to get rid of as meny bald pointers as > possible, end the best place to start is with new code. Sounds sensible regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: 1.2.0pre5 CVS (vc-register)
John Levon writes: > On Tue, May 14, 2002 at 11:50:26AM +0200, Nabil Hathout wrote: > > > It seems that vc-register does not work in 1.2.0pre5. Nothing happens when it > > is invoqued. > > You need to save the file first (in future, the output from lyx -dbg ... > is useful) > > I've opened bug 416 on this problem Thank you. I will send a debug log next time. regards, --Nabil Hathout
Re: Using xforms 0.999 with lyx-1.2
On Thu, 23 May 2002, John Levon wrote: > > - xforms-0.999 depends on libjpeg and libXpm (at least on NetBSD) > > Does your config/lyxinclude.m4 have LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG ? Yes it does (the AC_DEFUN defination). Without my "-ljpeg -lXpm" patch (but with the 0.9* detection patch) configure stops like this (before call to LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG): checking xpm header version... 4.11 checking for fl_initialize in -lforms... no checking for fl_initialize in -lxforms... no checking for X11/forms.h... yes checking xforms header version... 0..0 [...] Configuration Host type: i386--netbsdelf Special build flags:included-libsigc C Compiler: cc C Compiler flags: -O2 C++ Compiler: c++ (2.95.3) C++ Compiler flags: -O2 Linker flags:-L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/lib Frontend: xforms libXpm version: 4.11 libforms version: 0..0 LyX binary dir: /usr/pkg/bin LyX files dir: /usr/pkg/share/lyx The following problems have been detected by configure. Please check the messages below before running 'make'. (see the section 'Problems' in the INSTALL file) ** Cannot find libforms or libxforms. Please check that the xforms library is correctly installed on your system. The relevant config.log part (I can provide full config.log if needed): configure:9562: checking for XpmCreateBufferFromImage in -lXpm configure:9584: c++ -o conftest -O2 -I/usr/X11R6/include/X11 -isystem /usr/X1 1R6/include -L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/ pkg/lib -L/usr/pkg/lib conftest.C -lXpm -lSM -lICE -lc -lm -L/usr/X11R6/lib -lX11 1>&5 configure:9615: checking for X11/xpm.h configure:9625: c++ -E -I/usr/X11R6/include/X11 -isystem /usr/X11R6/include c onftest.C >/dev/null 2>conftest.out configure:9697: checking xpm header version configure:9741: checking for fl_initialize in -lforms configure:9763: c++ -o conftest -O2 -I/usr/X11R6/include/X11 -isystem /usr/X1 1R6/include -L/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -Wl,-R/usr/ pkg/lib -L/usr/pkg/lib conftest.C -lforms -lSM -lICE -lc -lm -L/usr/X11R6/li b -lX11 1>&5 /usr/X11R6/lib/libforms.so: undefined reference to `XpmCreatePixmapFromData' /usr/X11R6/lib/libforms.so: undefined reference to `jpeg_read_scanlines' Please note that there was no test for libjpeg before these lines. So it means we have to check libforms/libxforms AND if it needs Xpm and jpeg. > We probably need to improve the detection logic, but it's not a priority > until a new stable xforms release is done That's okay, it works now... Martti --- Martti Kuparinen <[EMAIL PROTECTED]> NetBSD - No media hype http://www.iki.fi/kuparine/ http://www.netbsd.org/
Re: [PATCH] guii-1: move Painter,PainterBase
On Thursday 23 May 2002 7:55 am, John Levon wrote: > Take 2. This one will actually produce a useful diff for the next stage. > > Again, no logic changes. Please apply to trunk > > thanks > john THis is a bit lazy isn't it: diff -N src/frontends/Painter.h ... +#ifndef PAINTERBASE_H +#define PAINTERBASE_H The file has been renamed, so so should the ifdef... Ditto diff -N src/frontends/xforms/XPainter.h ... +#ifndef PAINTER_H +#define PAINTER_H And while you're at it, I thought you were the one requesting the new-style headers. Angus (who's grumpy because he is completely unable to compile cvs at all as his compiler doesn't support tempatised return types and boost uses them extensively on purpose to piss him off. Request for new compiler please.)
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: > > Take 2. This one will actually produce a useful diff for the next stage. Take heed of this comment ... > THis is a bit lazy isn't it: No. This diff is /only/ so that the /real/ changes produce a useful diff that shows the actual changes I've made to Painter/PainterBase in stark details. I will also do something similar with the other files I've moved, one step at a time > And while you're at it, I thought you were the one requesting the new-style > headers. Which the real new versions also have :) regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon <[EMAIL PROTECTED]> writes: | also some minor cleanup This looks ok to me, apply it. -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: > Request for new compiler please. I've heard of gcc running on toasters... Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: defaults
On Wed, 22 May 2002 04:14:54 -0700 (PDT) wrote [EMAIL PROTECTED]: > > I've searched high and low for reference to > /$UserDir/templates/defaults.lyx which I finally figured out is how to set > my document defaults. There's lots of data about templates and the lyxrc > file but I can't find this one. > > Is this eluding me, deprecated, or is it not in the documentation? Seems like a documentation bug. (I learned about defaults.lyx only "accidentially" by regularly reading the lyx-users mailing list.) In the Customization guide, either in Section 2.1.2 "directories" or in the section 6.4 "Creating Templates", a hint that defaults.lyx is the template used with >File>New would be nice. BTW: In my (1.1.6) "de_Customization.lyx", the Section 2.1.2 Verzeichnisse (Directories) doesnot list the templates/ directory (the English version does). Günter -- [EMAIL PROTECTED]
Re: defaults
>>Date: Thu, 23 May 2002 10:02:50 +0200 (CEST) >>From: Guenter Milde <[EMAIL PROTECTED]> >>Subject: Re: defaults >>To: LyX users <[EMAIL PROTECTED]>, [EMAIL PROTECTED] >> >>On Wed, 22 May 2002 04:14:54 -0700 (PDT) wrote [EMAIL PROTECTED]: >> >>> >>> I've searched high and low for reference to >>> /$UserDir/templates/defaults.lyx which I finally figured out is how to set >>> my document defaults. There's lots of data about templates and the lyxrc >>> file but I can't find this one. >>> >>> Is this eluding me, deprecated, or is it not in the documentation? >> >>Seems like a documentation bug. (I learned about defaults.lyx only >>"accidentially" by regularly reading the lyx-users mailing list.) >> >>In the Customization guide, either in Section 2.1.2 "directories" or in the >>section 6.4 "Creating Templates", a hint that defaults.lyx is the template >>used with >File>New would be nice. >> >>BTW: In my (1.1.6) "de_Customization.lyx", the Section 2.1.2 Verzeichnisse >>(Directories) doesnot list the templates/ directory (the English version >>does). >> >>Günter >> >>-- >>[EMAIL PROTECTED] >> I remember having used a « Save as default » tag in the File, Edit or Layout menu, I don't find it any more. Is this the reason of misunderstanding ? I guess this replaced the default.lyx by the current template: if the function in on the deskset, you don't need any more to know where the file is located :-) -- Jean-Pierre
Re: defaults
Jean-Pierre.Chretien wrote: > I remember having used a « Save as default » tag in the File, Edit or > Layout menu, I don't find it any more. > Is this the reason of misunderstanding ? I guess this > replaced the default.lyx by the current template: if the function > in on the deskset, you don't need any more to know where the file > is located :-) In 1.1.6, this was in the menue under Layout. In 1.2.0, it has been moved into the document dialog: Layout -> Document -> "Save as Class Defaults" Juergen
contribution: Elsevier preprint class support
I have made up a basic LyX layout file and template to support the Elsevier preprint class (elsart.cls). They're online at http://www.physics.usyd.edu.au/~matthewa/lyx/ There are comments inside the files. Thanks for LyX. Cheers, Matthew.
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:36:10AM +0200, Lars Gullik Bjønnes wrote:
> This looks ok to me, apply it.
Applier needs this file too, sorry.
(frontends/Painter.C)
john
--
"This is playing, not work, therefore it's not a waste of time."
- Zath
/* This file is part of
* ==
*
* LyX, The Document Processor
*
* Copyright 1998-2001 The LyX Team
*
*==*/
#include
#ifdef __GNUG__
#pragma implementation
#endif
#include "Painter.h"
#include "lyxfont.h"
#include "WorkArea.h"
#include "font.h"
int PainterBase::paperMargin() const
{
return 20;
}
int PainterBase::paperWidth() const
{
return owner.workWidth();
}
int PainterBase::paperHeight() const
{
return owner.height();
}
PainterBase & PainterBase::circle(int x, int y, unsigned int d,
LColor::color col)
{
return ellipse(x, y, d, d, col);
}
PainterBase & PainterBase::ellipse(int x, int y,
unsigned int w, unsigned int h,
LColor::color col)
{
return arc(x, y, w, h, 0, 0, col);
}
PainterBase & PainterBase::button(int x, int y, int w, int h)
{
fillRectangle(x, y, w, h, LColor::buttonbg);
buttonFrame(x, y, w, h);
return * this;
}
PainterBase & PainterBase::buttonFrame(int x, int y, int w, int h)
{
// Width of a side of the button
int d = 2;
fillRectangle(x, y, w, d, LColor::top);
fillRectangle(x, (y+h-d), w, d, LColor::bottom);
// Now a couple of trapezoids
int x1[4], y1[4];
x1[0] = x + d; y1[0] = y + d;
x1[1] = x + d; y1[1] = (y + h - d);
x1[2] = x; y1[2] = y + h;
x1[3] = x; y1[3] = y;
fillPolygon(x1, y1, 4, LColor::left);
x1[0] = (x + w - d); y1[0] = y + d;
x1[1] = (x + w - d); y1[1] = (y + h - d);
x1[2] = x + w; y1[2] = (y + h - d);
x1[3] = x + w; y1[3] = y;
fillPolygon(x1, y1, 4, LColor::right);
return *this;
}
PainterBase & PainterBase::rectText(int x, int baseline,
string const & str,
LyXFont const & font,
LColor::color back,
LColor::color frame)
{
int width;
int ascent;
int descent;
lyxfont::rectText(str, font, width, ascent, descent);
rectangle(x, baseline - ascent, width, ascent + descent, frame);
fillRectangle(x + 1, baseline - ascent + 1, width - 1,
ascent + descent - 1, back);
text(x + 3, baseline, str, font);
return *this;
}
PainterBase & PainterBase::buttonText(int x, int baseline,
string const & str,
LyXFont const & font)
{
int width;
int ascent;
int descent;
lyxfont::buttonText(str, font, width, ascent, descent);
button(x, baseline - ascent, width, descent + ascent);
text(x + 4, baseline, str, font);
return *this;
}
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon <[EMAIL PROTECTED]> writes: | Take 2. This one will actually produce a useful diff for the next stage. > | Again, no logic changes. Please apply to trunk --- src/ColorHandler.h 22 May 2002 01:16:35 - 1.10 +++ src/ColorHandler.h 23 May 2002 06:25:55 - @@ -15,7 +15,7 @@ #pragma interface #endif -#include "PainterBase.h" +#include "frontends/Painter.h" #include Why this? Why does PainterBase.h not cut it? Why move PainterBase? And this XPainter stuff? That is new right? -- Lgb
Re: [PATCH] use template for undo stack
John Levon <[EMAIL PROTECTED]> writes: | On Thu, May 23, 2002 at 09:51:04AM +0200, Lars Gullik Bjønnes wrote: > >> Can you do this with out using a bald pointer in the stack? > | I can but try. > >> limited_stackXX; >> >> or something? > | So what do I do in overflow case ? > | ~T(); > | call the dtor directly ? You just throw the shared_ptr away? Or perhaps I do not understand you completely... -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thursday 23 May 2002 9:41 am, Andre Poenitz wrote: > On Thu, May 23, 2002 at 09:29:09AM +0100, Angus Leeming wrote: > > Request for new compiler please. > > I've heard of gcc running on toasters... > > Andre' I have bad experiences of gcc on a DEC. It's the linking stage that fails and unfortunalely GNU ld has historically not supported the DEC. I do have access to a Linux Alpha machine here, so may move my LyX tree there. However, I shall try and get cxx upgraded to version 6.2 (Jean-Marc's version), as this does support templatised return types. Anyway, holding off is no bad thing. It's not as if there isn't going to be enough muddying of the waters in the patch-frenzy that is starting to ramp up... Angus
Re: [PATCH] guii-1: move Painter,PainterBase
Angus Leeming <[EMAIL PROTECTED]> writes: | On Thursday 23 May 2002 7:55 am, John Levon wrote: >> Take 2. This one will actually produce a useful diff for the next stage. >> >> Again, no logic changes. Please apply to trunk >> >> thanks >> john > | THis is a bit lazy isn't it: | diff -N src/frontends/Painter.h | ... | +#ifndef PAINTERBASE_H | +#define PAINTERBASE_H > | The file has been renamed, so so should the ifdef... Aaahhh... so there was a rename | Angus (who's grumpy because he is completely unable to compile cvs at all as | his compiler doesn't support tempatised return types and boost uses them | extensively on purpose to piss him off. Request for new compiler please.) And gcc does not exist for this system? -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon <[EMAIL PROTECTED]> writes: | On Thu, May 23, 2002 at 10:36:10AM +0200, Lars Gullik Bjønnes wrote: > >> This looks ok to me, apply it. > | Applier needs this file too, sorry. do it yourself. -- Lgb
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: > -#include "PainterBase.h" > +#include "frontends/Painter.h" > > #include > > > Why this? > Why does PainterBase.h not cut it? Haven't we been over this before ? If you want to use PainterBase, then everywhere in the source that currently refers to Painter & needs to be changed to use PainterBase &. > Why move PainterBase? Because it describes a base class for something that must be implemented by a frontend. And it is particularly a frontend property. IMO the name PainterBase is wrong for the following reasons : 1. It is unnecessarily long 2. It exposes a fact that should be private to frontends/ to all core code (namely that Painter is an inheritance hierarchy). This is a small encapsulation violation IMHO 3. It means more code has to be changed un-necessarily > And this XPainter stuff? That is new right? Painter becomes the base class. XPainter is the xforms version. QtPainter is the Qt version, etc. Why prefer : PainterBase | || | QtPainterXPainter GnomePainter ?? It just means that the most sensible and obvious name "Painter" is no longer used anywhere. Painter | || | QtPainterXPainter GnomePainter ... seems nicer to me. The patch sent does not make things very clear, merely because it just moves files, and doesn't really show how things work (perhaps I should put the full GUII patch up for reading again ?) So, is this OK ? regards john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: > | Again, no logic changes. Please apply to trunk -ENOKARMA Access denied: Insufficient Karma (levon|lyx-devel/src) cvs server: Pre-commit check failed I feel like the Lawnmower Man john -- "This is playing, not work, therefore it's not a waste of time." - Zath
Re: [PATCH] guii-1: move Painter,PainterBase
John Levon <[EMAIL PROTECTED]> writes: | On Thu, May 23, 2002 at 10:51:30AM +0200, Lars Gullik Bjønnes wrote: > >> | Again, no logic changes. Please apply to trunk > | -ENOKARMA > | Access denied: Insufficient Karma (levon|lyx-devel/src) | cvs server: Pre-commit check failed BS! -- Lgb
