[Patch] CharStyles again
Okay I know, there are still pending regressions from André's patch... but this was OK before the patch, and quite orthogonal to it, so I think I'll just check it in later today. That will make it easier for me to participate in the bug fixing also as there are a couple of common files, which is a bother (and would be even if working in separate local trees). If you don't want this to happen, shout! Preview of changelog entry: * lib/examples/docbook_article.lyx: * lib/layouts/db_stdclass.inc: * lib/layouts/stdclass.inc: * lib/ui/stdmenus.ui: * po/POTFILES.in: * src/LaTeXFeatures.C: * src/LyXAction.C: * src/MenuBackend.C: * src/MenuBackend.h: * src/dispatchresult.h: * src/factory.C: * src/lfuns.h: * src/lyxfunc.C: * src/lyxtextclass.C: * src/lyxtextclass.h: * src/text3.C: * src/insets/Makefile.am: * src/insets/inset.h: * src/insets/insetcharstyle.C: * src/insets/insetcharstyle.h: The Character Style/XML short element patch. - Martin -- Martin Vermeer [EMAIL PROTECTED] Helsinki University of Technology Dept. of Surveying, Inst. of Geodesy P.O. Box 1200, FIN-02015 HUT, Finland :wq z.diff.gz Description: application/gunzip pgp0.pgp Description: PGP signature
Re: Why label etc. is not inserted
[EMAIL PROTECTED] wrote: > Looks like just the other way around, in fact: Sigh. I need a holiday to recover from the holiday. Ah well, -- Angus
Web page
http://www.devel.lyx.org/guii.php3 appears to lack the features Note, Footnote, Marginal note, Branch and Box. Is this an oversight, or (in the case of Foot/Marginal note) do I miss something? And is it up to date? Qt seems to be pretty complete now. - Martin pgp0.pgp Description: PGP signature
Re: which code for PO translation? (translating eu)
> "dooteo" == dooteo <[EMAIL PROTECTED]> writes: dooteo> Hi, We are translating LyX to Basque lang :) But there is a dooteo> cuestion. Which code should we use to do that? I mean, KBabel dooteo> can save PO files as UTF-8 but using this way some original dooteo> messages are made incorrect. dooteo> For example, on message 173 there are some rare symbols that dooteo> KBabel convert to UTF-8, so the result is not the same as the dooteo> original.It can save as iso-8859-15 too. GNOME needs UTF-8 to dooteo> be used, that's why I'm using this code (unicode). Currently, we use iso 8859-x for our catalogs. I understand that UTF-8 is probably better, but we are not ready for it yet, I think. JMarc
Linking time
Hello, from time to time, we discuss about the same problem again: Linking with debug information is sooo time-consuming. I would like to remind you of a very simple solution: Index: config/lyxinclude.m4 === RCS file: /cvs/lyx/lyx-devel/config/lyxinclude.m4,v retrieving revision 1.89 diff -u -r1.89 lyxinclude.m4 --- config/lyxinclude.m42003/09/16 15:23:54 1.89 +++ config/lyxinclude.m42003/11/12 10:37:34 @@ -216,7 +216,7 @@ *) CXXFLAGS="$lyx_opt";; esac if test x$enable_debug = xyes ; then - CXXFLAGS="-g $CXXFLAGS" + CXXFLAGS="-gstabs $CXXFLAGS" fi fi if test x$enable_warnings = xyes ; then This works very well with gcc 3.3.1 even on a 128MB machine. The back traces still look reasonable and the use of valgrind is not restricted (beside the output of some useless warnings at the beginning). Just a proposal, Michael
Grammar Check
Dear developers of LyX, With the risk of being the 5789th to suggest this feature I do it anyway. Among the textprocessing aid tools available in addition to the spellcheck and the thesaurus, it would nice to have a grammarcheck window, e.g. some implementation of "diction". As by now I run diction on the exported latex file, which also works, but it would be even nicer if it would be possible to use it or some other grammar checking utility inside LyX. I now that the implementatation of diction is not the best, so if a nice implementation is less straight forward, perhaps it has to wait for some more suitable grammar check to become available. This was just an idea. Regards, Staffan Ringbom ### This message has been scanned by F-Secure Anti-Virus for Internet Mail. For more information, connect to http://www.F-Secure.com/
Re: Web page
Martin Vermeer wrote: > http://www.devel.lyx.org/guii.php3 > > appears to lack the features Note, Footnote, Marginal note, Branch > and Box. > > Is this an oversight, or (in the case of Foot/Marginal note) do I > miss something? And is it up to date? Qt seems to be pretty complete > now. > > - Martin As these are your babies, perhaps you'll add them? May I suggest: $ cvs -d:ext:[EMAIL PROTECTED]:/usr/local/lyx/cvsroot -co www-user $ cd www-user [make the changes...] $ cvs -u diff > www-user.diff -- Angus
Re: Web page
-BEGIN PGP SIGNED MESSAGE- On Mittwoch, 12. November 2003 10:49, Martin Vermeer wrote: > http://www.devel.lyx.org/guii.php3 > > appears to lack the features Note, Footnote, Marginal note, Branch and Box. > > Is this an oversight, or (in the case of Foot/Marginal note) do I miss > something? And is it up to date? Qt seems to be pretty complete now. I was hoping, somebody else would use the Box-feature on qt-lyx. Am I the only one? There seems to be no method to launch the dialog on a box, so the description would apply only to xforms-lyx. kornel - -- Kornel Benko [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.1 (GNU/Linux) iQCVAwUBP7IbZ7ewfbDGmeqhAQEiDAP+Nw2HHU4LUDSJ1G2GQqNOFr5t/bpoubkn rrTVpRmo2zO3qHZFUeVQLHIZFkhYpcsKgYObTBWR6qRIpX2NS+yw6zhZIxvJsHKo 3B08J8bcu0CpKNaT75x52BNKTXvXKY4I7l3buZkvDNgjEno3QOcQaeu329dZR+Fu iKtMXiWMQso= =OeJz -END PGP SIGNATURE-
Re: Web page
On Wed, Nov 12, 2003 at 10:51:02AM +, Angus Leeming spake thusly: > Martin Vermeer wrote: > > > http://www.devel.lyx.org/guii.php3 > > > > appears to lack the features Note, Footnote, Marginal note, Branch > > and Box. > > > > Is this an oversight, or (in the case of Foot/Marginal note) do I > > miss something? And is it up to date? Qt seems to be pretty complete > > now. > > > > - Martin > > As these are your babies, perhaps you'll add them? May I suggest: > > $ cvs -d:ext:[EMAIL PROTECTED]:/usr/local/lyx/cvsroot -co > www-user > $ cd www-user Yes, without the '-' before co, and with www-devel instead of www-user... you need a longer holiday ;-) > [make the changes...] > > $ cvs -u diff > www-user.diff Attached. Is this factually correct? // order is xforms, qt, gnome // 0 means unported, 1, means pending, 2 is work in progress, 3 is // completed > -- > Angus - Martin ? x.diff Index: guii.php3 === RCS file: /usr/local/lyx/cvsroot/www-devel/guii.php3,v retrieving revision 1.64 diff -u -p -r1.64 guii.php3 --- guii.php3 9 Feb 2003 00:20:33 - 1.64 +++ guii.php3 12 Nov 2003 12:12:01 - @@ -45,6 +45,8 @@ minimal impact. $tab["About"] = array( 3, 3, 2, ""); $tab["BibTeX"] = array( 3, 3, 0, ""); $tab["BibItem"] = array( 3, 3, 0, ""); +$tab["Box"] = array( 3, 1, 0, ""); +$tab["Branch"] = array( 3, 3, 0, ""); $tab["Changes"] = array( 3, 3, 0, ""); $tab["Character"] =array( 3, 3, 1, ""); $tab["Citation"] = array( 3, 3, 0, ""); @@ -54,6 +56,7 @@ $tab["ERT"] =array( 3, $tab["External"] = array( 3, 3, 0, ""); $tab["FileDialog"] = array( 3, 3, 3, ""); $tab["Float"] =array( 3, 3, 0, ""); +$tab["Footnote"] = array( 3, 3, 0, ""); $tab["Forks"] =array( 3, 0, 0, "Child processes"); $tab["Include"] = array( 3, 3, 1, ""); $tab["Index"] =array( 3, 3, 1, ""); @@ -61,10 +64,11 @@ $tab["InsetGraphics"] =array( 3, $tab["Label"] =array( 3, 3, 0, ""); $tab["LatexLogfile"] = array( 3, 3, 0, ""); $tab["Listing"] = array( 3, 3, 0, ""); +$tab["MarginalNote"] = array( 3, 3, 0, ""); $tab["MathPanel"] =array( 3, 3, 0, ""); $tab["Menubar"] = array( 3, 3, 2, ""); $tab["MessageBox"] = array( 3, 3, 0, ""); -$tab["Minipage"] = array( 3, 3, 0, ""); +$tab["Note"] = array( 3, 2, 0, ""); $tab["Paragraph"] =array( 3, 3, 1, ""); $tab["Preamble"] = array( 3, 3, 0, ""); $tab["Preferences"] = array( 3, 3, 0, ""); @@ -87,6 +91,8 @@ $types = array ( "About", "BibTeX", "BibItem", + "Box", + "Branch", "Changes", "Character", "Citation", @@ -96,6 +102,7 @@ $types = array ( "External", "FileDialog", "Float", + "Footnote", "Forks", "Search", "Include", @@ -104,10 +111,11 @@ $types = array ( "Label", "LatexLogfile", "Listing", + "MarginalNote", "MathPanel", "Menubar", "MessageBox", - "Minipage", + "Note", "Paragraph", "Preamble", "Preferences", pgp0.pgp Description: PGP signature
Re: [Patch] CharStyles again
Martin Vermeer <[EMAIL PROTECTED]> writes:
| Index: src/lyxtextclass.C
| ===
| RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxtextclass.C,v
| retrieving revision 1.42
| diff -u -p -r1.42 lyxtextclass.C
| --- src/lyxtextclass.C3 Nov 2003 17:47:22 - 1.42
| +++ src/lyxtextclass.C12 Nov 2003 07:17:21 -
| @@ -56,6 +56,10 @@ struct compare_name {
| } // anon
|
|
| +CharStyle::CharStyle()
| +{}
I still do not get why this is needed.
| Index: src/lyxtextclass.h
| ===
| RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxtextclass.h,v
| retrieving revision 1.21
| diff -u -p -r1.21 lyxtextclass.h
| --- src/lyxtextclass.h6 Oct 2003 15:42:29 - 1.21
| +++ src/lyxtextclass.h12 Nov 2003 07:17:21 -
| @@ -22,6 +22,22 @@ class Counters;
| class FloatList;
|
|
| +///
| +struct CharStyle {
| + std::string name;
| + std::string latextype;
| + std::string latexname;
| + LyXFont font;
| + LyXFont labelfont;
| + std::string preamble;
| + CharStyle();
^^
and here.
What errors do you get when these are removed?
--
Lgb
Re: [Patch] CharStyles again
...
|
>| +CharStyle::CharStyle()
>| +{}
>
>I still do not get why this is needed.
...
| +struct CharStyle {
>| + std::string name;
>| + std::string latextype;
>| + std::string latexname;
>| + LyXFont font;
>| + LyXFont labelfont;
>| + std::string preamble;
>| + CharStyle();
>^^
>
>and here.
>
>What errors do you get when these are removed?
None if you remove both ;-) Ok, they're gone.
>--
>Lgb
- Martin
autocollapsing collapsables
It was recently removed a 1.3.x feature of collapsables that was considered useful with spellchecking. The feature consisted of the following: on an edit event, a bool first_after_edit was set to true. On any other event it was set to false. Then on the search code, if nothing (more) was found in the inset, and first_after_edit was true, the inset was automatically closed. The behaviour is then that while spellchecking, the inset was opened, and if nothing was found inside then it was closed. If the user typed something inside between a search and the following, while the cursor was inside, then first_after_edit becomes false and then the inset stays open. I think it would be relatively simple to reimplement exactly the same thing, but it seems pretty much of a hack to me, and would be search-specific. If we can have a reasonable implementation of autocloseable insets, then we can use that also in other parts of the code, like spellchecker, goto bookmark, toc navigation etc. Maybe some kind of LFUN_CURSOR_IS_ABOUT_TO_EXIT notification, that gives a chance to the inset to close itself if it is in "autoclose" mode? Thoughts? Alfredo
Re: [Patch] CharStyles again
Crime committed :-) - Martin
LFUN_MOUSE_MOTION
shouldn't LFUN_MOUSE_MOTION be dispatched to the inset having the cursor? Right now it's dispatched to whatever it's under the event position as any mouse click, but this looks bogus to me. Alfredo
Re: Why label etc. is not inserted
On Wed, Nov 12, 2003 at 08:29:12AM +, Angus Leeming spake thusly:
>
> [EMAIL PROTECTED] wrote:
> > Looks like just the other way around, in fact:
>
> Sigh. I need a holiday to recover from the holiday.
> Ah well,
> --
> Angus
Angus,
sorry to disturb your ongoing holiday :-) but what's wrong with this
code (attached)? When I try to insert a label, it correctly creates a
little grey inset button and pops up the dialog, but when I enter
something and press "Apply" (or OK), out comes
---
LyXFunc::dispatch: cmd: action: 236 arg: 'label LatexCommand
\label{abc}
\end_inset
' x: 0 y: 0
LCursor::dispatch:
trying to dispatch to main text 0x08b00ce8
LyXText::dispatch: cmd: action: 236 arg: 'label LatexCommand
\label{abc}
\end_inset
' x: 0 y: 0
INSET APPLY name:label
APPLY: no inset
LyXText::dispatch: cmd: action: 237 arg: 'label' x: 0 y: 0
result: 0
Redraw screen
dispatched by Cursor::dispatch()
BufferView::Pimpl::fitCursor.
---
It's the "APPLY: no inset" message I don't understand. There IS an
inset and it should be found, shouldn't it?
- Martin
Index: text3.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.177
diff -u -p -r1.177 text3.C
--- text3.C 12 Nov 2003 14:38:26 - 1.177
+++ text3.C 12 Nov 2003 15:33:39 -
@@ -992,6 +992,22 @@ DispatchResult LyXText::dispatch(FuncReq
break;
}
+ case LFUN_INSET_APPLY: {
+string const name = cmd.getArg(0);
+ lyxerr << "INSET APPLY name:" << name << endl;
+ InsetBase * inset = bv->owner()->getDialogs().getOpenInset(name);
+ if (inset) {
+lyxerr << "APPLY: we have an inset" << endl;
+ FuncRequest fr(bv, LFUN_INSET_MODIFY, name);
+ inset->dispatch(fr);
+ } else {
+lyxerr << "APPLY: no inset" << endl;
+ FuncRequest fr(bv, LFUN_INSET_INSERT, name);
+ dispatch(fr);
+ }
+ break;
+ }
+
case LFUN_INSET_SETTINGS:
bv->cursor().innerInset()->showInsetDialog(bv);
break;
@@ -1501,6 +1517,14 @@ DispatchResult LyXText::dispatch(FuncReq
InsetCommandParams p("htmlurl");
string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
+ break;
+ }
+
+ case LFUN_INSERT_LABEL: {
+ doInsertInset(this, cmd, true, false);
+ InsetCommandParams p("label");
+ string const data = InsetCommandMailer::params2string("label", p);
+ bv->owner()->getDialogs().show("label", data, 0);
break;
}
pgp0.pgp
Description: PGP signature
Re: Why label etc. is not inserted
Martin Vermeer wrote:
> On Wed, Nov 12, 2003 at 08:29:12AM +, Angus Leeming spake
> thusly:
>>
>> [EMAIL PROTECTED] wrote:
>> > Looks like just the other way around, in fact:
>>
>> Sigh. I need a holiday to recover from the holiday.
>> Ah well,
>> --
>> Angus
>
> Angus,
>
> sorry to disturb your ongoing holiday :-) but what's wrong with this
> code (attached)? When I try to insert a label, it correctly creates
> a little grey inset button and pops up the dialog, but when I enter
> something and press "Apply" (or OK), out comes
In itself, that looks wrong. The button should not be created at
all until "Apply" has been pressed.
You should be invoking the Dialogs::show member function to
pop up the dialog. If you press the button to launch the dialog,
then an InsetLabel pointer is passed to the function. On return
from the dialog ("Apply") the global dispatch() interrogates the
Dialogs class: "has any particular inset got an open dialog?"
Here are the two functions:
class Dialogs {
pulic:
/** \param name == "bibtex", "citation" etc; an identifier used to
launch a particular dialog.
\param data is a string representation of the Inset contents.
It is often little more than the output from Inset::write.
It is passed to, and parsed by, the frontend dialog.
\param inset is _not_ passed to the frontend dialog.
It is stored internally and used by the kernel to ascertain
what to do with the FuncRequest dispatched from the frontend
dialog on 'Apply'; should it be used to create a new inset at
the current cursor position or modify an existing, 'open' inset?
*/
void show(std::string const & name, std::string const & data,
InsetBase * inset);
///
InsetBase * getOpenInset(std::string const & name) const;
};
> LyXFunc::dispatch: cmd: action: 236 arg: 'label LatexCommand
> \label{abc}
> \end_inset
> ' x: 0 y: 0
>
> LCursor::dispatch:
>
> trying to dispatch to main text 0x08b00ce8
> LyXText::dispatch: cmd: action: 236 arg: 'label LatexCommand
> \label{abc}
> \end_inset
> ' x: 0 y: 0
> INSET APPLY name:label
> APPLY: no inset
So, presumably this means that Dialogs::getOpenInset is returning 0?
> It's the "APPLY: no inset" message I don't understand. There IS an
> inset and it should be found, shouldn't it?
Only if Dialogs::show is being passed an inset in the first place.
In your case, I think tht you shouldn't be creating the inset before
calling Dialogs::show...
--
Angus
Re: Why label etc. is not inserted
>You should be invoking the Dialogs::show member function to
>pop up the dialog. If you press the button to launch the dialog,
>then an InsetLabel pointer is passed to the function. On return
>from the dialog ("Apply") the global dispatch() interrogates the
>Dialogs class: "has any particular inset got an open dialog?"
>
>Here are the two functions:
>
>class Dialogs {
>pulic:
>/** \param name == "bibtex", "citation" etc; an identifier used to
>launch a particular dialog.
>\param data is a string representation of the Inset contents.
>It is often little more than the output from Inset::write.
>It is passed to, and parsed by, the frontend dialog.
>\param inset is _not_ passed to the frontend dialog.
>It is stored internally and used by the kernel to ascertain
>what to do with the FuncRequest dispatched from the frontend
>dialog on 'Apply'; should it be used to create a new inset at
>the current cursor position or modify an existing, 'open' inset?
>*/
>void show(std::string const & name, std::string const & data,
> InsetBase * inset);
>///
>InsetBase * getOpenInset(std::string const & name) const;
>
>};
>
>> LyXFunc::dispatch: cmd: action: 236 arg: 'label LatexCommand
>> \label{abc}
>> \end_inset
>> ' x: 0 y: 0
>>
>> LCursor::dispatch:
>>
>> trying to dispatch to main text 0x08b00ce8
>> LyXText::dispatch: cmd: action: 236 arg: 'label LatexCommand
>> \label{abc}
>> \end_inset
>> ' x: 0 y: 0
>> INSET APPLY name:label
>> APPLY: no inset
>
>So, presumably this means that Dialogs::getOpenInset is returning 0?
>
>> It's the "APPLY: no inset" message I don't understand. There IS an
>> inset and it should be found, shouldn't it?
>
>Only if Dialogs::show is being passed an inset in the first place.
>In your case, I think tht you shouldn't be creating the inset before
>calling Dialogs::show...
I see. But show is called when inserting the label inset:
1523 case LFUN_INSERT_LABEL: {
1524 doInsertInset(this, cmd, true, false);
1525 InsetCommandParams p("label");
1526 string const data = InsetCommandMailer::params2string("label", p);
1527 bv->owner()->getDialogs().show("label", data, 0);
1528 break;
1529 }
Ah... should I put statement 1524 after 1527?
No. That doesn't help.
- Martin
Re: Why label etc. is not inserted
[EMAIL PROTECTED] wrote:
> I see. But show is called when inserting the label inset:
>
>1523 case LFUN_INSERT_LABEL: {
>1524 doInsertInset(this, cmd, true, false);
>1525 InsetCommandParams p("label");
>1526 string const data =
>InsetCommandMailer::params2string("label", p);
>1527 bv->owner()->getDialogs().show("label", data, 0);
>1528 break;
>1529 }
>
> Ah... should I put statement 1524 after 1527?
No, you should simply remove 1524.
Thereafter, on return from "Apply", this block:
1134 case LFUN_INSET_APPLY: {
1135 string const name = ev.getArg(0);
1136
1137 lyxerr << "in BufferView_pimpl LFUN_INSET_APPLY" << std::endl;
1138 InsetBase * inset = owner_->getDialogs().getOpenInset(name);
1139 if (inset) {
1140 // This works both for 'original' and 'mathed' insets.
1141 // Note that the localDispatch performs update also.
1142 FuncRequest fr(bv_, LFUN_INSET_MODIFY, ev.argument);
1143 inset->dispatch(fr);
1144 } else {
1145 FuncRequest fr(bv_, LFUN_INSET_INSERT, ev.argument);
1146 dispatch(fr);
1147 }
1148 }
1149 break;
should invoke LFUN_INSET_INSERT rather than LFUN_INSET_MODIFY...
--
Angus
Re: Why label etc. is not inserted
Angus Leeming wrote:
> [EMAIL PROTECTED] wrote:
>> I see. But show is called when inserting the label inset:
>>
>>1523 case LFUN_INSERT_LABEL: {
>>1524 doInsertInset(this, cmd, true, false);
>>1525 InsetCommandParams p("label");
>>1526 string const data =
>>InsetCommandMailer::params2string("label", p);
>>1527 bv->owner()->getDialogs().show("label", data, 0);
>>1528 break;
>>1529 }
>>
>> Ah... should I put statement 1524 after 1527?
>
> No, you should simply remove 1524.
However, if the user invokes LFUN_INSERT_LABEL with the
contents already there, then you shouldn't lauch the dialog at all
but rather you should just create the inset with these data.
The analogous code in the 13x series is this:
case LFUN_CITATION_CREATE:
{
InsetCommandParams p("cite");
if (!argument.empty()) {
// This should be set at source, ie when typing
// "citation-insert foo" in the minibuffer.
// Question: would pybibliographer also need to be
// changed. Suspect so. Leave as-is therefore.
if (contains(argument, "|")) {
p.setContents(token(argument, '|', 0));
p.setOptions(token(argument, '|', 1));
} else {
p.setContents(argument);
}
dispatch(FuncRequest(view(), LFUN_CITATION_INSERT,
p.getAsString()));
} else
owner->getDialogs().createCitation(p.getAsString());
}
break;
I'm afraid I don't have the 14x sources to hand and searching
viewcvs is a pain. However, I'd hope that I retained this
capability. Unfortunately, I can no longer remember the name of the
generic LFUN_INSET_FOOBAR, now invoked as LFUN_INSET_FOOBAR "citation"...
--
Angus
Re: Web page
Kornel Benko wrote: > I was hoping, somebody else would use the Box-feature on qt-lyx. > Am I the only one? No. > There seems to be no method to launch the dialog on a box, so the > description would apply only to xforms-lyx. It is not implemented yet. But the implementation is trivial, I just did not find the time yet. So worry not, it will be implemented before 1.4 will be released. If no one beats me to it, this will be my next contribution. Regards, Jürgen. > kornel
Re: Why label etc. is not inserted
On Wed, Nov 12, 2003 at 05:10:41PM +, Angus Leeming spake thusly:
...
Progress!
Now I have the attached, and the dialog comes up and if you enter a
string there, it becomes the inset name. I.e., the "APPLY: no inset"
branch now functions. And not only for label, but for URLs as well.
The "APPLY: we have an inset" branch still fails though.
Still, this is an improvement. I propose to check this in -- unless
you have an easy, off-the-cuff proposal to get the MODIFY branch
going as well...
- Martin
Index: text3.C
===
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.177
diff -u -p -r1.177 text3.C
--- text3.C 12 Nov 2003 14:38:26 - 1.177
+++ text3.C 12 Nov 2003 19:41:18 -
@@ -992,6 +992,26 @@ DispatchResult LyXText::dispatch(FuncReq
break;
}
+ case LFUN_INSET_APPLY: {
+string const name = cmd.getArg(0);
+ lyxerr << "INSET APPLY name:" << name << endl;
+ InsetBase * inset = bv->owner()->getDialogs().getOpenInset(name);
+ if (inset) {
+lyxerr << "APPLY: we have an inset" << endl;
+ FuncRequest fr(bv, LFUN_INSET_MODIFY, name);
+ inset->dispatch(fr);
+ } else {
+lyxerr << "APPLY: no inset" << endl;
+ //FuncRequest fr(bv, LFUN_INSET_INSERT, name);
+ //dispatch(fr);
+ FuncRequest cmd2 = cmd;
+ cmd2.action = LFUN_INSET_INSERT;
+ doInsertInset(this, cmd2, true, false);
+lyxerr << "APPLY inset:" << inset << ":" << cmd2.action << endl;
+ }
+ break;
+ }
+
case LFUN_INSET_SETTINGS:
bv->cursor().innerInset()->showInsetDialog(bv);
break;
@@ -1489,7 +1509,6 @@ DispatchResult LyXText::dispatch(FuncReq
}
case LFUN_URL: {
- doInsertInset(this, cmd, true, false);
InsetCommandParams p("url");
string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
@@ -1497,10 +1516,16 @@ DispatchResult LyXText::dispatch(FuncReq
}
case LFUN_HTMLURL: {
- doInsertInset(this, cmd, true, false);
InsetCommandParams p("htmlurl");
string const data = InsetCommandMailer::params2string("url", p);
bv->owner()->getDialogs().show("url", data, 0);
+ break;
+ }
+
+ case LFUN_INSERT_LABEL: {
+ InsetCommandParams p("label");
+ string const data = InsetCommandMailer::params2string("label", p);
+ bv->owner()->getDialogs().show("label", data, 0);
break;
}
pgp0.pgp
Description: PGP signature
Re: Web page
On Wed, Nov 12, 2003 at 10:51:02AM +, Angus Leeming spake thusly: > As these are your babies, perhaps you'll add them? May I suggest: Patch attached for the karma-endowed :-( - Martin Index: ChangeLog === RCS file: /usr/local/lyx/cvsroot/www-devel/ChangeLog,v retrieving revision 1.191 diff -u -p -r1.191 ChangeLog --- ChangeLog 3 Nov 2003 11:31:14 - 1.191 +++ ChangeLog 12 Nov 2003 19:51:53 - @@ -1,3 +1,7 @@ +2003-11-12 Martin Vermeer <[EMAIL PROTECTED]> + + * guii.php3: update + 2003-11-03 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> * i18n.php3: update Index: guii.php3 === RCS file: /usr/local/lyx/cvsroot/www-devel/guii.php3,v retrieving revision 1.64 diff -u -p -r1.64 guii.php3 --- guii.php3 9 Feb 2003 00:20:33 - 1.64 +++ guii.php3 12 Nov 2003 19:51:53 - @@ -45,6 +45,8 @@ minimal impact. $tab["About"] = array( 3, 3, 2, ""); $tab["BibTeX"] = array( 3, 3, 0, ""); $tab["BibItem"] = array( 3, 3, 0, ""); +$tab["Box"] = array( 3, 0, 0, ""); +$tab["Branch"] = array( 3, 3, 0, ""); $tab["Changes"] = array( 3, 3, 0, ""); $tab["Character"] =array( 3, 3, 1, ""); $tab["Citation"] = array( 3, 3, 0, ""); @@ -54,6 +56,7 @@ $tab["ERT"] =array( 3, $tab["External"] = array( 3, 3, 0, ""); $tab["FileDialog"] = array( 3, 3, 3, ""); $tab["Float"] =array( 3, 3, 0, ""); +$tab["Footnote"] = array( 3, 3, 0, ""); $tab["Forks"] =array( 3, 0, 0, "Child processes"); $tab["Include"] = array( 3, 3, 1, ""); $tab["Index"] =array( 3, 3, 1, ""); @@ -61,10 +64,11 @@ $tab["InsetGraphics"] =array( 3, $tab["Label"] =array( 3, 3, 0, ""); $tab["LatexLogfile"] = array( 3, 3, 0, ""); $tab["Listing"] = array( 3, 3, 0, ""); +$tab["MarginalNote"] = array( 3, 3, 0, ""); $tab["MathPanel"] =array( 3, 3, 0, ""); $tab["Menubar"] = array( 3, 3, 2, ""); $tab["MessageBox"] = array( 3, 3, 0, ""); -$tab["Minipage"] = array( 3, 3, 0, ""); +$tab["Note"] = array( 3, 2, 0, ""); $tab["Paragraph"] =array( 3, 3, 1, ""); $tab["Preamble"] = array( 3, 3, 0, ""); $tab["Preferences"] = array( 3, 3, 0, ""); @@ -87,6 +91,8 @@ $types = array ( "About", "BibTeX", "BibItem", + "Box", + "Branch", "Changes", "Character", "Citation", @@ -96,6 +102,7 @@ $types = array ( "External", "FileDialog", "Float", + "Footnote", "Forks", "Search", "Include", @@ -104,10 +111,11 @@ $types = array ( "Label", "LatexLogfile", "Listing", + "MarginalNote", "MathPanel", "Menubar", "MessageBox", - "Minipage", + "Note", "Paragraph", "Preamble", "Preferences", pgp0.pgp Description: PGP signature
Re: Web page
Martin Vermeer wrote: > +$tab["Box"] = array( 3, 0, 0, ""); you can set this to 3, 1, 0 Jürgen.
Latest CVS Edit->Paragraph Settings inoperative
Nothing happens on Edit->Paragraph Settings Messages on console: LyXFunc::dispatch: cmd: action: 123 arg: '' x: 0 y: 0 LCursor::dispatch: trying to dispatch to main text 0x100b2cd0 LyXText::dispatch: cmd: action: 123 arg: '' x: 0 y: 0 result: 0 ### NOT DISPATCHED BY Cursor::dispatch() ### BufferView::Pimpl::fitCursor. LyXFunc::dispatch: cmd: action: 4 arg: '' x: 0 y: 0 BufferView::Pimpl::fitCursor. LyXFunc::dispatch: cmd: action: 123 arg: '' x: 0 y: 0 LCursor::dispatch: trying to dispatch to main text 0x100b2cd0 LyXText::dispatch: cmd: action: 123 arg: '' x: 0 y: 0 result: 0 ### NOT DISPATCHED BY Cursor::dispatch() ### BufferView::Pimpl::fitCursor. -- 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: LyX spell-checker?
Thank you! My conclusion is that I should keep on using --with-pspell with LyX 1.3.x and switch to --with-aspell when LyX 1.4 comes out. --Ling John Levon wrote: aspell is better ...
