Re: [PATCH] Change tracking

2007-05-08 Thread Michael Gerz
Jürgen Spitzmüller schrieb: Why not the linebreak? For my taste, that line is too long. Alright, I also added the line break :-) AFAIK, \newcommand only allows one optional argument. However, this doesn't hurt IMHO because LyX will always sets all three arguments. It's possible, but i

Re: [PATCH] Change tracking

2007-05-07 Thread Jürgen Spitzmüller
Michael Gerz wrote: > > It looks o.k., although I would probably have written it as: > > > > "\\newcommand\\lyxinserted[3]{\\changestart#3\\changeend}\n" > > "\\newcommand\\lyxdeleted[3]{%\n" > > "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n" > > Ok, I removed the {}'s. Why not the l

[PATCH] Change tracking

2007-05-07 Thread Michael Gerz
Michael Gerz wrote: > Unfortunately, the patch produces some artifacts with dvipost. See file > cttest.lyx. When exporting to DVI, the text inside the box is not > aligned with the outer text. If you deactivate change tracking output, > everything is fine. But this is not related to your patch, i

[PATCH] Change tracking 1

2006-11-24 Thread Michael Gerz
Hi, this patch fixes two problems with end-of-par handling. I tested it successfully and rigorously. I already committed it to speed up development. If you think that something is wrong, I will revert the patch instantly. Michael Index: text.C ===

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-10-02 Thread Michael Gerz
Michael Gerz schrieb: attached please find a simple patch that improves CT in LyX 1.4. Essentially, the patch consists of three parts: 1. The change bar is smarter (reduced width, more margin) 2. "next change" is introduced 3. accept/reject change is de-activated in non-CT mode Here comes an up

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-09-19 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: Therefore I think you should remove accept/reject change from the menu: they will cause more confusion than anything else. The result is that the shortcuts for accept/reject all changes will be weird, but we are not going to remake all translations. I tested accep

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-09-19 Thread Georg Baum
Jean-Marc Lasgouttes wrote: > This points out why I really really should not accept seemingly > trivial patches that come out of nowhere a few days before release :) Indeed. It seems that emails from you with subjects "Towards LyX 1.4.x [status update #x]" generate these patches. People, if you h

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-09-19 Thread Jean-Marc Lasgouttes
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> Jean-Marc Lasgouttes schrieb: Jean-Marc, attached please find Michael> a simple patch that improves CT in LyX 1.4. Essentially, the Michael> patch consists of three parts: >> Michael, as I told you yesterday, I think we should s

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-09-19 Thread Michael Gerz
Jean-Marc Lasgouttes schrieb: Michael> Jean-Marc, attached please find a simple patch that improves Michael> CT in LyX 1.4. Essentially, the patch consists of three Michael> parts: Michael, as I told you yesterday, I think we should skip this patch for 1.4.3. Did you? I remember you said you l

Re: [PATCH] Change Tracking in LyX 1.4.X

2006-09-19 Thread Jean-Marc Lasgouttes
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> Jean-Marc, attached please find a simple patch that improves Michael> CT in LyX 1.4. Essentially, the patch consists of three Michael> parts: Michael, as I told you yesterday, I think we should skip this patch for 1.4.3. Also, a

[PATCH] Change Tracking in LyX 1.4.X

2006-09-17 Thread Michael Gerz
Jean-Marc, attached please find a simple patch that improves CT in LyX 1.4. Essentially, the patch consists of three parts: 1. The change bar is smarter (reduced width, more margin) The code changes are trivial and please your eyes :-) 2. "next change" is introduced This feature makes i

Line deletion OK with bug 1827 (Re: [Patch] change tracking bar in rowpainter)

2006-03-15 Thread Martin Vermeer
On Mon, Mar 13, 2006 at 08:45:26AM +0100, Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > So I propose to remove the line > > > > setChange(0, Change::INSERTED); > > But then you have to check if bug 1827 doesn't come back. > > Jürgen I have the line deleted, and bug 1827 (according to t

Re: [Patch] change tracking bar in rowpainter

2006-03-14 Thread Martin Vermeer
On Mon, 2006-03-13 at 20:26 +0100, Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > No it is not. The attached is (cursed evo interface!) > > Yes, that's better :-) > Works for me, from a quick test. Do you think it is tested enough to go into 1.5? Attached the version with relevant comme

