LyX on Windows - Experience Report
Dear Angus,
I tried to edit/view a document which was located at
c:\Dokumente und Einstellungen\michael\Eigene Dateien
but I failed for several reasons:
1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
White space in argument---line 66 of file doc.aux
: \bibdata{C:/Dokumente
:und Einstellungen/michael/Eigene
Dateien/doc}
I'm skipping whatever remains of this command
2. YAP (Yet Another Previewer) cannot display my graphics:
Cannot find file .
3. Graphics conversion for PDFLaTeX fails (MikTeX Ghostscript 8.15)
Error: /undefinedfilename in (und)
Operand stack:
Execution stack:
%interp_exit .runexec2 --nostringval-- --nostringval--
--nostringval-- 2 %stopped_push --nostringval-- --nostringval--
--nostringval-- false 1 %stopped_push
Dictionary stack:
--dict:1115/1686(ro)(G)-- --dict:0/20(G)-- --dict:70/200(L)--
Current allocation mode is local
Last OS error: No such file or directory
M iKTeX GPL Ghostscript 8.15: Unrecoverable error, exit code 1
Looks like there are still a few problems left to be solved...
Regards, Michael
Re: lyx140cvs, internationalization
Hartmut == Hartmut Haase [EMAIL PROTECTED] writes: Hartmut Jean-Marc, what are we supposed to do with messages from Hartmut other programs that cannot be translated directly? E. g. if Hartmut ispell does not find the dictionary we raise an Alertbox with Hartmut the content Can't open /usr/lib/ispell/ngerman.hash or Hartmut similar. The message comes from ispell itself. Are there Hartmut examples where such messages are made translatable? I think we are stuck with whatever message gets sent to us by the helper programs. JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus I need this patch to compile the 1.4.x tree with mingw. It Angus results in support/globbing.C being compiled only if we're Angus building the XForms frontend. Why don't you just move globbing.* to frontends/xforms? JMarc
Re: [PATCH 14x] add Windows-specific code to support/userinfo.C
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Seems reasonable to me, so I'm committing it now. -- Angus Yes. JMarc
Re: [rework docs] two issues
On 25.04.05, Herbert Voss wrote: Uwe Stöhr wrote: it it possible that we change the check box order in the float placement window ... to - here - top - bottom - page This is more intuitive, because LaTeX uses always this order. no, LaTeX knows no presetting, it depends to the the documentclasses and they use in general tbp I do not know, whether it is only valid in standard document classes, but my LaTeX documentation told me, that when I use the optional argument, all [htbp], [phtb], [tbtp], [tbph], ... have the same result: place the float trying - here - top - bottom - page in that order. Günter -- G.Milde web.de
Re: Various table trouble
Georg Baum wrote:
Am Sonntag, 24. April 2005 13:12 schrieb Juergen Spitzmueller:
Georg, we are talking about the Text Style dialog (a.k.a character
dialog), not the char style inset. Does the patch really not enable the
settings in that dialog for you?
Sorry, that was a misunderstanding. The patch enables the settings, but
it is not the right fix, because it will also enable other things like
labels.
The real problem is that Dialog::checkStatus() is wrong for noninset
dialogs.
The attached patch fixes Dialog::checkStatus(). The dialog dependant part
is now in Dialog::Controller::getStatus() and reimplemented in all
dialogs that need it.
OK to apply?
Sure. It fixes a bug.
However, I wonder if it would not be nicer to have:
class Dialog {
public:
class Controller {
virtual kb_action getLfun() const { return LFUN_INSET_APPLY; }
public:
bool getStatus() const {
FuncRequest const fr(getLFun(), dialog().name());
FuncStatus const fs(kernel().lyxview().getLyXFunc().getStatus(fr));
return fs.enabled();
}
};
};
and override getLFun() ? Much less code in the derived classes.
--
Angus
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote: Angus I need this patch to compile the 1.4.x tree with mingw. It Angus results in support/globbing.C being compiled only if we're Angus building the XForms frontend. Why don't you just move globbing.* to frontends/xforms? Good idea, actually. But the client sub directory stuff is still needed. -- Angus
Re: [rework docs] two issues
Herbert Voss schrieb: no, LaTeX knows no presetting, it depends to the the documentclasses and they use in general tbp I read it in the LaTeX companion 2nd edition, that LaTeX follows _always_ the order htbp. There is an example that bt is equal to tb, first t is tried, then b. Could you please tell me what I misunderstand wrong, because I need this for the userguide. thanks and regards Uwe
Re: [PATCH 14x] build support/globbing.C only for XForms
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Jean-Marc Lasgouttes wrote: I need this patch to compile the Angus 1.4.x tree with mingw. It results in support/globbing.C being Angus compiled only if we're building the XForms frontend. Why don't you just move globbing.* to frontends/xforms? Angus Good idea, actually. But the client sub directory stuff is Angus still needed. Yes, I was about to answer to your previous message, which described your plans. Basically, I think this should not be done by testing for mingw, which is against autoconf usage, but by checking the feature you need. If the server and the client rely on select() being available, then it is _this_ feature that you should test to decide whether to compile this stuff. The same holds for ispell, of course. JMarc
Re: LyX on Windows - Experience Report
[EMAIL PROTECTED] wrote:
Dear Angus,
I tried to edit/view a document which was located at
c:\Dokumente und Einstellungen\michael\Eigene Dateien
but I failed for several reasons:
1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
White space in argument---line 66 of file doc.aux
: \bibdata{C:/Dokumente
:und Einstellungen/michael/Eigene
Dateien/doc}
I'm skipping whatever remains of this command
Well then. Looks pretty conclusive to me. Not much we can do about that if
the underlying software can't cope.
Does it help if you use a relative path or create a shortcut from your
document dir to the bibtex database?
2. YAP (Yet Another Previewer) cannot display my graphics:
Cannot find file .
Go and grab clean_dvi.py from
http://wiki.lyx.org/LaTeX/FilesWithSpecialChars
3. Graphics conversion for PDFLaTeX fails (MikTeX Ghostscript 8.15)
Sigh. Michael, what sort of bug report is this? Does your graphics
conversion fall through to convertDefault.sh or do you use your own
EPS-PDF converter? Etc, etc.
Looks like there are still a few problems left to be solved...
Regards, Michael
--
Angus
Re: LyX on Windows - Experience Report
Angus == Angus Leeming [EMAIL PROTECTED] writes:
Angus [EMAIL PROTECTED] wrote:
Dear Angus,
I tried to edit/view a document which was located at
c:\Dokumente und Einstellungen\michael\Eigene Dateien
but I failed for several reasons:
1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
White space in argument---line 66 of file doc.aux :
\bibdata{C:/Dokumente : und Einstellungen/michael/Eigene
Dateien/doc} I'm skipping whatever remains of this command
Angus Well then. Looks pretty conclusive to me. Not much we can do
Angus about that if the underlying software can't cope.
Is it really needed to use quotes for a \bibliography call? This is
not really a case of underlying \input, after all. It may be that
latex_path is not necessary in this case.
JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote: Angus Jean-Marc Lasgouttes wrote: I need this patch to compile the Angus 1.4.x tree with mingw. It results in support/globbing.C being Angus compiled only if we're building the XForms frontend. Why don't you just move globbing.* to frontends/xforms? Angus Good idea, actually. But the client sub directory stuff is Angus still needed. Yes, I was about to answer to your previous message, which described your plans. Basically, I think this should not be done by testing for mingw, which is against autoconf usage, but by checking the feature you need. If the server and the client rely on select() being available, then it is _this_ feature that you should test to decide whether to compile this stuff. The same holds for ispell, of course. Ok. So a configure test for HAVE_SELECT that also results in AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, test x$have_select = xtrue) I've come round to the opinion that ISpell.C should have a stub implementation for the case when HAVE_SELECT is not defined. The existing ISpell interface is sufficient to enable the rest of LyX to know that communication with the ispell binary has failed. That just leaves lyxserver and lyxsocket. Again, I think that we need stub implementations in the .C files. -- Angus
Re: LyX on Windows - Experience Report
Jean-Marc Lasgouttes wrote:
Dear Angus,
I tried to edit/view a document which was located at
c:\Dokumente und Einstellungen\michael\Eigene Dateien
but I failed for several reasons:
1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
White space in argument---line 66 of file doc.aux :
\bibdata{C:/Dokumente : und Einstellungen/michael/Eigene
Dateien/doc} I'm skipping whatever remains of this command
Angus Well then. Looks pretty conclusive to me. Not much we can do
Angus about that if the underlying software can't cope.
Is it really needed to use quotes for a \bibliography call? This is
not really a case of underlying \input, after all. It may be that
latex_path is not necessary in this case.
It would be nice if someone else took up the baton on this one. I feel
sort of snowed under by LyX ATM :(
--
Angus
[PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Thu, 2005-04-21 at 09:15, Martin Vermeer wrote:
On Wed, 2005-04-20 at 23:12, Martin Vermeer wrote:
On Wed, Apr 20, 2005 at 05:47:57PM +0300, Martin Vermeer wrote:
...
A radical, alternative idea would therefore be to just _merge_ the two
menus, to the extent that they have entries in common; let the menu
structure reflect the internal commonality. Perhaps a single submenu
Tabular features ?
Comments?
- Martin
Try this one on for size ;-)
- Martin
BTW I'll be travelling. Back on Monday.
Back, and an improved patch attached.
Now I also fixed the tick marks in front of the alignment menu items for
math, so they are working like for non-math tabular.
Nobody responded to the previous patch... is this one OK to commit?
- Martin
Index: src/mathed/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.493
diff -u -p -r1.493 ChangeLog
--- src/mathed/ChangeLog 11 Apr 2005 18:48:34 - 1.493
+++ src/mathed/ChangeLog 25 Apr 2005 09:48:24 -
@@ -1,3 +1,9 @@
+2005-04-25 Martin Vermeer [EMAIL PROTECTED]a
+
+ * math_gridinset.C (doDispatch):
+ * math_hullInset.C (doDispatch):
+ * math_nestInset.C (doDispatch): fix handling of alignment
+
2005-04-11 Martin Vermeer [EMAIL PROTECTED]
* math_nestinset.C (doDispatch): make insert-around-selection
Index: src/mathed/math_gridinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.160
diff -u -p -r1.160 math_gridinset.C
--- src/mathed/math_gridinset.C 10 Apr 2005 09:07:28 - 1.160
+++ src/mathed/math_gridinset.C 25 Apr 2005 09:48:24 -
@@ -1292,6 +1292,14 @@ bool MathGridInset::getStatus(LCursor
flag.message(bformat(
N_(Unknown tabular feature '%1$s'), s));
}
+
+ flag.setOnOff(s == align-left halign(cur.col()) == 'l'
+ || s == align-righthalign(cur.col()) == 'r'
+ || s == align-center halign(cur.col()) == 'c'
+ || s == valign-top valign() == 't'
+ || s == valign-bottom valign() == 'b'
+ || s == valign-middle valign() == 'm');
+
#if 0
// FIXME: What did this code do?
// Please check wether it is still needed!
Index: src/mathed/math_hullinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.163
diff -u -p -r1.163 math_hullinset.C
--- src/mathed/math_hullinset.C 24 Mar 2005 16:26:15 - 1.163
+++ src/mathed/math_hullinset.C 25 Apr 2005 09:48:24 -
@@ -1139,6 +1139,12 @@ bool MathHullInset::getStatus(LCursor
flag.enabled(false);
return true;
}
+ if (s == valign-top || s == valign-middle
+ || s == valign-bottom || s == align-left
+ || s == align-center || s == align-right) {
+ flag.enabled(false);
+ return true;
+ }
return MathGridInset::getStatus(cur, cmd, flag);
}
default:
Index: src/mathed/math_nestinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v
retrieving revision 1.152
diff -u -p -r1.152 math_nestinset.C
--- src/mathed/math_nestinset.C 11 Apr 2005 18:48:34 - 1.152
+++ src/mathed/math_nestinset.C 25 Apr 2005 09:48:25 -
@@ -866,6 +866,9 @@ bool MathNestInset::getStatus(LCursor
//string tc = mathnormal;
bool ret = true;
switch (cmd.action) {
+ case LFUN_TABULAR_FEATURE:
+ flag.enabled(false);
+ break;
#if 0
case LFUN_TABULAR_FEATURE:
// FIXME: check temporarily disabled
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.689
diff -u -p -r1.689 ChangeLog
--- lib/ChangeLog 21 Apr 2005 06:21:25 - 1.689
+++ lib/ChangeLog 25 Apr 2005 09:48:25 -
@@ -1,3 +1,7 @@
+2005-04-25 Martin Vermeer [EMAIL PROTECTED]
+
+ * ui/stdmenus.ui: rearrange tabular features stuff
+
2005-04-18 Martin Vermeer [EMAIL PROTECTED]
* stdtoolbars.ui: remove the 4x4 default size
Index: lib/ui/stdmenus.ui
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ui/stdmenus.ui,v
retrieving revision 1.43
diff -u -p -r1.43 stdmenus.ui
--- lib/ui/stdmenus.ui 18 Apr 2005 18:09:57 - 1.43
+++ lib/ui/stdmenus.ui 25 Apr 2005 09:48:25 -
@@ -90,6 +90,7 @@ Menuset
# Mathed b0rkage means these don't work properly
OptSubmenu Table|T edit_tabular
OptSubmenu Math|M edit_math
+ OptSubmenu Rows Cols|C tabular_features
Separator
OptItem Increase List Depth|I depth-increment
OptItem Decrease List Depth|D depth-decrement
@@ -117,12 +118,6 @@ Menuset
# not much we can do to help here
Menu edit_tabular
- Item Add Row|A tabular-feature append-row
- Item Delete Row|w tabular-feature delete-row
-
Re: Various table trouble
Georg Baum wrote: The attached patch fixes Dialog::checkStatus(). The dialog dependant part is now in Dialog::Controller::getStatus() and reimplemented in all dialogs that need it. OK to apply? fine with me. Jürgen
Re: [PATCH 13x, 14x] Windows packaging fix
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus This is just a head's up of a fix verified by (prompted by too Angus :) Rob Bearman. Very good. JMarc
Re: [PATCH 14x] Enable compilation on Windows with mingw
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus * we don't support communication with external processes Angus through pipes or sockets on Windows, so the Windows build Angus doesn't see Ispell.[Ch], lyxserver.[Ch], lyxsocket.[Ch], Angus support/socktools.[Ch] at all. * Concerning ispell: assuming we have a USE_ISPELL define, we could #include ispell.h only when it is defined. This means there is no need to make changes to ispell.h. Also, if we have a $(SPELL) Makefile variable which is either ispell.C, aspell.C or pspell.C, we will only compile the one we need. This means we do not need #ifdef in these files to make them seem empty. With these changes and your changes to ControlSpellChecker, I think everything will work without too much effort. We can probably make dialog-show spellchecker be disabled in this case. * for lyxserver and lyxsocket, can't we provide a dummy inline definition in the .h files that is just good enough to be able to compile? Angus * no glob.h on Windows, and no need for this functionality in Angus the Qt frontend, so support/globbing.[Ch] is also made Angus invisible. As I proposed elsewhere, this could be moved in frontemds/xforms. JMarc
Re: [rework docs] two issues (fwd)
Uwe Stöhr schrieb: Herbert Voss schrieb: no, LaTeX knows no presetting, it depends to the the documentclasses and they use in general tbp I read it in the LaTeX companion 2nd edition, that LaTeX follows _always_ the order htbp. There is an example that bt is equal to tb, first t is tried, then b. Could you please tell me what I misunderstand wrong, because I need this for the userguide. I suppose a misunderstanding here .. What I wanted to say, is that there is a difference between the order and the setting: - the setting pthb is the same as htbp - bh as hb - pbt as tbp the order follows always the htbp sequence, but when a t is missing, it is not valid. Herbert
[PATCH 14x] move support/globbing.[Ch] to frontends/xforms
Following JMarc's suggestion. Patch already committed.
--
AngusIndex: src/frontends/xforms/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.980
diff -u -p -r1.980 ChangeLog
--- src/frontends/xforms/ChangeLog 8 Apr 2005 15:11:46 - 1.980
+++ src/frontends/xforms/ChangeLog 25 Apr 2005 11:04:49 -
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming [EMAIL PROTECTED]
+
+ * globbing.[Ch]: moved here from the support directory.
+
+ * Makefile.am: associated change.
+
2005-04-08 Angus Leeming [EMAIL PROTECTED]
* FormAboutlyx.C (build): ensure that the CREDITS data fits on the
Index: src/frontends/xforms/FormFiledialog.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormFiledialog.C,v
retrieving revision 1.67
diff -u -p -r1.67 FormFiledialog.C
--- src/frontends/xforms/FormFiledialog.C 1 Feb 2005 16:41:24 - 1.67
+++ src/frontends/xforms/FormFiledialog.C 25 Apr 2005 11:04:49 -
@@ -15,13 +15,13 @@
#include forms/form_filedialog.h
#include forms_gettext.h
+#include globbing.h
#include xforms_helpers.h
#include frontends/Dialogs.h
#include support/filefilterlist.h
#include support/filetools.h
-#include support/globbing.h
#include support/lstrings.h
#include support/lyxlib.h
#include support/package.h
Index: src/frontends/xforms/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile.am
--- src/frontends/xforms/Makefile.am 4 Dec 2004 14:50:24 - 1.122
+++ src/frontends/xforms/Makefile.am 25 Apr 2005 11:04:49 -
@@ -37,6 +37,8 @@ libxforms_la_SOURCES = \
freebrowser.h \
fdesign_base.C \
fdesign_base.h \
+ globbing.C \
+ globbing.h \
input_validators.C \
input_validators.h \
lyx_gui.C \
Index: src/frontends/xforms/globbing.C
===
RCS file: src/frontends/xforms/globbing.C
diff -N src/frontends/xforms/globbing.C
--- /dev/null 1 Jan 1970 00:00:00 -
+++ src/frontends/xforms/globbing.C 25 Apr 2005 11:04:49 -
@@ -0,0 +1,44 @@
+/**
+ * \file globbing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include config.h
+
+#include globbing.h
+#include support/path.h
+
+#include glob.h
+
+using std::string;
+using std::vector;
+
+
+namespace lyx {
+namespace support {
+
+void glob(vectorstring matches,
+ string const pattern,
+ string const working_dir,
+ int flags)
+{
+ Path p(working_dir);
+
+ glob_t glob_buffer;
+ glob_buffer.gl_offs = 0;
+ glob(pattern.c_str(), flags, 0, glob_buffer);
+
+ matches.insert(matches.end(),
+ glob_buffer.gl_pathv,
+ glob_buffer.gl_pathv + glob_buffer.gl_pathc);
+
+ globfree(glob_buffer);
+}
+
+} // namespace support
+} // namespace lyx
Index: src/frontends/xforms/globbing.h
===
RCS file: src/frontends/xforms/globbing.h
diff -N src/frontends/xforms/globbing.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ src/frontends/xforms/globbing.h 25 Apr 2005 11:04:49 -
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+/**
+ * \file globbing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef GLOBBING_H
+#define GLOBBING_H
+
+#include string
+#include vector
+
+namespace lyx {
+namespace support {
+
+/** A wrapper for the Posix function 'glob'.
+ * \param matches files found to match \c pattern are appended.
+ * \param pattern the glob to be expanded. Eg *.[Ch].
+ * \param working_dir the starting directory from which \c pattern
+ * is to be expanded. Used only if \c pattern is a relative path.
+ * \param flags flags to be passed to the system function. See 'man glob'.
+ */
+void glob(std::vectorstd::string matches,
+ std::string const pattern,
+ std::string const working_dir,
+ int flags = 0);
+
+} // namespace support
+} // namespace lyx
+
+#endif // NOT GLOBBING_H
Index: src/support/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.341
diff -u -p -r1.341 ChangeLog
--- src/support/ChangeLog 24 Apr 2005 12:21:57 - 1.341
+++ src/support/ChangeLog 25 Apr 2005 11:04:50 -
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming [EMAIL PROTECTED]
+
+ * globbing.[Ch]: removed to frontends/xforms.
+
+ * Makefile.am: associated change.
+
2005-04-24 Angus Leeming [EMAIL PROTECTED]
* userinfo.C (user_name):
Re: [PATCH 14x] move support/globbing.[Ch] to frontends/xforms
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Following JMarc's suggestion. Patch already committed. Thanks. JMarc
Re: Various table trouble
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus However, I wonder if it would not be nicer to have: [a getLFUN method] Agreed. Also, I'd rather have a signature like virtual FuncStatus getStatus() const; since it is more in line with what LyXFunc does. JMarc
Re: [PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Mon, Apr 25, 2005 at 12:52:54PM +0300, Martin Vermeer wrote: Nobody responded to the previous patch... is this one OK to commit? Fine with me. Andre'
Re: [PATCH 13x, 14x] Windows packaging fix
On Fri, Apr 22, 2005 at 06:12:57PM -0400, Rob Bearman wrote: Here is the development/win32/package.C matching change, if this could be committed, please. Please strip the '^M' before committing. Andre'
Re: [PATCH 14x] build support/globbing.C only for XForms
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus I've come round to the opinion that ISpell.C should have a stub Angus implementation for the case when HAVE_SELECT is not defined. Angus The existing ISpell interface is sufficient to enable the rest Angus of LyX to know that communication with the ispell binary has Angus failed. Setting the pointer to the spellcheck to 0 should be enough... JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote:
Angus I've come round to the opinion that ISpell.C should have a stub
Angus implementation for the case when HAVE_SELECT is not defined.
Angus The existing ISpell interface is sufficient to enable the rest
Angus of LyX to know that communication with the ispell binary has
Angus failed.
Setting the pointer to the spellcheck to 0 should be enough...
Mmmm, but the ISpell class encapsulates our interaction with the external
ispell process. Not being able to interact with this external process (no
select(), different API to open pipes) is conceptually the same to the
rest of LyX as being unable to launch the ispell process. In both cases
all that matters is that ISpell tells the caller that we failed to launch
ispell.
Having special code in ControlSpellchecker breaks this encapsulation, no?
Anyway, here is the patch as it is, implementing stub versions of ISpell
and of LyXComm. Something similar is needed for LyXSocket but I can't
remember what the errors were when compiling with mingw, so will check
again later.
Angus (who's not convinced one way or the other and values your feedback :)Index: configure.ac
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.47
diff -u -p -r1.47 configure.ac
--- configure.ac 11 Mar 2005 10:49:09 - 1.47
+++ configure.ac 25 Apr 2005 12:37:05 -
@@ -288,10 +288,15 @@ dnl work correctly because of some confl
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink select socket)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
+
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, \
+ test x$ac_cv_func_select = xyes -a x$ac_cv_func_socket = xyes)
+
+AM_CONDITIONAL(USE_SOCKTOOLS, test x$ac_cv_func_socket = xyes)
### Some information on what just happened
real_bindir=`eval echo \`eval \echo ${bindir}\\``
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.224
diff -u -p -r1.224 Makefile.am
--- src/Makefile.am 31 Jan 2005 10:42:17 - 1.224
+++ src/Makefile.am 25 Apr 2005 12:37:05 -
@@ -4,7 +4,11 @@ DISTCLEANFILES += config.h libintl.h ver
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
Index: src/ispell.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ispell.C,v
retrieving revision 1.25
diff -u -p -r1.25 ispell.C
--- src/ispell.C 20 Jan 2005 16:17:36 - 1.25
+++ src/ispell.C 25 Apr 2005 12:37:05 -
@@ -43,6 +43,57 @@ using std::max;
using std::string;
+#if !defined (HAVE_SELECT)
+// We provide a stub class that disables ISpell.
+
+ISpell::ISpell(BufferParams const , string const )
+ : in(0), out(0), inerr(0), str(0)
+{}
+
+
+ISpell::~ISpell()
+{}
+
+
+bool ISpell::select(bool )
+{
+ return false;
+}
+
+
+string const ISpell::nextMiss()
+{
+ return string();
+}
+
+
+bool ISpell::alive()
+{
+ return false;
+}
+
+
+enum ISpell::Result ISpell::check(WordLangTuple const )
+{
+ return UNKNOWN_WORD;
+}
+
+
+void ISpell::accept(WordLangTuple const )
+{}
+
+
+void ISpell::insert(WordLangTuple const )
+{}
+
+
+string const ISpell::error()
+{
+ return _(Native OS API not yet supported.);
+}
+
+#else // defined (HAVE_SELECT)
+
namespace {
class LaunchIspell : public lyx::support::ForkedProcess {
@@ -446,3 +497,5 @@ string const ISpell::error()
{
return error_;
}
+
+#endif // defined (HAVE_SELECT)
Index: src/lyxserver.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxserver.C,v
retrieving revision 1.60
diff -u -p -r1.60 lyxserver.C
--- src/lyxserver.C 15 Feb 2005 11:04:40 - 1.60
+++ src/lyxserver.C 25 Apr 2005 12:37:06 -
@@ -55,13 +55,13 @@
#include fcntl.h
#ifdef __EMX__
-#include cstdlib
-#include io.h
-#define OS2EMX_PLAIN_CHAR
-#define INCL_DOSNMPIPES
-#define INCL_DOSERRORS
-#include os2.h
-#include support/os2_errortable.h
+# include cstdlib
+# include io.h
+# define OS2EMX_PLAIN_CHAR
+# define INCL_DOSNMPIPES
+# define INCL_DOSERRORS
+# include os2.h
+# include support/os2_errortable.h
#endif
using lyx::support::compare;
@@ -73,13 +73,39 @@ using std::endl;
using std::string;
-// provide an empty mkfifo() if we do not have one. This disables the
-// lyxserver.
-#ifndef HAVE_MKFIFO
-int mkfifo(char const * __path, mode_t __mode) {
- return 0;
+#if !defined (HAVE_MKFIFO)
+// We
Re: lyx140cvs, internationalization
Jean-Marc Lasgouttes wrote: Hartmut == Hartmut Haase [EMAIL PROTECTED] writes: Hartmut Jean-Marc, what are we supposed to do with messages from Hartmut other programs that cannot be translated directly? E. g. if Hartmut ispell does not find the dictionary we raise an Alertbox with Hartmut the content Can't open /usr/lib/ispell/ngerman.hash or Hartmut similar. The message comes from ispell itself. Are there Hartmut examples where such messages are made translatable? I think we are stuck with whatever message gets sent to us by the helper programs. I agree. People can install the proper locales and set LANG correctly, they will then get translated messages from any program that is translated. They can then take it up with the maintainer if the program still is english-only. Helge Hafting
Re: [PATCH 14x] build support/globbing.C only for XForms
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Mmmm, but the ISpell class encapsulates our interaction with Angus the external ispell process. Not being able to interact with Angus this external process (no select(), different API to open Angus pipes) is conceptually the same to the rest of LyX as being Angus unable to launch the ispell process. In both cases all that Angus matters is that ISpell tells the caller that we failed to Angus launch ispell. What about turning your dummy ispell implementation into a SpellBase implementation (that is make it non-working instead of abstract)? Then ControlSpellCheck would just use a SpellBase instance when the rest fails. Angus Anyway, here is the patch as it is, implementing stub versions Angus of ISpell and of LyXComm. Something similar is needed for Angus LyXSocket but I can't remember what the errors were when Angus compiling with mingw, so will check again later. The LyXComm dummy implementation looks good (at least to me). Concerning the configure stuff, I do not like much checking directly against cached variables, but the alternative would probably by uglier. JMarc
Re: [PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Mon, 2005-04-25 at 15:04, Andre Poenitz wrote: On Mon, Apr 25, 2005 at 12:52:54PM +0300, Martin Vermeer wrote: Nobody responded to the previous patch... is this one OK to commit? Fine with me. Andre' Committed. - Martin signature.asc Description: This is a digitally signed message part
RE: lyx-devel src/support/: ChangeLog userinfo.C development/W ...
Modified files: lyx-devel/src/support/: ChangeLog userinfo.C lyx-devel/development/Win32/: win32_kludge.diff Log message: Add Windows-specific code to userinfo.C. Under MSVC, the userinfo.C compile gives a PASCAL macro redefinition warning, the conflict being between windef.h and lmcons.h. If you switch the order of the #includes such that windows.h comes before lmcons.h, the warning goes away. FYI. Thanks Rob
Re: Various table trouble
Jean-Marc Lasgouttes wrote:
Angus == Angus Leeming [EMAIL PROTECTED]
writes:
Angus However, I wonder if it would not be nicer to have:
[a getLFUN method]
Yes.
Agreed. Also, I'd rather have a signature like
virtual FuncStatus getStatus() const;
since it is more in line with what LyXFunc does.
Yes, but we need only the boolean value here. Things like
virtual bool getStatus() const { return true; }
in ControlChanges.h would become more complicated, and we would need to
include FuncStatus.h in Dialog.h. Therefore I want to keep the current
signature.
I am going to apply the attached patch unless you insist on the FuncStatus
version.
GeorgIndex: src/frontends/controllers/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.473
diff -u -p -r1.473 ChangeLog
--- src/frontends/controllers/ChangeLog 19 Apr 2005 08:56:15 - 1.473
+++ src/frontends/controllers/ChangeLog 25 Apr 2005 15:50:20 -
@@ -1,3 +1,12 @@
+2005-04-25 Georg Baum [EMAIL PROTECTED]
+
+ * Dialog.h, ControlCharacter.h, ControlPrint.h, ControlSendto.h,
+ ControlTabular.h, ControlTabularCreate.h (getLfun): new, return the
+ lfun for applying the data
+ * Control*.C (dispatchParams): use getLfun where appropriate
+ * Dialog.[Ch], ControlChanges.h, ControlDocument.h (getStatus): new,
+ check wether the dialog data may be applied
+
2005-04-11 Jean-Marc Lasgouttes [EMAIL PROTECTED]
* ControlDocument.C (dispatchParams): update the counters if
Index: src/frontends/controllers/ControlBox.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBox.C,v
retrieving revision 1.3
diff -u -p -r1.3 ControlBox.C
--- src/frontends/controllers/ControlBox.C 19 May 2004 15:11:30 - 1.3
+++ src/frontends/controllers/ControlBox.C 25 Apr 2005 15:50:20 -
@@ -47,7 +47,7 @@ void ControlBox::clearParams()
void ControlBox::dispatchParams()
{
string const lfun = InsetBoxMailer::params2string(params());
- kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+ kernel().dispatch(FuncRequest(getLfun(), lfun));
}
Index: src/frontends/controllers/ControlBranch.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBranch.C,v
retrieving revision 1.8
diff -u -p -r1.8 ControlBranch.C
--- src/frontends/controllers/ControlBranch.C 19 May 2004 15:11:30 - 1.8
+++ src/frontends/controllers/ControlBranch.C 25 Apr 2005 15:50:20 -
@@ -49,7 +49,7 @@ void ControlBranch::clearParams()
void ControlBranch::dispatchParams()
{
string const lfun = InsetBranchMailer::params2string(params());
- kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+ kernel().dispatch(FuncRequest(getLfun(), lfun));
}
Index: src/frontends/controllers/ControlChanges.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlChanges.h,v
retrieving revision 1.10
diff -u -p -r1.10 ControlChanges.h
--- src/frontends/controllers/ControlChanges.h 11 Oct 2004 14:29:14 - 1.10
+++ src/frontends/controllers/ControlChanges.h 25 Apr 2005 15:50:20 -
@@ -32,6 +32,8 @@ public:
virtual void dispatchParams() {}
///
virtual bool isBufferDependent() const { return true; }
+ /// always true since dispatchParams() is empty
+ virtual bool getStatus() const { return true; }
/// find the next merge chunk and highlight it
bool find();
Index: src/frontends/controllers/ControlCharacter.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCharacter.C,v
retrieving revision 1.50
diff -u -p -r1.50 ControlCharacter.C
--- src/frontends/controllers/ControlCharacter.C 5 Oct 2004 10:11:39 - 1.50
+++ src/frontends/controllers/ControlCharacter.C 25 Apr 2005 15:50:20 -
@@ -65,7 +65,7 @@ void ControlCharacter::dispatchParams()
string data;
if (font2string(*font_.get(), toggleall_, data)) {
- kernel().dispatch(FuncRequest(LFUN_FREEFONT_UPDATE, data));
+ kernel().dispatch(FuncRequest(getLfun(), data));
}
}
Index: src/frontends/controllers/ControlCharacter.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCharacter.h,v
retrieving revision 1.20
diff -u -p -r1.20 ControlCharacter.h
--- src/frontends/controllers/ControlCharacter.h 19 May 2004 15:11:30 - 1.20
+++ src/frontends/controllers/ControlCharacter.h 25 Apr 2005 15:50:20 -
@@ -34,6 +34,8 @@ public:
virtual void dispatchParams();
///
virtual bool isBufferDependent() const { return true; }
+ ///
+ virtual kb_action getLfun() const { return LFUN_TABULAR_INSERT; }
///
void setFamily(LyXFont::FONT_FAMILY);
Index:
Re: fix bug 1542 in 1.3 completely
Georg Baum wrote:
Jean-Marc Lasgouttes wrote:
Georg == Georg Baum
[EMAIL PROTECTED]
writes:
Georg Jean-Marc, bug 1542 is only fixed partially in 1.3 (we got a
Georg new report two days ago): If you enter in math mode it is
Georg saved as , but it should be saved as \. Backporting the
Georg fix from 1.4 is trivial, do you want me to do it?
Yes, please.
It turned out that the fix in 1.4 is incomplete: If you insert an ''
inside an mbox or textrm it is blue instead of black, but this is not the
biggest problem: If you'll read such a file again you have suddenly a
space behind the ampersand. The attached patch (against 1.4) fixes that,
but I am not 100% sure wether it is correct.
It was not: spaces after were swallowed. But I remember now that
text-in-math is waiting for the new mbox inset in 1.5 and is partly broken
both in 1.3 and 1.4 . Since this patch is a monotonous improvement over the
current situation ( in text-in-math always resulted in invalid latex
before, now it is correct in some cases and swallows spaces if there are
any) I suggest to apply the attached patch to 1.3.
OK?
GeorgIndex: status.13x
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.240
diff -u -p -r1.1.2.240 status.13x
--- status.13x 7 Apr 2005 10:20:36 - 1.1.2.240
+++ status.13x 8 Apr 2005 12:25:45 -
@@ -50,6 +50,8 @@ What's new
- Fix crash when reading equations containing more columns than allowed
[bug 1542].
+- Store typed '' characters in math as '\' [bug 1542].
+
- Make sure that the amsmath package is used in LaTeX output when
using the AMS-specific array environments and over/under arrows in
equations.
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.103
diff -u -p -r1.363.2.103 ChangeLog
--- lib/ChangeLog 25 Mar 2005 16:27:41 - 1.363.2.103
+++ lib/ChangeLog 8 Apr 2005 12:03:54 -
@@ -1,3 +1,7 @@
+2005-04-08 Georg Baum [EMAIL PROTECTED]
+
+ * lib/symbols: treat as special character (fixes bug 1542 completely)
+
2005-03-25 Jean-Marc Lasgouttes [EMAIL PROTECTED]
* layouts/revtex4.layout: indicate that the revtex4 class provides
Index: lib/symbols
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/symbols,v
retrieving revision 1.40.2.1
diff -u -p -r1.40.2.1 symbols
--- lib/symbols 28 Mar 2003 17:52:28 - 1.40.2.1
+++ lib/symbols 8 Apr 2005 12:03:55 -
@@ -766,6 +768,7 @@ explyxblacktext 0 0 f
} mathnormal0 0 special x
$ mathnormal0 0 special x
% mathnormal0 0 special x
+ mathnormal0 0 special x
# don't remove the space from the beginning of the next line
# mathnormal0 0 special x
Index: src/mathed/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.299.2.20
diff -u -p -r1.299.2.20 ChangeLog
--- src/mathed/ChangeLog 30 Mar 2005 09:16:05 - 1.299.2.20
+++ src/mathed/ChangeLog 8 Apr 2005 12:04:05 -
@@ -1,3 +1,8 @@
+2005-04-08 Georg Baum [EMAIL PROTECTED]
+
+ * math_cursor.C (interpret): treat as special character (fixes
+ bug 1542 completely)
+
2005-03-30 Georg Baum [EMAIL PROTECTED]
* math_amsarrayinset.[Ch] (validate): new, require amsmath
Index: src/mathed/math_cursor.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Attic/math_cursor.C,v
retrieving revision 1.333.2.2
diff -u -p -r1.333.2.2 math_cursor.C
--- src/mathed/math_cursor.C 7 Dec 2004 10:49:50 - 1.333.2.2
+++ src/mathed/math_cursor.C 8 Apr 2005 12:04:05 -
@@ -1234,8 +1246,8 @@ bool MathCursor::interpret(char c)
return true;
}
- if (c == '$') {
- insert(createMathInset($));
+ if (c == '$' || c == '') {
+ insert(createMathInset(string(1, c)));
return true;
}
Re: Various table trouble
Georg Baum wrote:
Angus However, I wonder if it would not be nicer to have:
[a getLFUN method]
Yes.
Agreed. Also, I'd rather have a signature like
virtual FuncStatus getStatus() const;
since it is more in line with what LyXFunc does.
Yes, but we need only the boolean value here. Things like
virtual bool getStatus() const { return true; }
in ControlChanges.h would become more complicated, and we would need to
include FuncStatus.h in Dialog.h. Therefore I want to keep the current
signature.
I am going to apply the attached patch
In the ChangeLog and in Dialog.[Ch]: s/wether/whether/
Other than that, it looks/feels good.
--
Angus
RE: lyx-devel src/support/: ChangeLog userinfo.C development/W ...
Rob Bearman wrote: Log message: Add Windows-specific code to userinfo.C. Under MSVC, the userinfo.C compile gives a PASCAL macro redefinition warning, the conflict being between windef.h and lmcons.h. If you switch the order of the #includes such that windows.h comes before lmcons.h, the warning goes away. FYI. Thank you, Rob! -- Angus
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote:
Angus Mmmm, but the ISpell class encapsulates our interaction with
Angus the external ispell process. Not being able to interact with
Angus this external process (no select(), different API to open
Angus pipes) is conceptually the same to the rest of LyX as being
Angus unable to launch the ispell process. In both cases all that
Angus matters is that ISpell tells the caller that we failed to
Angus launch ispell.
What about turning your dummy ispell implementation into a SpellBase
implementation (that is make it non-working instead of abstract)? Then
ControlSpellCheck would just use a SpellBase instance when the rest
fails.
Angus Anyway, here is the patch as it is, implementing stub versions
Angus of ISpell and of LyXComm. Something similar is needed for
Angus LyXSocket but I can't remember what the errors were when
Angus compiling with mingw, so will check again later.
The LyXComm dummy implementation looks good (at least to me).
Concerning the configure stuff, I do not like much checking directly
against cached variables, but the alternative would probably by
uglier.
JMarc
Well, see how you like this, which extends the previous patch as you
suggest. It leads to the following variables being defined in config.h
/* Define to 1 if you have the `close' function. */
#define HAVE_CLOSE 1
/* Define to 1 if you have the `dup2' function. */
#define HAVE_DUP2 1
/* Define to 1 if you have the `read' function. */
#define HAVE_READ 1
/* Define to 1 if you have the `select' function. */
#define HAVE_SELECT 1
/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
/* Define to 1 if you have the `write' function. */
#define HAVE_WRITE 1
/* Define as 1 to use an external ispell process. */
#define USE_ISPELL 1
It also implements stubs for the lyxsocket as well if close(), read() or
write() are not defined.
--
AngusIndex: configure.ac
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.47
diff -u -p -r1.47 configure.ac
--- configure.ac 11 Mar 2005 10:49:09 - 1.47
+++ configure.ac 25 Apr 2005 16:22:35 -
@@ -288,10 +288,25 @@ dnl work correctly because of some confl
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(close dup2 lstat mkfifo mkstemp mktemp read readlink select socket write)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
+
+test x$ac_cv_func_dup2 = xyes -a x$ac_cv_func_select = xyes {
+ ac_use_ispell=1
+ AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process.])
+} || {
+ ac_use_ispell=0
+ AC_DEFINE(USE_ISPELL, 0, [Define as 1 to use an external ispell process.])
+}
+
+AM_CONDITIONAL(USE_ISPELL, test $ac_use_ispell -eq 1)
+
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, \
+ test x$ac_cv_func_select = xyes -a x$ac_cv_func_socket = xyes)
+
+AM_CONDITIONAL(USE_SOCKTOOLS, test x$ac_cv_func_socket = xyes)
### Some information on what just happened
real_bindir=`eval echo \`eval \echo ${bindir}\\``
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.224
diff -u -p -r1.224 Makefile.am
--- src/Makefile.am 31 Jan 2005 10:42:17 - 1.224
+++ src/Makefile.am 25 Apr 2005 16:22:35 -
@@ -4,7 +4,11 @@ DISTCLEANFILES += config.h libintl.h ver
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
@@ -51,6 +55,10 @@ BUILT_SOURCES = version.C
AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
+if USE_ISPELL
+ISPELL = ispell.C ispell.h
+endif
+
lyx_SOURCES = \
Bidi.C \
Bidi.h \
@@ -242,9 +250,7 @@ lyx_SOURCES = \
pariterator.C \
pariterator.h \
SpellBase.h \
- ispell.C \
- ispell.h \
- pspell.C \
+ $(ISPELL) pspell.C \
pspell.h \
rowpainter.C \
rowpainter.h \
Index: src/SpellBase.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/SpellBase.h,v
retrieving revision 1.9
diff -u -p -r1.9 SpellBase.h
--- src/SpellBase.h 20 Jan 2005 16:17:35 - 1.9
+++ src/SpellBase.h 25 Apr 2005 16:22:35 -
@@ -13,6 +13,7 @@
#ifndef SPELL_BASE_H
#define SPELL_BASE_H
+#include gettext.h
#include string
class BufferParams;
@@ -20,6 +21,7 @@ class WordLangTuple;
/**
* Base class of all spell checker implementations.
+ * The class can be instantiated but will have no functionality.
*/
class SpellBase {
public:
@@ -43,22 +45,23 @@ public:
virtual ~SpellBase() {}
/// return true if the
[PATCH 14x] using preprocessor guards
Basically this patch does nothing at all except protect #include statements with the appropriate #idef HAVE_FOO_H block. Just accounting in the lead up to a release IMO. OK? -- Angus guards.diff.gz Description: GNU Zip compressed data
Re: pch.h.gch messiness
Angus Leeming [EMAIL PROTECTED] writes: | The fact that the generated pch.h.gch is placed in the src tree rather than | the build tree means that using different compilers to make separate | builds is problematic. I get this warning: | cc1plus: warning: ./../../../../../src/frontends/qt2/ui/pch.h.gch: created | on host `i686-pc-linux-gnu', but used on host `i386-redhat-linux-gnu' | because I have a build-mingw-xcompile tree as well as my normal linux | build. Hmm, da hmm... Sure, if you can find a way to make this work, then we change to that. -- Lgb
[PATCH for 1.3.6] Fix translation for layout styles
Dear Jean-Marc, several styles defined in the *.layout files are not translatable, because their names contain underscores which are replaced by spaces at run-time. I have modified the corresponding layout files. Moreover, I have adjusted the po files for the 16 currently supported languages. This patch should be side-effect-free and allows us to translate about 25 additional messages. I have loaded some of LyX's examples file for the corresponding layouts - everythings seems to work just as before. If you don't have any objections, please commit the patch to the 1.3 branch. I will produce a similar patch for 1.4 next time I find some time. Kind regards, Michael patch-layout-1.3.gz Description: GNU Zip compressed data
LyX on Windows - Experience Report
Dear Angus,
I tried to edit/view a document which was located at
"c:\Dokumente und Einstellungen\michael\Eigene Dateien"
but I failed for several reasons:
1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
White space in argument---line 66 of file doc.aux
: \bibdata{"C:/Dokumente
:und Einstellungen/michael/Eigene
Dateien/doc"}
I'm skipping whatever remains of this command
2. YAP (Yet Another Previewer) cannot display my graphics:
Cannot find file "".
3. Graphics conversion for PDFLaTeX fails (MikTeX Ghostscript 8.15)
Error: /undefinedfilename in (und)
Operand stack:
Execution stack:
%interp_exit .runexec2 --nostringval-- --nostringval--
--nostringval-- 2 %stopped_push --nostringval-- --nostringval--
--nostringval-- false 1 %stopped_push
Dictionary stack:
--dict:1115/1686(ro)(G)-- --dict:0/20(G)-- --dict:70/200(L)--
Current allocation mode is local
Last OS error: No such file or directory
M iKTeX GPL Ghostscript 8.15: Unrecoverable error, exit code 1
Looks like there are still a few problems left to be solved...
Regards, Michael
Re: lyx140cvs, internationalization
> "Hartmut" == Hartmut Haase <[EMAIL PROTECTED]> writes: Hartmut> Jean-Marc, what are we supposed to do with messages from Hartmut> other programs that cannot be translated directly? E. g. if Hartmut> ispell does not find the dictionary we raise an Alertbox with Hartmut> the content "Can't open /usr/lib/ispell/ngerman.hash" or Hartmut> similar. The message comes from ispell itself. Are there Hartmut> examples where such messages are made translatable? I think we are stuck with whatever message gets sent to us by the helper programs. JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> I need this patch to compile the 1.4.x tree with mingw. It Angus> results in support/globbing.C being compiled only if we're Angus> building the XForms frontend. Why don't you just move globbing.* to frontends/xforms? JMarc
Re: [PATCH 14x] add Windows-specific code to support/userinfo.C
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Seems reasonable to me, so I'm committing it now. -- Angus Yes. JMarc
Re: [rework docs] two issues
On 25.04.05, Herbert Voss wrote: > Uwe Stöhr wrote: > > >it it possible that we change the check box order in the float placement > >window ... > >to > > > >- here > >- top > >- bottom > >- page > > > >This is more intuitive, because LaTeX uses always this order. > > no, LaTeX knows no presetting, it depends to the the > documentclasses and they use in general tbp I do not know, whether it is only valid in standard document classes, but my LaTeX documentation told me, that when I use the optional argument, all [htbp], [phtb], [tbtp], [tbph], ... have the same result: place the float trying > >- here > >- top > >- bottom > >- page in that order. Günter -- G.Milde web.de
Re: Various table trouble
Georg Baum wrote:
> Am Sonntag, 24. April 2005 13:12 schrieb Juergen Spitzmueller:
>> Georg, we are talking about the "Text Style" dialog (a.k.a "character
>> dialog"), not the char style inset. Does the patch really not enable the
>> settings in that dialog for you?
>
> Sorry, that was a misunderstanding. The patch enables the settings, but
> it is not the right fix, because it will also enable other things like
> labels.
>
> The real problem is that Dialog::checkStatus() is wrong for noninset
> dialogs.
>
> The attached patch fixes Dialog::checkStatus(). The dialog dependant part
> is now in Dialog::Controller::getStatus() and reimplemented in all
> dialogs that need it.
>
> OK to apply?
Sure. It fixes a bug.
However, I wonder if it would not be nicer to have:
class Dialog {
public:
class Controller {
virtual kb_action getLfun() const { return LFUN_INSET_APPLY; }
public:
bool getStatus() const {
FuncRequest const fr(getLFun(), dialog().name());
FuncStatus const fs(kernel().lyxview().getLyXFunc().getStatus(fr));
return fs.enabled();
}
};
};
and override getLFun() ? Much less code in the derived classes.
--
Angus
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote: > Angus> I need this patch to compile the 1.4.x tree with mingw. It > Angus> results in support/globbing.C being compiled only if we're > Angus> building the XForms frontend. > > Why don't you just move globbing.* to frontends/xforms? Good idea, actually. But the client sub directory stuff is still needed. -- Angus
Re: [rework docs] two issues
Herbert Voss schrieb: no, LaTeX knows no presetting, it depends to the the documentclasses and they use in general tbp I read it in the LaTeX companion 2nd edition, that LaTeX follows _always_ the order "htbp". There is an example that "bt" is equal to "tb", first "t" is tried, then "b". Could you please tell me what I misunderstand wrong, because I need this for the userguide. thanks and regards Uwe
Re: [PATCH 14x] build support/globbing.C only for XForms
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Jean-Marc Lasgouttes wrote: I need this patch to compile the Angus> 1.4.x tree with mingw. It results in support/globbing.C being Angus> compiled only if we're building the XForms frontend. >> Why don't you just move globbing.* to frontends/xforms? Angus> Good idea, actually. But the client sub directory stuff is Angus> still needed. Yes, I was about to answer to your previous message, which described your plans. Basically, I think this should not be done by testing for mingw, which is against autoconf usage, but by checking the feature you need. If the server and the client rely on select() being available, then it is _this_ feature that you should test to decide whether to compile this stuff. The same holds for ispell, of course. JMarc
Re: LyX on Windows - Experience Report
[EMAIL PROTECTED] wrote:
>
> Dear Angus,
>
> I tried to edit/view a document which was located at
>
>"c:\Dokumente und Einstellungen\michael\Eigene Dateien"
>
> but I failed for several reasons:
>
> 1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
>
>White space in argument---line 66 of file doc.aux
> : \bibdata{"C:/Dokumente
> :und Einstellungen/michael/Eigene
> Dateien/doc"}
>I'm skipping whatever remains of this command
Well then. Looks pretty conclusive to me. Not much we can do about that if
the underlying software can't cope.
Does it help if you use a relative path or create a shortcut from your
document dir to the bibtex database?
> 2. YAP (Yet Another Previewer) cannot display my graphics:
>
>Cannot find file "".
Go and grab clean_dvi.py from
http://wiki.lyx.org/LaTeX/FilesWithSpecialChars
> 3. Graphics conversion for PDFLaTeX fails (MikTeX Ghostscript 8.15)
Sigh. Michael, what sort of bug report is this? Does your graphics
conversion fall through to convertDefault.sh or do you use your own
EPS->PDF converter? Etc, etc.
> Looks like there are still a few problems left to be solved...
> Regards, Michael
--
Angus
Re: LyX on Windows - Experience Report
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> [EMAIL PROTECTED] wrote:
>> Dear Angus,
>>
>> I tried to edit/view a document which was located at
>>
>> "c:\Dokumente und Einstellungen\michael\Eigene Dateien"
>>
>> but I failed for several reasons:
>>
>> 1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
>>
>> White space in argument---line 66 of file doc.aux :
>> \bibdata{"C:/Dokumente : und Einstellungen/michael/Eigene
>> Dateien/doc"} I'm skipping whatever remains of this command
Angus> Well then. Looks pretty conclusive to me. Not much we can do
Angus> about that if the underlying software can't cope.
Is it really needed to use quotes for a \bibliography call? This is
not really a case of underlying \input, after all. It may be that
latex_path is not necessary in this case.
JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote: > Angus> Jean-Marc Lasgouttes wrote: I need this patch to compile the > Angus> 1.4.x tree with mingw. It results in support/globbing.C being > Angus> compiled only if we're building the XForms frontend. >>> Why don't you just move globbing.* to frontends/xforms? > > Angus> Good idea, actually. But the client sub directory stuff is > Angus> still needed. > > Yes, I was about to answer to your previous message, which described > your plans. Basically, I think this should not be done by testing for > mingw, which is against autoconf usage, but by checking the feature > you need. If the server and the client rely on select() being > available, then it is _this_ feature that you should test to decide > whether to compile this stuff. The same holds for ispell, of course. Ok. So a configure test for HAVE_SELECT that also results in AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, test x$have_select = xtrue) I've come round to the opinion that ISpell.C should have a stub implementation for the case when HAVE_SELECT is not defined. The existing ISpell interface is sufficient to enable the rest of LyX to know that communication with the ispell binary has failed. That just leaves lyxserver and lyxsocket. Again, I think that we need stub implementations in the .C files. -- Angus
Re: LyX on Windows - Experience Report
Jean-Marc Lasgouttes wrote:
>>> Dear Angus,
>>>
>>> I tried to edit/view a document which was located at
>>>
>>> "c:\Dokumente und Einstellungen\michael\Eigene Dateien"
>>>
>>> but I failed for several reasons:
>>>
>>> 1. BibTeX, Version 0.99c (MiKTeX 2.4) cannot handle spaces
>>>
>>> White space in argument---line 66 of file doc.aux :
>>> \bibdata{"C:/Dokumente : und Einstellungen/michael/Eigene
>>> Dateien/doc"} I'm skipping whatever remains of this command
>
> Angus> Well then. Looks pretty conclusive to me. Not much we can do
> Angus> about that if the underlying software can't cope.
>
> Is it really needed to use quotes for a \bibliography call? This is
> not really a case of underlying \input, after all. It may be that
> latex_path is not necessary in this case.
It would be nice if someone else took up the baton on this one. I feel
sort of snowed under by LyX ATM :(
--
Angus
[PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Thu, 2005-04-21 at 09:15, Martin Vermeer wrote:
> On Wed, 2005-04-20 at 23:12, Martin Vermeer wrote:
> > On Wed, Apr 20, 2005 at 05:47:57PM +0300, Martin Vermeer wrote:
>
> ...
>
> > A radical, alternative idea would therefore be to just _merge_ the two
> > menus, to the extent that they have entries in common; let the menu
> > structure reflect the internal commonality. Perhaps a single submenu
> > "Tabular features" ?
> >
> > Comments?
> >
> > - Martin
>
> Try this one on for size ;-)
>
> - Martin
>
> BTW I'll be travelling. Back on Monday.
Back, and an improved patch attached.
Now I also fixed the tick marks in front of the alignment menu items for
math, so they are working like for non-math tabular.
Nobody responded to the previous patch... is this one OK to commit?
- Martin
Index: src/mathed/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.493
diff -u -p -r1.493 ChangeLog
--- src/mathed/ChangeLog 11 Apr 2005 18:48:34 - 1.493
+++ src/mathed/ChangeLog 25 Apr 2005 09:48:24 -
@@ -1,3 +1,9 @@
+2005-04-25 Martin Vermeer <[EMAIL PROTECTED]>a
+
+ * math_gridinset.C (doDispatch):
+ * math_hullInset.C (doDispatch):
+ * math_nestInset.C (doDispatch): fix handling of alignment
+
2005-04-11 Martin Vermeer <[EMAIL PROTECTED]>
* math_nestinset.C (doDispatch): make insert-around-selection
Index: src/mathed/math_gridinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.160
diff -u -p -r1.160 math_gridinset.C
--- src/mathed/math_gridinset.C 10 Apr 2005 09:07:28 - 1.160
+++ src/mathed/math_gridinset.C 25 Apr 2005 09:48:24 -
@@ -1292,6 +1292,14 @@ bool MathGridInset::getStatus(LCursor &
flag.message(bformat(
N_("Unknown tabular feature '%1$s'"), s));
}
+
+ flag.setOnOff(s == "align-left"&& halign(cur.col()) == 'l'
+ || s == "align-right" && halign(cur.col()) == 'r'
+ || s == "align-center" && halign(cur.col()) == 'c'
+ || s == "valign-top"&& valign() == 't'
+ || s == "valign-bottom" && valign() == 'b'
+ || s == "valign-middle" && valign() == 'm');
+
#if 0
// FIXME: What did this code do?
// Please check wether it is still needed!
Index: src/mathed/math_hullinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.163
diff -u -p -r1.163 math_hullinset.C
--- src/mathed/math_hullinset.C 24 Mar 2005 16:26:15 - 1.163
+++ src/mathed/math_hullinset.C 25 Apr 2005 09:48:24 -
@@ -1139,6 +1139,12 @@ bool MathHullInset::getStatus(LCursor &
flag.enabled(false);
return true;
}
+ if (s == "valign-top" || s == "valign-middle"
+ || s == "valign-bottom" || s == "align-left"
+ || s == "align-center" || s == "align-right") {
+ flag.enabled(false);
+ return true;
+ }
return MathGridInset::getStatus(cur, cmd, flag);
}
default:
Index: src/mathed/math_nestinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v
retrieving revision 1.152
diff -u -p -r1.152 math_nestinset.C
--- src/mathed/math_nestinset.C 11 Apr 2005 18:48:34 - 1.152
+++ src/mathed/math_nestinset.C 25 Apr 2005 09:48:25 -
@@ -866,6 +866,9 @@ bool MathNestInset::getStatus(LCursor &
//string tc = "mathnormal";
bool ret = true;
switch (cmd.action) {
+ case LFUN_TABULAR_FEATURE:
+ flag.enabled(false);
+ break;
#if 0
case LFUN_TABULAR_FEATURE:
// FIXME: check temporarily disabled
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.689
diff -u -p -r1.689 ChangeLog
--- lib/ChangeLog 21 Apr 2005 06:21:25 - 1.689
+++ lib/ChangeLog 25 Apr 2005 09:48:25 -
@@ -1,3 +1,7 @@
+2005-04-25 Martin Vermeer <[EMAIL PROTECTED]>
+
+ * ui/stdmenus.ui: rearrange tabular features stuff
+
2005-04-18 Martin Vermeer <[EMAIL PROTECTED]>
* stdtoolbars.ui: remove the 4x4 default size
Index: lib/ui/stdmenus.ui
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ui/stdmenus.ui,v
retrieving revision 1.43
diff -u -p -r1.43 stdmenus.ui
--- lib/ui/stdmenus.ui 18 Apr 2005 18:09:57 - 1.43
+++ lib/ui/stdmenus.ui 25 Apr 2005 09:48:25 -
@@ -90,6 +90,7 @@ Menuset
# Mathed b0rkage means these don't work properly
OptSubmenu "Table|T" "edit_tabular"
OptSubmenu "Math|M" "edit_math"
+ OptSubmenu "Rows & Cols|C" "tabular_features"
Separator
OptItem "Increase List Depth|I" "depth-increment"
OptItem "Decrease List Depth|D" "depth-decrement"
@@ -117,12 +118,6 @@ Menuset
# not much we can do to help here
Menu
Re: Various table trouble
Georg Baum wrote: > The attached patch fixes Dialog::checkStatus(). The dialog dependant part > is now in Dialog::Controller::getStatus() and reimplemented in all > dialogs that need it. > > OK to apply? fine with me. Jürgen
Re: [PATCH 13x, 14x] Windows packaging fix
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> This is just a head's up of a fix verified by (prompted by too Angus> :) Rob Bearman. Very good. JMarc
Re: [PATCH 14x] Enable compilation on Windows with mingw
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> * we don't support communication with external processes Angus> through pipes or sockets on Windows, so the Windows build Angus> doesn't see Ispell.[Ch], lyxserver.[Ch], lyxsocket.[Ch], Angus> support/socktools.[Ch] at all. * Concerning ispell: assuming we have a USE_ISPELL define, we could #include ispell.h only when it is defined. This means there is no need to make changes to ispell.h. Also, if we have a $(SPELL) Makefile variable which is either ispell.C, aspell.C or pspell.C, we will only compile the one we need. This means we do not need #ifdef in these files to make them seem empty. With these changes and your changes to ControlSpellChecker, I think everything will work without too much effort. We can probably make "dialog-show spellchecker" be disabled in this case. * for lyxserver and lyxsocket, can't we provide a dummy inline definition in the .h files that is just good enough to be able to compile? Angus> * no glob.h on Windows, and no need for this functionality in Angus> the Qt frontend, so support/globbing.[Ch] is also made Angus> invisible. As I proposed elsewhere, this could be moved in frontemds/xforms. JMarc
Re: [rework docs] two issues (fwd)
Uwe Stöhr schrieb: Herbert Voss schrieb: no, LaTeX knows no presetting, it depends to the the documentclasses and they use in general tbp I read it in the LaTeX companion 2nd edition, that LaTeX follows _always_ the order "htbp". There is an example that "bt" is equal to "tb", first "t" is tried, then "b". Could you please tell me what I misunderstand wrong, because I need this for the userguide. I suppose a misunderstanding here .. What I wanted to say, is that there is a difference between the order and the setting: -> the setting pthb is the same as htbp -> bh as hb -> pbt as tbp the order follows always the htbp sequence, but when a "t" is missing, it is not valid. Herbert
[PATCH 14x] move support/globbing.[Ch] to frontends/xforms
Following JMarc's suggestion. Patch already committed.
--
AngusIndex: src/frontends/xforms/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.980
diff -u -p -r1.980 ChangeLog
--- src/frontends/xforms/ChangeLog 8 Apr 2005 15:11:46 - 1.980
+++ src/frontends/xforms/ChangeLog 25 Apr 2005 11:04:49 -
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
+
+ * globbing.[Ch]: moved here from the support directory.
+
+ * Makefile.am: associated change.
+
2005-04-08 Angus Leeming <[EMAIL PROTECTED]>
* FormAboutlyx.C (build): ensure that the CREDITS data fits on the
Index: src/frontends/xforms/FormFiledialog.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormFiledialog.C,v
retrieving revision 1.67
diff -u -p -r1.67 FormFiledialog.C
--- src/frontends/xforms/FormFiledialog.C 1 Feb 2005 16:41:24 - 1.67
+++ src/frontends/xforms/FormFiledialog.C 25 Apr 2005 11:04:49 -
@@ -15,13 +15,13 @@
#include "forms/form_filedialog.h"
#include "forms_gettext.h"
+#include "globbing.h"
#include "xforms_helpers.h"
#include "frontends/Dialogs.h"
#include "support/filefilterlist.h"
#include "support/filetools.h"
-#include "support/globbing.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/package.h"
Index: src/frontends/xforms/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile.am
--- src/frontends/xforms/Makefile.am 4 Dec 2004 14:50:24 - 1.122
+++ src/frontends/xforms/Makefile.am 25 Apr 2005 11:04:49 -
@@ -37,6 +37,8 @@ libxforms_la_SOURCES = \
freebrowser.h \
fdesign_base.C \
fdesign_base.h \
+ globbing.C \
+ globbing.h \
input_validators.C \
input_validators.h \
lyx_gui.C \
Index: src/frontends/xforms/globbing.C
===
RCS file: src/frontends/xforms/globbing.C
diff -N src/frontends/xforms/globbing.C
--- /dev/null 1 Jan 1970 00:00:00 -
+++ src/frontends/xforms/globbing.C 25 Apr 2005 11:04:49 -
@@ -0,0 +1,44 @@
+/**
+ * \file globbing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include
+
+#include "globbing.h"
+#include "support/path.h"
+
+#include
+
+using std::string;
+using std::vector;
+
+
+namespace lyx {
+namespace support {
+
+void glob(vector & matches,
+ string const & pattern,
+ string const & working_dir,
+ int flags)
+{
+ Path p(working_dir);
+
+ glob_t glob_buffer;
+ glob_buffer.gl_offs = 0;
+ glob(pattern.c_str(), flags, 0, _buffer);
+
+ matches.insert(matches.end(),
+ glob_buffer.gl_pathv,
+ glob_buffer.gl_pathv + glob_buffer.gl_pathc);
+
+ globfree(_buffer);
+}
+
+} // namespace support
+} // namespace lyx
Index: src/frontends/xforms/globbing.h
===
RCS file: src/frontends/xforms/globbing.h
diff -N src/frontends/xforms/globbing.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ src/frontends/xforms/globbing.h 25 Apr 2005 11:04:49 -
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+/**
+ * \file globbing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef GLOBBING_H
+#define GLOBBING_H
+
+#include
+#include
+
+namespace lyx {
+namespace support {
+
+/** A wrapper for the Posix function 'glob'.
+ * \param matches files found to match \c pattern are appended.
+ * \param pattern the glob to be expanded. Eg "*.[Ch]".
+ * \param working_dir the starting directory from which \c pattern
+ * is to be expanded. Used only if \c pattern is a relative path.
+ * \param flags flags to be passed to the system function. See 'man glob'.
+ */
+void glob(std::vector & matches,
+ std::string const & pattern,
+ std::string const & working_dir,
+ int flags = 0);
+
+} // namespace support
+} // namespace lyx
+
+#endif // NOT GLOBBING_H
Index: src/support/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.341
diff -u -p -r1.341 ChangeLog
--- src/support/ChangeLog 24 Apr 2005 12:21:57 - 1.341
+++ src/support/ChangeLog 25 Apr 2005 11:04:50 -
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
+
+ * globbing.[Ch]: removed to frontends/xforms.
+
+ * Makefile.am: associated change.
+
2005-04-24 Angus Leeming <[EMAIL PROTECTED]>
* userinfo.C (user_name): add
Re: [PATCH 14x] move support/globbing.[Ch] to frontends/xforms
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Following JMarc's suggestion. Patch already committed. Thanks. JMarc
Re: Various table trouble
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> However, I wonder if it would not be nicer to have: [a getLFUN method] Agreed. Also, I'd rather have a signature like virtual FuncStatus getStatus() const; since it is more in line with what LyXFunc does. JMarc
Re: [PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Mon, Apr 25, 2005 at 12:52:54PM +0300, Martin Vermeer wrote: > Nobody responded to the previous patch... is this one OK to commit? Fine with me. Andre'
Re: [PATCH 13x, 14x] Windows packaging fix
On Fri, Apr 22, 2005 at 06:12:57PM -0400, Rob Bearman wrote: > Here is the development/win32/package.C matching change, if this could > be committed, please. Please strip the '^M' before committing. Andre'
Re: [PATCH 14x] build support/globbing.C only for XForms
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> I've come round to the opinion that ISpell.C should have a stub Angus> implementation for the case when HAVE_SELECT is not defined. Angus> The existing ISpell interface is sufficient to enable the rest Angus> of LyX to know that communication with the ispell binary has Angus> failed. Setting the pointer to the spellcheck to 0 should be enough... JMarc
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote:
> Angus> I've come round to the opinion that ISpell.C should have a stub
> Angus> implementation for the case when HAVE_SELECT is not defined.
> Angus> The existing ISpell interface is sufficient to enable the rest
> Angus> of LyX to know that communication with the ispell binary has
> Angus> failed.
>
> Setting the pointer to the spellcheck to 0 should be enough...
Mmmm, but the ISpell class encapsulates our interaction with the external
ispell process. Not being able to interact with this external process (no
select(), different API to open pipes) is conceptually the same to the
rest of LyX as being unable to launch the ispell process. In both cases
all that matters is that ISpell tells the caller that we failed to launch
ispell.
Having special code in ControlSpellchecker breaks this encapsulation, no?
Anyway, here is the patch as it is, implementing stub versions of ISpell
and of LyXComm. Something similar is needed for LyXSocket but I can't
remember what the errors were when compiling with mingw, so will check
again later.
Angus (who's not convinced one way or the other and values your feedback :)Index: configure.ac
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.47
diff -u -p -r1.47 configure.ac
--- configure.ac 11 Mar 2005 10:49:09 - 1.47
+++ configure.ac 25 Apr 2005 12:37:05 -
@@ -288,10 +288,15 @@ dnl work correctly because of some confl
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink select socket)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
+
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, \
+ test x$ac_cv_func_select = xyes -a x$ac_cv_func_socket = xyes)
+
+AM_CONDITIONAL(USE_SOCKTOOLS, test x$ac_cv_func_socket = xyes)
### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.224
diff -u -p -r1.224 Makefile.am
--- src/Makefile.am 31 Jan 2005 10:42:17 - 1.224
+++ src/Makefile.am 25 Apr 2005 12:37:05 -
@@ -4,7 +4,11 @@ DISTCLEANFILES += config.h libintl.h ver
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
Index: src/ispell.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ispell.C,v
retrieving revision 1.25
diff -u -p -r1.25 ispell.C
--- src/ispell.C 20 Jan 2005 16:17:36 - 1.25
+++ src/ispell.C 25 Apr 2005 12:37:05 -
@@ -43,6 +43,57 @@ using std::max;
using std::string;
+#if !defined (HAVE_SELECT)
+// We provide a stub class that disables ISpell.
+
+ISpell::ISpell(BufferParams const &, string const &)
+ : in(0), out(0), inerr(0), str(0)
+{}
+
+
+ISpell::~ISpell()
+{}
+
+
+bool ISpell::select(bool &)
+{
+ return false;
+}
+
+
+string const ISpell::nextMiss()
+{
+ return string();
+}
+
+
+bool ISpell::alive()
+{
+ return false;
+}
+
+
+enum ISpell::Result ISpell::check(WordLangTuple const &)
+{
+ return UNKNOWN_WORD;
+}
+
+
+void ISpell::accept(WordLangTuple const &)
+{}
+
+
+void ISpell::insert(WordLangTuple const &)
+{}
+
+
+string const ISpell::error()
+{
+ return _("Native OS API not yet supported.");
+}
+
+#else // defined (HAVE_SELECT)
+
namespace {
class LaunchIspell : public lyx::support::ForkedProcess {
@@ -446,3 +497,5 @@ string const ISpell::error()
{
return error_;
}
+
+#endif // defined (HAVE_SELECT)
Index: src/lyxserver.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxserver.C,v
retrieving revision 1.60
diff -u -p -r1.60 lyxserver.C
--- src/lyxserver.C 15 Feb 2005 11:04:40 - 1.60
+++ src/lyxserver.C 25 Apr 2005 12:37:06 -
@@ -55,13 +55,13 @@
#include
#ifdef __EMX__
-#include
-#include
-#define OS2EMX_PLAIN_CHAR
-#define INCL_DOSNMPIPES
-#define INCL_DOSERRORS
-#include
-#include "support/os2_errortable.h"
+# include
+# include
+# define OS2EMX_PLAIN_CHAR
+# define INCL_DOSNMPIPES
+# define INCL_DOSERRORS
+# include
+# include "support/os2_errortable.h"
#endif
using lyx::support::compare;
@@ -73,13 +73,39 @@ using std::endl;
using std::string;
-// provide an empty mkfifo() if we do not have one. This disables the
-// lyxserver.
-#ifndef HAVE_MKFIFO
-int mkfifo(char const * __path, mode_t __mode) {
- return 0;
+#if !defined (HAVE_MKFIFO)
+// We provide a stub
Re: lyx140cvs, internationalization
Jean-Marc Lasgouttes wrote: "Hartmut" == Hartmut Haase <[EMAIL PROTECTED]> writes: Hartmut> Jean-Marc, what are we supposed to do with messages from Hartmut> other programs that cannot be translated directly? E. g. if Hartmut> ispell does not find the dictionary we raise an Alertbox with Hartmut> the content "Can't open /usr/lib/ispell/ngerman.hash" or Hartmut> similar. The message comes from ispell itself. Are there Hartmut> examples where such messages are made translatable? I think we are stuck with whatever message gets sent to us by the helper programs. I agree. People can install the proper locales and set LANG correctly, they will then get translated messages from any program that is translated. They can then take it up with the maintainer if the program still is english-only. Helge Hafting
Re: [PATCH 14x] build support/globbing.C only for XForms
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Mmmm, but the ISpell class encapsulates our interaction with Angus> the external ispell process. Not being able to interact with Angus> this external process (no select(), different API to open Angus> pipes) is conceptually the same to the rest of LyX as being Angus> unable to launch the ispell process. In both cases all that Angus> matters is that ISpell tells the caller that we failed to Angus> launch ispell. What about turning your dummy ispell implementation into a SpellBase implementation (that is make it non-working instead of abstract)? Then ControlSpellCheck would just use a SpellBase instance when the rest fails. Angus> Anyway, here is the patch as it is, implementing stub versions Angus> of ISpell and of LyXComm. Something similar is needed for Angus> LyXSocket but I can't remember what the errors were when Angus> compiling with mingw, so will check again later. The LyXComm dummy implementation looks good (at least to me). Concerning the configure stuff, I do not like much checking directly against cached variables, but the alternative would probably by uglier. JMarc
Re: [PATCH] Re: [PATCH] Re: Adjusting table column alignment failed with cursor inside math
On Mon, 2005-04-25 at 15:04, Andre Poenitz wrote: > On Mon, Apr 25, 2005 at 12:52:54PM +0300, Martin Vermeer wrote: > > Nobody responded to the previous patch... is this one OK to commit? > > Fine with me. > > Andre' Committed. - Martin signature.asc Description: This is a digitally signed message part
RE: lyx-devel src/support/: ChangeLog userinfo.C development/W ...
> Modified files: > lyx-devel/src/support/: ChangeLog userinfo.C > lyx-devel/development/Win32/: win32_kludge.diff > > Log message: > Add Windows-specific code to userinfo.C. Under MSVC, the userinfo.C compile gives a PASCAL macro redefinition warning, the conflict being between windef.h and lmcons.h. If you switch the order of the #includes such that windows.h comes before lmcons.h, the warning goes away. FYI. Thanks Rob
Re: Various table trouble
Jean-Marc Lasgouttes wrote:
>> "Angus" == Angus Leeming <[EMAIL PROTECTED]>
>> writes:
>
> Angus> However, I wonder if it would not be nicer to have:
> [a getLFUN method]
Yes.
> Agreed. Also, I'd rather have a signature like
> virtual FuncStatus getStatus() const;
> since it is more in line with what LyXFunc does.
Yes, but we need only the boolean value here. Things like
virtual bool getStatus() const { return true; }
in ControlChanges.h would become more complicated, and we would need to
include FuncStatus.h in Dialog.h. Therefore I want to keep the current
signature.
I am going to apply the attached patch unless you insist on the FuncStatus
version.
GeorgIndex: src/frontends/controllers/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.473
diff -u -p -r1.473 ChangeLog
--- src/frontends/controllers/ChangeLog 19 Apr 2005 08:56:15 - 1.473
+++ src/frontends/controllers/ChangeLog 25 Apr 2005 15:50:20 -
@@ -1,3 +1,12 @@
+2005-04-25 Georg Baum <[EMAIL PROTECTED]>
+
+ * Dialog.h, ControlCharacter.h, ControlPrint.h, ControlSendto.h,
+ ControlTabular.h, ControlTabularCreate.h (getLfun): new, return the
+ lfun for applying the data
+ * Control*.C (dispatchParams): use getLfun where appropriate
+ * Dialog.[Ch], ControlChanges.h, ControlDocument.h (getStatus): new,
+ check wether the dialog data may be applied
+
2005-04-11 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* ControlDocument.C (dispatchParams): update the counters if
Index: src/frontends/controllers/ControlBox.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBox.C,v
retrieving revision 1.3
diff -u -p -r1.3 ControlBox.C
--- src/frontends/controllers/ControlBox.C 19 May 2004 15:11:30 - 1.3
+++ src/frontends/controllers/ControlBox.C 25 Apr 2005 15:50:20 -
@@ -47,7 +47,7 @@ void ControlBox::clearParams()
void ControlBox::dispatchParams()
{
string const lfun = InsetBoxMailer::params2string(params());
- kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+ kernel().dispatch(FuncRequest(getLfun(), lfun));
}
Index: src/frontends/controllers/ControlBranch.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBranch.C,v
retrieving revision 1.8
diff -u -p -r1.8 ControlBranch.C
--- src/frontends/controllers/ControlBranch.C 19 May 2004 15:11:30 - 1.8
+++ src/frontends/controllers/ControlBranch.C 25 Apr 2005 15:50:20 -
@@ -49,7 +49,7 @@ void ControlBranch::clearParams()
void ControlBranch::dispatchParams()
{
string const lfun = InsetBranchMailer::params2string(params());
- kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+ kernel().dispatch(FuncRequest(getLfun(), lfun));
}
Index: src/frontends/controllers/ControlChanges.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlChanges.h,v
retrieving revision 1.10
diff -u -p -r1.10 ControlChanges.h
--- src/frontends/controllers/ControlChanges.h 11 Oct 2004 14:29:14 - 1.10
+++ src/frontends/controllers/ControlChanges.h 25 Apr 2005 15:50:20 -
@@ -32,6 +32,8 @@ public:
virtual void dispatchParams() {}
///
virtual bool isBufferDependent() const { return true; }
+ /// always true since dispatchParams() is empty
+ virtual bool getStatus() const { return true; }
/// find the next merge chunk and highlight it
bool find();
Index: src/frontends/controllers/ControlCharacter.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCharacter.C,v
retrieving revision 1.50
diff -u -p -r1.50 ControlCharacter.C
--- src/frontends/controllers/ControlCharacter.C 5 Oct 2004 10:11:39 - 1.50
+++ src/frontends/controllers/ControlCharacter.C 25 Apr 2005 15:50:20 -
@@ -65,7 +65,7 @@ void ControlCharacter::dispatchParams()
string data;
if (font2string(*font_.get(), toggleall_, data)) {
- kernel().dispatch(FuncRequest(LFUN_FREEFONT_UPDATE, data));
+ kernel().dispatch(FuncRequest(getLfun(), data));
}
}
Index: src/frontends/controllers/ControlCharacter.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCharacter.h,v
retrieving revision 1.20
diff -u -p -r1.20 ControlCharacter.h
--- src/frontends/controllers/ControlCharacter.h 19 May 2004 15:11:30 - 1.20
+++ src/frontends/controllers/ControlCharacter.h 25 Apr 2005 15:50:20 -
@@ -34,6 +34,8 @@ public:
virtual void dispatchParams();
///
virtual bool isBufferDependent() const { return true; }
+ ///
+ virtual kb_action getLfun() const { return LFUN_TABULAR_INSERT; }
///
void
Re: fix bug 1542 in 1.3 completely
Georg Baum wrote:
> Jean-Marc Lasgouttes wrote:
>
>>> "Georg" == Georg Baum
>>>
<[EMAIL PROTECTED]>
>>> writes:
>>
>> Georg> Jean-Marc, bug 1542 is only fixed partially in 1.3 (we got a
>> Georg> new report two days ago): If you enter "&" in math mode it is
>> Georg> saved as "&", but it should be saved as "\&". Backporting the
>> Georg> fix from 1.4 is trivial, do you want me to do it?
>>
>> Yes, please.
>
> It turned out that the fix in 1.4 is incomplete: If you insert an '&'
> inside an mbox or textrm it is blue instead of black, but this is not the
> biggest problem: If you'll read such a file again you have suddenly a
> space behind the ampersand. The attached patch (against 1.4) fixes that,
> but I am not 100% sure wether it is correct.
It was not: spaces after & were swallowed. But I remember now that
text-in-math is waiting for the new mbox inset in 1.5 and is partly broken
both in 1.3 and 1.4 . Since this patch is a monotonous improvement over the
current situation (& in text-in-math always resulted in invalid latex
before, now it is correct in some cases and swallows spaces if there are
any) I suggest to apply the attached patch to 1.3.
OK?
GeorgIndex: status.13x
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.240
diff -u -p -r1.1.2.240 status.13x
--- status.13x 7 Apr 2005 10:20:36 - 1.1.2.240
+++ status.13x 8 Apr 2005 12:25:45 -
@@ -50,6 +50,8 @@ What's new
- Fix crash when reading equations containing more columns than allowed
[bug 1542].
+- Store typed '&' characters in math as '\&' [bug 1542].
+
- Make sure that the amsmath package is used in LaTeX output when
using the AMS-specific array environments and over/under arrows in
equations.
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.103
diff -u -p -r1.363.2.103 ChangeLog
--- lib/ChangeLog 25 Mar 2005 16:27:41 - 1.363.2.103
+++ lib/ChangeLog 8 Apr 2005 12:03:54 -
@@ -1,3 +1,7 @@
+2005-04-08 Georg Baum <[EMAIL PROTECTED]>
+
+ * lib/symbols: treat & as special character (fixes bug 1542 completely)
+
2005-03-25 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* layouts/revtex4.layout: indicate that the revtex4 class provides
Index: lib/symbols
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/symbols,v
retrieving revision 1.40.2.1
diff -u -p -r1.40.2.1 symbols
--- lib/symbols 28 Mar 2003 17:52:28 - 1.40.2.1
+++ lib/symbols 8 Apr 2005 12:03:55 -
@@ -766,6 +768,7 @@ explyxblacktext 0 0 f
} mathnormal0 0 special x
$ mathnormal0 0 special x
% mathnormal0 0 special x
+& mathnormal0 0 special x
# don't remove the space from the beginning of the next line
# mathnormal0 0 special x
Index: src/mathed/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.299.2.20
diff -u -p -r1.299.2.20 ChangeLog
--- src/mathed/ChangeLog 30 Mar 2005 09:16:05 - 1.299.2.20
+++ src/mathed/ChangeLog 8 Apr 2005 12:04:05 -
@@ -1,3 +1,8 @@
+2005-04-08 Georg Baum <[EMAIL PROTECTED]>
+
+ * math_cursor.C (interpret): treat & as special character (fixes
+ bug 1542 completely)
+
2005-03-30 Georg Baum <[EMAIL PROTECTED]>
* math_amsarrayinset.[Ch] (validate): new, require amsmath
Index: src/mathed/math_cursor.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Attic/math_cursor.C,v
retrieving revision 1.333.2.2
diff -u -p -r1.333.2.2 math_cursor.C
--- src/mathed/math_cursor.C 7 Dec 2004 10:49:50 - 1.333.2.2
+++ src/mathed/math_cursor.C 8 Apr 2005 12:04:05 -
@@ -1234,8 +1246,8 @@ bool MathCursor::interpret(char c)
return true;
}
- if (c == '$') {
- insert(createMathInset("$"));
+ if (c == '$' || c == '&') {
+ insert(createMathInset(string(1, c)));
return true;
}
Re: Various table trouble
Georg Baum wrote:
>> Angus> However, I wonder if it would not be nicer to have:
>> [a getLFUN method]
>
> Yes.
>
>> Agreed. Also, I'd rather have a signature like
>> virtual FuncStatus getStatus() const;
>> since it is more in line with what LyXFunc does.
>
> Yes, but we need only the boolean value here. Things like
>
> virtual bool getStatus() const { return true; }
>
> in ControlChanges.h would become more complicated, and we would need to
> include FuncStatus.h in Dialog.h. Therefore I want to keep the current
> signature.
> I am going to apply the attached patch
In the ChangeLog and in Dialog.[Ch]: s/wether/whether/
Other than that, it looks/feels good.
--
Angus
RE: lyx-devel src/support/: ChangeLog userinfo.C development/W ...
Rob Bearman wrote: >> Log message: >> Add Windows-specific code to userinfo.C. > > Under MSVC, the userinfo.C compile gives a PASCAL macro redefinition > warning, the conflict being between windef.h and lmcons.h. If you switch > the order of the #includes such that windows.h comes before lmcons.h, > the warning goes away. FYI. Thank you, Rob! -- Angus
Re: [PATCH 14x] build support/globbing.C only for XForms
Jean-Marc Lasgouttes wrote:
> Angus> Mmmm, but the ISpell class encapsulates our interaction with
> Angus> the external ispell process. Not being able to interact with
> Angus> this external process (no select(), different API to open
> Angus> pipes) is conceptually the same to the rest of LyX as being
> Angus> unable to launch the ispell process. In both cases all that
> Angus> matters is that ISpell tells the caller that we failed to
> Angus> launch ispell.
>
> What about turning your dummy ispell implementation into a SpellBase
> implementation (that is make it non-working instead of abstract)? Then
> ControlSpellCheck would just use a SpellBase instance when the rest
> fails.
>
> Angus> Anyway, here is the patch as it is, implementing stub versions
> Angus> of ISpell and of LyXComm. Something similar is needed for
> Angus> LyXSocket but I can't remember what the errors were when
> Angus> compiling with mingw, so will check again later.
>
> The LyXComm dummy implementation looks good (at least to me).
>
> Concerning the configure stuff, I do not like much checking directly
> against cached variables, but the alternative would probably by
> uglier.
>
> JMarc
Well, see how you like this, which extends the previous patch as you
suggest. It leads to the following variables being defined in config.h
/* Define to 1 if you have the `close' function. */
#define HAVE_CLOSE 1
/* Define to 1 if you have the `dup2' function. */
#define HAVE_DUP2 1
/* Define to 1 if you have the `read' function. */
#define HAVE_READ 1
/* Define to 1 if you have the `select' function. */
#define HAVE_SELECT 1
/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
/* Define to 1 if you have the `write' function. */
#define HAVE_WRITE 1
/* Define as 1 to use an external ispell process. */
#define USE_ISPELL 1
It also implements stubs for the lyxsocket as well if close(), read() or
write() are not defined.
--
AngusIndex: configure.ac
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.47
diff -u -p -r1.47 configure.ac
--- configure.ac 11 Mar 2005 10:49:09 - 1.47
+++ configure.ac 25 Apr 2005 16:22:35 -
@@ -288,10 +288,25 @@ dnl work correctly because of some confl
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(close dup2 lstat mkfifo mkstemp mktemp read readlink select socket write)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
+
+test x$ac_cv_func_dup2 = xyes -a x$ac_cv_func_select = xyes && {
+ ac_use_ispell=1
+ AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process.])
+} || {
+ ac_use_ispell=0
+ AC_DEFINE(USE_ISPELL, 0, [Define as 1 to use an external ispell process.])
+}
+
+AM_CONDITIONAL(USE_ISPELL, test $ac_use_ispell -eq 1)
+
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, \
+ test x$ac_cv_func_select = xyes -a x$ac_cv_func_socket = xyes)
+
+AM_CONDITIONAL(USE_SOCKTOOLS, test x$ac_cv_func_socket = xyes)
### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
Index: src/Makefile.am
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.224
diff -u -p -r1.224 Makefile.am
--- src/Makefile.am 31 Jan 2005 10:42:17 - 1.224
+++ src/Makefile.am 25 Apr 2005 16:22:35 -
@@ -4,7 +4,11 @@ DISTCLEANFILES += config.h libintl.h ver
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
@@ -51,6 +55,10 @@ BUILT_SOURCES = version.C
AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
+if USE_ISPELL
+ISPELL = ispell.C ispell.h
+endif
+
lyx_SOURCES = \
Bidi.C \
Bidi.h \
@@ -242,9 +250,7 @@ lyx_SOURCES = \
pariterator.C \
pariterator.h \
SpellBase.h \
- ispell.C \
- ispell.h \
- pspell.C \
+ $(ISPELL) pspell.C \
pspell.h \
rowpainter.C \
rowpainter.h \
Index: src/SpellBase.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/SpellBase.h,v
retrieving revision 1.9
diff -u -p -r1.9 SpellBase.h
--- src/SpellBase.h 20 Jan 2005 16:17:35 - 1.9
+++ src/SpellBase.h 25 Apr 2005 16:22:35 -
@@ -13,6 +13,7 @@
#ifndef SPELL_BASE_H
#define SPELL_BASE_H
+#include "gettext.h"
#include
class BufferParams;
@@ -20,6 +21,7 @@ class WordLangTuple;
/**
* Base class of all spell checker implementations.
+ * The class can be instantiated but will have no functionality.
*/
class SpellBase {
public:
@@ -43,22 +45,23 @@ public:
virtual ~SpellBase()
[PATCH 14x] using preprocessor guards
Basically this patch does nothing at all except protect #include statements with the appropriate #idef HAVE_FOO_H block. Just accounting in the lead up to a release IMO. OK? -- Angus guards.diff.gz Description: GNU Zip compressed data
Re: pch.h.gch messiness
Angus Leeming <[EMAIL PROTECTED]> writes: | The fact that the generated pch.h.gch is placed in the src tree rather than | the build tree means that using different compilers to make separate | builds is problematic. I get this warning: > | cc1plus: warning: ./../../../../../src/frontends/qt2/ui/pch.h.gch: created | on host `i686-pc-linux-gnu', but used on host `i386-redhat-linux-gnu' > | because I have a build-mingw-xcompile tree as well as my normal linux | build. Hmm, da hmm... Sure, if you can find a way to make this work, then we change to that. -- Lgb
[PATCH for 1.3.6] Fix translation for layout styles
Dear Jean-Marc, several styles defined in the *.layout files are not translatable, because their names contain underscores which are replaced by spaces at run-time. I have modified the corresponding layout files. Moreover, I have adjusted the po files for the 16 currently supported languages. This patch should be side-effect-free and allows us to translate about 25 additional messages. I have loaded some of LyX's examples file for the corresponding layouts - everythings seems to work just as before. If you don't have any objections, please commit the patch to the 1.3 branch. I will produce a similar patch for 1.4 next time I find some time. Kind regards, Michael patch-layout-1.3.gz Description: GNU Zip compressed data
