Re: Figured it out - can we change from no_NO to nb_NO now?
Jean-Marc Lasgouttes wrote: Lars == Lars Gullik Bjønnes [EMAIL PROTECTED] writes: Lars Let's opt for the last one. Someone needs to push forward, why Lars not us. Note that intl/locale.alias says no_NO nb_NO.ISO-8859-1 no_NO.ISO-8859-1 nb_NO.ISO-8859-1 So it seems there is not much work to do... Well, yes. But the problem, according to various webpages, is that gettext doesn't actually support aliases (unless this changed since 2003), and therefore a user with no_NO gets english even if nb_NO is there. A program that supports aliases internally will work, but not one that relies on gettext for internationalization. Helge Hafting
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
Michael Gerz wrote: Please test. Works like a charm! Thank you! Thanks for testing! Can this one pass? Jürgen
Re: Python version of configure script (preview version)
Bo Peng wrote: Here's the output from my linux box together with a small fix. $ diff -u -Bbw ../build/lib/lyxrc.defaults . lyxrc.diff $ diff -u configure_orig.py configure.py configure.diff How do you like the attached new version? checkProg() now handles rc file and all info about checked program is now complete at one function call. It's looking good, but it occurs to me that you're trying to replace the LyX 1.3.6 version of configure. You should really be looking to the 1.4.0CVS version... -- Angus
no-nb transition complete, how do I make diff pick up the new filenames?
I now have a working lyx-1.4cvs which uses nb instead of no. I get translated text with LANG=nb_NO, and I get the freshly renamed nb_Intro.lyx from the help menu. This was less work than expected. Just a few renames, makefile changes, and changelog updates. How to I submit a patch with renamed files? I tried cvs diff -N -u but that did not work. It merely complained about the missing no.po, and wondered about the unexpected nb.po Should I send a diff for the changed files and let one of you do the rename in cvs, or is there a way of making a patch that removes the no files and add the nb files? Helge Hafting
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Helge Hafting wrote: Should I send a diff for the changed files and let one of you do the rename in cvs, or is there a way of making a patch that removes the no files and add the nb files? rename is not possible in cvs. You need to do cvs remove no.po cvs add nb.po and the the diff would be complete, but for that you need cvs write access. What you can do is to send two patches: One from cvs with the changed files and for each pair of renamed files a manual one (e.g. no.po - nb.po). Georg
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
Juergen == Juergen Spitzmueller [EMAIL PROTECTED] writes: Juergen Michael Gerz wrote: Please test. Works like a charm! Thank you! Juergen Thanks for testing! Juergen Can this one pass? Sure. You understand more about undo that I do now :) JMarc
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Helge Hafting [EMAIL PROTECTED] writes: | I now have a working lyx-1.4cvs which uses nb instead of no. | I get translated text with LANG=nb_NO, and I get the | freshly renamed nb_Intro.lyx from the help menu. | | This was less work than expected. Just a few renames, | makefile changes, and changelog updates. Nice. I think this is what we should do. | How to I submit a patch with renamed files? | I tried | cvs diff -N -u | but that did not work. It merely complained about the | missing no.po, and wondered about the unexpected nb.po you have to do a cvs add to make that work (and to do cvs add you need cvs write access) | Should I send a diff for the changed files and let one of you | do the rename in cvs, or is there a way of making a patch | that removes the no files and add the nb files? Send it to me with a list of what needs to be renamed. -- Lgb
Re: bugs in CVS build of 1.4.0
Mike == Mike Meyer [EMAIL PROTECTED] writes: Mike Details on my environment: A small offtopic remark: Mike --with-pspell This does nothing, since pspell is autodiscovered. Only --without-pspell matters. Mike --with-extra-libs=/usr/opt/lib --with-extra-inc=/usr/opt/include You can use --with-extra-prefix=/usr/opt and get the same effect. Mike --with-pspell-lib=/usr/opt/lib Mike --with-pspell-include=/usr/opt/lib/include These options do not exist anymore. I just mention these things to be sure that the configure script works as I think it works. JMarc
Re: Python version of configure script (preview version)
Angus == Angus Leeming [EMAIL PROTECTED] writes: Angus Bo Peng wrote: Here's the output from my linux box together with a small fix. $ diff -u -Bbw ../build/lib/lyxrc.defaults . lyxrc.diff $ diff -u configure_orig.py configure.py configure.diff How do you like the attached new version? checkProg() now handles rc file and all info about checked program is now complete at one function call. Angus It's looking good, but it occurs to me that you're trying to Angus replace the LyX 1.3.6 version of configure. You should really Angus be looking to the 1.4.0CVS version... I agree to both remarks. Concerning Bo's remark that a lot of win32/mac specific code is going to be added, we should think a bit about that before actually doing it. One solution would be to add code at LyX level to use OS-provided hooks for opening documents. Then we could decide that these OS-provided hooks override what LyX wants to do. The other solution is to do it in the python script. However, I do not know what abilities python has to discover these things. I do not like much the code that searches the registry in windows. JMarc
Web pages problem...
There appears to be a problem with some of the web pages. Eg http://www.lyx.org/about/credits.php http://www.lyx.org/about/blanket-permission.php Warning: Directory system set up for just ONE level ofsubdirectories. See main start.php3 file This page used to display properly. Anybody know what's changed? Note also that there's a spelling mistake in the warning: ofsubdirectories. -- Angus
Re: Python version of configure script (preview version)
Jean-Marc Lasgouttes wrote: Concerning Bo's remark that a lot of win32/mac specific code is going to be added, we should think a bit about that before actually doing it. One solution would be to add code at LyX level to use OS-provided hooks for opening documents. Then we could decide that these OS-provided hooks override what LyX wants to do. The other solution is to do it in the python script. However, I do not know what abilities python has to discover these things. I do not like much the code that searches the registry in windows. I think that we should have all this stuff outside of LyX itself. All LyX needs is to be able to find an executable and to know how to invoke it. LyXRC::path_prefix and the converters provide us with everything we need, no? I agree that the registry stuff is ugly. Individual apps store stuf in the registry in different ways, so there wouldn't appear to be a generic way to extract these data. As for python's abilities in this regard, googling on python search registry turns up lots of stuff. Eg http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/174627 http://www.oreillynet.com/pub/wlg/2608 http://www.microsoft.com/technet/scriptcenter/scripts/python/os/registry/default.mspx -- Angus
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
Jean-Marc Lasgouttes wrote: Juergen Can this one pass? Sure. You understand more about undo that I do now :) I don't claim to understand the internals, but I think I'm beginning to understand how it is meant to be used (which is not much, but enough to fix this bug). Anyway, it will be in shortly. Jürgen
Re: Web pages problem...
Angus Leeming [EMAIL PROTECTED] writes: | There appears to be a problem with some of the web pages. Eg | http://www.lyx.org/about/credits.php | http://www.lyx.org/about/blanket-permission.php | | Warning: Directory system set up for just ONE level ofsubdirectories. | See main start.php3 file | | This page used to display properly. Anybody know what's changed? | | Note also that there's a spelling mistake in the warning: | ofsubdirectories. They all neet a goot look over to work properly with php 5. -- Lgb
Re: Python version of configure script (preview version)
Angus Leeming wrote: As for python's abilities in this regard, googling on python search registry turns up lots of stuff. Eg http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/174627 Also http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146305 -- Angus
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Helge == Helge Hafting [EMAIL PROTECTED] writes: Helge I noticed that cvs diff skipped three files: * po/Makefile Is Helge this one autogenerated with languages from po/LINGUAS? Helge * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from Helge lib/doc/Makefile.am ? These files are indeed generated. Do we want to do the same for 1.3.7? JMarc
Re: Web pages problem...
Lars Gullik Bjønnes wrote: Angus Leeming [EMAIL PROTECTED] writes: | There appears to be a problem with some of the web pages. Eg | http://www.lyx.org/about/credits.php | http://www.lyx.org/about/blanket-permission.php | | Warning: Directory system set up for just ONE level | ofsubdirectories. See main start.php3 file | | This page used to display properly. Anybody know what's changed? | | Note also that there's a spelling mistake in the warning: | ofsubdirectories. They all neet a goot look over to work properly with php 5. sigh Lars, sometimes your upgrading is just half-baked, y'know! Upgrade by all means, but get people on board before you do it and they'll be willing and able to help you resolve these problems. Breaking our interface to the outside world and then just leaving it broken is frankly ridiculous. /sigh Seriously, could you not revert www.lyx.org to PHP3/4 for now and set up a sandbox running PHP5 where we could resolve these problems? -- Angus
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Helge Hafting [EMAIL PROTECTED] writes: | Lars Gullik Bjønnes wrote: | | Helge Hafting [EMAIL PROTECTED] writes: | [...] | | Should I send a diff for the changed files and let one of you | | do the rename in cvs, or is there a way of making a patch | | that removes the no files and add the nb files? | | Send it to me with a list of what needs to be renamed. | | I noticed that cvs diff skipped three files: | * po/Makefile |Is this one autogenerated with languages from po/LINGUAS? yes. auto | | * lib/doc/Makefile | * lib/doc/Makefile.in |Autogenerated from lib/doc/Makefile.am ? yes | File to rename in po: | no.po to nb.po | | File to rename in lib/doc: | no_Intro.lyx to nb_Intro.lyx | no_TOC.lyx to no_Intro.lyx ok | Assuming the above mentioned files get autogenerated, this is all | you need to get a working nb_NO locale for lyx. no_NO is lost, unless | make uninstall leaves the old file behind. I noticed that | make uninstall leaves lots of files and directories in /usr/local/lyx-1.4cvs it shouldn't ... and I thought make distcheck checked for that... you are including the patch inline and not as attachment. -- Lgb
Re: Web pages problem...
Angus Leeming [EMAIL PROTECTED] writes: | Lars Gullik Bjønnes wrote: | | Angus Leeming [EMAIL PROTECTED] writes: | | | There appears to be a problem with some of the web pages. Eg | | http://www.lyx.org/about/credits.php | | http://www.lyx.org/about/blanket-permission.php | | | | Warning: Directory system set up for just ONE level | | ofsubdirectories. See main start.php3 file | | | | This page used to display properly. Anybody know what's changed? | | | | Note also that there's a spelling mistake in the warning: | | ofsubdirectories. | | They all neet a goot look over to work properly with php 5. | | sigh | Lars, sometimes your upgrading is just half-baked, y'know! Upgrade by | all means, but get people on board before you do it and they'll be | willing and able to help you resolve these problems. Breaking our | interface to the outside world and then just leaving it broken is | frankly ridiculous. | /sigh | If you all had help with upgrading the php code to php4 some ... let's see .. two years ago.. we most likely would have no problems now. | Seriously, could you not revert www.lyx.org to PHP3/4 for now and set | up a sandbox running PHP5 where we could resolve these problems? no. -- Lgb
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Jean-Marc Lasgouttes [EMAIL PROTECTED] writes: | Helge == Helge Hafting [EMAIL PROTECTED] writes: | | Helge I noticed that cvs diff skipped three files: * po/Makefile Is | Helge this one autogenerated with languages from po/LINGUAS? | | Helge * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from | Helge lib/doc/Makefile.am ? | | These files are indeed generated. | | Do we want to do the same for 1.3.7? I'd say no. but your call. -- Lgb
Re: bug 1765 (was: Re: Cut Paste in tables is broken!)
On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: Martin Vermeer wrote: Please post the patch to bugzilla. I'll be happy to test it once my tree is ready for it (i.e., my tabular changes are in). So done. The patch fixes the bug, as far a can tell from my testing. Jürgen OK, thanks! Lars, can this go in? - Martin signature.asc Description: This is a digitally signed message part
Re: Web pages problem...
Lars Gullik Bjønnes wrote: | They all neet a goot look over to work properly with php 5. | | sigh | Lars, sometimes your upgrading is just half-baked, y'know! Upgrade | by all means, but get people on board before you do it and they'll | be willing and able to help you resolve these problems. Breaking | our interface to the outside world and then just leaving it broken | is frankly ridiculous. | /sigh | If you all had help with upgrading the php code to php4 some ... let's see .. two years ago.. we most likely would have no problems now. That's my point. I wasn't even aware that there had been an upgrade two years ago. Communicate more! Ask for help more! Can you summarise what needs to be done? -- Angus
Re: Web pages problem...
[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | Angus Leeming [EMAIL PROTECTED] writes: | | | Lars Gullik Bjønnes wrote: | | | | Angus Leeming [EMAIL PROTECTED] writes: | | | | | There appears to be a problem with some of the web pages. Eg | | | http://www.lyx.org/about/credits.php | | | http://www.lyx.org/about/blanket-permission.php | | | | | | Warning: Directory system set up for just ONE level | | | ofsubdirectories. See main start.php3 file And you _could_ just fix this you know... (I did just that...) -- Lgb
Re: Web pages problem...
Angus Leeming [EMAIL PROTECTED] writes: | That's my point. I wasn't even aware that there had been an upgrade | two years ago. You have head me wanting to get rid of the php3 extension right? Did you think I pulled that out of thin air? | Communicate more! | Ask for help more! | | Can you summarise what needs to be done? probably turns out to be nothing... bug in credits.php3. (and if that did not trigger before then _that_ was too a bug.) -- Lgb
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Lars == Lars Gullik Bjønnes [EMAIL PROTECTED] writes: Lars you are including the patch inline and not as attachment. K b is your friend in GNUS in such cases. JMarc
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Lars == Lars Gullik Bjønnes [EMAIL PROTECTED] writes: | Do we want to do the same for 1.3.7? Lars I'd say no. but your call. Well, I'll do what Norwegian guys tell me to do. So I have one no vote. JMarc
Re: bug 1765 (was: Re: Cut Paste in tables is broken!)
Martin Vermeer [EMAIL PROTECTED] writes: | On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: | Martin Vermeer wrote: |Please post the patch to bugzilla. I'll be happy to test it once my tree |is ready for it (i.e., my tabular changes are in). | | So done. | | The patch fixes the bug, as far a can tell from my testing. | | Jürgen | | OK, thanks! | | Lars, can this go in? ok -- Lgb
Re: bug 1765 (was: Re: Cut Paste in tables is broken!)
On Fri, 2005-09-16 at 11:59 +0200, Lars Gullik Bjønnes wrote: Martin Vermeer [EMAIL PROTECTED] writes: | On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: | Martin Vermeer wrote: |Please post the patch to bugzilla. I'll be happy to test it once my tree |is ready for it (i.e., my tabular changes are in). | | So done. | | The patch fixes the bug, as far a can tell from my testing. | | Jürgen | | OK, thanks! | | Lars, can this go in? ok Done. - Martin signature.asc Description: This is a digitally signed message part
Re: Web pages problem...
[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | [EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | | | Angus Leeming [EMAIL PROTECTED] writes: | | | | | Lars Gullik Bjønnes wrote: | | | | | | Angus Leeming [EMAIL PROTECTED] writes: | | | | | | | There appears to be a problem with some of the web pages. Eg | | | | http://www.lyx.org/about/credits.php | | | | http://www.lyx.org/about/blanket-permission.php | | | | | | | | Warning: Directory system set up for just ONE level | | | | ofsubdirectories. See main start.php3 file | | And you _could_ just fix this you know... And it turns out that you did this... did you do it on purpose to have something to complain about? -- Lgb
Re: Web pages problem...
Lars Gullik Bjønnes wrote: | That's my point. I wasn't even aware that there had been an | upgrade two years ago. You have head me wanting to get rid of the php3 extension right? Did you think I pulled that out of thin air? I have no idea what goes on inside that head of yours :) | Communicate more! | Ask for help more! | | Can you summarise what needs to be done? probably turns out to be nothing... bug in credits.php3. (and if that did not trigger before then _that_ was too a bug.) A, OK, I see. Thanks. The page is autogenerated: $ python generate_contributions.py \ CREDITS \ credits.php \ blanket_permissions.php $ cp credits.php blanket_permissions.php ../../www-user/about/. works, but $ python generate_contributions.py \ CREDITS \ ../../www-user/about/credits.php \ ../../www-user/about/blanket_permissions.php does not. I'll try and remember :) Meanwhile, could you update blanket_permissions.php too? (I don't have a copy of www-user checked out here.) -- Angus
Re: no-nb transition complete, how do I make diff pick up the new filenames?
Jean-Marc Lasgouttes [EMAIL PROTECTED] writes: | Lars == Lars Gullik Bjønnes [EMAIL PROTECTED] writes: | | Lars you are including the patch inline and not as attachment. | | K b is your friend in GNUS in such cases. nice to know -- Lgb
Re: Web pages problem...
Angus Leeming [EMAIL PROTECTED] writes: | Lars Gullik Bjønnes wrote: | | That's my point. I wasn't even aware that there had been an | | upgrade two years ago. | | You have head me wanting to get rid of the php3 extension right? | Did you think I pulled that out of thin air? | | I have no idea what goes on inside that head of yours :) To be honest, I don't find it particularly funny. -- Lgb
[PATCH] mathed cut crashes (1960, 1981)
Martin, what is this fix for bug 1981 supposed to do? case LFUN_CUT: + cur.pos() = 0; // Prevent stale position = size crash cutSelection(cur, true, true); cur.message(_(Cut)); break; It is the cause of a rather silly behaviour: when you cut a selected string from a math nestinset, not only the selection, but also everything preceeding it will be cut. IMO (and I'm pretty sure) the correct fix is to use cur.normalize() instead, which fixes the cursor position if it is outside the size() range. I have tested that it fixes both bug 1981 and bug 1960, which seem to share the cause. Can this go in? Jürgen Index: math_nestinset.C === RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v retrieving revision 1.166 diff -u -r1.166 math_nestinset.C --- math_nestinset.C 19 Aug 2005 12:57:47 - 1.166 +++ math_nestinset.C 16 Sep 2005 10:39:01 - @@ -423,9 +423,10 @@ } case LFUN_CUT: - cur.pos() = 0; // Prevent stale position = size crash cutSelection(cur, true, true); cur.message(_(Cut)); + // Prevent stale position = size crash + cur.normalize(); break; case LFUN_COPY:
Re: [PATCH] mathed cut crashes (1960, 1981)
On Fri, 2005-09-16 at 12:46 +0200, Juergen Spitzmueller wrote: Martin, what is this fix for bug 1981 supposed to do? case LFUN_CUT: + cur.pos() = 0; // Prevent stale position = size crash cutSelection(cur, true, true); cur.message(_(Cut)); break; It is the cause of a rather silly behaviour: when you cut a selected string from a math nestinset, not only the selection, but also everything preceeding it will be cut. IMO (and I'm pretty sure) the correct fix is to use cur.normalize() instead, which fixes the cursor position if it is outside the size() range. I have tested that it fixes both bug 1981 and bug 1960, which seem to share the cause. Can this go in? Jürgen OK, this looks better. - Martin signature.asc Description: This is a digitally signed message part
Re: Web pages problem...
| | | | There appears to be a problem with some of the web pages. | | | | Eg http://www.lyx.org/about/credits.php | | | | http://www.lyx.org/about/blanket-permission.php | | | | | | | | Warning: Directory system set up for just ONE level | | | | ofsubdirectories. See main start.php3 file | | And you _could_ just fix this you know... And it turns out that you did this... did you do it on purpose to have something to complain about? No. I'm just not very competent. Again, thanks for bailing me out. -- Angus
Re: Web pages problem...
Lars Gullik Bjønnes wrote: | | That's my point. I wasn't even aware that there had been an | | upgrade two years ago. | | You have head me wanting to get rid of the php3 extension right? | Did you think I pulled that out of thin air? | | I have no idea what goes on inside that head of yours :) To be honest, I don't find it particularly funny. Now you've lost me. -- Angus
[PATCH] bug 1987: Crash when switching to different document class
This pair of patches is for
http://bugzilla.lyx.org/show_bug.cgi?id=1987
Test case:
1. New document
2. Change layout of empty paragraph to Date
3. Change document class to Broadway
= Crash
I began by trying to move more code (in particular the
LFUN_TEXTCLASS_APPLY) into LFUN_BUFFERPARAMS_APPLY. I think this is
sound, and it fixes the bug (what happens is that LFUN_TEXTCLASS_APPLY
changes the layouts of the paragraphs when needed, but does not touch
the textclass itself; thus, if there is an update before
LFUN_BUFFERPARAMS_APPLY is run, the code that sets the layout bar
crashes).
The result is classcrash.diff below, which contains several contents
telling where more cleanup can/should be done.
Then it occurred to me that it is enough to just set the textclass in
LFUN_TEXTCLASS_APPLY.
JMarc
Index: src/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2280
diff -u -p -r1.2280 ChangeLog
--- src/ChangeLog 15 Sep 2005 16:00:27 - 1.2280
+++ src/ChangeLog 16 Sep 2005 10:54:38 -
@@ -1,3 +1,8 @@
+2005-09-16 Jean-Marc Lasgouttes [EMAIL PROTECTED]
+
+ * lyxfunc.C (dispatch): make LFUN_BUFFERPARAMS_APPLY perform the
+ task previously devoted to LFUN_TEXTCLASS_APPLY (bug 1987).
+
2005-09-14 Michael Gerz [EMAIL PROTECTED]
* lyxfunc.C: update display after LFUN_ALL_INSETS_TOGGLE
Index: src/lyxfunc.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.667
diff -u -p -r1.667 lyxfunc.C
--- src/lyxfunc.C 15 Sep 2005 16:00:29 - 1.667
+++ src/lyxfunc.C 16 Sep 2005 10:54:38 -
@@ -1454,14 +1454,16 @@ void LyXFunc::dispatch(FuncRequest const
}
case LFUN_BUFFERPARAMS_APPLY: {
- biblio::CiteEngine const engine =
-owner-buffer()-params().cite_engine;
+ // FIXME: we may want to move this code to
+ // buffer_funcs.C, especially if it inherits
+ // some code from ControlDocument. (JMarc)
+ Buffer buf = *owner-buffer();
+ BufferParams old_params = buf.params();
istringstream ss(argument);
LyXLex lex(0,0);
lex.setStream(ss);
- int const unknown_tokens =
-owner-buffer()-readHeader(lex);
+ int const unknown_tokens = buf.readHeader(lex);
if (unknown_tokens != 0) {
lyxerr Warning in LFUN_BUFFERPARAMS_APPLY!\n
@@ -1469,22 +1471,46 @@ void LyXFunc::dispatch(FuncRequest const
(unknown_tokens == 1 ? : s)
endl;
}
- if (engine == owner-buffer()-params().cite_engine)
-break;
- LCursor cur = view()-cursor();
- FuncRequest fr(LFUN_INSET_REFRESH);
+ BufferParams const params = buf.params();
- InsetBase inset = owner-buffer()-inset();
- InsetIterator it = inset_iterator_begin(inset);
- InsetIterator const end = inset_iterator_end(inset);
- for (; it != end; ++it)
-if (it-lyxCode() == InsetBase::CITE_CODE)
- it-dispatch(cur, fr);
+ if (old_params.cite_engine != params.cite_engine) {
+
+LCursor cur = view()-cursor();
+FuncRequest fr(LFUN_INSET_REFRESH);
+
+InsetBase inset = buf.inset();
+InsetIterator it = inset_iterator_begin(inset);
+InsetIterator const end = inset_iterator_end(inset);
+for (; it != end; ++it)
+ if (it-lyxCode() == InsetBase::CITE_CODE)
+ it-dispatch(cur, fr);
+ }
+
+ if (old_params.textclass != params.textclass) {
+owner-message(_(Converting document to new document class...));
+textclasslist[params.textclass].load();
+recordUndoFullDocument(view());
+StableDocIterator backcur(view()-cursor());
+ErrorList el;
+lyx::cap::SwitchBetweenClasses(
+ old_params.textclass,
+ params.textclass,
+ buf.paragraphs(), el);
+
+view()-setCursor(backcur.asDocIterator((buf.inset(;
+bufferErrors(buf, el);
+view()-showErrorList(_(Class switch));
+updateCounters(buf);
+update = true;
+ }
break;
}
case LFUN_TEXTCLASS_APPLY: {
+ //FIXME: the functionality of this is
+ //duplicated in LFUN_BUFFERPARAMS_APPLY; it is
+ //not clear that this LFUN should be kept. (JMarc)
recordUndoFullDocument(view());
Buffer * buffer = owner-buffer();
Index: src/frontends/controllers/ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.497
diff -u -p -r1.497 ChangeLog
--- src/frontends/controllers/ChangeLog 15 Sep 2005 14:56:27 - 1.497
+++ src/frontends/controllers/ChangeLog 16 Sep 2005 10:54:38 -
@@ -1,3 +1,9 @@
+2005-09-16 Jean-Marc Lasgouttes [EMAIL PROTECTED]
+
+ * ControlDocument.C (dispatchParams): do not invoke
+ LFUN_TEXTCLASS_APPLY, to avoid a spurious update that can cause a
+ crash. This job is now done by LFUN_BUFFERPARAMS_APPLY (bug 1987).
+
2005-09-15 Jürgen Spitzmüller [EMAIL PROTECTED]
* ControlDocument.C
Re: [PATCH] bug 1987: Crash when switching to different document class
Jean-Marc == Jean-Marc Lasgouttes [EMAIL PROTECTED] writes: Jean-Marc The result is classcrash.diff below, which contains several Jean-Marc contents telling where more cleanup can/should be done. Jean-Marc Then it occurred to me that it is enough to just set the Jean-Marc textclass in LFUN_TEXTCLASS_APPLY. I sent my message too fast... So, finally, I came up with the simpler simple-classcrash.diff which also fixes the bug. Lars, am I right that you prefer this one? JMarc
Re: Top labels are not printed correctly
michael == michael gerz [EMAIL PROTECTED] writes:
michael Hello, in a g-brief-de document, the top label Brieftext
michael (letter text) is printed too low (BUG!). Yesterday, I looked
michael at the LyX code and discovered the reason. The problem is
michael that RowPainter::paintFirst (line 515) does not regard the
michael ascent of the row's text. However, row_.ascent() cannot be
michael used as offset because it already includes the height of the
michael label itself (and possibly the height of other elements such
michael as the append marker).
I think this is the right fix (I copied the code used for chapter).
Could you try it?
JMarc
Index: src/rowpainter.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/rowpainter.C,v
retrieving revision 1.155
diff -u -p -r1.155 rowpainter.C
--- src/rowpainter.C 7 Sep 2005 10:37:00 - 1.155
+++ src/rowpainter.C 16 Sep 2005 13:13:52 -
@@ -489,9 +489,7 @@ void RowPainter::paintFirst()
} else {
spacing_val = buffer.params().spacing().getValue();
}
-#ifdef WITH_WARNINGS
-#warning Look is this correct?
-#endif
+
int const labeladdon = int(font_metrics::maxHeight(font) * layout-spacing.getValue() * spacing_val);
int const maxdesc = int(font_metrics::maxDescent(font) * layout-spacing.getValue() * spacing_val)
@@ -531,6 +529,8 @@ void RowPainter::paintFirst()
else
spacing_val = buffer.params().spacing().getValue();
+ int const labeladdon = int(font_metrics::maxHeight(font) * layout-spacing.getValue() * spacing_val);
+
int maxdesc =
int(font_metrics::maxDescent(font) * layout-spacing.getValue() * spacing_val
+ (layout-labelbottomsep * defaultRowHeight()));
@@ -544,7 +544,7 @@ void RowPainter::paintFirst()
x = width_ - leftMargin() -
font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ - maxdesc, str, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
}
}
Re: Python version of configure script (preview version)
One problem with the rc approach is that re-configuration is required whenever users change a filetype association. Also, opening a file with its associated application is quite easy under windows. (There are APIs.) Bo
Re: Python version of configure script (preview version)
Bo == Bo Peng [EMAIL PROTECTED] writes: Bo One problem with the rc approach is that re-configuration is Bo required whenever users change a filetype association. Not if you use start as viewer of any file that is supported by windows (the problem is to discover that). Bo Also, opening a file with its associated application is quite easy Bo under windows. (There are APIs.) Could you point us to the API? I found ShellExecute, but I did not find a way to tell whether a file format is handled. JMarc
Bugs in 1.4.0CVS for Mac OS X
Readme.MacOSX refers to ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.5-skeleton.tar.gz. That file doesn't exist - it's actually a .zip file. Configure ignores (some of) the --datadir, --bindir and --mandir options. I set them all to /Users/mwm/Applications/LyX.app/Contents/... to install 1.4.0CVSin ~/Applications, and make intsall still installed things in /Applications. mike -- Mike Meyer [EMAIL PROTECTED] http://www.mired.org/consulting.html Independent Network/Unix/Perforce consultant, email for more information.
[patch] fix broken documents in lib/doc
Due to a lyx2lyx bug we have broken documents in lib/doc. See http://bugzilla.lyx.org/show_bug.cgi?id=2027 for details. This patch repairs the documents, but does not fix the original lyx2lyx bug. OK to apply? GeorgIndex: lib/doc/ChangeLog === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/ChangeLog,v retrieving revision 1.33 diff -u -p -r1.33 ChangeLog --- lib/doc/ChangeLog 8 Sep 2005 09:20:12 - 1.33 +++ lib/doc/ChangeLog 16 Sep 2005 13:54:21 - @@ -1,3 +1,7 @@ +2005-09-16 Georg Baum [EMAIL PROTECTED] + + * various files: repair invalid syntax, probably caused by a lyx2lyx bug + 2005-09-08 Angus Leeming [EMAIL PROTECTED] * UserGuide.lyx: correct grammar describing invocation of the Index: lib/doc/TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/TOC.lyx,v retrieving revision 1.3 diff -u -p -r1.3 TOC.lyx --- lib/doc/TOC.lyx 18 Jul 2005 09:41:48 - 1.3 +++ lib/doc/TOC.lyx 16 Sep 2005 13:54:21 - @@ -3654,8 +3654,6 @@ Standard math bindings Other Accelerators \end_layout -\end_deeper -\end_deeper \end_body \end_document Index: lib/doc/cs_TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/cs_TOC.lyx,v retrieving revision 1.2 diff -u -p -r1.2 cs_TOC.lyx --- lib/doc/cs_TOC.lyx 18 Jul 2005 09:41:50 - 1.2 +++ lib/doc/cs_TOC.lyx 16 Sep 2005 13:54:22 - @@ -3589,7 +3589,7 @@ The simple LyX Server Protocol \end_layout \end_deeper \begin_layout Description -8 \start_of_appendix +8 Bindings \end_layout @@ -3691,10 +3691,6 @@ Standard math bindings \begin_layout Description 8.3.5 Other Accelerators -\end_layout -\end_deeper -\end_deeper - \end_layout \end_body Index: lib/doc/da_TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/da_TOC.lyx,v retrieving revision 1.2 diff -u -p -r1.2 da_TOC.lyx --- lib/doc/da_TOC.lyx 18 Jul 2005 09:41:50 - 1.2 +++ lib/doc/da_TOC.lyx 16 Sep 2005 13:54:22 - @@ -3575,7 +3575,7 @@ The simple LyX Server Protocol \end_layout \end_deeper \begin_layout Description -8 \start_of_appendix +8 Bindings \end_layout @@ -3677,10 +3677,6 @@ Standard math bindings \begin_layout Description 8.3.5 Other Accelerators -\end_layout -\end_deeper -\end_deeper - \end_layout \end_body Index: lib/doc/de_TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/de_TOC.lyx,v retrieving revision 1.2 diff -u -p -r1.2 de_TOC.lyx --- lib/doc/de_TOC.lyx 18 Jul 2005 09:41:53 - 1.2 +++ lib/doc/de_TOC.lyx 16 Sep 2005 13:54:22 - @@ -5064,7 +5064,7 @@ Die Zukunft der externen Einfügung \end_layout \end_deeper \begin_layout Description -8 \start_of_appendix +8 Tastaturkürzel \end_layout @@ -5167,10 +5167,6 @@ Standard-Definitionen im Mathematikmodus \begin_layout Description 8.3.5 Sonstige Tastaturkürzel -\end_layout -\end_deeper -\end_deeper - \end_layout \end_body Index: lib/doc/de_UserGuide.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/de_UserGuide.lyx,v retrieving revision 1.4 diff -u -p -r1.4 de_UserGuide.lyx --- lib/doc/de_UserGuide.lyx 18 Jul 2005 09:41:53 - 1.4 +++ lib/doc/de_UserGuide.lyx 16 Sep 2005 13:54:25 - @@ -10653,8 +10653,6 @@ Umschalt+Alt\InsetSpace ~ \end_layout \begin_deeper -\end_layout - \begin_deeper \begin_layout Standard Index: lib/doc/es_TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/es_TOC.lyx,v retrieving revision 1.2 diff -u -p -r1.2 es_TOC.lyx --- lib/doc/es_TOC.lyx 18 Jul 2005 09:41:55 - 1.2 +++ lib/doc/es_TOC.lyx 16 Sep 2005 13:54:25 - @@ -3563,7 +3563,7 @@ The simple LyX Server Protocol \end_layout \end_deeper \begin_layout Description -8 \start_of_appendix +8 Bindings \end_layout @@ -3665,10 +3665,6 @@ Standard math bindings \begin_layout Description 8.3.5 Other Accelerators -\end_layout -\end_deeper -\end_deeper - \end_layout \end_body Index: lib/doc/eu_TOC.lyx === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/eu_TOC.lyx,v retrieving revision 1.2 diff -u -p -r1.2 eu_TOC.lyx --- lib/doc/eu_TOC.lyx 18 Jul 2005 09:41:57 - 1.2 +++ lib/doc/eu_TOC.lyx 16 Sep 2005 13:54:25 - @@ -3436,7 +3436,7 @@ LYX zerbitzariaren protokoloa \end_layout \end_deeper \begin_layout Description -8 \start_of_appendix +8 Lasterbideak \end_layout @@ -3544,10 +3544,6 @@ A.3.4 Matematikako lasterbide estandarra \begin_layout Description 8.3.5 Beste azeleratzaileak -\end_layout -\end_deeper -\end_deeper - \end_layout \end_body Index: lib/doc/fr_TOC.lyx
Re: Python version of configure script (preview version)
In [EMAIL PROTECTED], Bo Peng [EMAIL PROTECTED] typed: One problem with the rc approach is that re-configuration is required whenever users change a filetype association. Also, opening a file with its associated application is quite easy under windows. (There are APIs.) Since Bo Peng didn't provide context, I groveled it out by chasing down the message-id he's replying to. He is replying to a message pointing out how to dig information out of the windows registry. From what he says, I presume said information would be the type-viewer map, and that reconfig should store the appropriate viewer in the LyX preferences file. A reconfig isn't required. Until that's done, LyX will just use the old viewer. Who knows - that may even be the one the User wants? I know I don't want LyX to use my default web browser for ViewHTML. On OS X, the solution is easy - you look for the viewer /usr/bin/open. If you find it, you use it. I've got an open for Unix that I've been using in LyX for the last week. I hope to have a version with enough features that it's useful for end users done this weekend. According to Jean-Marc Lasgouttes, you should use start on Windows. Is that an external application? If so, then LyX just needs to know how to launch external command line applications, so no changes are needed. configure will need to be taught to check for open/start, and use those for the viewer for everything if it finds them. mike -- Mike Meyer [EMAIL PROTECTED] http://www.mired.org/consulting.html Independent Network/Unix/Perforce consultant, email for more information.
Re: request for help with CVS access to LyX sources
Lars Gullik Bjønnes wrote: We can keep them separate from the users pov, but have them in the same cvs module, and in the same virtual host on the web server. Is somebody working on this? If it is just a matter of copying the files to the www-user cvs module and adjusting links etc. I could do that. I know php, but I don't know at all how the LyX www setup work. Georg
Re: Bugs in 1.4.0CVS for Mac OS X
Mike == Mike Meyer [EMAIL PROTECTED] writes: Mike Readme.MacOSX refers to Mike ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.5-skeleton.tar.gz. Mike That file doesn't exist - it's actually a .zip file. This will need to be updated (actually put in CVS like we did for 1.3.x). Mike Configure ignores (some of) the --datadir, --bindir and --mandir Mike options. I set them all to Mike /Users/mwm/Applications/LyX.app/Contents/... to install Mike 1.4.0CVSin ~/Applications, and make intsall still installed Mike things in /Applications. You should use --prefix=/Users/mwm/Applications/ instead. JMarc
[patch] bug 1921: lyxbreaker is still asserting...
While thinking about the last (!) remaining critical bug in the 1.4 pipe, I
stumbled over an old patch from Alfredo, which was rejected due to the
feature freeze
(http://marc.theaimsgroup.com/?l=lyx-develm=110186623406865q=p3)
The thing is, now, that this patch fixes the assert in a really elegant way:
collapsables are automatically opened when the cursor enters (and closed when
it leaves, except status_ is open). Something like this has to be done anyway
to cure the bug. I think this is enough judgement to let the minor feature
enhancement, which the patch originally aimed at, pass thru.
I have adapted the patch to current cvs (see attached). The autoopen feature
is not yet used by the spellchecker, though (which would be a oneliner, I
guess, but could certainly also wait).
Lars, could this get into favour with you?
Jürgen
Index: insetcollapsable.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.278
diff -p -u -r1.278 insetcollapsable.C
--- insetcollapsable.C 15 Jul 2005 22:10:21 - 1.278
+++ insetcollapsable.C 16 Sep 2005 14:06:55 -
@@ -40,9 +40,16 @@ using std::min;
using std::ostream;
+InsetCollapsable::CollapseStatus InsetCollapsable::status() const
+{
+ return autoOpen_ ? Open : status_;
+}
+
+
InsetCollapsable::InsetCollapsable
(BufferParams const bp, CollapseStatus status)
- : InsetText(bp), label(Label), status_(status), openinlined_(false)
+ : InsetText(bp), label(Label), status_(status),
+ openinlined_(false), autoOpen_(false)
{
setAutoBreakRows(true);
setDrawFrame(true);
@@ -122,12 +129,14 @@ Dimension InsetCollapsable::dimensionCol
void InsetCollapsable::metrics(MetricsInfo mi, Dimension dim) const
{
+ autoOpen_ = mi.base.bv-cursor().isInside(this);
mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
- if (status_ == Inlined) {
+
+ if (status() == Inlined) {
InsetText::metrics(mi, dim);
} else {
dim = dimensionCollapsed();
- if (status_ == Open) {
+ if (status() == Open) {
InsetText::metrics(mi, textdim_);
openinlined_ = (textdim_.wid + dim.wid = mi.base.textwidth);
if (openinlined_) {
@@ -151,7 +160,7 @@ void InsetCollapsable::metrics(MetricsIn
void InsetCollapsable::draw(PainterInfo pi, int x, int y) const
{
const int xx = x + TEXT_TO_INSET_OFFSET;
- if (status_ == Inlined) {
+ if (status() == Inlined) {
InsetText::draw(pi, xx, y);
} else {
Dimension dimc = dimensionCollapsed();
@@ -162,7 +171,7 @@ void InsetCollapsable::draw(PainterInfo
button_dim.y2 = top + dimc.height();
pi.pain.buttonText(xx, top + dimc.asc, label, labelfont_);
- if (status_ == Open) {
+ if (status() == Open) {
int textx, texty;
if (openinlined_) {
textx = xx + dimc.width();
@@ -181,13 +190,13 @@ void InsetCollapsable::draw(PainterInfo
void InsetCollapsable::drawSelection(PainterInfo pi, int x, int y) const
{
x += TEXT_TO_INSET_OFFSET;
- if (status_ == Open) {
+ if (status() == Open) {
if (openinlined_)
x += dimensionCollapsed().wid;
else
y += dimensionCollapsed().des + textdim_.asc;
}
- if (status_ != Collapsed)
+ if (status() != Collapsed)
InsetText::drawSelection(pi, x, y);
}
@@ -195,32 +204,30 @@ void InsetCollapsable::drawSelection(Pai
void InsetCollapsable::cursorPos
(CursorSlice const sl, bool boundary, int x, int y) const
{
- if (status_ == Collapsed) {
- x = xo();
- y = yo();
- } else {
- InsetText::cursorPos(sl, boundary, x, y);
- if (status_ == Open) {
- if (openinlined_)
-x += dimensionCollapsed().wid;
- else
-y += dimensionCollapsed().height() - ascent()
- + TEXT_TO_INSET_OFFSET + textdim_.asc;
- }
- x += TEXT_TO_INSET_OFFSET;
+ BOOST_ASSERT(status() != Collapsed);
+
+ InsetText::cursorPos(sl, boundary, x, y);
+
+ if (status() == Open) {
+ if (openinlined_)
+ x += dimensionCollapsed().wid;
+ else
+ y += dimensionCollapsed().height() - ascent()
++ TEXT_TO_INSET_OFFSET + textdim_.asc;
}
+ x += TEXT_TO_INSET_OFFSET;
}
InsetBase::EDITABLE InsetCollapsable::editable() const
{
- return status_ != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
+ return status() != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
}
bool InsetCollapsable::descendable() const
{
- return status_ != Collapsed;
+ return status() != Collapsed;
}
@@ -262,7 +269,7 @@ void InsetCollapsable::edit(LCursor cu
InsetBase * InsetCollapsable::editXY(LCursor cur, int x, int y)
{
//lyxerr InsetCollapsable: edit xy endl;
- if (status_ == Collapsed)
+ if (status() == Collapsed)
return this;
cur.push(*this);
return InsetText::editXY(cur, x, y);
@@ -276,9 +283,9 @@ void InsetCollapsable::doDispatch(LCurso
switch (cmd.action) {
case LFUN_MOUSE_PRESS:
- if (status_ == Inlined)
+ if (status() == Inlined)
InsetText::doDispatch(cur, cmd);
- else if (status_ == Open !hitButton(cmd))
+ else if (status() == Open !hitButton(cmd))
Re: [patch] fix broken documents in lib/doc
Georg == Georg Baum [EMAIL PROTECTED] writes: Georg Due to a lyx2lyx bug we have broken documents in lib/doc. See Georg http://bugzilla.lyx.org/show_bug.cgi?id=2027 for details. This Georg patch repairs the documents, but does not fix the original Georg lyx2lyx bug. Georg OK to apply? No, these files are generated by the 'make TOCs' makefile target. This in turn uses a pair of python scripts to do the work. Unfortunately, these scripts do not work when building outside of the main source tree. Nevertheless, the bug you are looking for is in lib/doc/doc_toc.py. JMarc
Re: Bugs in 1.4.0CVS for Mac OS X
On Sep 16, 2005, at 9:33 AM, Mike Meyer wrote: Readme.MacOSX refers to ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.5-skeleton.tar.gz. That file doesn't exist - it's actually a .zip file. This file needs to be updated in at least a couple ways. First, it should be renamed to Install.MacOSX (as with the 1.3.x branch). Second, it should refer not to the ftp server for the LyX/Mac skeleton but to lyx-devel/development/MacOSX/LyX.app. But first, the LyX.app skeleton should actually be placed there! I've attached my most recent version of the LyX/Mac-1.4.0 skeleton to this e-mail, which includes the (crude) Spotlight metadata importer. (Actually, attaching this file results in the e-mail's being rejected by the mail server. I've posted it at http://edisk.fandm.edu/ bennett.helm/LyX/LyX.app.zip.) Configure ignores (some of) the --datadir, --bindir and --mandir options. These should all be replaced with --prefix. (I'm not sure if that fixes the problem below.) I set them all to /Users/mwm/Applications/LyX.app/Contents/... to install 1.4.0CVSin ~/Applications, and make intsall still installed things in /Applications. Bennett
Re: Hebrew/bidi bug 1975
On Tue, 2005-08-16 at 09:05 +0200, Lars Gullik Bjønnes wrote:
Martin Vermeer [EMAIL PROTECTED] writes:
| On Mon, Aug 15, 2005 at 03:12:03PM +0200, Lars Gullik Bjønnes wrote:
My main reaons for being so unwilling is the changes to the .layout
format. It really looks like a cludge to me. (even the existing one)
--
Lgb
| OK, here is one more, the fix for 1975 (cursor positioning inside inset
| in RtL). This one handles inset-within-inset correctly. Straight UI
| regression fix.
Try to get someone else to test it as well, then ok.
A fresh patch for bug 1975, due to the boundary changes.
Bugzilla doesn't like me today, so attached.
Still no external testers found... please?!?
- Martin
Index: text.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text.C,v
retrieving revision 1.627
diff -u -p -r1.627 text.C
--- text.C 10 Sep 2005 13:29:44 - 1.627
+++ text.C 16 Sep 2005 14:41:37 -
@@ -2124,12 +2124,21 @@ int LyXText::cursorX(CursorSlice const
}
// see correction above
- if (boundary_correction)
- if (getFont(par, ppos).isRightToLeft())
+ if (boundary_correction) {
+ if (getFont(par, ppos).isVisibleRightToLeft())
x -= singleWidth(par, ppos);
else
x += singleWidth(par, ppos);
+ }
+ // Make sure inside an inset we always count from the left
+ // edge (bidi!) -- MV
+ if (sl.pos() par.size()) {
+ font = getFont(par, sl.pos());
+ if (!boundary font.isVisibleRightToLeft()
+ par.isInset(sl.pos()))
+ x -= par.getInset(sl.pos())-width();
+ }
return int(x);
}
signature.asc
Description: This is a digitally signed message part
Re: [patch] bug 1921: lyxbreaker is still asserting...
Juergen Spitzmueller [EMAIL PROTECTED] writes: | While thinking about the last (!) remaining critical bug in the 1.4 pipe, I | stumbled over an old patch from Alfredo, which was rejected due to the | feature freeze | (http://marc.theaimsgroup.com/?l=lyx-develm=110186623406865q=p3) | | The thing is, now, that this patch fixes the assert in a really elegant way: | collapsables are automatically opened when the cursor enters (and closed when | it leaves, except status_ is open). Something like this has to be done anyway | to cure the bug. I think this is enough judgement to let the minor feature | enhancement, which the patch originally aimed at, pass thru. | | I have adapted the patch to current cvs (see attached). The autoopen feature | is not yet used by the spellchecker, though (which would be a oneliner, I | guess, but could certainly also wait). | | Lars, could this get into favour with you? Test it hard, and get ok from J-M as well. -- Lgb
Re: Bugs in 1.4.0CVS for Mac OS X
In [EMAIL PROTECTED], Jean-Marc Lasgouttes [EMAIL PROTECTED] typed: Mike Configure ignores (some of) the --datadir, --bindir and --mandir Mike options. I set them all to Mike /Users/mwm/Applications/LyX.app/Contents/... to install Mike 1.4.0CVSin ~/Applications, and make intsall still installed Mike things in /Applications. You should use --prefix=/Users/mwm/Applications/ instead. configure --help says that won't work, but it does. Though you actually want ../Applications/LyX.app. The INSTALL.MacOSX (post-rename) needs to be fixed. Thanks, mike -- Mike Meyer [EMAIL PROTECTED] http://www.mired.org/consulting.html Independent Network/Unix/Perforce consultant, email for more information.
Is http://www.devel.lyx.org/ down?
I can not use pserver:[EMAIL PROTECTED]:/lyx/cvs to get the latest cvs either. Bo
gettext update?
Hello, last time I checked LyX/Win 1.4-MinGW, it crashed right after the start. The debugger pointed to some gettext-related problem. Yesterday, I tried to recompile the whole sources and - by accident - I noticed a compiler warning in intl/printf-args.c, line 83. gcc told me that the wrong type of parameter is passed and that the program will stop at run-time if this line of code is reached (no joke). AFAICS, the sources in ./intl are based on gettext 0.14.1. I looked at the GNU server: version 0.14.5 is available. I can't tell you right now whether the new version actually fixes the problem but shouldn't we update gettext anyway? Michael
Re: [patch] fix broken documents in lib/doc
Jean-Marc Lasgouttes wrote: Georg == Georg Baum [EMAIL PROTECTED] writes: Georg Due to a lyx2lyx bug we have broken documents in lib/doc. See Georg http://bugzilla.lyx.org/show_bug.cgi?id=2027 for details. This Georg patch repairs the documents, but does not fix the original Georg lyx2lyx bug. Georg OK to apply? No, these files are generated by the 'make TOCs' makefile target. This in turn uses a pair of python scripts to do the work. Unfortunately, these scripts do not work when building outside of the main source tree. Is that the reason why are they in cvs despite they can be autogenerated? Nevertheless, the bug you are looking for is in lib/doc/doc_toc.py. I don't think so. The current TOC files were not generated by doc_toc.py, but mass converted with lyx2lyx by Jose' 8 weeks ago: http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/lib/doc/ I tried to recreate da_TOC.lyx with ./doc_toc.py da but the created file is much smaller than the current one (it does not contain the untranslated english sections). Something seems to be wrong here. What about de_Userguide and it_Userguide? They are not autogenerated. Can I apply that part of the patch? Georg
Re: [patch] bug 1921: lyxbreaker is still asserting...
Lars Gullik Bjønnes wrote: Test it hard, and get ok from J-M as well. Certainly. Maybe even André finds the time to review the three assert fixes over the weekend. Jürgen
Re: Is http://www.devel.lyx.org/ down?
Bo Peng wrote: Hi, Bo. Yes, www.devel.lyx.org is currently dead. For CVS try Try pserver:anoncvs AT anoncvs.us.lyx.org:/var/cvs Peplace AT with @. -- Angus
Re: Is http://www.devel.lyx.org/ down?
Angus Leeming [EMAIL PROTECTED] writes: | Bo Peng wrote: | | Hi, Bo. Yes, www.devel.lyx.org is currently dead. For CVS try Not just currently, it will stay so. I might add a redirecting alias later. -- Lgb
Re: Is http://www.devel.lyx.org/ down?
Try pserver:anoncvs AT anoncvs.us.lyx.org:/var/cvs Peplace AT with @. % cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs login Logging in to :pserver:[EMAIL PROTECTED]:2401/var/cvs CVS password: Fatal error, aborting. anoncvs: no such user Bo
[PATCH] vspace metrics/draw corrections/improvements
Hello,
if you place the cursor in front of a vspace inset, it is displayed way
too high.
I had a look at method metrics in insetvspace.C which IMHO is a bit
confusing (and partially wrong - Why is size set to 10 initially? Why do
we decrease the font size twice but compute some values in between?)
I cleaned up the code and modified it in such a way that the cursor in
displayed on the same level as the vspace label.
Jean-Marc, Lars, can I commit it? (Pleease...)
Michael
PS: This was a nice opportunity in order to practice metrics
computation. I am ready for the rowpainter stuff now :-)
Index: ChangeLog
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.1189
diff -u -r1.1189 ChangeLog
--- ChangeLog 16 Sep 2005 10:19:02 - 1.1189
+++ ChangeLog 16 Sep 2005 16:46:17 -
@@ -1,3 +1,8 @@
+2005-09-16 Michael Gerz [EMAIL PROTECTED]
+
+ * insetvspace.C (metrics): compute ascent and descent in a way that
+ the cursor is placed on the same level as the label text
+
2005-09-11 Martin Vermeer [EMAIL PROTECTED]
* insettabular.C: fixes bug 1765: multicol cell width on screen not
Index: insetvspace.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetvspace.C,v
retrieving revision 1.18
diff -u -r1.18 insetvspace.C
--- insetvspace.C 12 Sep 2005 14:57:50 - 1.18
+++ insetvspace.C 16 Sep 2005 16:46:17 -
@@ -116,25 +116,25 @@
void InsetVSpace::metrics(MetricsInfo mi, Dimension dim) const
{
- int size = 10;
- int const space_size = space_.inPixels(*mi.base.bv);
-
LyXFont font;
font.decSize();
- int const min_size = max(3 * arrow_size, font_metrics::maxHeight(font));
+ font.decSize();
+
+ int height = 3 * arrow_size;
- if (space_.length().len().value() 0.0)
- size = min_size;
- else
- size = max(min_size, space_size);
+ if (space_.length().len().value() 0.0)
+ height = max(height, space_.inPixels(*mi.base.bv));
- dim.asc = size / 2;
- dim.des = size / 2;
int w = 0;
int a = 0;
int d = 0;
- font.decSize();
font_metrics::rectText(label(), font, w, a, d);
+
+ height = max(height, a * 2 + 1); // one extra pixel at the top
+ height = max(height, d * 2 + 1); // ... and at the bottom
+
+ dim.asc = height / 2 + (a - d) / 2; // align cursor with the
+ dim.des = height - dim.asc; // label text
dim.wid = ADD_TO_VSPACE_WIDTH + 2 * arrow_size + 5 + w;
dim_ = dim;
@@ -150,8 +150,6 @@
int const start = y - dim_.asc;
int const end = y + dim_.des;
- // the label to display (if any)
- string const str = label();
// y-values for top arrow
int ty1, ty2;
// y-values for bottom arrow
@@ -184,8 +182,9 @@
font.decSize();
font_metrics::rectText(label(), font, w, a, d);
- pi.pain.rectText(x + 2 * arrow_size + 5, y + d,
- str, font, LColor::none, LColor::none);
+ pi.pain.rectText(x + 2 * arrow_size + 5,
+ start + (end - start) / 2 + (a - d) / 2,
+ label(), font, LColor::none, LColor::none);
// top arrow
pi.pain.line(x, ty1, midx, ty2, LColor::added_space);
Re: Frames for multi-columns
Juergen Spitzmueller wrote: = Question: How do I deactivate the line for the current cell? a.) using the tabular dialog instead of the toolbar b.) M-x m-toggle-line-top I am not sure whether the user will actually be aware of these options. Seriously, your bug report only refers to the tabular toolbar, not the dialog. Well, the same applies to the menu entries (Edit = Table) which makes things a bit more problematic. The problem is that the toolbar only has toggle-line-* lfuns, while the (qt) dialog uses the corresponding m-toggle-line-* lfun while being in a multicolumn cell. I don't know if it is possible to implement such a context sensitive behaviour in the toolbars. IMHO we should introduce LFUN_M_TOGGLE_OR_TOGGLE_DEPENDING_ON_CONTEXT. Michael
Re: [PATCH] vspace metrics/draw corrections/improvements
Michael Gerz wrote: Hello, if you place the cursor in front of a vspace inset, it is displayed way too high. Did you try different vspace values (very large, very small)? I am not sure whether this behaviour is on purpose or not. I had a look at method metrics in insetvspace.C which IMHO is a bit confusing (and partially wrong - Why is size set to 10 initially? This is not needed, but does no harm either. Why do we decrease the font size twice but compute some values in between?) Because it was only one step until recently. When I included the text width in metrics I did change the original code as little as possible because I did not want to dig in the details of the vertical metrics. Georg
Re: Is http://www.devel.lyx.org/ down?
On 9/16/05, Bo Peng [EMAIL PROTECTED] wrote: Try pserver:anoncvs AT anoncvs.us.lyx.org:/var/cvs Peplace AT with @. % cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs login Logging in to :pserver:[EMAIL PROTECTED]:2401/var/cvs CVS password: Fatal error, aborting. anoncvs: no such user Maybe PM me a password for an account? Bo
Re: [PATCH] vspace metrics/draw corrections/improvements
Georg Baum wrote: if you place the cursor in front of a vspace inset, it is displayed way too high. Did you try different vspace values (very large, very small)? I am not sure whether this behaviour is on purpose or not. Yes, I did. The LyX cursor is determined by the font size of the paragraph; its vertical bar is drawn from maximum ascent to maximum descent. To make vspace insets look good, their relative position to the baseline must be defined properly. This is what the patch does. This is not needed, but does no harm either. I know. Why do we decrease the font size twice but compute some values in between?) Because it was only one step until recently. When I included the text width in metrics I did change the original code as little as possible because I did not want to dig in the details of the vertical metrics. Aha! Anyway, I hope that the new code is a bit clearer. After all there is no magic in it. Michael
[Patch] RtL space width bug fix
The displayed width of a space on-screen is taken from the wrong
position in the row... but only for RtL text. And thus the row display
is messed up if it contains spaces. Patch fixes this.
I believe this to be correct, but please test. Bug and patch are in
bugzilla: bug 2029.
- Martin
Index: rowpainter.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/rowpainter.C,v
retrieving revision 1.155
diff -u -p -r1.155 rowpainter.C
--- rowpainter.C7 Sep 2005 10:37:00 - 1.155
+++ rowpainter.C16 Sep 2005 14:38:37 -
@@ -627,7 +627,7 @@ void RowPainter::paintText()
}
const int width_pos =
- text_.singleWidth(par_, vpos, par_.getChar(vpos), font);
+ text_.singleWidth(par_, pos, par_.getChar(pos), font);
if (x_ + width_pos 0) {
x_ += width_pos;
Re: Python version of configure script (preview version)
Dear list,
Attached is a python version of lib/configure for 1.4.0 cvs. It is
written according to the m4 file at
http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/lib/configure.m4 .
Since I do not have access to lyx/cvs, I can only test it against
1.4.0pre1 from ftp.lyx.org.
Please test this script and report any problem here. Note that you
should diff sorted lyxrc.default files since configure.py does not
keep the original entry order.
Angus, could you add this file to the repository?
Thanks.
Bo
#!/usr/bin/env python
#
# Python version of the configure script
#
# Bo Peng ([EMAIL PROTECTED])
# Sep, 2005
#
import sys, os, re, shutil, glob
outfile = 'lyxrc.defaults'
rc_entries = ''
lyx_check_config = True
lyx_keep_temps = False
srcdir = ''
version_suffix = ''
def writeToFile(filename, lines, append = False):
utility function: write or append lines to filename
if append:
file = open(filename, 'a')
else:
file = open(filename, 'w')
file.write(lines)
file.close()
def addToRC(lines):
''' utility function: shortcut for appending lines to outfile
add newline at the end of lines.
'''
if lines.strip() != '':
writeToFile(outfile, lines + '\n', append = True)
def removeFiles(filenames):
'''utility function: 'rm -f'
ignore erroes when file does not exist, or is a directory.
'''
for file in filenames:
try:
os.remove(file)
except:
pass
def cmdOutput(cmd, line=-1):
'''utility function: run a command and get its output
cmd: command to run
line: return the 'line' line. (with boundary checking)
if line==-1 (default), return all lines.
'''
fout = os.popen(cmd)
output = fout.readlines()
fout.close()
if line 0:
return output
elif line = len(output):
print Output of command, cmd, has less than, line+1, lines
sys.exit(4)
return output[line]
## Parse the command line
for op in sys.argv[1:]: # default shell/for list is $*, the options
if op in [ '-help', '--help', '-h' ]:
print '''Usage: configure [options]
Options:
--help show this help lines
--keep-temps keep temporary files (for debug. purposes)
--without-latex-config do not run LaTeX to determine configuration
--with-version-suffix=suffix suffix of binary installed files
'''
sys.exit(0)
elif op == '--without-latex-config':
lyx_check_config = False
elif op == '--keep-temps':
lyx_keep_temps = True
elif op[0:22] == '--with-version-suffix=': # never mind if op is not long
enough
version_suffix = op[23:]
else:
print Unknown option, op
sys.exit(1)
## Checking for some echo oddities (ignored)
## The original script defines ac_n, ac_t and ac_c for
## tab, newline etc, I just use python's print output.
## I do not really know why this is useful, but we might as well keep it.
### NLS nuisances.
### Only set these to C if already set. These must not be set unconditionally
### because not all systems understand e.g. LANG=C (notably SCO).
### Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
### Non-C LC_CTYPE values break the ctype check.
##
os.environ['LANG'] = os.getenv('LANG', 'C')
os.environ['LC'] = os.getenv('LC_ALL', 'C')
os.environ['LC_MESSAGE'] = os.getenv('LC_MESSAGE', 'C')
os.environ['LC_CTYPE'] = os.getenv('LC_CTYPE', 'C')
## Guess the directory in which configure is located.
ac_prog = sys.argv[0]
srcdir = os.path.dirname(ac_prog)
if srcdir == '':
srcdir = '.'
if not os.path.isfile( os.path.join(srcdir, 'chkconfig.ltx') ):
print configure: error: cannot find chkconfig.ltx script
sys.exit(1)
## Adjust PATH for Win32 (Cygwin)
#
use_cygwin_path_fix = ''
if sys.platform == 'cygwin':
from tempfile import mkstemp
fd, tmpfname = mkstemp(suffix='.ltx')
os.write(fd, r'''
\documentstyle{article}
\begin{document}\end{document}
''')
os.close(fd)
inpname = cmdOutput('cygpath -w ' + tmpfname, 0).replace('\\', '/').strip()
# a wrapper file
wfd, wtmpfname = mkstemp(suffix='.ltx')
os.write(wfd, r'\input{' + inpname + '}' )
os.close(wfd)
check_err = False
# grep Error
for line in cmdOutput('latex ' + wtmpfname):
if line.count('Error') != 0:
check_err = True
break
removeFiles( [ tmpfname, wtmpfname ])
if check_err:
print configure: cygwin detected; path correction
srcdir = cmdOutput('cygpath -w ' + srcdir, 0).replace(r'\\', '').strip()
print srcdir = , srcdir
use_cygwin_path_fix = 'true'
else:
print configure: cygwin detected; path correction is not needed
use_cygwin_path_fix = 'false'
Create the build directories if necessary
for dir in ['bind', 'clipart', 'doc', 'examples', 'images', 'kbd', \
'layouts', 'scripts', 'templates', 'ui' ]:
if not os.path.isdir( dir ):
try:
os.mkdir( dir)
except:
print Failed to create directory , dir
sys.exit(1)
## Write the first part of outfile
writeToFile(outfile, '''# This file has been automatically
Re: Python version of configure script (preview version)
On Fri, Sep 16, 2005 at 09:12:20PM -0700, Bo Peng wrote: Since I do not have access to lyx/cvs, I can only test it against 1.4.0pre1 from ftp.lyx.org. Well, you can always use CVSROOT=:pserver:[EMAIL PROTECTED]:/var/cvs/lyx Then cvs login (password is lyx) Failing that, you can always browse ftp://ftp.sylvan.com/pub/lyx/devel and grab the latest CVS snapshot tar.bz2 file. ---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: Figured it out - can we change from no_NO to nb_NO now?
Jean-Marc Lasgouttes wrote: "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: Lars> Let's opt for the last one. Someone needs to push forward, why Lars> not us. Note that intl/locale.alias says no_NO nb_NO.ISO-8859-1 no_NO.ISO-8859-1 nb_NO.ISO-8859-1 So it seems there is not much work to do... Well, yes. But the problem, according to various webpages, is that "gettext" doesn't actually support aliases (unless this changed since 2003), and therefore a user with no_NO gets english even if nb_NO is there. A program that supports aliases internally will work, but not one that relies on gettext for internationalization. Helge Hafting
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
Michael Gerz wrote: > >Please test. > > > > Works like a charm! Thank you! Thanks for testing! Can this one pass? Jürgen
Re: Python version of configure script (preview version)
Bo Peng wrote: >> Here's the output from my linux box together with a small fix. >> >> $ diff -u -Bbw ../build/lib/lyxrc.defaults . > lyxrc.diff >> $ diff -u configure_orig.py configure.py > configure.diff > > How do you like the attached new version? checkProg() now > handles rc file and all info about checked program is now > complete at one function call. It's looking good, but it occurs to me that you're trying to replace the LyX 1.3.6 version of configure. You should really be looking to the 1.4.0CVS version... -- Angus
no->nb transition complete, how do I make "diff" pick up the new filenames?
I now have a working lyx-1.4cvs which uses nb instead of no. I get translated text with LANG=nb_NO, and I get the freshly renamed nb_Intro.lyx from the help menu. This was less work than expected. Just a few renames, makefile changes, and changelog updates. How to I submit a patch with renamed files? I tried cvs diff -N -u but that did not work. It merely complained about the missing no.po, and wondered about the unexpected nb.po Should I send a diff for the changed files and let one of you do the rename in cvs, or is there a way of making a patch that removes the "no" files and add the "nb" files? Helge Hafting
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting wrote: > Should I send a diff for the changed files and let one of you > do the rename in cvs, or is there a way of making a patch > that removes the "no" files and add the "nb" files? rename is not possible in cvs. You need to do cvs remove no.po cvs add nb.po and the the diff would be complete, but for that you need cvs write access. What you can do is to send two patches: One from cvs with the changed files and for each pair of renamed files a manual one (e.g. no.po -> nb.po). Georg
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> Michael Gerz wrote: >> >Please test. > >> >> Works like a charm! Thank you! Juergen> Thanks for testing! Juergen> Can this one pass? Sure. You understand more about undo that I do now :) JMarc
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting <[EMAIL PROTECTED]> writes: | I now have a working lyx-1.4cvs which uses nb instead of no. | I get translated text with LANG=nb_NO, and I get the | freshly renamed nb_Intro.lyx from the help menu. | | This was less work than expected. Just a few renames, | makefile changes, and changelog updates. Nice. I think this is what we should do. | How to I submit a patch with renamed files? | I tried | cvs diff -N -u | but that did not work. It merely complained about the | missing no.po, and wondered about the unexpected nb.po you have to do a cvs add to make that work (and to do cvs add you need cvs write access) | Should I send a diff for the changed files and let one of you | do the rename in cvs, or is there a way of making a patch | that removes the "no" files and add the "nb" files? Send it to me with a list of what needs to be renamed. -- Lgb
Re: bugs in CVS build of 1.4.0
> "Mike" == Mike Meyer <[EMAIL PROTECTED]> writes: Mike> Details on my environment: A small offtopic remark: Mike> --with-pspell This does nothing, since pspell is autodiscovered. Only --without-pspell matters. Mike> --with-extra-libs=/usr/opt/lib --with-extra-inc=/usr/opt/include You can use --with-extra-prefix=/usr/opt and get the same effect. Mike> --with-pspell-lib=/usr/opt/lib Mike> --with-pspell-include=/usr/opt/lib/include These options do not exist anymore. I just mention these things to be sure that the configure script works as I think it works. JMarc
Re: Python version of configure script (preview version)
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> Bo Peng wrote: >>> Here's the output from my linux box together with a small fix. >>> >>> $ diff -u -Bbw ../build/lib/lyxrc.defaults . > lyxrc.diff $ diff >>> -u configure_orig.py configure.py > configure.diff >> How do you like the attached new version? checkProg() now handles >> rc file and all info about checked program is now complete at one >> function call. Angus> It's looking good, but it occurs to me that you're trying to Angus> replace the LyX 1.3.6 version of configure. You should really Angus> be looking to the 1.4.0CVS version... I agree to both remarks. Concerning Bo's remark that a lot of win32/mac specific code is going to be added, we should think a bit about that before actually doing it. One solution would be to add code at LyX level to use OS-provided hooks for opening documents. Then we could decide that these OS-provided hooks override what LyX wants to do. The other solution is to do it in the python script. However, I do not know what abilities python has to discover these things. I do not like much the code that searches the registry in windows. JMarc
Web pages problem...
There appears to be a problem with some of the web pages. Eg http://www.lyx.org/about/credits.php http://www.lyx.org/about/blanket-permission.php Warning: Directory system set up for just ONE level ofsubdirectories. See main start.php3 file This page used to display properly. Anybody know what's changed? Note also that there's a spelling mistake in the warning: "ofsubdirectories". -- Angus
Re: Python version of configure script (preview version)
Jean-Marc Lasgouttes wrote: > Concerning Bo's remark that a lot of win32/mac specific code is > going to be added, we should think a bit about that before actually > doing it. > > One solution would be to add code at LyX level to use OS-provided > hooks for opening documents. Then we could decide that these > OS-provided hooks override what LyX wants to do. > > The other solution is to do it in the python script. However, I do > not know what abilities python has to discover these things. I do > not like much the code that searches the registry in windows. I think that we should have all this stuff outside of LyX itself. All LyX needs is to be able to find an executable and to know how to invoke it. LyXRC::path_prefix and the converters provide us with everything we need, no? I agree that the registry stuff is ugly. Individual apps store stuf in the registry in different ways, so there wouldn't appear to be a generic way to extract these data. As for python's abilities in this regard, googling on "python search registry" turns up lots of stuff. Eg http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/174627 http://www.oreillynet.com/pub/wlg/2608 http://www.microsoft.com/technet/scriptcenter/scripts/python/os/registry/default.mspx -- Angus
Re: [PATCH] Bug 2011: Pasting text with middle mouse button is not undoable
Jean-Marc Lasgouttes wrote: > Juergen> Can this one pass? > > Sure. You understand more about undo that I do now :) I don't claim to understand the internals, but I think I'm beginning to understand how it is meant to be used (which is not much, but enough to fix this bug). Anyway, it will be in shortly. Jürgen
Re: Web pages problem...
Angus Leeming <[EMAIL PROTECTED]> writes: | There appears to be a problem with some of the web pages. Eg | http://www.lyx.org/about/credits.php | http://www.lyx.org/about/blanket-permission.php | | Warning: Directory system set up for just ONE level ofsubdirectories. | See main start.php3 file | | This page used to display properly. Anybody know what's changed? | | Note also that there's a spelling mistake in the warning: | "ofsubdirectories". They all neet a goot look over to work properly with php 5. -- Lgb
Re: Python version of configure script (preview version)
Angus Leeming wrote: > As for python's abilities in this regard, googling on "python search > registry" turns up lots of stuff. Eg > http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/174627 Also http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/146305 -- Angus
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Helge" == Helge Hafting <[EMAIL PROTECTED]> writes: Helge> I noticed that "cvs diff" skipped three files: * po/Makefile Is Helge> this one autogenerated with languages from po/LINGUAS? Helge> * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from Helge> lib/doc/Makefile.am ? These files are indeed generated. Do we want to do the same for 1.3.7? JMarc
Re: Web pages problem...
Lars Gullik Bjønnes wrote: > Angus Leeming <[EMAIL PROTECTED]> writes: > > | There appears to be a problem with some of the web pages. Eg > | http://www.lyx.org/about/credits.php > | http://www.lyx.org/about/blanket-permission.php > | > | Warning: Directory system set up for just ONE level > | ofsubdirectories. See main start.php3 file > | > | This page used to display properly. Anybody know what's changed? > | > | Note also that there's a spelling mistake in the warning: > | "ofsubdirectories". > > They all neet a goot look over to work properly with php 5. Lars, sometimes your upgrading is just half-baked, y'know! Upgrade by all means, but get people on board before you do it and they'll be willing and able to help you resolve these problems. Breaking our interface to the outside world and then just leaving it broken is frankly ridiculous. Seriously, could you not revert www.lyx.org to PHP3/4 for now and set up a sandbox running PHP5 where we could resolve these problems? -- Angus
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | | >Helge Hafting <[EMAIL PROTECTED]> writes: | >[...] | >| Should I send a diff for the changed files and let one of you | >| do the rename in cvs, or is there a way of making a patch | >| that removes the "no" files and add the "nb" files? | > | >Send it to me with a list of what needs to be renamed. | > | I noticed that "cvs diff" skipped three files: | * po/Makefile |Is this one autogenerated with languages from po/LINGUAS? yes. auto | | * lib/doc/Makefile | * lib/doc/Makefile.in |Autogenerated from lib/doc/Makefile.am ? yes | File to rename in po: | no.po to nb.po | | File to rename in lib/doc: | no_Intro.lyx to nb_Intro.lyx | no_TOC.lyx to no_Intro.lyx ok | Assuming the above mentioned files get autogenerated, this is all | you need to get a working nb_NO locale for lyx. no_NO is lost, unless | "make uninstall" leaves the old file behind. I noticed that | make uninstall leaves lots of files and directories in /usr/local/lyx-1.4cvs it shouldn't ... and I thought make distcheck checked for that... you are including the patch "inline" and not as attachment. -- Lgb
Re: Web pages problem...
Angus Leeming <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | | > Angus Leeming <[EMAIL PROTECTED]> writes: | > | > | There appears to be a problem with some of the web pages. Eg | > | http://www.lyx.org/about/credits.php | > | http://www.lyx.org/about/blanket-permission.php | > | | > | Warning: Directory system set up for just ONE level | > | ofsubdirectories. See main start.php3 file | > | | > | This page used to display properly. Anybody know what's changed? | > | | > | Note also that there's a spelling mistake in the warning: | > | "ofsubdirectories". | > | > They all neet a goot look over to work properly with php 5. | | | Lars, sometimes your upgrading is just half-baked, y'know! Upgrade by | all means, but get people on board before you do it and they'll be | willing and able to help you resolve these problems. Breaking our | interface to the outside world and then just leaving it broken is | frankly ridiculous. | | If you all had help with upgrading the php code to php4 some ... let's see .. two years ago.. we most likely would have no problems now. | Seriously, could you not revert www.lyx.org to PHP3/4 for now and set | up a sandbox running PHP5 where we could resolve these problems? no. -- Lgb
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: | > "Helge" == Helge Hafting <[EMAIL PROTECTED]> writes: | | Helge> I noticed that "cvs diff" skipped three files: * po/Makefile Is | Helge> this one autogenerated with languages from po/LINGUAS? | | Helge> * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from | Helge> lib/doc/Makefile.am ? | | These files are indeed generated. | | Do we want to do the same for 1.3.7? I'd say no. but your call. -- Lgb
Re: bug 1765 (was: Re: Cut & Paste in tables is broken!)
On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: > Martin Vermeer wrote: > > > Please post the patch to bugzilla. I'll be happy to test it once my tree > > > is ready for it (i.e., my tabular changes are in). > > > > So done. > > The patch fixes the bug, as far a can tell from my testing. > > Jürgen OK, thanks! Lars, can this go in? - Martin signature.asc Description: This is a digitally signed message part
Re: Web pages problem...
Lars Gullik Bjønnes wrote: > | > They all neet a goot look over to work properly with php 5. > | > | > | Lars, sometimes your upgrading is just half-baked, y'know! Upgrade > | by all means, but get people on board before you do it and they'll > | be willing and able to help you resolve these problems. Breaking > | our interface to the outside world and then just leaving it broken > | is frankly ridiculous. > | > | > If you all had help with upgrading the php code to php4 some ... > let's see .. two years ago.. we most likely would have no problems > now. That's my point. I wasn't even aware that there had been an upgrade two years ago. Communicate more! Ask for help more! Can you summarise what needs to be done? -- Angus
Re: Web pages problem...
[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | Angus Leeming <[EMAIL PROTECTED]> writes: | | | Lars Gullik Bjønnes wrote: | | | | > Angus Leeming <[EMAIL PROTECTED]> writes: | | > | | > | There appears to be a problem with some of the web pages. Eg | | > | http://www.lyx.org/about/credits.php | | > | http://www.lyx.org/about/blanket-permission.php | | > | | | > | Warning: Directory system set up for just ONE level | | > | ofsubdirectories. See main start.php3 file And you _could_ just fix this you know... (I did just that...) -- Lgb
Re: Web pages problem...
Angus Leeming <[EMAIL PROTECTED]> writes: | That's my point. I wasn't even aware that there had been an upgrade | two years ago. You have head me wanting to get rid of the php3 extension right? Did you think I pulled that out of thin air? | Communicate more! | Ask for help more! | | Can you summarise what needs to be done? probably turns out to be nothing... bug in credits.php3. (and if that did not trigger before then _that_ was too a bug.) -- Lgb
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: Lars> you are including the patch "inline" and not as attachment. "K b" is your friend in GNUS in such cases. JMarc
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: | Do we want to do the same for 1.3.7? Lars> I'd say no. but your call. Well, I'll do what Norwegian guys tell me to do. So I have one "no" vote. JMarc
Re: bug 1765 (was: Re: Cut & Paste in tables is broken!)
Martin Vermeer <[EMAIL PROTECTED]> writes: | On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: | > Martin Vermeer wrote: | > > > Please post the patch to bugzilla. I'll be happy to test it once my tree | > > > is ready for it (i.e., my tabular changes are in). | > > | > > So done. | > | > The patch fixes the bug, as far a can tell from my testing. | > | > Jürgen | | OK, thanks! | | Lars, can this go in? ok -- Lgb
Re: bug 1765 (was: Re: Cut & Paste in tables is broken!)
On Fri, 2005-09-16 at 11:59 +0200, Lars Gullik Bjønnes wrote: > Martin Vermeer <[EMAIL PROTECTED]> writes: > > | On Thu, 2005-09-15 at 14:10 +0200, Juergen Spitzmueller wrote: > | > Martin Vermeer wrote: > | > > > Please post the patch to bugzilla. I'll be happy to test it once my > tree > | > > > is ready for it (i.e., my tabular changes are in). > | > > > | > > So done. > | > > | > The patch fixes the bug, as far a can tell from my testing. > | > > | > Jürgen > | > | OK, thanks! > | > | Lars, can this go in? > > ok Done. - Martin signature.asc Description: This is a digitally signed message part
Re: Web pages problem...
[EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | [EMAIL PROTECTED] (Lars Gullik Bjønnes) writes: | | | Angus Leeming <[EMAIL PROTECTED]> writes: | | | | | Lars Gullik Bjønnes wrote: | | | | | | > Angus Leeming <[EMAIL PROTECTED]> writes: | | | > | | | > | There appears to be a problem with some of the web pages. Eg | | | > | http://www.lyx.org/about/credits.php | | | > | http://www.lyx.org/about/blanket-permission.php | | | > | | | | > | Warning: Directory system set up for just ONE level | | | > | ofsubdirectories. See main start.php3 file | | And you _could_ just fix this you know... And it turns out that you did this... did you do it on purpose to have something to complain about? -- Lgb
Re: Web pages problem...
Lars Gullik Bjønnes wrote: > | That's my point. I wasn't even aware that there had been an > | upgrade two years ago. > > You have head me wanting to get rid of the php3 extension right? > Did you think I pulled that out of thin air? I have no idea what goes on inside that head of yours :) > | Communicate more! > | Ask for help more! > | > | Can you summarise what needs to be done? > > probably turns out to be nothing... > > bug in credits.php3. > (and if that did not trigger before then _that_ was too a bug.) A, OK, I see. Thanks. The page is autogenerated: $ python generate_contributions.py \ CREDITS \ credits.php \ blanket_permissions.php $ cp credits.php blanket_permissions.php ../../www-user/about/. works, but $ python generate_contributions.py \ CREDITS \ ../../www-user/about/credits.php \ ../../www-user/about/blanket_permissions.php does not. I'll try and remember :) Meanwhile, could you update blanket_permissions.php too? (I don't have a copy of www-user checked out here.) -- Angus
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: | > "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: | | Lars> you are including the patch "inline" and not as attachment. | | "K b" is your friend in GNUS in such cases. nice to know -- Lgb
Re: Web pages problem...
Angus Leeming <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | > | That's my point. I wasn't even aware that there had been an | > | upgrade two years ago. | > | > You have head me wanting to get rid of the php3 extension right? | > Did you think I pulled that out of thin air? | | I have no idea what goes on inside that head of yours :) To be honest, I don't find it particularly funny. -- Lgb
[PATCH] mathed cut crashes (1960, 1981)
Martin,
what is this fix for bug 1981 supposed to do?
case LFUN_CUT:
+ cur.pos() = 0; // Prevent stale position >= size crash
cutSelection(cur, true, true);
cur.message(_("Cut"));
break;
It is the cause of a rather silly behaviour: when you cut a selected string
from a math nestinset, not only the selection, but also everything preceeding
it will be cut.
IMO (and I'm pretty sure) the correct fix is to use cur.normalize() instead,
which fixes the cursor position if it is outside the size() range. I have
tested that it fixes both bug 1981 and bug 1960, which seem to share the
cause.
Can this go in?
Jürgen
Index: math_nestinset.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_nestinset.C,v
retrieving revision 1.166
diff -u -r1.166 math_nestinset.C
--- math_nestinset.C 19 Aug 2005 12:57:47 - 1.166
+++ math_nestinset.C 16 Sep 2005 10:39:01 -
@@ -423,9 +423,10 @@
}
case LFUN_CUT:
- cur.pos() = 0; // Prevent stale position >= size crash
cutSelection(cur, true, true);
cur.message(_("Cut"));
+ // Prevent stale position >= size crash
+ cur.normalize();
break;
case LFUN_COPY:
Re: [PATCH] mathed cut crashes (1960, 1981)
On Fri, 2005-09-16 at 12:46 +0200, Juergen Spitzmueller wrote:
> Martin,
> what is this fix for bug 1981 supposed to do?
> case LFUN_CUT:
> + cur.pos() = 0; // Prevent stale position >= size crash
> cutSelection(cur, true, true);
> cur.message(_("Cut"));
> break;
>
> It is the cause of a rather silly behaviour: when you cut a selected string
> from a math nestinset, not only the selection, but also everything preceeding
> it will be cut.
>
> IMO (and I'm pretty sure) the correct fix is to use cur.normalize() instead,
> which fixes the cursor position if it is outside the size() range. I have
> tested that it fixes both bug 1981 and bug 1960, which seem to share the
> cause.
>
> Can this go in?
>
> Jürgen
OK, this looks better.
- Martin
signature.asc
Description: This is a digitally signed message part
Re: Web pages problem...
> | | | > | There appears to be a problem with some of the web pages. > | | | > | Eg http://www.lyx.org/about/credits.php > | | | > | http://www.lyx.org/about/blanket-permission.php > | | | > | > | | | > | Warning: Directory system set up for just ONE level > | | | > | ofsubdirectories. See main start.php3 file > | > | And you _could_ just fix this you know... > > And it turns out that you did this... did you do it on purpose to > have something to complain about? No. I'm just not very competent. Again, thanks for bailing me out. -- Angus