Re: Doc patch (Re: [Patch] Change tracking)

2006-03-13 Thread Martin Vermeer
On Sat, 2006-03-11 at 19:11 +0200, Martin Vermeer wrote: > On Sat, Mar 11, 2006 at 11:51:39AM +0100, Jean-Marc Lasgouttes wrote: > > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > > > Martin> A large part of the backspace method was factored out into > > Martin> backspacePos0. So

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Martin Vermeer
On Mon, Mar 13, 2006 at 07:29:02PM +0100, Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > -   if (start == end || !par_.isChanged(start, end - 1)) > > +   if (start == end || !par_.isChanged(start, end)) > > Are you sure this is the right patch? No it is not. The attached is (curs

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Juergen Spitzmueller
Martin Vermeer wrote: > -   if (start == end || !par_.isChanged(start, end - 1)) > +   if (start == end || !par_.isChanged(start, end)) Are you sure this is the right patch? Jürgen

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Juergen Spitzmueller
Martin Vermeer wrote: > No it is not. The attached is (cursed evo interface!) Yes, that's better :-) Works for me, from a quick test. Jürgen

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Martin Vermeer
On Mon, 2006-03-13 at 12:22 +0200, Martin Vermeer wrote: > On Mon, 2006-03-13 at 10:55 +0200, Martin Vermeer wrote: > > On Mon, 2006-03-13 at 09:18 +0100, Juergen Spitzmueller wrote: > > > Juergen Spitzmueller wrote: > > > > Martin Vermeer wrote: > > > > > So I propose to remove the line > > > > >

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Martin Vermeer
On Mon, 2006-03-13 at 10:55 +0200, Martin Vermeer wrote: > On Mon, 2006-03-13 at 09:18 +0100, Juergen Spitzmueller wrote: > > Juergen Spitzmueller wrote: > > > Martin Vermeer wrote: > > > > So I propose to remove the line > > > > > > > > setChange(0, Change::INSERTED); > > > > > > But then you have

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Martin Vermeer
On Mon, 2006-03-13 at 09:18 +0100, Juergen Spitzmueller wrote: > Juergen Spitzmueller wrote: > > Martin Vermeer wrote: > > > So I propose to remove the line > > > > > > setChange(0, Change::INSERTED); > > > > But then you have to check if bug 1827 doesn't come back. > > It probably could even be r

Re: [Patch] change tracking bar in rowpainter

2006-03-13 Thread Juergen Spitzmueller
Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > So I propose to remove the line > > > > setChange(0, Change::INSERTED); > > But then you have to check if bug 1827 doesn't come back. It probably could even be removed (I don't like it either). However, while testing if bug 1823 will be revi

Re: [Patch] change tracking bar in rowpainter

2006-03-12 Thread Juergen Spitzmueller
Am Montag, 13. März 2006 08:40 schrieb Martin Vermeer: > Would it be possible to simply disable DESM/DEPM when CT is on, so the > one cannot subvert the other? Would save us a lot of heartache. I think it would already help much if DESM/DEPM would only remove INSERTED blanks, leave DELETED ones a

Re: [Patch] change tracking bar in rowpainter

2006-03-12 Thread Juergen Spitzmueller
Martin Vermeer wrote: > So I propose to remove the line > > setChange(0, Change::INSERTED); But then you have to check if bug 1827 doesn't come back. Jürgen

Re: [Patch] change tracking bar in rowpainter

2006-03-12 Thread Martin Vermeer
On Mon, 2006-03-13 at 08:13 +0100, Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > What was the original reason for introducing it? > > Can we get rid of it? > > It's not my doing. It's this: > > Log message: > (Johnathan Burchill): change tracker fixes (bug 1827) > > Bugs: > htt

Re: [Patch] change tracking bar in rowpainter

2006-03-12 Thread Juergen Spitzmueller
Martin Vermeer wrote: > What was the original reason for introducing it? > Can we get rid of it? It's not my doing. It's this: Log message: (Johnathan Burchill): change tracker fixes (bug 1827) Bugs: http://bugzilla.lyx.org/show_bug.cgi?id=1827 But in general, change tracking and DESM/D

Re: [Patch] change tracking bar in rowpainter

