Re: patch for aastex6
On 04/04/2016 11:23 PM, Scott Kostyshak wrote: > On Mon, Apr 04, 2016 at 08:45:17AM +, Guenter Milde wrote: > >> For the other patch (acmsiggraph.layout with incompatible version but same >> cls file name), I would wait for an agreement whether to update the layout >> (file format change needed) or add a new one. My last preference is an >> updated layout file. > Does anyone disagree with having a new one? New file is probably the right way to go. Uwe posted one in a separate thread. Richard
Re: patch for aastex6
On Mon, Apr 04, 2016 at 08:45:17AM +, Guenter Milde wrote: > For the other patch (acmsiggraph.layout with incompatible version but > same cls file name), I would wait for an agreement whether to update the > layout (file format change needed) or add a new one. My last preference > is an updated layout file. Does anyone disagree with having a new one? Scott signature.asc Description: PGP signature
Re: patch for aastex6
On Mon, Apr 04, 2016 at 10:29:23PM +0200, Georg Baum wrote: > Guenter Milde wrote: > > > The patch is ready. > > > > This is the "new layout for new cls file name" case, similar to what we > > already have for, e.g. scrltr2. > > > > As it looks like we all agree that a new layout does *not* require a file > > format update, we could also put this in after rc1. > > > > Scott, what would you prefer? > > I'd suggest to put it in after 2.2.0 (between rc1 and 2.2.0 should only be > very critical changes). I agree that layout changes should not be made between RC1 and 2.2.0. > The reason for this is that we could include the new > styles offered by aastex6 right from the beginning. If we publish > aastex6.layout first without them it will be a bit more work do add them > later (but it would be possible, so this is only a slight preference). This would be using ForceLocal? Scott > Alternatively, I could give a +1 for a complete patch tomorrow morning > (Although I am pretty sure that the bits you sent are correct I am a bit > reluctant with combining bots from different messages for a +1). signature.asc Description: PGP signature
Re: possible tag and tar of 2.2.0rc1 on Tuesday
On Tue, Apr 05, 2016 at 03:17:01AM +0200, Uwe Stöhr wrote: > Am 01.04.2016 um 22:33 schrieb Georg Baum: > > >Note that Peter made some further tests and found out that the merged build > >does not fix the crash, but only hides it: > >http://www.lyx.org/trac/ticket/10009 > > Yes, and Peter already fixed this this weekend. I used the latest Qt 5.6 > build with this patch a lot the last 2 days and for me the crash is gone, > also with a non-merged build. Good news. > As I proposed, for RC1 I could release a Qt 5.6 and a Qt 5.5.1 build. I know > some users who will volunteer to check ut both versions. This would also > help me that the installer is in shape for a final release. > > So OK to come up with these 2 installers: > A Qt 5.5.1, MSVC 2010 > B Qt 5.6.0, MSVC 2015 update 2 Sounds good. > The other third-party programs like ImageMagick etc. will be identic. > > > > Could the layout updates please go in before RC1? Yes I agree: before RC1 or not for 2.2.0. Scott signature.asc Description: PGP signature
Re: possible tag and tar of 2.2.0rc1 on Tuesday
On Mon, Apr 04, 2016 at 10:21:52PM +0200, Georg Baum wrote: > I'd really like to wait for the final updates for pt_PT and pt_BR for RC1 if > possible. OK we'll wait. > The good news is that the percentage of reviewed strings in 2.2.0 will be > higher than in 2.1.0. That is good news indeed. Thanks for your help on this, Scott signature.asc Description: PGP signature
Re: [LyX/master] beamer: add French example files, patch from Jean-Pierre
On Tue, Apr 05, 2016 at 02:15:10AM +0200, Uwe Stöhr wrote: > Am 29.03.2016 um 23:49 schrieb Scott Kostyshak: > > >Uwe, this commit introduced two \origin tags. I removed the unavailable > >one at e5e21da4. I just wanted to confirm that you added the > >systemlyxdir one manually and just forgot to remove the unavailable one. > > Yes, sorry, I demonstrated this to Jean-Pierre and forgot to remove it > before committing. Makes sense, thanks for confirming. Scott signature.asc Description: PGP signature
Re: possible tag and tar of 2.2.0rc1 on Tuesday
Am 01.04.2016 um 22:33 schrieb Georg Baum: Note that Peter made some further tests and found out that the merged build does not fix the crash, but only hides it: http://www.lyx.org/trac/ticket/10009 Yes, and Peter already fixed this this weekend. I used the latest Qt 5.6 build with this patch a lot the last 2 days and for me the crash is gone, also with a non-merged build. As I proposed, for RC1 I could release a Qt 5.6 and a Qt 5.5.1 build. I know some users who will volunteer to check ut both versions. This would also help me that the installer is in shape for a final release. So OK to come up with these 2 installers: A Qt 5.5.1, MSVC 2010 B Qt 5.6.0, MSVC 2015 update 2 The other third-party programs like ImageMagick etc. will be identic. Could the layout updates please go in before RC1? I would like to keep the layouts stable afterwards and only fix bugs (hard string freeze to help the translators). I just sent one patch. if this is OK I will also send a similar patch for AGUTeX. thanks and regards Uwe
[patch] update layout for acmsiggraph
attached is a patch to update the layout of acmsiggraph according to the latest development.lyx file. Is this OK to go in or what else do I have to do? thanks and regards Uwe p.s. sorry for not following the list. I had/have lot of stress and try to have a look the next days to be up to date lib/layouts/acmsiggraph-0-92.layout | 340 + lib/layouts/acmsiggraph.layout | 2 +- lib/templates/ACM-siggraph.lyx | 365 +--- 3 files changed, 508 insertions(+), 199 deletions(-) diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout new file mode 100644 index 000..5c0ff18 --- /dev/null +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -0,0 +1,340 @@ +#% Do not delete he line below; configure depends on this +# \DeclareLaTeXClass[acmsiggraph,comment.sty,lineno.sty]{ACM SIGGGRAPH 0.92} +# \DeclareCategory{Articles} +# ACM SIGGRAPH textclass definition file. +# Author : Uwe Stöhr +# +# The required LaTeX class file "acmsiggraph.cls", a LaTex template +# BibTeX style and template, and the documentation is available at +# http://www.siggraph.org/learn/instructions-authors +# +# Versions: +# siggraph 0.9: initial layout +# siggraph 0.92: Removed styles "TOG project URL", "TOG video URL", +# "TOG data URL", and "TOG code URL". The corresponding +# LaTeX commands are no longer supported. + +Format 59 + +Columns1 +Sides 1 +SecNumDepth3 +TocDepth 3 +DefaultStyle Standard + +ClassOptions + FontSize 9|10|11|12 +End + +DefaultFont + Family Roman + Series Medium + ShapeUp + Size Normal + ColorNone +EndFont + + +Style Standard + Category MainText + Margin Static + LatexTypeParagraph + LatexNamedummy + ParIndentMM + ParSkip 0.4 + AlignBlock + AlignPossibleBlock, Left, Right, Center + LabelTypeNo_Label +End + + +Input stdcounters.inc +Input stdfloats.inc +Input stdlists.inc +Input stdsections.inc +Input stdstarsections.inc + +# don't use the following styles +NoStylePart +NoCounter part +NoStylePart* +NoStyleChapter +NoCounter chapter +NoStyleChapter* +NoStyleSubparagraph +NoCounter subparagraph +NoStyleSubparagraph* + + +Style "TOG online ID" + Margin Dynamic + LatexType Command + LatexName TOGonlineid + CategoryFrontMatter + InPreamble 1 + ParSkip 0.4 + BottomSep 0.5 + Align Left + LabelSepxx + LabelType Static + LabelString "Online ID:" + LabelFont + Color Green + SeriesBold + EndFont +End + + +Style "TOG volume" + CopyStyle "TOG online ID" + LatexName TOGvolume + LabelString "Volume number:" +End + + +Style "TOG number" + CopyStyle "TOG online ID" + LatexName TOGnumber + LabelString "Article number:" +End + + +Style "Set_copyright" + CopyStyle "TOG online ID" + LatexName setcopyright + LabelString "Copyright type:" +End + + +Style "Copyright_year" + CopyStyle "TOG online ID" + LatexName copyrightyear + LabelString "Year of copyright:" +End + + +Style "Conference_info" + CopyStyle "TOG online ID" + LatexName conferenceinfo + LabelString "Conference info:" + Argument 1 + Mandatory 1 + LabelString "Name" + Tooltip "Conference name" + EndArgument +End + + +Style "ISBN" + CopyStyle "TOG online ID" + LatexName isbn + LabelString "ISBN:" +End + + +Style "DOI" + CopyStyle "TOG online ID" + LatexName doi + LabelString "Article DOI:" +End + + +Style "TOG article DOI" + CopyStyle "TOG online ID" + LatexName TOGarticleDOI + LabelString "Article DOI:" + ObsoletedBy DOI +End + + +Input stdtitle.inc +Input stdstruct.inc +NoStyleDate + + +# modify the Title definition from stdtitle.inc +Style Title + InTitle 0 + InPreamble 1 + Font +
Re: Beamer separators in 2.2b2
On Tue, Apr 05, 2016 at 12:55:24AM +0200, Enrico Forestieri wrote: > > BTW, the patch does not apply cleanly anymore. Updated patch attached. -- Enrico diff --git a/development/FORMAT b/development/FORMAT index 9384409..01319df 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -11,6 +11,16 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx. --- +2016-04-05 Enrico Forestieri+ * Format incremented to 508 + New kind of Separator inset (latexpar). The old parbreak separator + used specifically to introduce a LaTeX paragraph break in the output + (and thus not as a proper separator) is turned into a latexpar kind. + The only difference with the parbreak kind is the representation + on screen. The new latexpar kind is represented by the same symbol + used previously for the parbreak one, while the latter is now + represented as a double line. + 2016-03-25 Jean-Marc Lasgouttes * Format incremented to 507 Convert caption subtype LongTableNoNumber to Unnumbered diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index e7078f1..66108dc 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -86,7 +86,7 @@ format_relation = [("0_06",[200], minor_versions("0.6" , 4)), ("1_6", list(range(277,346)), minor_versions("1.6" , 10)), ("2_0", list(range(346,414)), minor_versions("2.0" , 8)), ("2_1", list(range(414,475)), minor_versions("2.1" , 0)), - ("2_2", list(range(475,508)), minor_versions("2.2" , 0)) + ("2_2", list(range(475,509)), minor_versions("2.2" , 0)) ] diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index 04c32ce..37a26be 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -334,6 +334,46 @@ def revert_separator(document): i = i + 1 +def convert_parbreak(document): +""" +Convert parbreak separators not specifically used to separate +environments to latexpar separators. +""" +parbreakinset = "\\begin_inset Separator parbreak" +i = 0 +while 1: +i = find_token(document.body, parbreakinset, i) +if i == -1: +return +lay = get_containing_layout(document.body, i) +if lay == False: +document.warning("Malformed LyX document: Can't convert separator inset at line " + str(i)) +i += 1 +continue +if lay[0] == "Standard": +# Convert only if not alone in the paragraph +k1 = find_nonempty_line(document.body, lay[1] + 1, i + 1) +k2 = find_nonempty_line(document.body, i + 1, lay[2]) +if (k1 < i) or (k2 > i + 1) or not check_token(document.body[i], parbreakinset): +document.body[i] = document.body[i].replace("parbreak", "latexpar") +else: +document.body[i] = document.body[i].replace("parbreak", "latexpar") +i += 1 + + +def revert_parbreak(document): +""" +Revert latexpar separators to parbreak separators. +""" +i = 0 +while 1: +i = find_token(document.body, "\\begin_inset Separator latexpar", i) +if i == -1: +return +document.body[i] = document.body[i].replace("latexpar", "parbreak") +i += 1 + + def revert_smash(document): " Set amsmath to on if smash commands are used " @@ -2284,10 +2324,12 @@ convert = [ [504, [convert_save_props]], [505, []], [506, [convert_info_tabular_feature]], - [507, [convert_longtable_label]] + [507, [convert_longtable_label]], + [508, [convert_parbreak]] ] revert = [ + [507, [revert_parbreak]], [506, [revert_longtable_label]], [505, [revert_info_tabular_feature]], [504, []], diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 1e83905..831c3f6 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -635,9 +635,9 @@ void LyXAction::init() { LFUN_NEWLINE_INSERT, "newline-insert", Noop, Edit }, /*! * \var lyx::FuncCode lyx::LFUN_SEPARATOR_INSERT - * \li Action: Inserts an environment separator or paragraph break. + * \li Action: Inserts an environment separator or latex paragraph break. * \li Syntax: separator-insert [] - * \li Params: : default: plain + * \li Params: : default: plain * \li Origin: ef, 2 May 2014 * \endvar */ diff --git a/src/factory.cpp b/src/factory.cpp index b7320d0..b8d9433 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -107,6 +107,8 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd) inp.kind = InsetSeparatorParams::PLAIN;
Re: [LyX/master] beamer: add French example files, patch from Jean-Pierre
Am 29.03.2016 um 23:49 schrieb Scott Kostyshak: Uwe, this commit introduced two \origin tags. I removed the unavailable one at e5e21da4. I just wanted to confirm that you added the systemlyxdir one manually and just forgot to remove the unavailable one. Yes, sorry, I demonstrated this to Jean-Pierre and forgot to remove it before committing. regards Uwe
Re: Insert LyX Separator
On Sat, Apr 02, 2016 at 11:12:01AM -0400, Richard Heck wrote: > > Is there a menu entry for inserting LyX separators and paragraph breaks? > I would have thought I'd find it under Insert> Formatting. No, they are only automatically inserted through some menus or when converting old documents. There is no provision for directly inserting them from the GUI. The plain separator is actually equivalent to any other element that does not produce any output (such as an empty ERT, for example) and only has a visual usefulness. On the other hand, the parbreak one actually breaks a LyX paragraph into two latex ones and may give problems if one is not aware of that. The only interesting usage that I can think of is that it could be used in an itemize like environment to start a new paragraph in the same environment without the need of nesting it. So, either they are not useful (other than for their intended usage) or can be dangerous. Hence, it is better to not provide a method for indiscriminately inserting them. If you really need them, there always is the lfun way. -- Enrico
Re: Replacement of "long table" by "multi-pages table" in the manuals
Am 02.04.2016 um 01:20 schrieb Pavel Sanda: This location was not intuitive to me either. Perhaps it was chosen because that way it will not ship with LyX? Kind of. These are files which no normal user should ever see and we know it is so obsolete that it deserves deletion, but it might be of interest for developer/translator who appears in future and wants to give new shape or get inspiration. I was not aware of any changelogs translators use, I believe that CT was used to signalize new things in manuals. The files there are my personal files to coordinate the translation work. The translators know the files and can work on their files accordingly whenever they want. There is no need to add stuff there if you don't like. It is OK to use CT in the English version and I'll do the rest. regards Uwe
Re: Beamer separators in 2.2b2
On Thu, Mar 31, 2016 at 05:41:47PM -0400, Scott Kostyshak wrote: > > José? Can you review and test this patch before Monday? If you do so, > please give an explicit +1 if you support the inclusion of it for 2.2.0. I think that you should take the responsibility of making a decision. The worst that may happen is that a parbreak separator is not converted to the new latexpar kind. But they are perfectly equivalent and it is only their representation that changes on screen. BTW, the patch does not apply cleanly anymore. -- Enrico
Re: patch for aastex6
Guenter Milde wrote: > The patch is ready. > > This is the "new layout for new cls file name" case, similar to what we > already have for, e.g. scrltr2. > > As it looks like we all agree that a new layout does *not* require a file > format update, we could also put this in after rc1. > > Scott, what would you prefer? I'd suggest to put it in after 2.2.0 (between rc1 and 2.2.0 should only be very critical changes). The reason for this is that we could include the new styles offered by aastex6 right from the beginning. If we publish aastex6.layout first without them it will be a bit more work do add them later (but it would be possible, so this is only a slight preference). Alternatively, I could give a +1 for a complete patch tomorrow morning (Although I am pretty sure that the bits you sent are correct I am a bit reluctant with combining bots from different messages for a +1). Georg
Re: Proposal for a guide on updating layouts
Guenter Milde wrote: > > Dear Georg, > > thank you for your feedback. > > On 2016-04-03, Georg Baum wrote: > >> Concerning the list in section 2.2 I'd prefer it to stay simple. It >> starts to become too complicated for my taste. There is too much >> nesting, footnotes, and you have to read two times to understand how >> the line "Modified layouts and modules with a" is to be parsed. > > I simplified it a bit in 77fc7fe > (I Kept the nesting for "New valid value for an existing setting" to make > clear that this are example cases.) > > >> Finally, I'd also prefer it if this document is not used for indirect >> communication. If you want to discuss whether a new language needs a file >> format update, then we can do that on the list. I believe that this is >> one of the cases whithout consensus, since this issue has been discussed >> in the past IIRC. > > Yes. exchange of arguments should be on the list. > (I kept a note that this point is under discussion - similar to what was > in the "new layout" item before we decided to remove it from this list.) > > Feel free to edit - this is still work in progress. Thanks. Currently I am too busy with layout translations, I'll have a detailed look later. Georg
Re: possible tag and tar of 2.2.0rc1 on Tuesday
Scott Kostyshak wrote: > Dear all, > > Thanks to the help of several LyX developers who addressed needed issues > for 2.2.0rc1, we are getting close. I would like to propose Tuesday as > the tentative date to tag and tar rc1. There are still some issues that > are pending but I hope that they can be resolved by then. > > Georg is taking care of the translations of math environments, which > hopefully will receive enough attention from translators by Monday. I submitted all updates I got, with one exception: The two portuguese languages. We need to sort out how to translate "Chart" (Pavel is in the discussion as well). Also, today an indonesian user wrote on the users list that some translations are not correct. It might be too late to overtake his corrections (depends on what he complains about - I would take untranslated strings, but I would not change already reviewed translations without asking Waluyo, and this would take too long). I'd really like to wait for the final updates for pt_PT and pt_BR for RC1 if possible. Also, we should overtake all translations from the po files which replace strings which have not been reviewed yet. Unfortunately I cannot do that today anymore, tomorrow I'll be available in the morning and evening (CEST). The good news is that the percentage of reviewed strings in 2.2.0 will be higher than in 2.1.0. Georg
Re: [LyX/master] Arabic translations have been reviewed
Pavel Sanda wrote: > Georg, > I am somewhat confused. Was the ack from arabic translator > for all these changes already? Yes, on the users list: http://www.mail-archive.com/lyx-users@lists.lyx.org/msg102705.html Georg
Re: Bleeding-edge LyX
Am 04.04.2016 um 12:24 schrieb Andrew Parsloe: On 4/04/2016 10:19 a.m., Andrew Parsloe wrote: On 4/04/2016 9:02 a.m., Scott Kostyshak wrote: On Mon, Apr 04, 2016 at 07:50:58AM +1200, Andrew Parsloe wrote: On 4/04/2016 5:38 a.m., Scott Kostyshak wrote: On Sun, Apr 03, 2016 at 10:14:18AM +1200, Andrew Parsloe wrote: On 3/04/2016 2:44 a.m., Peter Kümmel wrote: I've downloaded a more recent version, and the console window is absent, which is good. However, there is a problem with \lyxformat numbers. I see that a new document in bleeding-edge LyX is format 507. Documents in beta2 are 506 and are not converted. Looking at the messages pane (newfile1.lyx is a 506 document), Opening document D:\Documents\newfile1.lyx...Error: Document format failure C:/Users/Andrew/AppData/Local/Temp/lyx_tmpdir.ZzYoSAnf4440/Buffer_convertLyXFormatiA4440.lyx is not a readable LyX document. Are you able to open 2.1.x files? Scott I hadn't tried that, but I've just done so, and no, 2.1.x files result in the same error. (I've reverted to beta2 now.) I wonder if the problem is that your 2.2.0dev binary either cannot find lyx2lyx or is using a different lyx2lyx. Note that lyx and lyx2lyx are separate programs so the lyx program calls lyx2lyx (thus your PATH is important). Are you using this bleeding-edge LyX thing locally or did you install it? Scott Having unzipped the download, you are presented with two directories, one labelled bin and one Resources. As I understand it, you simply copy these on top of the installed LyX. It sounds somewhat hair-raising. My bumbling about (it took me a number of attempts to work out exactly what to do although the instructions seem clear enough in hindsight) may well have had side-effects, including corrupting PATH. At this point I'll simply wait for rc1. Andrew In fact I've had another go, and now the bleeding edge LyX can open documents from earlier versions of LyX. Help > About lists the date of the build as 3 April, QT Version 5.5.1. The citation dialogue which you were looking for a windows user's comments on (#10019, & which is why I undertook this exercise) looks good, as far as I can tell. The minimum height is a little less than in 2.1.4, the minimum width the same. It seems to stretch horizontally and vertically as I would expect. However, there are still problems with bleeding edge LyX and as you surmised, Scott, they do seem to centre around the path. The format of my custom modules is not updated to 60. I had to do that manually and the LyX icon in the task bar, when LyX is being used, is the windows default icon for a program. When I try to change the icon windows responds: Windows can't find the file %Program Files%\LyX 2.2\bin\lyx.exe. When I browse to C:\Program Files (x86)\LyX 2.2\bin\lyx.exe it tells me that "the file C:\Program Files (x86)\LyX 2.2\bin\lyx.exe" contains no icons. Whether this is the fault of b-e LyX or me, I don't know. The missing icon is a bug of b-e. Andrew --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus
Re: Bleeding-edge LyX
On 4/04/2016 10:19 a.m., Andrew Parsloe wrote: On 4/04/2016 9:02 a.m., Scott Kostyshak wrote: On Mon, Apr 04, 2016 at 07:50:58AM +1200, Andrew Parsloe wrote: On 4/04/2016 5:38 a.m., Scott Kostyshak wrote: On Sun, Apr 03, 2016 at 10:14:18AM +1200, Andrew Parsloe wrote: On 3/04/2016 2:44 a.m., Peter Kümmel wrote: I've downloaded a more recent version, and the console window is absent, which is good. However, there is a problem with \lyxformat numbers. I see that a new document in bleeding-edge LyX is format 507. Documents in beta2 are 506 and are not converted. Looking at the messages pane (newfile1.lyx is a 506 document), Opening document D:\Documents\newfile1.lyx...Error: Document format failure C:/Users/Andrew/AppData/Local/Temp/lyx_tmpdir.ZzYoSAnf4440/Buffer_convertLyXFormatiA4440.lyx is not a readable LyX document. Are you able to open 2.1.x files? Scott I hadn't tried that, but I've just done so, and no, 2.1.x files result in the same error. (I've reverted to beta2 now.) I wonder if the problem is that your 2.2.0dev binary either cannot find lyx2lyx or is using a different lyx2lyx. Note that lyx and lyx2lyx are separate programs so the lyx program calls lyx2lyx (thus your PATH is important). Are you using this bleeding-edge LyX thing locally or did you install it? Scott Having unzipped the download, you are presented with two directories, one labelled bin and one Resources. As I understand it, you simply copy these on top of the installed LyX. It sounds somewhat hair-raising. My bumbling about (it took me a number of attempts to work out exactly what to do although the instructions seem clear enough in hindsight) may well have had side-effects, including corrupting PATH. At this point I'll simply wait for rc1. Andrew In fact I've had another go, and now the bleeding edge LyX can open documents from earlier versions of LyX. Help > About lists the date of the build as 3 April, QT Version 5.5.1. The citation dialogue which you were looking for a windows user's comments on (#10019, & which is why I undertook this exercise) looks good, as far as I can tell. The minimum height is a little less than in 2.1.4, the minimum width the same. It seems to stretch horizontally and vertically as I would expect. However, there are still problems with bleeding edge LyX and as you surmised, Scott, they do seem to centre around the path. The format of my custom modules is not updated to 60. I had to do that manually and the LyX icon in the task bar, when LyX is being used, is the windows default icon for a program. When I try to change the icon windows responds: Windows can't find the file %Program Files%\LyX 2.2\bin\lyx.exe. When I browse to C:\Program Files (x86)\LyX 2.2\bin\lyx.exe it tells me that "the file C:\Program Files (x86)\LyX 2.2\bin\lyx.exe" contains no icons. Whether this is the fault of b-e LyX or me, I don't know. Andrew --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus
Re: patch for aastex6
On 2016-04-01, Scott Kostyshak wrote: > On Fri, Apr 01, 2016 at 12:08:59PM -0400, Richard Heck wrote: >> On 03/31/2016 03:45 PM, Georg Baum wrote: >> > Guenter Milde wrote: >> > >> >> For a safe "last minute commit", it would be good if somone could check >> >> the code itself, and the notes in the updated template and example file >> >> and then give an explicit +1 or not. >> > I did not test anything, but I looked at the code and the notes. They are >> > all OK. The following is missing: >> > >> > - An entry in lib/Makefile.am, so that lib/layouts/aastex6.layout actually >> > gets installed >> > - An entry in lib/doc/LaTeXConfig.lyx for aastex6.cls >> > - A final decision whether new layout files require a file format change >> > or >> > not. So far it looks like we agree that no file format change is needed, >> > but >> > to be correct I'd like to see that documented in Development.lyx before we >> > add new layout files without lyx2lyx. >> Yes, I believe that is our decision. But it should be documented, as you >> say. > Documentation first would be nice. Documentation is now in Development.lyx. The patch is ready. This is the "new layout for new cls file name" case, similar to what we already have for, e.g. scrltr2. As it looks like we all agree that a new layout does *not* require a file format update, we could also put this in after rc1. Scott, what would you prefer? For the other patch (acmsiggraph.layout with incompatible version but same cls file name), I would wait for an agreement whether to update the layout (file format change needed) or add a new one. My last preference is an updated layout file. Günter
Re: Proposal for a guide on updating layouts
Dear Georg, thank you for your feedback. On 2016-04-03, Georg Baum wrote: > Concerning the list in section 2.2 I'd prefer it to stay simple. It > starts to become too complicated for my taste. There is too much > nesting, footnotes, and you have to read two times to understand how > the line "Modified layouts and modules with a" is to be parsed. I simplified it a bit in 77fc7fe (I Kept the nesting for "New valid value for an existing setting" to make clear that this are example cases.) > Finally, I'd also prefer it if this document is not used for indirect > communication. If you want to discuss whether a new language needs a file > format update, then we can do that on the list. I believe that this is one > of the cases whithout consensus, since this issue has been discussed in the > past IIRC. Yes. exchange of arguments should be on the list. (I kept a note that this point is under discussion - similar to what was in the "new layout" item before we decided to remove it from this list.) Feel free to edit - this is still work in progress. Günter
Re: possible tag and tar of 2.2.0rc1 on Tuesday
Den 01. april 2016 22:13, skrev Scott Kostyshak: What I didn't fully grasp until it was explained to me is that even more important than testing Qt 5.6.0 is testing a binary built from a new compiler version. If the compiler version matters: I compiled LyX with gcc 5.3.0 (64-bit), and libQt5Gui.so.5.6.0 also seems to be compiled with gcc 5.3.0. At least, the string "GCC: (GNU) 5.3.0" is in that binary. Helge Hafting
SVG Icon going to fallback plaintext in Windows
I noticed something interesting today. I had a Windows laptop where I used the Qt5.5 libraries and git master lyx sources. It compiled fine and the toolbar icons were all fine. Today, I compiled it on a fresh Win8 desktop using Qt5.6 and Lyx git master and all icons disappeared! But this is most likely a false diagnostic. In my previous laptop, I had the stable bundle installed, so most likely it was sourcing icons from that. In a fresh install, ann icons disappear because I noticed all icons are .svgz now. So I patched GuiApplication.cpp to use QtSVGRenderer to paint the svg onto a QPixMap - as far as the rest of the code is concerned, its still getting a PixMap and not a SVG for rendering directly on the canvas. Now how are other follks getting to see the images in Qt5.6 without this change? I'm confused! -Shankar PS:- Attaching patch used in plaintext inline as well as attachment. diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 12f99d5..9edf05f 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -101,6 +101,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,7 @@ #include #include #include +#include #include #include #include @@ -552,18 +554,27 @@ QString iconName(FuncRequest const & f, bool unknown) bool getPixmap(QPixmap & pixmap, QString const & path) { - if (pixmap.load(path)) { + bool success; #if QT_VERSION >= 0x05 - if (path.endsWith(".svgz") || path.endsWith(".svg") ) { - GuiApplication const * guiApp = theGuiApp(); - if (guiApp != 0) { - pixmap.setDevicePixelRatio(guiApp->pixelRatio()); - } + if (path.endsWith(".svgz") || path.endsWith(".svg") ) { + GuiApplication const * guiApp = theGuiApp(); + if (guiApp != 0) { + pixmap.setDevicePixelRatio(guiApp->pixelRatio()); } -#endif - return true; + QSvgRenderer renderer; + success = renderer.load(path); + pixmap = QPixmap(16, 16); //UGLY: Does not work without this. Why??? + QPainter painter(); + renderer.render(); } - return false; + else { + success = pixmap.load(path); + } + +#else + success = pixmap.load(path); +#endif + return success; } svg_icon_fix.patch Description: Binary data