Re: tex2lyx on the wiki
On 22.02.05, Angus Leeming wrote: > G. Milde wrote: ... > >> $ sh make_tex2lyx_dist.sh . > >> > >> should build the package > > Here I got an error: > ?-I../../../../[src > The line marked '?' looks suspicious, no? It looks to me as if the '[' is > messing up the reading of the -DBOOST_USER_CONFIG argument. You got the finger at the point. I tried with > $ sh ./make_tex2lyx_dist.sh . > make.log 2>&1 and found the interesting message Building Makefile templates... . configure.ac: 6: required file `./[src/config.h].in' not found configure.ac: 6: required file `./[src/stamp-h.in' not found Thus I canged line 6 in configure.ac from AM_CONFIG_HEADER([src/config.h]) to AM_CONFIG_HEADER(src/config.h) and could pass this hurdle. Now it stops at the install (edited extract from the log file): /usr/bin/install: reguläre Datei .../lyx-cvs/devel/build-tex2lyx/LyX/share/lyx/reLyX/Text/Text/manpage.3pm" kann nicht angelegt werden: Datei oder Verzeichnis nicht gefunden /usr/bin/install: reguläre Datei .../lyx-cvs/devel/build-tex2lyx/LyX/share/lyx/reLyX/Text/Text/TeX.pm" kann nicht angelegt werden: Datei oder Verzeichnis nicht gefunden make[2]: *** [install-relyxtextDATA] Fehler 1 make[1]: *** [install-am] Fehler 2 make: *** [install-recursive] Fehler 1 Usage: make_tex2lyx_dist.sh make install failed Could this have to do with the old automake (GNU automake 1.4-p6) as mentioned by Angus? In the log, I see a lot of warnings/errors like Makefile.am:26: invalid variable `dist_noinst_DATA' lib/Makefile.am:906: invalid variable `dist_ui_DATA' lib/Makefile.am:727: invalid variable `dist_layouts_DATA' lib/Makefile.am:874: invalid variable `dist_templates_DATA' I will try a newer automake and report... Günter -- G.Milde web.de
Re: regression in mathed for unknown math environments
Jean-Marc Lasgouttes wrote:
> Is the class name mix intended?
Of course not. And it does not even compile. I removed insetcaption a long
time ago from Makefile.am, because it cannot be inserted from within LyX
anymore. It can be read from a .lyx file however, and I was too lazy to
check wether it can still slip through lyx2lyx. Therefore I did not simply
remove it. But as long as it is compiled it certainly needs a doClone()
method!
Updated patch attached.
GeorgIndex: src/insets/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.1113
diff -u -p -r1.1113 ChangeLog
--- src/insets/ChangeLog 22 Feb 2005 16:57:35 - 1.1113
+++ src/insets/ChangeLog 23 Feb 2005 08:53:23 -
@@ -1,3 +1,7 @@
+2005-02-23 Georg Baum <[EMAIL PROTECTED]>
+
+ * insetcaption.[Ch] (doClone): implement
+
2005-02-22 Georg Baum <[EMAIL PROTECTED]>
* insetgraphics.C (prepareFile): handle non-existing files
Index: src/insets/insetcaption.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.C,v
retrieving revision 1.58
diff -u -p -r1.58 insetcaption.C
--- src/insets/insetcaption.C 25 Nov 2004 19:13:03 - 1.58
+++ src/insets/insetcaption.C 23 Feb 2005 08:53:24 -
@@ -34,6 +34,7 @@
using lyx::support::bformat;
+using std::auto_ptr;
using std::endl;
using std::string;
using std::ostream;
@@ -138,7 +139,7 @@ int InsetCaption::latex(Buffer const & b
int InsetCaption::plaintext(Buffer const & /*buf*/,ostream & /*os*/,
OutputParams const & /*runparams*/) const
{
- // FIX: Implement me!
+ // FIXME: Implement me!
return 0;
}
@@ -151,4 +152,10 @@ int InsetCaption::docbook(Buffer const &
ret = InsetText::docbook(buf, os, runparams);
os << "\n";
return ret;
+}
+
+
+auto_ptr InsetCaption::doClone() const
+{
+ return auto_ptr(new InsetCaption(*this));
}
Index: src/insets/insetcaption.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.h,v
retrieving revision 1.24
diff -u -p -r1.24 insetcaption.h
--- src/insets/insetcaption.h 25 Nov 2004 19:13:03 - 1.24
+++ src/insets/insetcaption.h 23 Feb 2005 08:53:24 -
@@ -42,6 +42,9 @@ public:
///
int docbook(Buffer const & buf, std::ostream & os,
OutputParams const & runparams) const;
+private:
+ ///
+ virtual std::auto_ptr doClone() const;
};
Index: src/mathed/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.473
diff -u -p -r1.473 ChangeLog
--- src/mathed/ChangeLog 14 Feb 2005 15:28:45 - 1.473
+++ src/mathed/ChangeLog 23 Feb 2005 08:53:44 -
@@ -1,3 +1,9 @@
+2005-02-23 Georg Baum <[EMAIL PROTECTED]>
+
+ * math_parinset.[Ch] (doClone): Implement, avoids triggering the
+ assert in InsetBase::clone()
+ * ref_inset.[Ch] (clone): rename to doClone
+
2005-02-14 Angus Leeming <[EMAIL PROTECTED]>
* math_rootinset.C (idxUpDown): Silence an MSVC compiler warning
Index: src/mathed/math_parinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parinset.C,v
retrieving revision 1.34
diff -u -p -r1.34 math_parinset.C
--- src/mathed/math_parinset.C 7 Sep 2003 21:25:36 - 1.34
+++ src/mathed/math_parinset.C 23 Feb 2005 08:53:45 -
@@ -16,6 +16,9 @@
#include "support/std_ostream.h"
+using std::auto_ptr;
+
+
MathParInset::MathParInset(MathArray const & ar)
{
cells_[0] = ar;
@@ -47,4 +50,10 @@ void MathParInset::write(WriteStream & o
void MathParInset::infoize(std::ostream & os) const
{
os << "Type: Paragraph ";
+}
+
+
+auto_ptr MathParInset::doClone() const
+{
+ return auto_ptr(new MathParInset(*this));
}
Index: src/mathed/math_parinset.h
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parinset.h,v
retrieving revision 1.28
diff -u -p -r1.28 math_parinset.h
--- src/mathed/math_parinset.h 19 Aug 2003 13:00:55 - 1.28
+++ src/mathed/math_parinset.h 23 Feb 2005 08:53:45 -
@@ -31,6 +31,9 @@ public:
void infoize(std::ostream & os) const;
///
void write(WriteStream & os) const;
+private:
+ ///
+ virtual std::auto_ptr doClone() const;
};
#endif
Index: src/mathed/ref_inset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ref_inset.C,v
retrieving revision 1.49
diff -u -p -r1.49 ref_inset.C
--- src/mathed/ref_inset.C 24 Nov 2004 21:58:42 - 1.49
+++ src/mathed/ref_inset.C 23 Feb 2005 08:53:45 -
@@ -44,7 +44,7 @@ RefInset::RefInset(string const & data)
{}
-auto_ptr RefInset::clone() const
+auto_ptr RefInset::doClone() const
{
return auto_ptr(new RefInset(*this));
}
Index: src/mathed/ref_
Re: [PATCH] fix captions labelstring
Jean-Marc Lasgouttes wrote: > Breaking a paragraph in the userguide gives a delay of ~ 1sec on my > 2.8GHz Xeon. Not acceptable IMO. > > Here is an updated version of the patch (with lyxtext.h this time) for > people who want to play with it. A debug build (without gprof) gives a similar delay on a 700 MHz Athlon. It is of course faster on a Athlon(tm) XP 3200+, but still noticeable. This is still too slow IMO. Georg
Re: [Patch] Fix bug 1746: table dialog shows wrong settings when LaTeX-argument is entered
Martin Vermeer wrote: > On Tue, 2005-02-22 at 22:37, Georg Baum wrote: >> Nice idea, but IMHO impossible to implement correctly in finite time with >> a finite amount of code, because the special string is LaTeX and LaTeX is >> a mess. >> >> >> Georg > > For some definitions of "correctly", yes. I wouldn't go that far. It is > still the user's reponsibility to write correct LaTeX. Of course. But even "correct LaTeX" can be horrible. And if we do that, we should either understand "correct LaTeX" or don't go that way at all. We could reuse the tex2lyx table column parser for that, but it is still too much effort IMO. Georg
Re: The LyX licence
Dear Angus & all, allthough I only contributed to documentation and layout files I do (of course) agree to the suggested change. Cheers, Pit Angus Leeming wrote: > Dear all, > > please excuse the personal email, but I'm trying to do something about > the messy state of the LyX licence and need your help. > > LyX is currently licenced under the GPL with a huge hole blowing it > wide apart so that it could be linked against the closed source > XForms library. See http://www.lyx.org/about/license.php3. Legal > opinion has it that this exception does not apply only to the XForms > library. Instead, anything and everything is allowed to link against > the LyX source code, defeating the whole point and purpose of the > GPL. Moreover, the exception is no longer needed as XForms (and > indeed Qt) are available under the GPL. > > To make a messy situation even messier, it's not even certain whether > the current license is valid at all, as the necessary permissions may > not have been obtained before the change was made to the original > GPL. > > In light of all this, I'm asking whether I can have your permission to > add your names to http://www.lyx.org/blanket-permission.txt: > > "The following people hereby grant permission to licence their > contributions to LyX under the Gnu General Public Licence, version 2 > or later." > > so that we can have a permanent record of those people who have > contributed code to LyX and who are happy for this code to be > licenced under the GPL. > > Kind regards, > Angus > > ps, if you reply to lyx-devel@lists.lyx.org, we'll have a permanent > record of your response. -- Dr. Peter "Pit" Suetterlin http://www.astro.uu.nl/~suetter Sterrenkundig Instituut Utrecht Tel.: +31 (0)30 253 5225 [EMAIL PROTECTED]
Re: The LyX licence
On Tue, 22 Feb 2005 14:55:35 + Angus Leeming <[EMAIL PROTECTED]> wrote: > Dear all, > > please excuse the personal email, but I'm trying to do something about the > messy state of the LyX licence and need your help. > > LyX is currently licenced under the GPL with a huge hole blowing it wide > apart > so that it could be linked against the closed source XForms library. See > http://www.lyx.org/about/license.php3. Legal opinion has it that this > exception does not apply only to the XForms library. Instead, anything and > everything is allowed to link against the LyX source code, defeating the > whole point and purpose of the GPL. Moreover, the exception is no longer > needed as XForms (and indeed Qt) are available under the GPL. > > To make a messy situation even messier, it's not even certain whether the > current license is valid at all, as the necessary permissions may not have > been obtained before the change was made to the original GPL. > > In light of all this, I'm asking whether I can have your permission to add > your names to http://www.lyx.org/blanket-permission.txt: > > "The following people hereby grant permission to licence their contributions > to LyX under the Gnu General Public Licence, version 2 or later." > > so that we can have a permanent record of those people who have contributed > code to LyX and who are happy for this code to be licenced under the GPL. > > Kind regards, > Angus > > ps, if you reply to lyx-devel@lists.lyx.org, we'll have a permanent record of > your response. > That's fine with me: I hereby grant permission to licence my contributions to LyX under the GNU General Public Licence, version 2 or later. Eulogio Serradilla
Re: The LyX licence
Kayvan A. Sylvan wrote: > On Tue, Feb 22, 2005 at 08:52:31PM -0500, John Weiss wrote: >> On Tue, Feb 22, 2005 at 12:06:02PM +, Angus Leeming wrote: >> > Dear all, >> : >> : >> > In light of all this, I asking whether I can have your permission to >> > add your names to http://www.lyx.org/blanket-permission.txt: >> >> No. >> >> I have lately grown to detest FSF-Fundamentalism, and now refuse to >> GPL or LGPL anything of mine. But even beforehand, I preferred to >> release all of my code and documentation under the Artistic License. >> Any contributions I made to LyX (early reLyX, documentation) should >> therefore be considered as originally under the Artistic License. >> >> Make of that what you will. > > Hmmm... Okay... > > I'm not an FSFanatic, and I respect your choice to go with the Artistic > license. > > From a practical point of view, I don't think it changes much. > The Artistic License is more permissive than the GPL or LGPL, so anything > that can be done with a product under GPL is permitted under the Artistic > license. > > My conclusion is that the two licenses can co-exist (a few files under > the Artistic license and the rest under the GPL). > > Anyone have another opinion they want to share on this? I think that you're correct. The purpose of this request for permission to change the licence was twofold: 1. To make it clear legally what licence code contributed to LyX was licenced under. 2. To make the licence more restrictive than the published "GPL + XForms exception". So I'll add a section to blanket-permissions.txt The following people hereby grant permission to licence their contributions to LyX under the Artistic Licence http://www.opensource.org/licenses/artistic-license.php John Weiss <[EMAIL PROTECTED]> See lyx-devel list message entitled "The LyX licence" of 23 February 2005. -- Angus
lyx140cvs: make error?
After updating, configuring with ./configure --with-frontend=qt --with-version-suffix=-latestcvs, make and make install lyx-latestcvs referrd to /usr/local/share/lyx instead of /usr/local/share/lyx-latestcvs. -- Viele Grüße, Hartmut Hungerhilfe: http://www.thehungersite.com Das heutige Motto: You have many friends, and very few enemies.
Re: The LyX licence
> > In light of all this, I asking whether I can have your permission to add > your names to http://www.lyx.org/blanket-permission.txt: > yes you can -- Viele Grüße, Hartmut Hungerhilfe: http://www.thehungersite.com Das heutige Motto: The hardest thing is to disguise your feelings when you put a lot of relatives on the train for home.
Licencing clarification status report
It's quite interesting to see what happens when you post off a request into the ether and wait. So far, 45 people have responded and 56 haven't. The following people have agreed to the GPL: Asger Alstrup Heinrich Bauer Georg Baum Lars Gullik Bjønnes Johnathan Burchill Matej Cepl Matthias Kalle Dalheimer Hartmut Haase Bennett Helm Claus Hindsgaul Michal Jaegermann David L. Johnson Amir Karger Michael Koziarski Felix Kurth Rob Lahaye Jean-Marc Lasgouttes Angus Leeming Edwin Leuven John Levon José Matos Iñaki Larrañaga Murgoitio Daniel Naber Pablo De Napoli Allan Rae Garst R. Reese Christian Ridderstrom Michael Schmitt Eulogio Serradilla Lior Silberman Andre Spiegel Jürgen Spitzmüller John Spray Peter Suetterlin Kayvan Sylvan Reuben Thomas Dekel Tsur Matthias Ulrichs Marko Vendelin Martin Vermeer Jürgen Vigna Herbert Voss Andreas Vox Stephan Witt Henner Zeller The following people have agreed to the Artistic Licence: John Weiss The following people are yet to respond but appear to have valid email addresses: Alejandro Aguilar Sierra Pascal André Yves Bastide Hans Bausewein Alfredo Braunstein Albert Chin edscott Matthias Ettrich Baruch Even Ronald Florence Stefano Ghirlanda Helge Hafting Claus Hentschel Robert van der Kamp Victor Lavrenko Ling Li Roman Maurer Tino Meinen João Luis Meloni Assirati Carl Ollivier-Gooch Panayotis Papasotiriou Zvezdan Petkovic Kornelia Pietsch Geoffroy Piroux André Pönitz Alkis Polyzotis Thomas Pundt Adrien Rebollo Bernd Rellermeyer Michael Ressler Miyata Shigeru Ben Stanley David Suárez de Lis H. Turgut Uyar Pauli Virtanen Mate Wierdl Serge Winitzki Xiaokun Zhu The following people are yet to respond and may or may not be the right person (the address we have is invalid and the one I posted to is grabbed off the internet): Claudio Coco Bernard Michael Hurley Martin Konold Francesc Burrull i Mestres We don't have a valid email address for the following people: Maarten Afman Graham Biswell Christian Buescher John Michael Floyd Hartmut Goebel Bernhard Iselborn Peter Kremer Bernd Kümmerlen Dirk Niggemann Joacim Persson Hubert Schreier Ivan Schreter Edmar Wienskoski Jr. Huang Ying -- Angus
Re: The LyX licence
> "Amir" == Amir Karger <[EMAIL PROTECTED]> writes: Amir> I still check lyx.org every few months for nostalgia's sake. Amir> Best of luck with the devel efforts, and I'm still waiting for Amir> the day that someone tells me I ought to use this brand spanking Amir> new WYSIWYM document processor... Hello Amir, nice to hear from you again! Amir> -Amir Karger ps Don't know if I ever mentioned to most of you Amir> that I got my first job out of grad school because they Amir> basically asked just one question at the interview: can you do Amir> OO Perl? And I, having learned OO Perl to write reLyX, answered Amir> yes! Currently, one of the hot topics is getting rid of reLyX, since we have no perl hacker anymore :) JMarc
Re: regression in mathed for unknown math environments
> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes: Georg> Updated patch attached. Looks good. JMarc
Re: Change to lyxserver.C breaks win32_kludge.diff patch
> "Rob" == Rob Bearman <[EMAIL PROTECTED]> writes: Rob> Apologies if I'm unclear on protocol as I haven't heard back on Rob> this. Could my win32 patches please be applied if they're Rob> acceptable? If you send the patch to me again, I'll apply it. Sorry for the delay. JMarc
Re: [PATCH] fix display problem with displayed include inset.
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Jean-Marc Lasgouttes wrote: >> This patch fixes the following bug: >> >> 1/ create an InsetInclude with type 'include' >> >> 2/ place the cursor after the inset and hit >> >> 3/ see how the button turned into a small white square. >> >> The following patch fixes it here. Angus, I'd appreciate your >> comments on whether it is the right way to do it. Angus> I'm not sure :-( Probably. Clearly the existing code is wrong. Note that this problem has nothing to do with previewing, since it still happens with previews off. So I suggest to commit it anyway. OK? JMarc
Re: [PATCH] fix display problem with displayed include inset.
Jean-Marc Lasgouttes wrote: > Angus> Jean-Marc Lasgouttes wrote: >>> This patch fixes the following bug: >>> >>> 1/ create an InsetInclude with type 'include' >>> >>> 2/ place the cursor after the inset and hit >>> >>> 3/ see how the button turned into a small white square. >>> >>> The following patch fixes it here. Angus, I'd appreciate your >>> comments on whether it is the right way to do it. > > Angus> I'm not sure :-( Probably. Clearly the existing code is wrong. > > Note that this problem has nothing to do with previewing, since it > still happens with previews off. So I suggest to commit it anyway. OK? Sure. One thing I'm sure of is that the previewing code needs a bit of an overhaul. To be honest, it could do with some documentation detailing its design (which will probably improve its design ;-)). As could the graphics loading and child process handling code on which it is based. Ur. Whilst we're at it, the external inset code could do with some docs too. Ur times two. -- Angus
Re: [PATCH] fix captions labelstring
Georg Baum <[EMAIL PROTECTED]> writes: | Jean-Marc Lasgouttes wrote: > >> Breaking a paragraph in the userguide gives a delay of ~ 1sec on my >> 2.8GHz Xeon. Not acceptable IMO. >> >> Here is an updated version of the patch (with lyxtext.h this time) for >> people who want to play with it. > | A debug build (without gprof) gives a similar delay on a 700 MHz Athlon. It | is of course faster on a Athlon(tm) XP 3200+, but still noticeable. | This is still too slow IMO. Ok, then we need find some simple ways of speeding it up. Preferably a way that has little or now impact on other code. -- Lgb
Re: ACM SIG Proceedings Format Layout
> "Luke" == Luke Simon <[EMAIL PROTECTED]> writes: Hi Luke, Luke> I might have left some things out, but initial testing seems to Luke> show that it works good enough for a paper that includes a Luke> varied mix of environments. Is this the working one? You sent another message later about babel-related problems... Luke> One aspect that is lacking in both IEEETran.layout and therefore Luke> the layout that I made is multiple author affiliations. I am not Luke> sure how to do this correctly in the layout or if it is even Luke> supported by LyX. Currently I just use a free "TeX" LyX Luke> environment to embed the correct code to make things work in the Luke> case of multiple affiliations. What does the code look like? Luke> Almost forgot to attach the layout. Feel free to modify/whatever Luke> this layout as it is just a modification of the LyX team's file, Luke> and please if you have any suggestions for improvement, let me Luke> know. A few remarks: - the cls file says that on 9pt size is possible. You should change the size options to reflect that, probably - the package includes amsmath.sty. Add ProvidesAmsMaths 1 somewhere at the beginning ot the layout file. - regarding the comment about non numeric numbering for sections being available in LyX 2.0: hopefully it will work in 1.4.0 :) Luke> As far as the LyX devs are concerned, please considering Luke> including this or some other implemenation of an ACM layout in Luke> the default LyX distro. I would be glad to incude this in LyX. I will need a small entry for LaTeXConfig.lyx.in (look in the file to see how layout files are described) and, even better, a little documentation for Extended.lyx. Luke> Also, why aren't IEEETran.cls, elsart.cls, and other class files Luke> included with the default distro? If their layouts are included Luke> by default, then their class files should also be included, in Luke> my opinion. We try to avoid distributing such things, since this is asking for trouble. Basically, LyX supports the latex installation that people have. JMarc
Re: The LyX licence
On Tue, Feb 22, 2005 at 08:52:31PM -0500, John Weiss wrote: > GPL or LGPL anything of mine. But even beforehand, I preferred to > release all of my code and documentation under the Artistic License. Which one, the original artistic license, or the clarified one? Thankfully, the latter is compatible with the GPL, so the situation will not change and we can happily GPL all of LyX. The former is too vague to be useful. regards john
Re: The LyX licence
Angus Leeming <[EMAIL PROTECTED]> writes: | Kayvan A. Sylvan wrote: > >> On Tue, Feb 22, 2005 at 08:52:31PM -0500, John Weiss wrote: >>> On Tue, Feb 22, 2005 at 12:06:02PM +, Angus Leeming wrote: >>> > Dear all, >>> : >>> : >>> > In light of all this, I asking whether I can have your permission to >>> > add your names to http://www.lyx.org/blanket-permission.txt: >>> >>> No. You just made it a lot harder for us. >>> I have lately grown to detest FSF-Fundamentalism, and now refuse to >>> GPL or LGPL anything of mine. Which, IMHO, is just another kindo of fundamentalism... >>> But even beforehand, I preferred to >>> release all of my code and documentation under the Artistic License. >>> Any contributions I made to LyX (early reLyX, documentation) should >>> therefore be considered as originally under the Artistic License. No, you played by the rules then. You are not allowed to change them now. >> From a practical point of view, I don't think it changes much. >> The Artistic License is more permissive than the GPL or LGPL, so anything >> that can be done with a product under GPL is permitted under the Artistic >> license. >> >> My conclusion is that the two licenses can co-exist (a few files under >> the Artistic license and the rest under the GPL). If we are not allowed to relicense John's contributions then we cannot use his contributions. And it would be rather rude of us to relicense without permission, even if the Artistic License allows it. >> Anyone have another opinion they want to share on this? > | I think that you're correct. The purpose of this request for permission to | change the licence was twofold: > | 1. To make it clear legally what licence code contributed to LyX was | licenced under. | 2. To make the licence more restrictive than the published "GPL + XForms | exception". > | So I'll add a section to blanket-permissions.txt > | The following people hereby grant permission to licence their | contributions to LyX under the Artistic Licence | http://www.opensource.org/licenses/artistic-license.php We really cannot have this... We cannot have parts of code with GPL and others with artistic-license in the _same_ file. I am afraid that, by taking this stance, Johan has alienated himself from LyX development. -- Lgb
Re: regression in mathed for unknown math environments
Jean-Marc Lasgouttes wrote: >> "Georg" == Georg Baum >> <[EMAIL PROTECTED]> >> writes: > > Georg> Updated patch attached. > > Looks good. This is in. Now I'm waiting for André to explain the math_parser change, then this regression is gone! Georg
Re: The LyX licence
On Wed, Feb 23, 2005 at 01:01:24PM +0100, Lars Gullik Bj?nnes wrote: > We cannot have parts of code with GPL and others with artistic-license > in the _same_ file. Sure we can. Why not? We merely need to note that certain portions are licensed under the artistic license as well as the GPL. Note that by contributing, he was bound by the GPL+xforms license we had, and the xforms exception doesn't appear to be relevant to what he contributed to. Therefore, his contributions are ALREADY probably under the GPL. Anyway, it's inconvenient, and utterly silly, but there is no disputing that he's the copyright holder on his contributions. regards john
Re: The LyX licence
John Levon <[EMAIL PROTECTED]> writes: | On Wed, Feb 23, 2005 at 01:01:24PM +0100, Lars Gullik Bj?nnes wrote: > >> We cannot have parts of code with GPL and others with artistic-license >> in the _same_ file. > | Sure we can. Why not? We merely need to note that certain portions are | licensed under the artistic license as well as the GPL. This is not aceptable to me. No. It is not up to us to dual license. That is up to the author. If John, or anyone else, has a patch that _do not_ derive from LyX code. (And how to you make that patch, hmm?) Then he would be free to dual license it... but we are free to pick the correct license for our usage: GPL. | Note that by | contributing, he was bound by the GPL+xforms license we had, and the | xforms exception doesn't appear to be relevant to what he contributed | to. Right. | Therefore, his contributions are ALREADY probably under the GPL. Anyway, | it's inconvenient, and utterly silly, but there is no disputing that | he's the copyright holder on his contributions. Yes, they are. He is copyright holder, but if his contributions are to be i the LyX sources they have to be GPL. -- Lgb
Re: The added space patch
On Tue, Feb 22, 2005 at 08:09:46AM +0100, Juergen Spitzmueller wrote: > > There's still one regression from 1.3.x I found: clicking on the space > > to the right of a full line will place the cursor on the next line, not > > the end of the current line. > > I could probably fix it (in insettext::getCursorPos), if I knew how to check > for this very position. Any ideas? Can we file a bug onto the 1.4.0 radar? I agree with Lars it's not a *required* fix for 1.4.0, but it would be nice john
Re: tex2lyx on the wiki
On 22.02.05, Frederic-Emmanuel PICCA wrote: > If it was like for me the default automake in devian is 1.4 and you need > a newer one. > > I tried with automake 1.7, and it was ok. > I saw the difference during the ./autogen.sh > > lots of warning/errors with 1.4 > everythings ok with 1.7 The same for me. With automake1.7 and the before-mentioned change in configure.ac, I managed to build tex2lyx. Added the debian-testing binary-tarball to the wiki http://wiki.lyx.org/LaTeX/LatexToLyx > I asked for this information in the INSTALL file. but I do not know if > someone made the change. I added documentation about this to the wiki page too (in subsection "Setting up the build environment on an Linux distribution"). Hope this helps people trying next. Günter -- G.Milde web.de
Re: The added space patch
John Levon wrote: > Can we file a bug onto the 1.4.0 radar? I agree with Lars it's not a > *required* fix for 1.4.0, but it would be nice Yes, please do do. Jürgen
Re: The LyX licence
Angus Leeming wrote: In light of all this, I asking whether I can have your permission to add your names to http://www.lyx.org/blanket-permission.txt: Fine with me. I don't know if I have any _code_ in lyx, but I've done some translation. Helge Hafting
Re: The LyX licence
Angus Leeming <[EMAIL PROTECTED]> writes: > > Kayvan A. Sylvan wrote: > > > On Tue, Feb 22, 2005 at 08:52:31PM -0500, John Weiss wrote: Hi John! How's your job going? > >> Any contributions I made to LyX (early reLyX, documentation) should > >> therefore be considered as originally under the Artistic License. > >> > >> Make of that what you will. > > > > I think that you're correct. The purpose of this request for permission to > change the licence was twofold: > > 1. To make it clear legally what licence code contributed to LyX was > licenced under. > 2. To make the licence more restrictive than the published "GPL + XForms > exception". > > So I'll add a section to blanket-permissions.txt > > The following people hereby grant permission to licence their > contributions to LyX under the Artistic Licence > http://www.opensource.org/licenses/artistic-license.php I'm afraid that this will not be practical. It's ok to have separate file with different licences, but mixing will be difficult. First there's the documentation clause: 3. You may otherwise modify your copy of this Package in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: a) place your modifications in the Public Domain or otherwise make them Freely Available, ... Since in LyX we don't document changes per file but in separate Changelogs, this will only be practical for a few isolated files under the Artistic Licence. The other problem would be how to interpret the definition of this licence: * What's the 'package' of a contribution to LyX? * What is the 'standard version'? Is the usual development of LyX working on the standard version or does it constitute a derived version? So I'd stick with the GPL in large and only put single files under another licence. If a copyright holder insists that his/her changes to an existing GPL'd file shall fall under a different licence, they have to be convinced that this is not possible (I'm not sure if GPL would alow this!) Conclusion: If anyone wants to have their contribution under a different licence, they have to provide this contribution in an isolated file. For John's contributions it would be possible to put reLyX and the docs under the Artistic licence, but then all the other contributers would have to agree :-( In doubt I'd stick with the licence which first appeard in file -- if someone changes the file later, they have to accept the existing licence. Ciao /Andreas BTW, John: The Artistic preamble says "... such that the Copyright Holder maintains some semblance of artistic control over the development of the package ..." In a fast developing project as LyX the best way to maintain this control would be to keep contributing and to join the discussions, no? ;-)
Re: regression in mathed for unknown math environments
Georg Baum wrote: > This is in. Now I'm waiting for André to explain the math_parser change, > then this regression is gone! This also fixes bug 1791. Good work! Jürgen > Georg
Re: configure.ac problem (was tex2lyx on the wiki)
Building tex2lyx on my Debian/testing system required 2 changes: --- /home/milde/downloads/lyx-cvs/devel/configure.ac.1442005-02-23 13:32:17.0 +0100 +++ /home/milde/downloads/lyx-cvs/devel/configure.ac2005-02-22 16:58:30.0 +0100 @@ -3,7 +3,7 @@ AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) -AM_CONFIG_HEADER([src/config.h]) +AM_CONFIG_HEADER(src/config.h) AC_CONFIG_AUX_DIR(config) and the upgrading of automake to version 1.7 What is the meaning of the []-s in the original line? Are they needed? Would the line be understood unchanged by automake 1.7? Günter -- G.Milde web.de
Re: configure.ac problem (was tex2lyx on the wiki)
G. Milde wrote: > Building tex2lyx on my Debian/testing system required 2 changes: > > --- /home/milde/downloads/lyx-cvs/devel/configure.ac.144 2005-02-23 > 13:32:17.0 +0100 > +++ /home/milde/downloads/lyx-cvs/devel/configure.ac 2005-02-22 > 16:58:30.0 +0100 @@ -3,7 +3,7 @@ > AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org) > AC_PREREQ(2.52) > AC_CONFIG_SRCDIR(src/main.C) > -AM_CONFIG_HEADER([src/config.h]) > +AM_CONFIG_HEADER(src/config.h) > > AC_CONFIG_AUX_DIR(config) > > > and the upgrading of automake to version 1.7 > > What is the meaning of the []-s in the original line? They are 'quotes' that are needed by versions of automake > 1.4. Higher versions complain progressively more loudly if they are not present. > Are they needed? Yes. We don't support automake 1.4. I can probably add a test for this to autogen.sh. > Would the line be understood unchanged by automake 1.7? Yes. (Try ;-) > Günter -- Angus
Re: tex2lyx on the wiki
G. Milde wrote: > The same for me. With automake1.7 and the before-mentioned change in > configure.ac, I managed to build tex2lyx. > > Added the debian-testing binary-tarball to the wiki > >http://wiki.lyx.org/LaTeX/LatexToLyx > >> I asked for this information in the INSTALL file. but I do not know if >> someone made the change. > > I added documentation about this to the wiki page too (in subsection > "Setting up the build environment on an Linux distribution"). Hope this > helps people trying next. > > Günter Thanks, Günter! -- Angus
Re: [PATCH] fix captions labelstring
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: > > To be more precise, 96% of the time spent in updateCounters is due to > ParIterator::operator++(int). Does this change if you use the preincrement operator instead? I'm not sure how much overhead comes from the initialisation of the temporary ParIterator object. Ciao /Andreas
Re: The LyX licence
Andreas Vox <[EMAIL PROTECTED]> writes: | So I'd stick with the GPL in large and only put single files under another | licence. If a copyright holder insists that his/her changes to an existing | GPL'd file shall fall under a different licence, they have to be convinced | that this is not possible (I'm not sure if GPL would alow this!) > | Conclusion: | If anyone wants to have their contribution under a different licence, they | have to provide this contribution in an isolated file. Note that the file would have to be freestanding as well and not build upon any other LyX code, because then it is GPL automatically. And if that is unacceptable for the author then we cannot allow the patch/file. -- Lgb
Re: configure.ac problem
"G. Milde" <[EMAIL PROTECTED]> writes: | and the upgrading of automake to version 1.7 Whitch probably would have taken care of all the errors. > | What is the meaning of the []-s in the original line? It is a m4 way of quoting. | Are they needed? > | Would the line be understood unchanged by automake 1.7? Yes. -- Lgb
Re: [PATCH] fix captions labelstring
> "Andreas" == Andreas Vox <[EMAIL PROTECTED]> writes: Andreas> Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: >> To be more precise, 96% of the time spent in updateCounters is due >> to ParIterator::operator++(int). Andreas> Does this change if you use the preincrement operator Andreas> instead? I'm not sure how much overhead comes from the Andreas> initialisation of the temporary ParIterator object. This is the ++it operator (I may have the notation wrong above). The overhead really somce from DocIterator::forwardPar(). JMarc
Re: configure.ac problem (was tex2lyx on the wiki)
On 23.02.05, Angus Leeming wrote: > We don't support automake 1.4. I can probably add a test for this to > autogen.sh. Please do, as at least with Debian automake 1.4 is still the default version (even in testing). Günter -- G.Milde web.de
Re: ACM SIG Proceedings Format Layout
On Wed, 23 Feb 2005, Jean-Marc Lasgouttes wrote: > Luke> Also, why aren't IEEETran.cls, elsart.cls, and other class files > Luke> included with the default distro? If their layouts are included > Luke> by default, then their class files should also be included, in > Luke> my opinion. > > We try to avoid distributing such things, since this is asking for > trouble. Basically, LyX supports the latex installation that people > have. What about uploading these to the wiki (or simply place links to them from the wiki). That way they wouldn't come with the distribution, but would be easy to find (via the wiki)? /Christian PS. As usual with placing files/links/information on the wiki you'll have the problem of not knowing if it is "authentic" since anyone can upload files or add/modify links. In theory, I guess someone could make an "evil" IEETran.cls which hacks your system when you use it... In practice I don't think this is a problem though. -- Christian Ridderström, +46-8-768 39 44 http://www.md.kth.se/~chr
Re: ACM SIG Proceedings Format Layout
> "chr" == chr <[EMAIL PROTECTED]> writes: chr> On Wed, 23 Feb 2005, Jean-Marc Lasgouttes wrote: Luke> Also, why aren't IEEETran.cls, elsart.cls, and other class files Luke> included with the default distro? If their layouts are included Luke> by default, then their class files should also be included, in Luke> my opinion. >> We try to avoid distributing such things, since this is asking for >> trouble. Basically, LyX supports the latex installation that people >> have. chr> What about uploading these to the wiki (or simply place links to chr> them from the wiki). That way they wouldn't come with the chr> distribution, but would be easy to find (via the wiki)? The document Help>LaTeX Configuration already gives this information. JMarc
[PATCH] Enforce automake > 1.4
Given that "Debian unstable" ships with automake 1.4 by default and that "Debian testing" and "Debian stable" do the same, I'd like to propose the following patch to autogen.sh. Ok? Angus Index: autogen.sh === RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v retrieving revision 1.54 diff -u -p -r1.54 autogen.sh --- autogen.sh 26 May 2004 20:26:09 - 1.54 +++ autogen.sh 23 Feb 2005 13:08:14 - @@ -6,12 +6,27 @@ AUTOMAKE="automake -a -c --foreign" AUTOCONF="autoconf" ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4" +# Discover what version of automake we are using. +automake_version=`$AUTOMAKE --version | head -n 1` +echo "Using $automake_version" + +case $automake_version in +*' '1\.[5-7].*) + ;; +*) + + echo "This automake version is not supported by LyX." + echo "LyX only supports automake 1.[5-7]." + exit + ;; +esac + # Discover what version of autoconf we are using. autoversion=`$AUTOCONF --version | head -n 1` - echo "Using $autoversion" + case $autoversion in -*2.5[2-9]) +*' '2\.5[2-9]) EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4" ;; *) -- Angus
Re: ACM SIG Proceedings Format Layout
On Wed, 23 Feb 2005, Jean-Marc Lasgouttes wrote: > > "chr" == chr <[EMAIL PROTECTED]> writes: > > chr> On Wed, 23 Feb 2005, Jean-Marc Lasgouttes wrote: > Luke> Also, why aren't IEEETran.cls, elsart.cls, and other class files > Luke> included with the default distro? If their layouts are included > Luke> by default, then their class files should also be included, in > Luke> my opinion. > >> We try to avoid distributing such things, since this is asking for > >> trouble. Basically, LyX supports the latex installation that people > >> have. > > chr> What about uploading these to the wiki (or simply place links to > chr> them from the wiki). That way they wouldn't come with the > chr> distribution, but would be easy to find (via the wiki)? > > The document Help>LaTeX Configuration already gives this information. True, I'd forgotten about that... not much point in uploading the files to the wiki either then, but perhaps we should somehow make it more clear that people need to look in Help->LaTeX Configuration when they need stuff like this? /Christian -- Christian Ridderström, +46-8-768 39 44 http://www.md.kth.se/~chr
Re: [PATCH] Enforce automake > 1.4
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Given that "Debian unstable" ships with automake 1.4 by default Angus> and that "Debian testing" and "Debian stable" do the same, I'd Angus> like to propose the following patch to autogen.sh. It seems reasonable. Angus> +case $automake_version in + *' '1\.[5-7].*) + ;; + *) Are you sure you need the "\."? This is globbing, not regexps. Also, update INSTALL to explain the requirement. AFAIK they are autoconf 2.5x automake >= 1.5 gettext >=0.12 If you feel like it, you could also update the part about gcc version :) JMarc
Re: [PATCH] Enforce automake > 1.4
Jean-Marc Lasgouttes wrote:
>> "Angus" == Angus Leeming <[EMAIL PROTECTED]>
>> writes:
>
> Angus> Given that "Debian unstable" ships with automake 1.4 by default
> Angus> and that "Debian testing" and "Debian stable" do the same, I'd
> Angus> like to propose the following patch to autogen.sh.
>
> It seems reasonable.
>
> Angus> +case $automake_version in + *' '1\.[5-7].*) + ;; + *)
>
> Are you sure you need the "\."? This is globbing, not regexps.
It appears that you are right. Thanks.
> Also, update INSTALL to explain the requirement. AFAIK they are
>
> autoconf 2.5x
> automake >= 1.5
> gettext >=0.12
>
> If you feel like it, you could also update the part about gcc version :)
Let me see...
> JMarc
$ cat trial.sh
#! /bin/sh
test_it() {
case "$1" in
*' '1.[5-7]*)
echo "Can use $1"
;;
*)
echo "Cannot use $1"
;;
esac
}
automake_16="automake (GNU automake) 1.6.3
Written by Tom Tromey <[EMAIL PROTECTED]>.
Copyright 2002 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE."
automake_14="automake (GNU automake) 1.4-p6
Copyright (C) 1999, 2001 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE."
automake_16=`echo "$automake_16" | head -n1`
automake_14=`echo "$automake_14" | head -n1`
test_it "$automake_16"
test_it "$automake_14"
--
Angus
[PATCH 1.3.x] missing space with 'et al.'
For information: I am going to apply the following path for 1.3.x.
Should be straightforward enough...
It only all bugs were so easy!
JMarc
Index: status.13x
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Attic/status.13x,v
retrieving revision 1.1.2.232
diff -u -p -r1.1.2.232 status.13x
--- status.13x 21 Feb 2005 10:10:17 - 1.1.2.232
+++ status.13x 23 Feb 2005 14:27:00 -
@@ -79,6 +79,8 @@ What's new
- Semantic improvements in the Insert>Cross reference dialog.
+- Fix display of citations when using 'et al.'
+
- Fix server function server-get-tip [Bug 1781]
Index: src/frontends/controllers/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.273.2.12
diff -u -p -r1.273.2.12 ChangeLog
--- src/frontends/controllers/ChangeLog 28 Jan 2005 15:12:56 - 1.273.2.12
+++ src/frontends/controllers/ChangeLog 23 Feb 2005 14:27:00 -
@@ -1,3 +1,8 @@
+2005-02-23 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * biblio.C (getAbbreviatedAuthor): add missing space before `et
+ al.' in the non boost:format case
+
2005-01-17 Angus Leeming <[EMAIL PROTECTED]>
* tex_helpers.C (rescanTexStyles): prepend the name of the
Index: src/frontends/controllers/biblio.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/biblio.C,v
retrieving revision 1.44.2.1
diff -u -p -r1.44.2.1 biblio.C
--- src/frontends/controllers/biblio.C 7 Dec 2004 10:49:05 - 1.44.2.1
+++ src/frontends/controllers/biblio.C 23 Feb 2005 14:27:00 -
@@ -106,7 +106,7 @@ string const getAbbreviatedAuthor(InfoMa
if (authors.size() == 2)
msg = familyName(authors[0]) + _(" and ") + familyName(authors[1]);
else if (authors.size() > 2)
- msg = familyName(authors[0]) + _("et al.");
+ msg = familyName(authors[0]) + _(" et al.");
else
msg = familyName(authors[0]);
return msg;
[PATCH] fix bug 1824
We currently recognize warnings from pdftex as errors. This is no regression
and no crash, but the fix should IMO go in (probably for 1.3, too), because
it is very simple.
OK?
GeorgIndex: src/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2127
diff -u -p -r1.2127 ChangeLog
--- src/ChangeLog 22 Feb 2005 11:41:21 - 1.2127
+++ src/ChangeLog 23 Feb 2005 14:32:18 -
@@ -1,3 +1,7 @@
+2005-02-23 Georg Baum <[EMAIL PROTECTED]>
+
+ * LaTeX.C (scanLogFile): recognize pdfTeX warnings
+
2005-02-14 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* BufferView.C (setCursor): change to use a DocIterator.
Index: src/LaTeX.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeX.C,v
retrieving revision 1.108
diff -u -p -r1.108 LaTeX.C
--- src/LaTeX.C 31 Jan 2005 10:42:17 - 1.108
+++ src/LaTeX.C 23 Feb 2005 14:32:33 -
@@ -545,7 +544,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
if (token.empty())
continue;
- if (prefixIs(token, "LaTeX Warning:")) {
+ if (prefixIs(token, "LaTeX Warning:") ||
+ prefixIs(token, "! pdfTeX warning")) {
// Here shall we handle different
// types of warnings
retval |= LATEX_WARNING;
Re: [PATCH] Enforce automake > 1.4
Jean-Marc Lasgouttes wrote:
> Angus> Given that "Debian unstable" ships with automake 1.4 by default
> Angus> and that "Debian testing" and "Debian stable" do the same, I'd
> Angus> like to propose the following patch to autogen.sh.
>
> It seems reasonable.
>
> Angus> +case $automake_version in + *' '1\.[5-7].*) + ;; + *)
>
> Are you sure you need the "\."? This is globbing, not regexps.
>
> Also, update INSTALL to explain the requirement. AFAIK they are
>
> autoconf 2.5x
> automake >= 1.5
> gettext >=0.12
>
> If you feel like it, you could also update the part about gcc version :)
>
> JMarc
Updated patch attached. I've documented INSTALL and check for gettext and
automake in autogen.sh
--
AngusIndex: INSTALL
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/INSTALL,v
retrieving revision 1.60
diff -u -p -r1.60 INSTALL
--- INSTALL 26 Oct 2004 21:16:41 - 1.60
+++ INSTALL 23 Feb 2005 14:41:47 -
@@ -29,9 +29,11 @@ These four steps will compile, test and
Note for CVS checkouts
--
-If you have checked this out from CVS, you need to have
-automake, autoconf, and gettext installed. Then,
-type "./autogen.sh" to build the needed configuration
+If you have checked this out from CVS, you need to have:
+* automake >= 1.5
+* autoconf >= 2.52
+* gettext >= 0.12
+Then type "./autogen.sh" to build the needed configuration
files and proceed as stated below.
You will also probably need GNU m4 (perhaps installed as gm4).
@@ -41,16 +43,17 @@ Requirements
First of all, you will also need a recent C++ compiler, where recent
means that the compilers are close to C++ standard conforming.
-Compilers that are known to compile LyX are egcs 1.1.x, gcc 2.95.x and
-later, and Digital C++ version 6.1 and later. Please tell us your
-experience with other compilers. It is _not_ possible to compile LyX
-with gcc 2.7.x and 2.8.x, and this is not likely to change in the
-future.
+Compilers that are known to compile LyX are gcc 2.95.x and later
+and Digital C++ version 6.1 and later. Please tell us your experience
+with other compilers.
-Note that, contrary to LyX 1.0.x, LyX 1.3.x makes great use of C++
-Standard Template Library (STL); this means that gcc users will have
-to install the relevant libstdc++ library to be able to compile this
-version.
+It is _not_ possible to compile LyX with gcc 2.7.x and 2.8.x.
+
+LyX 1.4.x makes great use of C++ Standard Template Library (STL).
+This means that gcc users will have to install the relevant libstdc++
+library to be able to compile this version of LyX. Users of gcc 2.95.x
+will have to install the STLPort version of these libraries as the
+ones that come with gcc 2.95.x are too broken for us to use.
* xforms frontend
Index: autogen.sh
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.54
diff -u -p -r1.54 autogen.sh
--- autogen.sh 26 May 2004 20:26:09 - 1.54
+++ autogen.sh 23 Feb 2005 14:41:47 -
@@ -6,12 +6,59 @@ AUTOMAKE="automake -a -c --foreign"
AUTOCONF="autoconf"
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
+# Discover what version of gettext we are using.
+gettext_version=`gettext --version 2>/dev/null | head -n 1`
+
+test "$gettext_version" != "" && {
+echo "Using $gettext_version"
+} || {
+echo "LyX requires getttext >= 0.12"
+exit
+}
+
+case $gettext_version in
+*' '0.1[2-4]*)
+ ;;
+*)
+ echo "This gettext version is not supported by LyX."
+ echo "LyX supports only gettext 0.1[2-4]."
+ exit
+ ;;
+esac
+
+# Discover what version of automake we are using.
+automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+
+test "$automake_version" != "" && {
+echo "Using $automake_version"
+} || {
+echo "LyX requires automake >= 1.5"
+exit
+}
+
+case $automake_version in
+*' '1.[5-7]*)
+ ;;
+*)
+
+ echo "This automake version is not supported by LyX."
+echo "LyX only supports automake 1.[5-7]."
+exit
+;;
+esac
+
# Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version | head -n 1`
+autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
-echo "Using $autoversion"
+test "$autoversion" != "" && {
+echo "Using $autoversion"
+} || {
+echo "LyX requires autoconf >= 2.52"
+exit
+}
+
case $autoversion in
-*2.5[2-9])
+*' '2.5[2-9])
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;;
*)
Re: [PATCH] Enforce automake > 1.4
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Updated patch attached. I've documented INSTALL and check for Angus> gettext and automake in autogen.sh Very good work Angus. JMarc
RE: Change to lyxserver.C breaks win32_kludge.diff patch
> If you send the patch to me again, I'll apply it. Sorry for the delay. > > JMarc > Thank you! Here they are again, including my comments: win32_kludge.diff - This is the fixed development\win32\win32_kludge.diff file (a replacement for the existing file, not a diff of the diff file). msvc.diff - Fixes package.C with the changes specified earlier by Angus, and updates the .vcproj file win32config.diff - This patches development\win32\configure.h to define PACKAGE as "lyx" rather than "lyx-1.4.0cvs" Thanks Rob win32config.diff Description: win32config.diff msvc.diff Description: msvc.diff win32_kludge.diff Description: win32_kludge.diff
Re: [PATCH] fix captions labelstring
Am 23.02.2005 um 13:57 schrieb Jean-Marc Lasgouttes: Andreas> Does this change if you use the preincrement operator Andreas> instead? I'm not sure how much overhead comes from the Andreas> initialisation of the temporary ParIterator object. This is the ++it operator (I may have the notation wrong above). The overhead really somce from DocIterator::forwardPar(). Good, I was afraid we are running different versions of LyX ;-) My version doesn't call the post-increment operator at all. Still, how comes I can't feel that delay on the PowerPC architecture? The only change I have is my patch to bug #1790 I posted before, but that should only affect updateCounters() if setCursor() or the like are called indirectly. Ciao /Andreas
Re: The LyX licence
Hello, In light of all this, I'm asking whether I can have your permission to add your names to http://www.lyx.org/blanket-permission.txt: "The following people hereby grant permission to licence their contributions to LyX under the Gnu General Public Licence, version 2 or later." Yes, sure. -- Turgut Uyar so that we can have a permanent record of those people who have contributed code to LyX and who are happy for this code to be licenced under the GPL.
Re: The LyX licence
On Wed, Feb 23, 2005 at 12:33:23PM +0100, Jean-Marc Lasgouttes wrote: > > "Amir" == Amir Karger <[EMAIL PROTECTED]> writes: > > Amir> I still check lyx.org every few months for nostalgia's sake. > Amir> Best of luck with the devel efforts, and I'm still waiting for > Amir> the day that someone tells me I ought to use this brand spanking > Amir> new WYSIWYM document processor... > > Hello Amir, nice to hear from you again! > > Amir> -Amir Karger ps Don't know if I ever mentioned to most of you > Amir> that I got my first job out of grad school because they > Amir> basically asked just one question at the interview: can you do > Amir> OO Perl? And I, having learned OO Perl to write reLyX, answered > Amir> yes! > > Currently, one of the hot topics is getting rid of reLyX, since we > have no perl hacker anymore :) Actually, we do have at least one (me) but I'm also a python hacker and a C++ hacker and it looks to me like tex2lyx is doing an increasingly better job of TeX translation. There seems to be little point in keeping reLyX around. ---Kayvan -- 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)
Re: [PATCH 1.3.x] missing space with 'et al.'
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: | For information: I am going to apply the following path for 1.3.x. | Should be straightforward enough... I don't agree competely with the patch.. Would be better IMHO to add the space outside the l10n string. Then translations does not have to change. Also a confusing " " at the beginning of a l10n string is avoided. -- Lgb
Re: [PATCH] fix bug 1824
Georg Baum <[EMAIL PROTECTED]> writes: | We currently recognize warnings from pdftex as errors. This is no regression | and no crash, but the fix should IMO go in (probably for 1.3, too), because | it is very simple. | OK? ok -- Lgb
Re: [PATCH] fix captions labelstring
> "Andreas" == Andreas Vox <[EMAIL PROTECTED]> writes: Andreas> Am 23.02.2005 um 13:57 schrieb Jean-Marc Lasgouttes: >> Andreas> Does this change if you use the preincrement operator Andreas> instead? I'm not sure how much overhead comes from the Andreas> initialisation of the temporary ParIterator object. >> This is the ++it operator (I may have the notation wrong above). >> The overhead really somce from DocIterator::forwardPar(). Andreas> Good, I was afraid we are running different versions of LyX Andreas> ;-) My version doesn't call the post-increment operator at Andreas> all. Andreas> Still, how comes I can't feel that delay on the PowerPC Andreas> architecture? The only change I have is my patch to bug #1790 Andreas> I posted before, but that should only affect updateCounters() Andreas> if setCursor() or the like are called indirectly. Are you sure that you compiled after applying the patch? ;) JMarc
Re: The LyX licence
> "Kayvan" == Kayvan A Sylvan <[EMAIL PROTECTED]> writes: Kayvan> Actually, we do have at least one (me) but I'm also a python Kayvan> hacker and a C++ hacker and it looks to me like tex2lyx is Kayvan> doing an increasingly better job of TeX translation. There Kayvan> seems to be little point in keeping reLyX around. I did not want to bellittle your skills, Kayvan :) But the fact is nobody is really motivated to make reLyX progress... JMarc
Re: [PATCH 1.3.x] missing space with 'et al.'
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: Lars> I don't agree competely with the patch.. Lars> Would be better IMHO to add the space outside the l10n string. Lars> Then translations does not have to change. I thought about that for a minute, actually; and then I decided not to bother ;) Lars> Also a confusing " " at the beginning of a l10n string is Lars> avoided. Note that this patch is only for 1.3.x, and then only in the case where boost::format is not in use. Therefore I am not really sure this is very important. JMarc
Re: [PATCH] fix captions labelstring
Am 23.02.2005 um 18:03 schrieb Jean-Marc Lasgouttes: Are you sure that you compiled after applying the patch? ;) Does this look like the correct source: $ grep updateCounters src/*.C src/CutAndPaste.C: updateCounters(cur.buffer(), cur); src/CutAndPaste.C: updateCounters(cur.buffer(), cur); src/text.C: updateCounters(cur.buffer(), cur); src/text.C: updateCounters(cur.buffer(), cur); src/text2.C:updateCounters(*bv->buffer(), src/text2.C:updateCounters(cur.buffer(), cur); src/text2.C:updateCounters(cur.buffer(), cur); src/text2.C:void updateCounters(Buffer const & buf, DocIterator const & dit) src/text3.C:updateCounters(cur.buffer(), cur); That's the one I compiled. I compiled again today and the results are the same. Do you have exact instructions for producing the delay? Like "Go to that paragraph in userguide and hit enter after the word X" ? It would be interesting to find out the reason for this discrepancy. What are your compiler options? Ciao /Andreas
Re: [PATCH] fix captions labelstring
Andreas Vox wrote: > Does this look like the correct source: > > $ grep updateCounters src/*.C > src/CutAndPaste.C: updateCounters(cur.buffer(), cur); > src/CutAndPaste.C: updateCounters(cur.buffer(), cur); > src/text.C: updateCounters(cur.buffer(), cur); > src/text.C: updateCounters(cur.buffer(), cur); > src/text2.C:updateCounters(*bv->buffer(), > src/text2.C:updateCounters(cur.buffer(), cur); > src/text2.C:updateCounters(cur.buffer(), cur); > src/text2.C:void updateCounters(Buffer const & buf, DocIterator const & > dit) > src/text3.C:updateCounters(cur.buffer(), cur); It looks similar here. > Do you have exact instructions for producing the delay? > Like "Go to that paragraph in userguide and hit enter after the word X" > ? I simply pressed enter in random paragraphs. I could not see a difference in paragraphs at the beginning of the document vs end of document. Georg
RE: Change to lyxserver.C breaks win32_kludge.diff patch
Rob Bearman wrote: >> If you send the patch to me again, I'll apply it. Sorry for the delay. >> >> JMarc >> > > Thank you! Here they are again, including my comments: > > win32_kludge.diff - This is the fixed > development\win32\win32_kludge.diff file (a replacement for the existing > file, not a diff of the diff file). > > msvc.diff - Fixes package.C with the changes specified earlier > by Angus, and updates the .vcproj file > > win32config.diff - This patches development\win32\configure.h to define > PACKAGE as "lyx" rather than "lyx-1.4.0cvs" > > Thanks > Rob I guess that I beat JMarc to it; I've applied them. -- Angus
Re: [PATCH] fix captions labelstring
> "Andreas" == Andreas Vox <[EMAIL PROTECTED]> writes: Andreas> Do you have exact instructions for producing the delay? Like Andreas> "Go to that paragraph in userguide and hit enter after the Andreas> word X" ? In text2.C, function updateCounters, you have two version of the function. The first one, inside #if 0, is the original non recursive one, which does use the DocIterator parameter. This one is fast but does not update in insets. The other one after the #else ignores the DocIterator and goes through the whole document. This one is much slower but mostly works. Is this clearer now? JMarc
Re: The LyX licence
You have my permission to put my name in the file you mentioned. Adrien Rebollo > Dear all, > > please excuse the personal email, but I'm trying to do something about the > messy state of the LyX licence and need your help. > > LyX is currently licenced under the GPL with a huge hole blowing it wide > apart > so that it could be linked against the closed source XForms library. See > http://www.lyx.org/about/license.php3. Legal opinion has it that this > exception does not apply only to the XForms library. Instead, anything and > everything is allowed to link against the LyX source code, defeating the > whole point and purpose of the GPL. Moreover, the exception is no longer > needed as XForms (and indeed Qt) are available under the GPL. > > To make a messy situation even messier, it's not even certain whether the > current license is valid at all, as the necessary permissions may not have > been obtained before the change was made to the original GPL. > > In light of all this, I'm asking whether I can have your permission to add > your names to http://www.lyx.org/blanket-permission.txt: > > "The following people hereby grant permission to licence their > contributions > to LyX under the Gnu General Public Licence, version 2 or later." > > so that we can have a permanent record of those people who have > contributed > code to LyX and who are happy for this code to be licenced under the GPL. > > Kind regards, > Angus > > ps, if you reply to lyx-devel@lists.lyx.org, we'll have a permanent record > of > your response. > > pps. in case you're wondering where I got your email address from: it's > listed > in the LyX hall of fame: > http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/lib/CREDITS?rev=1.53&content-type=text/vnd.viewcvs-markup > Equivalent URL: http://tinyurl.com/5nqhs > -- Lassen Sie Ihren Gedanken freien Lauf... z.B. per FreeSMS GMX bietet bis zu 100 FreeSMS/Monat: http://www.gmx.net/de/go/mail
Fwd: Re: The LyX licence
--- Begin Message --- Hello Angus. You have my permission. :-) Best regards. Alejandro > Dear all, > > please excuse the personal email, but I'm trying to do something about the > messy state of the LyX licence and need your help. > > LyX is currently licenced under the GPL with a huge hole blowing it wide > apart > so that it could be linked against the closed source XForms library. See > http://www.lyx.org/about/license.php3. Legal opinion has it that this > exception does not apply only to the XForms library. Instead, anything and > everything is allowed to link against the LyX source code, defeating the > whole point and purpose of the GPL. Moreover, the exception is no longer > needed as XForms (and indeed Qt) are available under the GPL. > > To make a messy situation even messier, it's not even certain whether the > current license is valid at all, as the necessary permissions may not have > been obtained before the change was made to the original GPL. > > In light of all this, I'm asking whether I can have your permission to add > your names to http://www.lyx.org/blanket-permission.txt: > > "The following people hereby grant permission to licence their > contributions > to LyX under the Gnu General Public Licence, version 2 or later." > > so that we can have a permanent record of those people who have > contributed > code to LyX and who are happy for this code to be licenced under the GPL. > > Kind regards, > Angus > > ps, if you reply to lyx-devel@lists.lyx.org, we'll have a permanent record > of > your response. > > pps. in case you're wondering where I got your email address from: it's > listed > in the LyX hall of fame: > http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/lib/CREDITS?rev=1.53&content-type=text/vnd.viewcvs-markup > Equivalent URL: http://tinyurl.com/5nqhs > --- End Message ---
Re: The LyX licence
On Tuesday 22 February 2005 16:55, you wrote: > Dear all, > > please excuse the personal email, but I'm trying to do something about the > messy state of the LyX licence and need your help. > [clip] > In light of all this, I'm asking whether I can have your permission to add > your names to http://www.lyx.org/blanket-permission.txt: > > "The following people hereby grant permission to licence their > contributions to LyX under the Gnu General Public Licence, version 2 or > later." > > so that we can have a permanent record of those people who have contributed > code to LyX and who are happy for this code to be licenced under the GPL. Hi, You have my permission to license my contributions to LyX under the GPL. Pauli Virtanen pgpPN1zfegtpW.pgp Description: PGP signature
Re: The LyX licence
Em Ter 22 Fev 2005 18:31, vocà escreveu: > > In light of all this, I'm asking whether I can have your permission to > add your names to http://www.lyx.org/blanket-permission.txt: > so that we can have a permanent record of those people who have > contributed code to LyX and who are happy for this code to be > licenced under the GPL. > > Kind regards, > Angus > > ps, if you reply to lyx-devel@lists.lyx.org, we'll have a permanent > record of your response. I hereby grant permission to licence my contributions to LyX under the Gnu General Public Licence, version 2 or later. JoÃo Luis Meloni Assirati
Re: [PATCH] fix captions labelstring
Am Montag, 21. Februar 2005 09:22 schrieb Andre Poenitz:
> I think replacing
>
> void DocIterator::forwardPar()
> {
> forwardPos();
> while (!empty() && (!inTexted() || pos() != 0))
>forwardPos();
> }
>
> with something more sensible would be better. Most likely a cut&paste
> job from forwardPos, but not stepping over all characters, but only over
> insets.
I tried that. The good news: I have something that gives instant paragraph
break with the user guide on a 2.6 GHz P4 (I'll try the slow machine
tomorrow). I could find no bugs so far. The bad news: The code is
probably still too complicated, and if we are going to use this we need
to put some explanations in.
I started by turning this
forwardPos();
while (!empty() && (!inTexted() || pos() != 0))
forwardPos();
into a do-while loop:
do
forwardPos();
while (!empty() && (!inTexted() || pos() != 0));
and then replacing forwardPos() by the actual code of forwardPos(). I
tried to remove parts of it then, but I always got segfaults (it seemed
that pariterator got into an inconsistent state).
The only change that seems to make all the difference is this:
#ifdef SLOW_forwardPar
++tip.pos();
#else
tip.pos() = lastp;
#endif
If you want to test this you need Jean-Marcs latest patch, too.
Georg
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/dociterator.C lyx-1.4-cvs/src/dociterator.C
--- lyx-1.4-clean/src/dociterator.C 2005-02-15 18:34:30.0 +0100
+++ lyx-1.4-cvs/src/dociterator.C 2005-02-23 22:01:57.0 +0100
@@ -381,9 +381,82 @@ void DocIterator::forwardPosNoDescend()
void DocIterator::forwardPar()
{
+#if 0
forwardPos();
while (!empty() && (!inTexted() || pos() != 0))
forwardPos();
+#else
+ do {
+ //this dog bites his tail
+ if (empty()) {
+ push_back(CursorSlice(*inset_));
+ continue;
+ }
+
+ CursorSlice & tip = top();
+ //lyxerr << "XXX\n" << *this << endl;
+
+ // this is used twice and shows up in the profiler!
+ pos_type const lastp = lastpos();
+
+ // move into an inset to the right if possible
+ InsetBase * n = 0;
+
+ if (tip.pos() != lastp) {
+ // this is impossible for pos() == size()
+ if (inMathed()) {
+n = (tip.cell().begin() + tip.pos())->nucleus();
+ } else {
+if (paragraph().isInset(tip.pos()))
+ n = paragraph().getInset(tip.pos());
+ }
+ }
+
+ if (n && n->isActive()) {
+ //lyxerr << "... descend" << endl;
+ push_back(CursorSlice(*n));
+ continue;
+ }
+
+ // otherwise move on one position if possible
+ if (tip.pos() < lastp) {
+ //lyxerr << "... next pos" << endl;
+ // The following two lines make all the speed difference:
+#ifdef SLOW_forwardPar
+ ++tip.pos();
+#else
+ tip.pos() = lastp;
+#endif
+ continue;
+ }
+ //lyxerr << "... no next pos" << endl;
+
+ // otherwise move on one paragraph if possible
+ if (tip.pit() < lastpit()) {
+ //lyxerr << "... next par" << endl;
+ ++tip.pit();
+ tip.pos() = 0;
+ continue;
+ }
+ //lyxerr << "... no next pit" << endl;
+
+ // otherwise try to move on one cell if possible
+ if (tip.idx() < lastidx()) {
+ //lyxerr << "... next idx" << endl;
+ ++tip.idx();
+ tip.pit() = 0;
+ tip.pos() = 0;
+ continue;
+ }
+ //lyxerr << "... no next idx" << endl;
+
+ // otherwise leave inset and jump over inset as a whole
+ pop_back();
+ // 'top' is invalid now...
+ if (!empty())
+ ++top().pos();
+ } while (!empty() && (!inTexted() || pos() != 0));
+#endif
}
Re: [PATCH] fix captions labelstring
Am 23.02.2005 um 19:37 schrieb Jean-Marc Lasgouttes: "Andreas" == Andreas Vox <[EMAIL PROTECTED]> writes: Andreas> Do you have exact instructions for producing the delay? Like Andreas> "Go to that paragraph in userguide and hit enter after the Andreas> word X" ? In text2.C, function updateCounters, you have two version of the function. The first one, inside #if 0, is the original non recursive one, which does use the DocIterator parameter. This one is fast but does not update in insets. The other one after the #else ignores the DocIterator and goes through the whole document. This one is much slower but mostly works. Is this clearer now? Yes, but that wasn't my question. :-) I just wanted to know if I'm just too stupid to produce the delay or if PowerPC is genuinely faster. Now that's settled I'd like to know your compiler settings, so I can try to compile a proper slow LyX version for me ;-) Ciao /Andreas
Re: [PATCH] fix captions labelstring
Georg Baum wrote:
Am Montag, 21. Februar 2005 09:22 schrieb Andre Poenitz:
The only change that seems to make all the difference is this:
#ifdef SLOW_forwardPar
++tip.pos();
#else
tip.pos() = lastp;
#endif
Yes, but this is not safe if there insets in the paragraph before lastp,
I think.
Here is a simpler try that does mostly what you propose, but uses
forwardPos() to do the hard work. I kept the old code around (see the
#if 0) to be able to compare the results with the old slow method.
I will continue some testing, but basically it sees to work.
Testing welcome.
JMarc
Index: lib/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.676
diff -u -r1.676 ChangeLog
--- lib/ChangeLog 22 Feb 2005 09:15:06 - 1.676
+++ lib/ChangeLog 23 Feb 2005 22:24:15 -
@@ -1,3 +1,7 @@
+2005-02-20 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * layouts/stdlayouts.inc: change labelstring to "Senseless!"
+
2005-02-21 Angus Leeming <[EMAIL PROTECTED]>
* CREDITS: add some missing pretty printing info.
Index: lib/layouts/stdlayouts.inc
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/stdlayouts.inc,v
retrieving revision 1.8
diff -u -r1.8 stdlayouts.inc
--- lib/layouts/stdlayouts.inc 13 Oct 2003 09:50:10 - 1.8
+++ lib/layouts/stdlayouts.inc 23 Feb 2005 22:24:16 -
@@ -71,7 +71,7 @@
Align Center
AlignPossible Center
LabelType Sensitive
- LabelString Caption
+ LabelString "Senseless!"
OptionalArgs 1
LabelFont
Series Bold
Index: src/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2128
diff -u -r1.2128 ChangeLog
--- src/ChangeLog 23 Feb 2005 16:56:40 - 1.2128
+++ src/ChangeLog 23 Feb 2005 22:25:08 -
@@ -1,3 +1,21 @@
+2005-02-23 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * cursor.C: remove unused variable
+
+ * text3.C (dispatch):
+ * text.C (breakParagraph, backspace):
+ * CutAndPaste.C (cutSelection, pasteSelection): pass a buffer to
+ updateCounters.
+
+ * text2.C (updateCounters): turn into a free standing function and
+ add a buffer and dociterator parameters. Remove dead code for
+ tracking labelstring change.
+ (init, setLayout, changeDepth): pass a buffer to updateCounters.
+ (setCounter): change into a free-standing function which gets a
+ dociterator as argument. Use this iterator to fix captions in a
+ simple way. When no float is found above the caption, use the
+ labelstring of the caption layout as default.
+
2005-02-23 Georg Baum <[EMAIL PROTECTED]>
* LaTeX.C (scanLogFile): recognize pdfTeX warnings
Index: src/CutAndPaste.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/CutAndPaste.C,v
retrieving revision 1.148
diff -u -r1.148 CutAndPaste.C
--- src/CutAndPaste.C 8 Feb 2005 13:17:56 - 1.148
+++ src/CutAndPaste.C 23 Feb 2005 22:25:08 -
@@ -503,7 +503,7 @@
// need a valid cursor. (Lgb)
cur.clearSelection();
- text->updateCounters();
+ updateCounters(cur.buffer());
}
if (cur.inMathed()) {
@@ -596,7 +596,7 @@
cur.resetAnchor();
text->setCursor(cur, ppp.first, ppp.second);
cur.setSelection();
- text->updateCounters();
+ updateCounters(cur.buffer());
}
if (cur.inMathed()) {
Index: src/cursor.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.122
diff -u -r1.122 cursor.C
--- src/cursor.C 15 Feb 2005 17:34:53 - 1.122
+++ src/cursor.C 23 Feb 2005 22:25:11 -
@@ -123,8 +123,6 @@
{
BOOST_ASSERT(!cursor.empty());
CursorSlice bottom = cursor[0];
- LyXText * text = bottom.text();
- BOOST_ASSERT(text);
DocIterator it = doc_iterator_begin(bottom.inset());
DocIterator const et = doc_iterator_end(bottom.inset());
Index: src/dociterator.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/dociterator.C,v
retrieving revision 1.24
diff -u -r1.24 dociterator.C
--- src/dociterator.C 14 Feb 2005 08:17:23 - 1.24
+++ src/dociterator.C 23 Feb 2005 22:25:15 -
@@ -382,8 +382,27 @@
void DocIterator::forwardPar()
{
forwardPos();
- while (!empty() && (!inTexted() || pos() != 0))
+
+#if 0
+ DocIterator cmp(*this);
+#endif
+
+ while (!empty() && (!inTexted() || pos() != 0)) {
+ if (inTexted()) {
+ pos_type const lastp = lastpos();
+ Paragraph const & par = paragraph();
+ pos_type & pos = top().pos();
+ while (pos < lastp && !par.isInset(pos))
+++pos;
+ }
forwardPos();
+ }
+
+#if 0
+ while (!cmp.empty() && (!cmp.inTexted() || cmp.pos() != 0))
+ cmp.forwardPos();
+ BOOST_ASSERT(cmp == *this);
+#endif
}
Index: src/lyxtext.h
==
[PATCH 13x]: remove the FormForks dialog
Hi, JMarc. This patch simply removes the forked process dialog from the XForms frontend. It never made it into the Qt frontend and has since been removed from the 1.4.x tree too. Removing this is the simplest way towards implementing asynchronous child processes under Windows. 28 files changed, 40 insertions(+), 831 deletions(-) Ok? -- Angus fork_dialog.diff.bz2 Description: BZip2 compressed data
Re: The LyX licence
On Wed, 23 Feb 2005 12:33:23 +0100, Jean-Marc Lasgouttes <[EMAIL PROTECTED]> wrote: > > "Amir" == Amir Karger <[EMAIL PROTECTED]> writes: > > Hello Amir, nice to hear from you again! Hey, JM! > Amir> And I, having learned OO Perl to write reLyX... > > Currently, one of the hot topics is getting rid of reLyX, since we > have no perl hacker anymore :) Yes, well, if reLyX only as good as it was when I left it several years ago, I hope you take it out behind the barn and shoot it! I mean, not only was it sitting on top of Text::TeX v0.01 (which AFAIK never progressed any further and had known bugs), it was also the project I learned OO Perl with. Yuck! In the meantime, I found a much more useless hobby of Perl Golf. Gave that up for my second-to-latest (and completely useless) project, translating (Infocom-ish) Z-machine files into Perl, which was supposed to develop into making Parrot able to read Z-machine files directly. Only I left that for my current project, which is doing no programming at all because I am totally overwhelmed with (a longer commute and) having two kids. I've heard rumors that some people actually had three (like my parents) but I'm sure that's an urban legend. But I'll always have a soft spot in my heart for the LyX creature. Anyway, good luck. -Amir
Building with automake-1.8
I modified autogen.sh to allow this and it seems to build just fine. Is there a reason for not supporting 1.8? Already FC2 comes with 1.8.3. - Martin signature.asc Description: This is a digitally signed message part