2006-03-12 Thread Martin Vermeer
On Mon, 2006-03-13 at 08:52 +0200, Martin Vermeer wrote: > This fixes the non-existent change bar in case only the paragraph break > has been changed. From a bug report by Jürgen (under bugzilla 880, but > see also 1254-1255), thanks. Jürgen, about the routine stripLeadingSpaces in paragraph.C: co

[Patch] change tracking bar in rowpainter

2006-03-12 Thread Martin Vermeer
This fixes the non-existent change bar in case only the paragraph break has been changed. From a bug report by Jürgen (under bugzilla 880, but see also 1254-1255), thanks. If I hear no objections this goes in presently. - Martin Index: rowpainter.C ===

Doc patch (Re: [Patch] Change tracking)

2006-03-11 Thread Martin Vermeer
On Sat, Mar 11, 2006 at 11:51:39AM +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > Martin> A large part of the backspace method was factored out into > Martin> backspacePos0. Some 50+ lines, that changes indent and show up > Martin> as insertio

Re: [Patch] Change tracking

2006-03-11 Thread Martin Vermeer
On Sat, Mar 11, 2006 at 11:51:39AM +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > Martin> A large part of the backspace method was factored out into > Martin> backspacePos0. Some 50+ lines, that changes indent and show up > Martin> as insertio

Re: [Patch] Change tracking

2006-03-11 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> A large part of the backspace method was factored out into Martin> backspacePos0. Some 50+ lines, that changes indent and show up Martin> as insertions/deletions in the patch. Out of total 203- and Martin> 256+. If it is the sam

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, Mar 10, 2006 at 10:30:11PM +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: ... > Martin> It is smaller now with 2212 split out. Much of the bigness is > Martin> an optical illusion though, see what happened around > Martin> backspacePos

Re: [Patch] Change tracking

2006-03-10 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: >> > Maybe something like > + BOOST_ASSERT(pos < size() || pos == >> size() && tracking()); Martin> Actually no. Due to the changes in the rest of the patch, Martin> erase is called with pos == size(), but with tracking off it Martin> d

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, Mar 10, 2006 at 04:47:29PM +0200, Martin Vermeer wrote: > On Fri, 2006-03-10 at 15:03 +0100, Jean-Marc Lasgouttes wrote: > > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: ... > >bool Paragraph::Pimpl::erase(pos_type pos) > >{ > > - BOOST_ASSERT(pos < size()); > >

Re: [Patch] Change tracking

2006-03-10 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: >> Maybe something like + BOOST_ASSERT(pos < size() || pos == size() >> && tracking()); Martin> Sharper test, you mean? Yes, to remain as sharp as it used to be without CT. JMarc

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, Mar 10, 2006 at 03:49:39PM +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > >> It seems OK to me (in trunk). I think 2212 should committed > >> separately in both trunk and branch. > > Martin> I'll prepare a separate patch first. I co

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, 2006-03-10 at 16:47 +0200, Martin Vermeer wrote: > On Fri, 2006-03-10 at 15:03 +0100, Jean-Marc Lasgouttes wrote: > > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: ... > > Also, are you confident that you understand why eraseSelectionHelper > > is much smaller now? > > Par

Re: [Patch] Change tracking

2006-03-10 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: >> It seems OK to me (in trunk). I think 2212 should committed >> separately in both trunk and branch. Martin> I'll prepare a separate patch first. I tested the one in the bug under qt and xforms and it seems to work. What is not nice

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, 2006-03-10 at 15:03 +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > Martin> Attached the patch with fixed Cut behaviour in C&P (see bug > Martin> ): behaves correctly for arbitrary combinations of > Martin> unchanged, inserted and d

Re: [Patch] Change tracking

2006-03-10 Thread Martin Vermeer
On Fri, 2006-03-10 at 14:56 +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: ... > Martin> Attached the change tracking patch (multi-paragraph i.e. 880) > Martin> but fixes 2212 (skip over first change) as well. > > Martin> Lars, others: OK to com

Re: [Patch] Change tracking

2006-03-10 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> Attached the patch with fixed Cut behaviour in C&P (see bug Martin> ): behaves correctly for arbitrary combinations of Martin> unchanged, inserted and deleted text or paragraph breaks Martin> within the cut area. The eraseSel

Re: [Patch] Change tracking

2006-03-10 Thread Jean-Marc Lasgouttes
> "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: Martin> On Tue, 2006-03-07 at 14:06 +0100, Jean-Marc Lasgouttes wrote: >> > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: >> Martin> Could you please re-list them? It isn't clear to me which ones Martin> you are referring t

Re: [Patch] Change tracking

2006-03-09 Thread Martin Vermeer
On Tue, Mar 07, 2006 at 05:06:26PM +0200, Martin Vermeer wrote: > On Tue, 2006-03-07 at 14:06 +0100, Jean-Marc Lasgouttes wrote: > > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > > > Martin> Could you please re-list them? It isn't clear to me which ones > > Martin> you are refer

[Patch] Change tracking

2006-03-07 Thread Martin Vermeer
On Tue, 2006-03-07 at 14:06 +0100, Jean-Marc Lasgouttes wrote: > > "Martin" == Martin Vermeer <[EMAIL PROTECTED]> writes: > > Martin> Could you please re-list them? It isn't clear to me which ones > Martin> you are referring to here. > > I have to leave now, but it would be something like 880

Re: [PATCH] change tracking changes, revised

2005-08-08 Thread Andre Poenitz
On Thu, Jul 21, 2005 at 04:12:01PM +0100, John Levon wrote: > non-editable. Andre, please look it over > > Index: lyxfunc.C > === > RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v > retrieving revision 1.663 > diff -u -a -p

Re: [PATCH] change tracking changes, revised

2005-08-08 Thread Andre Poenitz
On Thu, Jul 21, 2005 at 04:46:32PM +0100, John Levon wrote: > On Thu, Jul 21, 2005 at 05:31:33PM +0200, Jean-Marc Lasgouttes wrote: > > > Why don't you add the editable() stuff directly to InsetBase? Both > > math and normal insets derive from that these days. > > There's a nasty comment saying I

Re: [PATCH] change tracking changes, revised

2005-07-21 Thread John Levon
On Thu, Jul 21, 2005 at 05:56:57PM +0200, Jean-Marc Lasgouttes wrote: > John> There's a nasty comment saying I'm not allowed to add data > John> members > > Indeed :) What kind of support do you want to obtain anyway? You do > not plan to support change tracking _inside_ insets, I guess? Sure I

