Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Richard Heck
On 11/12/2015 01:29 PM, Georg Baum wrote: > Guillaume Munch wrote: > >> * Georg, you told us an old story of "FIXME: UNICODE"s being placed in >> the source when the developers decided that docstring would be the only >> place where we see Unicode. I am happy to fix these as I go through the >>

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Georg Baum
Richard Heck wrote: > Like this? Basically yes, but I guess including strfwd.h shoud be enough, and the FIXME shoud of course be removed;-) Georg

hanging xelatex for japanese docs

2015-11-12 Thread Georg Baum
I observe a considerable slowdown with the tests. Currently I have four xelatex processes for Additional_pdf4, EmbeddedObjects_pdf4, Customization_pdf4 and UserGuide_pdf4. These did not hang a week ago. Georg

Re: hanging xelatex for japanese docs

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 21:25:48, schrieb Georg Baum > I observe a considerable slowdown with the tests. Currently I have four > xelatex processes for Additional_pdf4, EmbeddedObjects_pdf4, > Customization_pdf4 and UserGuide_pdf4. These did not hang

Re: [patch] proof of concept for bug 9744: allow parallel configuration of TeX and non-TeX fonts

2015-11-12 Thread Georg Baum
Scott Kostyshak wrote: > I have not followed the #9744 discussion closely or looked at Georg's > recent work, so my following suggestion might be irrelevant now, but in > any case: > > Would it make sense to check the box "Use non-TeX fonts" by > default, and then change the full string from >

Re: hanging xelatex for japanese docs

2015-11-12 Thread Georg Baum
Kornel Benko wrote: > I tried to compile with "ctest -j12 -R > '(Additional|EmbeddedObjects|Customization|UserGuide)_pdf4'" Here the > summary: 75% tests passed, 14 tests failed out of 56 > > Label Time Summary: > export = 1199.48 sec (52 tests) > reverted = 311.95 sec (10 tests) >

Re: We now include both png and svgz?

2015-11-12 Thread Georg Baum
Vincent van Ravesteijn wrote: > In any case, the logic is a bit strange. The icon names are defined > with the extension {png,svgz} so that any one matched, and getPixmap > checks whether the file can be loaded or not. However, iconName then > already decides on whether it is png or svgz just

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Andrew Parsloe
On 13/11/2015 3:23 a.m., Jean-Marc Lasgouttes wrote: Le 12/11/2015 01:30, Uwe Stöhr a écrit : +Menu "context-tabular" +Item "Formal style|F" "inset-modify tabular set-booktabs" +Item "Longtable|o" "inset-modify tabular set-longtabular" What about "Formal Table" and "Long

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Richard Heck
On 11/12/2015 03:15 PM, Georg Baum wrote: > Richard Heck wrote: > >> Like this? > > Basically yes, but I guess including > strfwd.h shoud be enough, and the FIXME shoud of course be removed;-) Yes, indeed. I'll commit it after alpha. Richard

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 20:11:44, schrieb Kornel Benko > > Could you post a list of failing tests, please? > > (Maybe we could have an URL for test results (on the ftp server or wiki), so > > that people not able to run the test could check the latest results.) > > >

Re: We now include both png and svgz?

2015-11-12 Thread Enrico Forestieri
On Thu, Nov 12, 2015 at 09:14:02PM +0100, Georg Baum wrote: > Vincent van Ravesteijn wrote: > > > In any case, the logic is a bit strange. The icon names are defined > > with the extension {png,svgz} so that any one matched, and getPixmap > > checks whether the file can be loaded or not. However,

Re: beamer workflow

2015-11-12 Thread Edwin Leuven
On 11 Nov 2015, at 19:07, Jürgen Spitzmüller wrote: > Am Dienstag 10 November 2015, 10:21:02 schrieb Edwin Leuven: >> dear all, >> >> when i insert a new frame, add the title and hit enter the new line is set >> to “Frame” > >> similarly if i am editing the contents of my frame

