Re: [PATCH] Minipage removal
Michael Schmitt wrote: Juergen Spitzmueller wrote: I think this can go in. Don't know what Angus' current plans about moving the minipage->box conversion from 225 to 228 are, though. So I'd wait for his vote. If all this patch does is prevent new Miniboxes being created, then great. Of course I vote for it to go in. However, as I read it, it prevents minipages in existing documents from being read. As no conversion script minipage->box exists, then of course that means it can't go in. Hm... I think there _is_ a minipage->box conversion available in lyxconvert_224.py. Loading a LyX 1.3.4 document works as expected, at least. So what exactly is missing? Enclosed please find a slightly modified patch again the current HEAD that "improves" the button label for boxes (the text "parbox" or "minipage" alone is a bit misleading UI-wise, especially as you may think that minipages are still alive). If there are no objections, please apply. Otherwise, please let me. ^ Ooops... "know" is missing :-)
Re: LyX/Mac patch for 1.4.0cvs
> "Ronald" == Ronald Florence <[EMAIL PROTECTED]> writes: Ronald> The attached patch: A few comments of my own for the other's enjoyment: Ronald> 1. Enables compilation of 1.4.0cvs on MacOSX (qfont_loader.C, Ronald> math_symbolinset.C, support/tostr.[Ch]). This should be fairly uncontroversial. Note that the #ifdef in math_symbolinset.C is still not perfect and that I have a patch pending (so-called 'ugly' patch) to 'improve' that. Ronald> - enables double-clicking on LyX files from the Mac Ronald> Finder (lux-gui.C, QWorkArea.C); This should be uncontroversial too. However, Ronald, I just saw that the code is conditionned on Q_OS_MAC which means ``running on macos9 or macosx''. I think you should use Q_WS_MACX, which means ``using aqua frontend'' [here WS stands for window system]. The macos9 case is definitely irrelevant, but your code could have problem if somebody tried to compile on osx against qt/x11 (I guess this beast exists in fink). Q_WS_MACX is the right way to test for Qt/Mac. Ronald> - makes the LyX/Mac application relocatable Ronald> (reLyX/reLyX.in, path_defines.C.in); Ronald> - sets up the PATH for the LyX/Mac application and Ronald> dependent programs like LaTeX, previewers, reLyX, etc. Ronald> (path_defines.C.in); This is a less satisfying part... Ronald> 3. Changes the README.MacOSX to reflect the procedure and Ronald> compiler necessary to build 1.4.0cvs on MacOSX. The new Ronald> README.MacOSX assumes that the LyX/Mac framework (xml files Ronald> and icons) is installed in development/MacOSX. I have to think about this one. JMarc
Re: [Patch] AGU header work
On Mon, Dec 22, 2003 at 02:49:14PM +, Jose' Matos spake thusly: > On Monday 22 December 2003 13:12, Martin Vermeer wrote: > > > > Next attempt, fresh screenshot (in the earlier announced place) > > No further objections. :-) > > > - Martin > > -- > José Abílio It's in. - Martin pgp0.pgp Description: PGP signature
Re: [PATCH] Minipage removal
On Mon, Dec 22, 2003 at 03:58:52PM +0100, Michael Schmitt spake thusly: > Enclosed please find a slightly modified patch again the current HEAD > that "improves" the button label for boxes (the text "parbox" or > "minipage" alone is a bit misleading UI-wise, especially as you may > think that minipages are still alive). Good idea. - Martin pgp0.pgp Description: PGP signature
Re: g-brief question
> "Michael" == Michael Schmitt <[EMAIL PROTECTED]> writes: Michael> Hello, short question - hopefully short answer: Michael> Why do we need g-brief2-en and g-brief2-de? Wouldn't one Michael> layout file be enough? Michael> I ask this because it does not really make much fun to Michael> translate the same messages again and again. If we can get Michael> rid of one of these layout files that would be very nice. I do not know really. It is how it was with g-brief, I guess. But it may be that this was necessary only back when we did not translate layout names in the interface. Since you speak german better that I do, I propose that you investigate the matter :) We should probably get rid of g-brief2-de, rename g-brief2-en to g-brief2 (and maybe do something about g-brief too). Felix, do you think that we need both classes, if the environment names are translated in LyX itself? JMarc
Re: [PATCH] Minipage removal
Juergen Spitzmueller wrote:
I think this can go in. Don't know what Angus' current plans about
moving the minipage->box conversion from 225 to 228 are, though. So
I'd wait for his vote.
If all this patch does is prevent new Miniboxes being created, then
great. Of course I vote for it to go in. However, as I read it, it
prevents minipages in existing documents from being read. As no
conversion script minipage->box exists, then of course that means it
can't go in.
Hm... I think there _is_ a minipage->box conversion available in
lyxconvert_224.py. Loading a LyX 1.3.4 document works as expected, at
least. So what exactly is missing?
Enclosed please find a slightly modified patch again the current HEAD
that "improves" the button label for boxes (the text "parbox" or
"minipage" alone is a bit misleading UI-wise, especially as you may
think that minipages are still alive).
If there are no objections, please apply. Otherwise, please let me.
Regards, Michael
Index: src/ChangeLog
===
RCS file: /cvs/lyx/lyx-devel/src/ChangeLog,v
retrieving revision 1.1758
diff -u -r1.1758 ChangeLog
--- src/ChangeLog 2003/12/20 00:24:30 1.1758
+++ src/ChangeLog 2003/12/22 14:24:30
@@ -1,3 +1,13 @@
+2003-12-14 Michael Schmitt <[EMAIL PROTECTED]>
+
+ * LaTeXFeatures.C:
+ * lyx_sty.[Ch]: remove minipageindent_def
+
+ * LyXAction.C:
+ * factory.C:
+ * lfuns.h:
+ * lyxfunc.C:
+ * text3.C: remove LFUN_INSET_MINIPAGE
2003-12-19 Alfredo Braunstein <[EMAIL PROTECTED]>
Index: src/LaTeXFeatures.C
===
RCS file: /cvs/lyx/lyx-devel/src/LaTeXFeatures.C,v
retrieving revision 1.101
diff -u -r1.101 LaTeXFeatures.C
--- src/LaTeXFeatures.C 2003/11/12 14:38:24 1.101
+++ src/LaTeXFeatures.C 2003/12/22 14:24:32
@@ -357,8 +357,6 @@
macros << mathcircumflex_def << '\n';
// other
- if (isRequired("NeedLyXMinipageIndent"))
- macros << minipageindent_def;
if (isRequired("ParagraphLeftIndent"))
macros << paragraphleftindent_def;
if (isRequired("NeedLyXFootnoteCode"))
Index: src/LyXAction.C
===
RCS file: /cvs/lyx/lyx-devel/src/LyXAction.C,v
retrieving revision 1.189
diff -u -r1.189 LyXAction.C
--- src/LyXAction.C 2003/11/12 14:38:24 1.189
+++ src/LyXAction.C 2003/12/22 14:24:33
@@ -224,7 +224,6 @@
{ LFUN_MENU_OPEN_BY_NAME, "menu-open", NoBuffer },
{ LFUN_MENU_SEPARATOR, "menu-separator-insert", Noop },
{ LFUN_META_FAKE, "meta-prefix", NoBuffer },
- { LFUN_INSET_MINIPAGE, "minipage-insert", Noop },
{ LFUN_INSERT_BRANCH, "branch-insert", Noop },
{ LFUN_INSERT_CHARSTYLE, "charstyle-insert", Noop },
{ LFUN_INSERT_NOTE, "note-insert", Noop },
Index: src/factory.C
===
RCS file: /cvs/lyx/lyx-devel/src/factory.C,v
retrieving revision 1.79
diff -u -r1.79 factory.C
--- src/factory.C 2003/12/14 16:33:51 1.79
+++ src/factory.C 2003/12/22 14:24:34
@@ -84,9 +84,6 @@
case LFUN_INSERT_PAGEBREAK:
return new InsetPagebreak;
- case LFUN_INSET_MINIPAGE:
- return new InsetBox(params, "Frameless");
-
case LFUN_INSERT_CHARSTYLE: {
string s = cmd.getArg(0);
CharStyles::iterator found_cs = params.getLyXTextClass().charstyle(s);
@@ -443,8 +440,6 @@
inset.reset(new InsetMarginal(buf.params()));
} else if (tmptok == "OptArg") {
inset.reset(new InsetOptArg(buf.params()));
- } else if (tmptok == "Minipage") {
- inset.reset(new InsetBox(buf.params(), "Frameless"));
} else if (tmptok == "Float") {
lex.next();
string tmptok = lex.getString();
Index: src/lfuns.h
===
RCS file: /cvs/lyx/lyx-devel/src/lfuns.h,v
retrieving revision 1.25
diff -u -r1.25 lfuns.h
--- src/lfuns.h 2003/11/28 15:53:23 1.25
+++ src/lfuns.h 2003/12/22 14:24:35
@@ -259,81 +259,80 @@
LFUN_LOAVIEW, // Dekel 2519
LFUN_SET_COLOR, // SLior 2611
LFUN_INSET_MARGINAL,// Lgb 2626
- LFUN_INSET_MINIPAGE,// Lgb 2627
- // 195
LFUN_INSET_FLOAT, // Lgb 2627
+ // 195
LFUN_INSET_WIDE_FLOAT, // Lgb 20010531
LFUN_INSET_CAPTION, // Lgb 2718
LFUN_SWITCHBUFFER,
LFUN_TABULAR_FEATURE, // Jug 2728
- // 200
LFUN_LAYOUT_TABULAR,// Jug 2731
+ // 200
Re: [Patch] AGU header work
On Monday 22 December 2003 13:12, Martin Vermeer wrote: > > Next attempt, fresh screenshot (in the earlier announced place) No further objections. :-) > - Martin -- José Abílio
Re: new versions of seminar.layout and dinbrief.layout
On Fri, 19 Dec 2003, Günter Milde wrote: > Also, it would be nice to have the Contributed Stuff page > http://www.lyx.org/download/contrib.php3 > updated with a link from "Additional layout files" to the layout wiki. I've attached a patch with changes the text so that it refers to the wiki-wiki instead, see here for how it looks: http://www.lyx.org/~chr/www-user/download/contrib.php3 /Christian PS. I am not able to commit this, because my account on baywatch.lyx.org does not belong to the group 'cvsusers' (this is what I think is the problem anyway, the account also does not have a home directory on that machine, but I don't know if that actually matters). -- Christian Ridderström http://www.md.kth.se/~chr ? contrib.diff Index: download/contrib.php3 === RCS file: /cvs/lyx/www-user/download/contrib.php3,v retrieving revision 1.3 diff -u -r1.3 contrib.php3 --- download/contrib.php3 2002/10/29 13:14:09 1.3 +++ download/contrib.php3 2003/12/22 13:34:33 @@ -53,17 +53,7 @@ Additional layout files - - Guenter Milde has contributed a textclass for the seminar - document class. It has not been added to the main - distribution because it is not very clean (due to LyX - shortcomings), but you can find it - ftp://ftp.lyx.org/pub/lyx/contrib/seminar.tar.gz";>in - the contrib section of the ftp site. - - - - +Look in the http://wiki.lyx.org/pmwiki.php/Layouts/Layouts";>layouts-section of the LyX http://wiki.lyx.org/pmwiki.php";>wiki-wiki site. Useful scripts
Re: [Patch] AGU header work
On Mon, Dec 22, 2003 at 09:45:31AM +, Jose' Matos spake thusly: > > That we are on the right track. :-) > -- > José Abílio Next attempt, fresh screenshot (in the earlier announced place) - Martin Index: layouts/agu_stdclass.inc === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/agu_stdclass.inc,v retrieving revision 1.4 diff -u -p -r1.4 agu_stdclass.inc --- layouts/agu_stdclass.inc18 Dec 2003 12:42:02 - 1.4 +++ layouts/agu_stdclass.inc22 Dec 2003 12:55:48 - @@ -43,10 +43,22 @@ CharStyle Firstname EndFont End +CharStyle Fname + LatexType Command + LatexName fname + Font + Shape SmallCaps + EndFont + LabelFont + Shape Up + Color blue + EndFont +End + CharStyle Surname LatexType Command - LatexName firstname + LatexName surname Font Shape SmallCaps EndFont @@ -59,7 +71,7 @@ End CharStyle Filename LatexType Command - LatexName firstname + LatexName filename Font Family Typewriter EndFont @@ -72,7 +84,7 @@ End CharStyle Literal LatexType Command - LatexName firstname + LatexName literal Font Family Typewriter EndFont @@ -92,6 +104,87 @@ CharStyle Emph EndFont LabelFont Shape Up + Color blue + EndFont +End + + +CharStyle Abbrev + LatexType Command + LatexName abbrev + LabelFont + Color blue + EndFont +End + + +CharStyle Citation-number + LatexType Command + LatexName citation-number + LabelFont + Color blue + EndFont +End + + +CharStyle Volume + LatexType Command + LatexName volume + LabelFont + Color blue + EndFont +End + + +CharStyle Day + LatexType Command + LatexName day + LabelFont + Color blue + EndFont +End + + +CharStyle Month + LatexType Command + LatexName month + LabelFont + Color blue + EndFont +End + + +CharStyle Year + LatexType Command + LatexName year + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-number + LatexType Command + LatexName issue-number + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-day + LatexType Command + LatexName issue-day + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-months + LatexType Command + LatexName issue-months + LabelFont Color blue EndFont End Index: layouts/agu_stdtitle.inc === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/agu_stdtitle.inc,v retrieving revision 1.1 diff -u -p -r1.1 agu_stdtitle.inc --- layouts/agu_stdtitle.inc18 Dec 2003 12:42:02 - 1.1 +++ layouts/agu_stdtitle.inc22 Dec 2003 12:55:48 - @@ -10,45 +10,59 @@ Input stdtitle.inc Style Header - MarginFirst_dynamic + MarginStatic LatexType Command LatexName header LabelSep xx LabelType Centered_Top_Environment - LabelString "" + LabelString "-- Header --" CommandDepth 2 KeepEmpty 1 NextNoIndent 1 LabelFont - Color green + SizeLargest + Series Bold + Color blue EndFont End Style Special-section CopyStyle Header + MarginDynamic LatexName special-section LabelType Static - LabelString "" + LabelString "Special-section: " CommandDepth 3 LabelFont - Color blue + SizeNormal + Series Medium EndFont End + Style AGU-journal CopyStyle Special-section LatexName AGU-journal - LabelString "" + LabelString "AGU-journal: " CommandDepth 3 End
Re: g-brief question
Jean-Marc Lasgouttes wrote:
Since you speak german better that I do, I propose that you
investigate the matter :) We should probably get rid of g-brief2-de,
rename g-brief2-en to g-brief2 (and maybe do something about g-brief
too).
Felix, do you think that we need both classes, if the environment
names are translated in LyX itself?
I think the answer is NO. A diff between both files tells me:
2c2
< # \DeclareLaTeXClass[g-brief2]{letter (g-brief2)}
---
> # \DeclareLaTeXClass[g-brief2]{letter (g-brief2, german)}
5,6c5,6
< # Author : Felix Kurth <[EMAIL PROTECTED]> based on work from
< # Thomas Hartkens <[EMAIL PROTECTED]>
---
> # Author :Felix Kurth <[EMAIL PROTECTED]> based on work from
> # Thomas Hartkens <[EMAIL PROTECTED]>
18c18
< DefaultStyle Letter
---
> DefaultStyle Brieftext
33c33
The remaining differences are "Style" and "LabelString" lines. Both
should have no impact on the LaTeX output.
Could you please change the files as proposed above (preferable for the
stable branch first so that I can continue bug fixing?). I think it is
pretty silly if _I_ prepare a patch for you in that case, isn't it?
There is no need to remerge the po files at this stage. I have another
Makefile fix that will add a few messages. I will tell you about it when
we are through with g-brief2.
Regards, Michael
g-brief question
Hello, short question - hopefully short answer: Why do we need g-brief2-en and g-brief2-de? Wouldn't one layout file be enough? I ask this because it does not really make much fun to translate the same messages again and again. If we can get rid of one of these layout files that would be very nice. Regards, Michael
Re: [Patch] AGU header work
On Monday 22 December 2003 09:40, Martin Vermeer wrote:
>
> Neither have I... would a simple blue label without the <> do better?
> Possibly with a colon ("AGU-journal: ")
That I like, also the point is to be consistent for all styles. The
principle os least surprise.
> Perhaps for Title and Author, no label at all, just a centered
> paragraph (and bigger text)
As long as it is evident from the context, I agree.
> What do you think?
That we are on the right track. :-)
> - Martin
--
José Abílio
Re: [Patch] AGU header work
On Mon, Dec 22, 2003 at 09:03:53AM +, Jose' Matos spake thusly:
> On Monday 22 December 2003 08:39, Martin Vermeer wrote:
> >
> > Here is some further work on the AGU header. It starts looking really
> > good now. See
> >
> > http://www.hut.fi/~mvermeer/agu_pic.jpeg
> >
> > (some changes were made after that still)
>
> I don't like your notation for the display name, it is very unLyXish.
> ;-)
>
> I don't like it in aestetichal terms, but I don't have also any better
> solution.
Neither have I... would a simple blue label without the <> do better?
Possibly with a colon ("AGU-journal: ")
Perhaps for Title and Author, no label at all, just a centered
paragraph (and bigger text)
What do you think?
> > As this is pretty unproblematic stuff and unconnected to anything
> > else, I'll just check it in later today unless I hear objections.
>
> With the single exception of the LAbelString issue I agree with you.
>
> > - Martin
>
> --
> José Abílio
- Martin
pgp0.pgp
Description: PGP signature
Re: [Patch] AGU header work
On Monday 22 December 2003 08:39, Martin Vermeer wrote: > > Here is some further work on the AGU header. It starts looking really > good now. See > > http://www.hut.fi/~mvermeer/agu_pic.jpeg > > (some changes were made after that still) I don't like your notation for the display name, it is very unLyXish. ;-) I don't like it in aestetichal terms, but I don't have also any better solution. > As this is pretty unproblematic stuff and unconnected to anything > else, I'll just check it in later today unless I hear objections. With the single exception of the LAbelString issue I agree with you. > - Martin -- José Abílio
[Patch] AGU header work
On Wed, Dec 17, 2003 at 04:11:02PM +, Jose' Matos spake thusly: > On Wednesday 17 December 2003 16:15, Martin Vermeer wrote: > > > In docbook the whole header-like stuff is at the same depth as the > > > usual sections for that style ( section for articles and chapters for > > > book) so that as soon as the chapter begins the header closes. > > > > > > This has some problems, sometimes but IMHO it is more homegeneous than > > > the intitle hack. :-) > > > > The attached is done in that way. I also fixed a bug that made it > > impossible to have an empty command with KeepEmpty = 1 :-) > > > > Does this look OK? > > Sure. :-) > Perfect, I would say. ;-) > > > - Martin > > -- > José Abílio Here is some further work on the AGU header. It starts looking really good now. See http://www.hut.fi/~mvermeer/agu_pic.jpeg (some changes were made after that still) As this is pretty unproblematic stuff and unconnected to anything else, I'll just check it in later today unless I hear objections. - Martin -- Martin Vermeer [EMAIL PROTECTED] Helsinki University of Technology Dept. of Surveying, Inst. of Geodesy P.O. Box 1200, FIN-02015 HUT, Finland :wq Index: layouts/agu_stdclass.inc === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/agu_stdclass.inc,v retrieving revision 1.4 diff -u -p -r1.4 agu_stdclass.inc --- layouts/agu_stdclass.inc18 Dec 2003 12:42:02 - 1.4 +++ layouts/agu_stdclass.inc22 Dec 2003 07:55:35 - @@ -43,10 +43,22 @@ CharStyle Firstname EndFont End +CharStyle Fname + LatexType Command + LatexName fname + Font + Shape SmallCaps + EndFont + LabelFont + Shape Up + Color blue + EndFont +End + CharStyle Surname LatexType Command - LatexName firstname + LatexName surname Font Shape SmallCaps EndFont @@ -59,7 +71,7 @@ End CharStyle Filename LatexType Command - LatexName firstname + LatexName filename Font Family Typewriter EndFont @@ -72,7 +84,7 @@ End CharStyle Literal LatexType Command - LatexName firstname + LatexName literal Font Family Typewriter EndFont @@ -92,6 +104,87 @@ CharStyle Emph EndFont LabelFont Shape Up + Color blue + EndFont +End + + +CharStyle Abbrev + LatexType Command + LatexName abbrev + LabelFont + Color blue + EndFont +End + + +CharStyle Citation-number + LatexType Command + LatexName citation-number + LabelFont + Color blue + EndFont +End + + +CharStyle Volume + LatexType Command + LatexName volume + LabelFont + Color blue + EndFont +End + + +CharStyle Day + LatexType Command + LatexName day + LabelFont + Color blue + EndFont +End + + +CharStyle Month + LatexType Command + LatexName month + LabelFont + Color blue + EndFont +End + + +CharStyle Year + LatexType Command + LatexName year + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-number + LatexType Command + LatexName issue-number + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-day + LatexType Command + LatexName issue-day + LabelFont + Color blue + EndFont +End + + +CharStyle Issue-months + LatexType Command + LatexName issue-months + LabelFont Color blue EndFont End Index: layouts/agu_stdtitle.inc === RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/agu_stdtitle.inc,v retrieving revision 1.1 diff -u -p -r1.1 agu_stdtitle.inc --- layouts/agu_stdtitle.inc18 Dec 2003 12:42:02 - 1.1 +++ layouts/agu_stdtitle.inc22 Dec 2003 07:55:35 - @@ -20,7 +20,8 @@ Style Header KeepEmpty 1 NextNoIndent 1 LabelFont - Color green + SizeLargest + Color blue EndFont End @@ -32,19 +33,30 @@ Style Special-section LabelString "" CommandDepth