Re: [PATCH] change tracking changes, revised

2005-07-21 Thread Jean-Marc Lasgouttes
> "John" == John Levon <[EMAIL PROTECTED]> writes: John> On Thu, Jul 21, 2005 at 05:31:33PM +0200, Jean-Marc Lasgouttes John> wrote: >> Why don't you add the editable() stuff directly to InsetBase? Both >> math and normal insets derive from that these days. John> There's a nasty comment sayin

Re: [PATCH] change tracking changes, revised

2005-07-21 Thread John Levon
On Thu, Jul 21, 2005 at 05:31:33PM +0200, Jean-Marc Lasgouttes wrote: > Why don't you add the editable() stuff directly to InsetBase? Both > math and normal insets derive from that these days. There's a nasty comment saying I'm not allowed to add data members regards john

Re: [PATCH] change tracking changes, revised

2005-07-21 Thread Jean-Marc Lasgouttes
> "John" == John Levon <[EMAIL PROTECTED]> writes: John> This version includes basic support for making math formulae John> non-editable. Andre, please look it over Why don't you add the editable() stuff directly to InsetBase? Both math and normal insets derive from that these days. JMarc

[PATCH] change tracking changes, revised

2005-07-21 Thread John Levon
This version includes basic support for making math formulae non-editable. Andre, please look it over thanks john Index: lyxfunc.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v retrieving revision 1.663 diff -u -a -

[patch] Change tracking marker (QT UI, bug-1301)

2005-03-06 Thread Johnathan Burchill
Hi folks, Working on paragraph breaks for the change tracker is not trivial, so I decided to tackle bug 1301 (which is marked trivial :) for a change of pace. Here is a patch and .ui file (attached) that implements Alfredo's and John's idea of a marker (see "bug" 1301) that reflects whether cha

Re: [PATCH] Change tracking hacking