Re: beamer workflow

2015-11-12 Thread Jürgen Spitzmüller
2015-11-12 10:19 GMT+01:00 Edwin Leuven: > > thanks Jürgen, but in my experience Frame does not behave the same as > nested Standard > > once i start add for example an Itemize my slide is all messed up (both > the alignment, and a a new slide is added) > Itemize is not Standard. All except

Re: beamer workflow

2015-11-12 Thread Edwin Leuven
On 12 Nov 2015, at 10:32, Jürgen Spitzmüller wrote: > 2015-11-12 10:19 GMT+01:00 Edwin Leuven: > > thanks Jürgen, but in my experience Frame does not behave the same as nested > Standard > > once i start add for example an Itemize my slide is all messed up (both the >

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Uwe Stöhr
Am 12.11.2015 um 17:12 schrieb Jürgen Spitzmüller: Personally, I would prefer something more transparent, such as "Allow page breaks". Nobody without knowledge of the longtable package knows what a "long table" is supposed to be. Good idea! Until we don't have a toggle entry, I named it

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Uwe Stöhr
Am 12.11.2015 um 15:23 schrieb Jean-Marc Lasgouttes: "Longtable" is used all over theplace in the docs as its own term I would therefore keep it. I think it is a mistake. I do not see why we should use this unenglish term. (I guess that "unenglish" is itself unenglish :) Because

Re: We now include both png and svgz?

2015-11-12 Thread Enrico Forestieri
On Wed, Nov 11, 2015 at 01:37:51PM +0100, Vincent van Ravesteijn wrote: > > So, either we make QtSvg a "required" dependency, and cmake/autotools > should check for it, or we improve the logic to decide whether we lood > the png or svgz variant. It is not intended to work that way. If the svgz

Re: [patch] proof of concept for bug 9744: allow parallel configuration of TeX and non-TeX fonts

2015-11-12 Thread Georg Baum
Guenter Milde wrote: > The current GUI design is inconsistent if you want to export to the most > commen document types: > > 1. DVI TeX fonts for the TeX nostalgic > > 2. PS TeX fonts for fast preview/printing and PS-tricks > > 3. PDF (pdflatex) TeX fonts

Re: [patch] proof of concept for bug 9744: allow parallel configuration of TeX and non-TeX fonts

2015-11-12 Thread Scott Kostyshak
On Thu, Nov 12, 2015 at 09:35:31PM +0100, Georg Baum wrote: > Scott Kostyshak wrote: > > > I have not followed the #9744 discussion closely or looked at Georg's > > recent work, so my following suggestion might be irrelevant now, but in > > any case: > > > > Would it make sense to check the box

Re: docs with \origin unavailable

2015-11-12 Thread Enrico Forestieri
On Tue, Nov 10, 2015 at 08:43:56PM +0100, Georg Baum wrote: > Hi, > > we have currently several documents with > > \origin unavailable > > instead of > > \origin /systemlyxdir/doc/ Note that the \origin tag gets updated at make install time. So, whatever the tag, it is replaced with the

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Scott Kostyshak
On Thu, Nov 12, 2015 at 01:02:17PM -0500, Richard Heck wrote: > On 11/12/2015 11:12 AM, Jürgen Spitzmüller wrote: > > 2015-11-12 16:14 GMT+01:00 Jean-Marc Lasgouttes: > > Likewise, > > "Longtable" feels like a German word : > > > I think > it is rather a LaTeXism. It is called "longtable"

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Uwe Stöhr
Am 12.11.2015 um 17:14 schrieb Jean-Marc Lasgouttes: Yes, allow page breaks looks nice. But of course this means that our dialog shall be reworked. Do we want to do that for 2.2, or wait until 2.3? I vote for now. It is just a changed string and the translators did not yet start their work.

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Uwe Stöhr
Am 12.11.2015 um 16:14 schrieb Jean-Marc Lasgouttes: OTOH, now that I actually tried the menu, I would say that it is not clear to know where table stuff starts. Having "Formal Table" would help. Is it better now? I noticed that we don't have an LFUN to toggle the longtable and the

Re: beamer workflow

2015-11-12 Thread Jürgen Spitzmüller
2015-11-12 10:43 GMT+01:00 Edwin Leuven: > but even so, perhaps we should consider the behaviour that we have with > itemize: > > preserves indent, and on an empty itemize decreases indent > > we could do the same with nesting no? > > i think that would be natural > I agree. > > > > this is

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Guillaume Munch
Le 12/11/2015 00:30, Uwe Stöhr a écrit : Am 11.11.2015 um 13:13 schrieb Jean-Marc Lasgouttes: Many Thanks for reviewing. Since the menu name is about lines, should we just have entry Top/Bottom... Done. What about putting multirow with rows and multicolumns with columns? That#s a

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Guillaume Munch
Le 12/11/2015 00:34, Uwe Stöhr a écrit : Am 11.11.2015 um 13:57 schrieb Guillaume Munch: Well multirow and multicolumn is about cells, so I moved it with cells. multirow can be for several cells but also for complete rows. Therefore I don't think it is sensible to have a special cell group.

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 00:13:54, schrieb Kornel Benko > Am Mittwoch, 11. November 2015 um 22:49:19, schrieb Guenter Milde > > > On 2015-11-11, Kornel Benko wrote: > > > Am Mittwoch, 11. November 2015 um 00:11:26, schrieb Günter Milde ... > > >

Re: beamer workflow

2015-11-12 Thread Guillaume Munch
Le 12/11/2015 09:19, Edwin Leuven a écrit : On 11 Nov 2015, at 19:07, Jürgen Spitzmüller wrote: Am Dienstag 10 November 2015, 10:21:02 schrieb Edwin Leuven: dear all, when i insert a new frame, add the title and hit enter the new line is set to “Frame” similarly if i am

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Guillaume Munch
Le 12/11/2015 00:39, Uwe Stöhr a écrit : Am 11.11.2015 um 13:52 schrieb Guillaume Munch: Yes, I committed now a version which includes your and also JMarc's changes. Thanks again P.S.: it might be good to disable "inset-modify tabular multi(column|row)" when a single cell is selected and

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Pavel Sanda
Georg Baum wrote: > Unfortunately there is a good > reason for this behaviour: If LyX would not do that, then unused \author > lines could easily accumulate: If I accept all changes of my co-author, and > he never edits the file again, then his \author line will remain in the file > forever.

Re: [LyX/master] stdcontext.inc: new context menu for tables

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 01:21:27, schrieb Uwe Stöhr > commit 2230be75b3b0584775547b83af79f59b4c40ec27 > Author: Uwe Stöhr > Date: Thu Nov 12 01:21:21 2015 +0100 > > stdcontext.inc: new context menu for tables > > see the list

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Jean-Marc Lasgouttes
Le 12/11/2015 01:30, Uwe Stöhr a écrit : +Menu "context-tabular" +Item "Formal style|F" "inset-modify tabular set-booktabs" +Item "Longtable|o" "inset-modify tabular set-longtabular" What about "Formal Table" and "Long Table"? "Longtable" is used all over theplace in the

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 16:18:12, schrieb Guenter Milde > On 2015-11-12, Kornel Benko wrote: > > Am Donnerstag, 12. November 2015 um 00:13:54, schrieb Kornel Benko > > > >> Am Mittwoch, 11. November 2015 um 22:49:19, schrieb Guenter Milde > >>

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Georg Baum
Vincent van Ravesteijn wrote: > I doubt whether it is a good thing to start fiddling with the document > when we read in a corrupt file. > > Version control systems can corrupt a file in so many ways.. do we > really want to raise the impression we could read it in properly but > in the mean

Re: Plan for the current testing situation

2015-11-12 Thread Georg Baum
Guenter Milde wrote: > What is the policy regarding change-tracking for Development.lyx? Not needed: It is not translated. If we want to know latzer who edited a certain part then we can use git. Georg

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 19:08:05, schrieb Guenter Milde > On 2015-11-12, Guenter Milde wrote: > > On 2015-11-12, Kornel Benko wrote: > > >> Testing the exports gives now 126 failed tests. This is an improvement > >> of 6 cases. Improved tests are of type

Re: [LyX/master] stdcontext.inc: new context menu for tables

2015-11-12 Thread Kornel Benko
Am Donnerstag, 12. November 2015 um 14:53:41, schrieb Kornel Benko > Am Donnerstag, 12. November 2015 um 01:21:27, schrieb Uwe Stöhr > > > commit 2230be75b3b0584775547b83af79f59b4c40ec27 > > Author: Uwe Stöhr > > Date: Thu Nov 12

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Jean-Marc Lasgouttes
Le 11/11/2015 23:12, Guillaume Munch a écrit : Dear list, The patch below fixes bug #9854. () Find more details in the commit log. I have two questions: * I had to remove a const qualifier in Text::readParToken (see patch below). Do I need to put it back?

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Jean-Marc Lasgouttes
Le 12/11/2015 12:16, Guillaume Munch a écrit : +Menu "context-tabular" +Item "Formal style|F" "inset-modify tabular set-booktabs" +Item "Longtable|o" "inset-modify tabular set-longtabular" What about "Formal Table" and "Long Table"? "Longtable" is used all over theplace in

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Richard Heck
On 11/12/2015 11:12 AM, Jürgen Spitzmüller wrote: > 2015-11-12 16:14 GMT+01:00 Jean-Marc Lasgouttes: > > Likewise, > "Longtable" feels like a German word : > > > I think it is rather a LaTeXism. It is called "longtable" (not "long table") since package, command and environment names cannot

Re: Tentative schedule for 2.2.0 release

2015-11-12 Thread Georg Baum
Pavel Sanda wrote: > I agree with JMarc that we could be flexible WRT shortcuting the dates in > case things look good, but I also know that all plans we ever had for our > releases were delayed. Let's see :) Yes, the plans get always delayed. Therefore I'd like a schedule with about 3 weeks

Re: synchronizing po file of branch and trunk

2015-11-12 Thread Georg Baum
Jean-Marc Lasgouttes wrote: > Le 11/11/15 22:39, Scott Kostyshak a écrit : >>> Branch has less strings than master. (6609 vs. 6817). And not all >>> strings from branch are common with master. >> >> I see. So there is no rule that I can use to do what I want then. I >> guess I will just copy over

Re: docs with \origin unavailable

2015-11-12 Thread Georg Baum
Scott Kostyshak wrote: > Thanks for volunteering. Please go ahead. This is now finished. While doing this, I noticed that the following items should probably be part of the release check list (don't know which items are already there): - update development/tools/gen_lfuns.py to generate

Re: [LyX/master] Add example using the varwidth package

2015-11-12 Thread Georg Baum
Guillaume Munch wrote: > commit e17838b11fca51b4ebe6dfcea8ed2b52c41c437a > Author: Guillaume Munch > Date: Thu Nov 12 15:33:25 2015 + > > Add example using the varwidth package Looks like the lib/Makefile.am entry is missing, this it will not be in the tarball. Georg

Re: Tentative schedule for 2.2.0 release

2015-11-12 Thread Scott Kostyshak
On Thu, Nov 12, 2015 at 07:04:42PM +0100, Georg Baum wrote: > Pavel Sanda wrote: > > > I agree with JMarc that we could be flexible WRT shortcuting the dates in > > case things look good, but I also know that all plans we ever had for our > > releases were delayed. Let's see :) > > Yes, the

tomorrow afternoon I will tag and tar alpha

2015-11-12 Thread Scott Kostyshak
Tomorrow (afternoon, US East Coast time) I will tag and tar 2.2.0alpha1. Assuming things go smoothly with uploading to FTP I will upload it then as well. We can then make the announcement on Monday after some basic testing and a couple of days for binaries to be built (although if they are not

Re: docs with \origin unavailable

2015-11-12 Thread Scott Kostyshak
On Thu, Nov 12, 2015 at 07:18:54PM +0100, Georg Baum wrote: > Scott Kostyshak wrote: > > > Thanks for volunteering. Please go ahead. > > This is now finished. While doing this, I noticed that the following items > should probably be part of the release check list (don't know which items > are

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Vincent van Ravesteijn
On Thu, Nov 12, 2015 at 4:41 PM, Jean-Marc Lasgouttes wrote: > Le 11/11/2015 23:12, Guillaume Munch a écrit : >> >> Dear list, >> >> >> The patch below fixes bug #9854. () >> Find more details in the commit log. >> >> I have two questions:

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Jürgen Spitzmüller
2015-11-12 16:14 GMT+01:00 Jean-Marc Lasgouttes: > Likewise, "Longtable" feels like a German word : I think it is rather a LaTeXism. It is called "longtable" (not "long table") since package, command and environment names cannot have spaces. Personally, I would prefer something more

Re: [patch] RFC: better submenu for tables

2015-11-12 Thread Jean-Marc Lasgouttes
Le 12/11/2015 17:12, Jürgen Spitzmüller a écrit : 2015-11-12 16:14 GMT+01:00 Jean-Marc Lasgouttes: Likewise, "Longtable" feels like a German word : I think it is rather a LaTeXism. It is called "longtable" (not "long table") since package, command and environment names cannot have spaces.

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Guenter Milde
On 2015-11-12, Kornel Benko wrote: > Am Donnerstag, 12. November 2015 um 00:13:54, schrieb Kornel Benko > >> Am Mittwoch, 11. November 2015 um 22:49:19, schrieb Guenter Milde >> >> > On 2015-11-11, Kornel Benko wrote: >> > > Am Mittwoch, 11. November 2015 um

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Guillaume Munch
Le 12/11/2015 16:07, Vincent van Ravesteijn a écrit : On Thu, Nov 12, 2015 at 4:41 PM, Jean-Marc Lasgouttes wrote: Le 11/11/2015 23:12, Guillaume Munch a écrit : Dear list, The patch below fixes bug #9854. () Find more details in the

Re: Plan for the current testing situation

2015-11-12 Thread Guenter Milde
On 2015-11-11, Scott Kostyshak wrote: > On Tue, Nov 10, 2015 at 03:30:24PM +, Guenter Milde wrote: >> On 2015-11-10, Scott Kostyshak wrote: >> > On Mon, Nov 09, 2015 at 11:19:16AM +0100, Vincent van Ravesteijn wrote: >> >> And yes of course there is an implicit rule that when your commit

Re: [PATCH] Bug #9854 "Dataloss after git merge with change tracking"

2015-11-12 Thread Georg Baum
Guillaume Munch wrote: > * Georg, you told us an old story of "FIXME: UNICODE"s being placed in > the source when the developers decided that docstring would be the only > place where we see Unicode. I am happy to fix these as I go through the > code, but I am not sure that I understood what's

Re: [LyX/master] Fix 480937a103708a651/lyxgit. See also #9740.

2015-11-12 Thread Guenter Milde
On 2015-11-12, Guenter Milde wrote: > On 2015-11-12, Kornel Benko wrote: >> Testing the exports gives now 126 failed tests. This is an improvement >> of 6 cases. Improved tests are of type dvi3_texF and pdf5_texF. With this fix, * the inputencoding setting is ignored with XETEX (utf8 for