2005-02-24 Thread Juergen Spitzmueller
Johnathan Burchill wrote: > The simplest way to reproduce it is: > 2. insert "a". > 3. track changes. > 4. cut "a" and paste it at the beginning of the par > 5. paste "a" at beginning again. > 6. paste "a" at beginning again ---> problem appears (4 "a"'s all marked > inserted). I have committed th

Re: [PATCH] Change tracking hacking

2005-02-24 Thread Lars Gullik Bjønnes
Juergen Spitzmueller <[EMAIL PROTECTED]> writes: | Juergen Spitzmueller wrote: >> As to the crash fix: can someone please have a look if this can be applied? >> (fixes the crash described in bug 1277). > | Lars? | (see http://marc.theaimsgroup.com/?l=lyx-devel&m=110894706811499&w=2 for the | patc

Re: [PATCH] Change tracking hacking

2005-02-24 Thread Juergen Spitzmueller
Juergen Spitzmueller wrote: > As to the crash fix: can someone please have a look if this can be applied? > (fixes the crash described in bug 1277). Lars? (see http://marc.theaimsgroup.com/?l=lyx-devel&m=110894706811499&w=2 for the patch). Jürgen

Re: [PATCH] Change tracking hacking

2005-02-22 Thread Juergen Spitzmueller
Johnathan Burchill wrote: > The simplest way to reproduce it is: > 2. insert "a". > 3. track changes. > 4. cut "a" and paste it at the beginning of the par > 5. paste "a" at beginning again. > 6. paste "a" at beginning again ---> problem appears (4 "a"'s all marked > inserted). > > It seems to be a

Re: [PATCH] Change tracking hacking

2005-02-21 Thread Johnathan Burchill
On Monday 21 February 2005 07:08, you wrote: > Johnathan Burchill wrote: > > I've attached the bug fix. There's no point in providing the > > break-paragraph patch until it's fully functional. If you want to play > > with it, see my first attachment in this thread. Whether or not you want > > to im

Re: [PATCH] Change tracking hacking

2005-02-21 Thread Juergen Spitzmueller
Johnathan Burchill wrote: > I've attached the bug fix. There's no point in providing the > break-paragraph patch until it's fully functional. If you want to play with > it, see my first attachment in this thread. Whether or not you want to > implement the functionality in 1.4.0, I'll work on it in

Re: [PATCH] Change tracking hacking

2005-02-20 Thread Johnathan Burchill
Lars Gullik Bjønnes wrote: >Juergen Spitzmueller <[EMAIL PROTECTED]> writes: > >| Lars Gullik Bjønnes wrote: >> >>> I am very happy to see bugs fixed. but I am a bit wary of adding >>> functionality at this stage. >> >| It's a bug fix really. The unability to break paragraphs is a severe (and >|

Re: [PATCH] Change tracking hacking

2005-02-15 Thread Lars Gullik Bjønnes
Juergen Spitzmueller <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: > >> I am very happy to see bugs fixed. but I am a bit wary of adding >> functionality at this stage. > | It's a bug fix really. The unability to break paragraphs is a severe (and | the biggest remaining AFAICS) limitat

Re: [PATCH] Change tracking hacking

2005-02-15 Thread John Levon
On Tue, Feb 15, 2005 at 03:21:22PM +0100, Juergen Spitzmueller wrote: > > I am very happy to see bugs fixed. but I am a bit wary of adding > > functionality at this stage. > > It's a bug fix really. The unability to break paragraphs is a severe (and > the biggest remaining AFAICS) limitation of

Re: [PATCH] Change tracking hacking

2005-02-15 Thread Juergen Spitzmueller
Lars Gullik Bjønnes wrote: > I am very happy to see bugs fixed. but I am a bit wary of adding > functionality at this stage. It's a bug fix really. The unability to break paragraphs is a severe (and the biggest remaining AFAICS) limitation of the change tracker (see bug 880). > Are you able to

Re: [PATCH] Change tracking hacking

2005-02-15 Thread Lars Gullik Bjønnes
Johnathan Burchill <[EMAIL PROTECTED]> writes: | Hi folks, > | Please find attached three files: a change-tracking patch, and a new inset | declaration and implementation. > | Use -p0 from the top-level source dir for applying the patch. | insetnewparagraph.{C,h} need to be placed in src/insets/

Re: [PATCH] Change tracking hacking

2005-02-14 Thread Juergen Spitzmueller
Johnathan Burchill wrote: > This patch addresses bug#1277, and adds functionality to ct. > The bug-fix addresses pasting while change-tracking. The main modification > is the "Change" parameter that has been added to moveItem(). > > The new functionality is to let the user break a paragraph within

[PATCH] Change tracking hacking

2005-02-14 Thread Johnathan Burchill
Hi folks, Please find attached three files: a change-tracking patch, and a new inset declaration and implementation. Use -p0 from the top-level source dir for applying the patch. insetnewparagraph.{C,h} need to be placed in src/insets/. This patch addresses bug#1277, and adds functionality to

Re: [patch] change tracking output

2005-01-28 Thread Andre Poenitz
On Thu, Jan 27, 2005 at 05:13:07PM +0100, Juergen Spitzmueller wrote: > Angus Leeming wrote: > > Oh, if the file is meant to change only at predetermined times, then a > > single line added to lyx_cb.C's Reconfigure would do the trick: > > > >     LatexFeatures::getAvailable(); > > > > no? > > > >

Re: [patch] change tracking output

2005-01-28 Thread Lars Gullik Bjønnes
Juergen Spitzmueller <[EMAIL PROTECTED]> writes: | Jose' Matos wrote: >> That us premature optimization Jürgen. :-) >> >>   It is easier to simply clear the list since the effect is the same, there >> is no need to consider the different cases. The code then becomes easier to >> understand by anyo

Re: [patch] change tracking output

2005-01-28 Thread Juergen Spitzmueller
Jose' Matos wrote: > When I wrote that my wrist watch still showed 27, I have since then fixed > it. I see you want a fight... No. But I think there are quite a lot of good opportunities ATM. Jürgen

Re: [patch] change tracking output

2005-01-28 Thread Jose' Matos
On Friday 28 January 2005 10:22, Juergen Spitzmueller wrote: > > P.S.: Isn't it Friday today? When I wrote that my wrist watch still showed 27, I have since then fixed it. I see you want a fight... -- José Abílio

Re: [patch] change tracking output

2005-01-28 Thread Juergen Spitzmueller
Jose' Matos wrote: > That us premature optimization Jürgen. :-) > >   It is easier to simply clear the list since the effect is the same, there > is no need to consider the different cases. The code then becomes easier to > understand by anyone. :-) Really? OK, then I change that. Jürgen P.S.: I

Re: [patch] change tracking output

2005-01-28 Thread Jose' Matos
On Friday 28 January 2005 08:52, Juergen Spitzmueller wrote: > > while in case (1) it is not necessary to clear the list (because it is > already empty) it is necessary in (2). That's the reason why I added the > check (to avoid redundant clearing in case 1, which is the more common > one). That

Re: [patch] change tracking output

2005-01-28 Thread Juergen Spitzmueller
Lars Gullik Bjønnes wrote: > Any particualr reason not to just clear it? > >     // Make sure that we are clean >     packages_.clear(); Currently, getAvailable is called from two places: (1) LaTeXFeatures::isAvailable if (packages_.empty()) getAvailable(); (when LyX checks

Re: [patch] change tracking output

2005-01-27 Thread Lars Gullik Bjønnes
Juergen Spitzmueller <[EMAIL PROTECTED]> writes: | Angus Leeming wrote: >> Oh, if the file is meant to change only at predetermined times, then a >> single line added to lyx_cb.C's Reconfigure would do the trick: >> >>     LatexFeatures::getAvailable(); >> >> no? >> >> But you're probably right. N

Re: [patch] change tracking output

2005-01-27 Thread Juergen Spitzmueller
Angus Leeming wrote: > Oh, if the file is meant to change only at predetermined times, then a > single line added to lyx_cb.C's Reconfigure would do the trick: > >     LatexFeatures::getAvailable(); > > no? > > But you're probably right. Not worth it. At the moment. I did it nevertheless. Patch at

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Angus Leeming wrote: > Oh, if the file is meant to change only at predetermined times, then a > single line added to lyx_cb.C's Reconfigure would do the trick: > >     LatexFeatures::getAvailable(); > > no? Ah, yes, probably. Maybe I'll have a look after my return (weekend). Regards, Jürgen

Re: [patch] change tracking output

2005-01-24 Thread Angus Leeming
Juergen Spitzmueller wrote: > Angus Leeming wrote: >> What you could do is "watch" packages.lst and read it again when it >> changes. See RenderMonitoredPreview (src/insets/render_preview.[Ch]). >> >> Basically, you'd store a >> // Check the file every 2 secs >> lyx::support::FileMonitor monitor_(

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Angus Leeming wrote: > What you could do is "watch" packages.lst and read it again when it > changes. See RenderMonitoredPreview (src/insets/render_preview.[Ch]). > > Basically, you'd store a >     // Check the file every 2 secs >     lyx::support::FileMonitor monitor_(std::string(), 2000); > > Onc

Re: [patch] change tracking output

2005-01-24 Thread Angus Leeming
Juergen Spitzmueller wrote: > Angus Leeming wrote: >> ..and what's a PackagesList? Is the compiler looking for >> >> LaTeXFeatures::PackagesList LaTeXFeatures::packages_; >> >> perhaps? > > Umm. Thank you both. > The static list works now. The only drawback (vs. non-static) is that you > have to

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Angus Leeming wrote: > ..and what's a PackagesList? Is the compiler looking for > >     LaTeXFeatures::PackagesList LaTeXFeatures::packages_; > > perhaps? Umm. Thank you both. The static list works now. The only drawback (vs. non-static) is that you have to restart LyX to get packages.lst reparse

Re: [patch] change tracking output

2005-01-24 Thread Georg Baum
Juergen Spitzmueller wrote: > * format incremented to 240. > * new bufferparam: > \output_changes {true|false} > (should the change tracking marks be visible in the output or not?) > * lyx2lyx should just delete the param in 239. Here is the patch. Untested, but should work ;-) Georg? output_ch

Re: [patch] change tracking output

2005-01-24 Thread Angus Leeming
Juergen Spitzmueller wrote: > I might be totally blind, but I cannot get it to compile. ...and what's a PackagesList? Is the compiler looking for LaTeXFeatures::PackagesList LaTeXFeatures::packages_; perhaps? -- Angus

Re: [patch] change tracking output

2005-01-24 Thread Georg Baum
Juergen Spitzmueller wrote: >> PackagesList LaTeXFeatures::packages_; Try LaTeXFeatures::PackagesList LaTeXFeatures::packages_; because PackagesList is a type defined inside the class LaTeXFeatures. Georg

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Angus Leeming wrote: > It isn't static in the patch you posted. Sure isn't ;-) > Anyway, this is what you need: > > LaTeXFeatures.h > > class LaTeXFeatures { >     ... >     static PackagesList packages_; > }; > > LaTeXFeatures.C (immediately below the #includes): > > PackagesList LaTeXFeatures

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Georg Baum wrote: > I can do that this evening if I know what you wrote in development/FORMAT. > I guess it is only the new parameter in the header? Yes. Here's what I wrote: * format incremented to 240. * new bufferparam: \output_changes {true|false} (sho

Re: [patch] change tracking output

2005-01-24 Thread Georg Baum
Juergen Spitzmueller wrote: > Jean-Marc Lasgouttes wrote: >> When you do that >> -int const LYX_FORMAT = 239; >> +int const LYX_FORMAT = 240; >> don't forget to update development/FORMAT > > Sure (already done). I'll need someone to adapt lyx2lyx, though. I can do that this evening if I know wha

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Jean-Marc Lasgouttes wrote: > When you do that > -int const LYX_FORMAT = 239; > +int const LYX_FORMAT = 240; > don't forget to update development/FORMAT Sure (already done). I'll need someone to adapt lyx2lyx, though. Jürgen

Re: [patch] change tracking output

2005-01-24 Thread Jean-Marc Lasgouttes
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> Done. Updated patch (without the getAvailable() changes) Juergen> attached. When you do that -int const LYX_FORMAT = 239; +int const LYX_FORMAT = 240; don't forget to update development/FORMAT JMarc

Re: [patch] change tracking output

2005-01-24 Thread Jean-Marc Lasgouttes
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> It isn't static in the patch you posted. Anyway, this is what Angus> you need: Angus> LaTeXFeatures.h Angus> class LaTeXFeatures { ... static PackagesList packages_; }; Angus> LaTeXFeatures.C (immediately below the #includes): A

Re: [patch] change tracking output

2005-01-24 Thread Angus Leeming
Juergen Spitzmueller wrote: >> I am not sure putting this list in LaTeXFeatures like that is the best >> solution, since packages.lst will be parsed everytime one exports to >> latex... You may want to turn packages_ into a static variable and >> make getPackage static too. > > I tried this, but t

Re: [patch] change tracking output

2005-01-24 Thread Juergen Spitzmueller
Jean-Marc Lasgouttes wrote: > > "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: > The patch looks good. A few remarks: > > + case LFUN_OUTPUT_CHANGES: { > + LaTeXFeatures features(*buf, buf->params(), false); > + if (!features.isAvailable("dvipost")) >

Re: [patch] change tracking output

2005-01-24 Thread Jean-Marc Lasgouttes
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> The attached patch fixes some real problems with the output Juergen> of change tracked documents and implements a possibility to Juergen> check whether a (required) package is installed. Good idea. Juergen> - If dvipost

[patch] change tracking output

2005-01-23 Thread Juergen Spitzmueller
The attached patch fixes some real problems with the output of change tracked documents and implements a possibility to check whether a (required) package is installed. The problems, which always occur when a user is in change tracking mode (also cf. bug 1031): - If dvipost is not installed, e

Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Lars Gullik Bjønnes
Allan Rae <[EMAIL PROTECTED]> writes: | Does GCC really have long living branches with multiple merges from | the trunk into the branch? yes. | If so, they must know something a lot of others don't. perhaps. The crucial things is to tag HAED and branch, so that you have something to merge agai

Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Allan Rae
On 4 Dec 2002, Lars Gullik Bjønnes wrote: > Allan Rae <[EMAIL PROTECTED]> writes: > > | On Wed, 4 Dec 2002, John Levon wrote: > | > | [...] > | > With all that administration, I'm even less inclined to do so then. > | > > | > CVS is worse at handling conflicts in such cases than patch is > | > | B

Re: [PATCH] Change tracking for 1.3cvs

2002-12-04 Thread Lars Gullik Bjønnes
Allan Rae <[EMAIL PROTECTED]> writes: | On Wed, 4 Dec 2002, John Levon wrote: | | [...] | > With all that administration, I'm even less inclined to do so then. | > | > CVS is worse at handling conflicts in such cases than patch is | | But at least CVS allows others to keep up to date with your w

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread Allan Rae
On Wed, 4 Dec 2002, John Levon wrote: [...] > With all that administration, I'm even less inclined to do so then. > > CVS is worse at handling conflicts in such cases than patch is But at least CVS allows others to keep up to date with your work and fiddle along with you. All you need to do is w

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread John Levon
On Wed, Dec 04, 2002 at 12:07:07PM +1000, Allan Rae wrote: > Then you should do as many other CVS-based projects do (gdb for > example) and start a new branch every so often and roll your > patch (branch to original trunk point) forward. > > I've found that merging the trunk into the branch works

Re: [PATCH] Change tracking for 1.3cvs

2002-12-03 Thread Allan Rae
On Sat, 30 Nov 2002, John Levon wrote: > On Sat, Nov 30, 2002 at 11:39:49PM +0100, Lars Gullik Bjønnes wrote: > > > | I intend to soon when I find a merging guide that works as advertised > > | (neither of Lars' do) > > > > sure they do... > > (what is not working?) > > Trying to merge up trunk c

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread John Levon
On Sat, Nov 30, 2002 at 11:39:49PM +0100, Lars Gullik Bjønnes wrote: > | I intend to soon when I find a merging guide that works as advertised > | (neither of Lars' do) > > sure they do... > (what is not working?) Trying to merge up trunk changes to the branch, it didn't work properly. http://

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread Lars Gullik Bjønnes
John Levon <[EMAIL PROTECTED]> writes: | On Sat, Nov 30, 2002 at 01:34:53PM +0200, Dekel Tsur wrote: | | > How about creating a branch for it ? | | I intend to soon when I find a merging guide that works as advertised | (neither of Lars' do) sure they do... (what is not working?) -- L

Re: [PATCH] Change tracking for 1.3cvs

2002-11-30 Thread John Levon
On Sat, Nov 30, 2002 at 01:34:53PM +0200, Dekel Tsur wrote: > How about creating a branch for it ? I intend to soon when I find a merging guide that works as advertised (neither of Lars' do) regards john -- "Trolls like content too." - Bob Abooey, /.

  1   2   >