Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
> "Joost" == Joost Verburg <[EMAIL PROTECTED]> writes: Joost> Jean-Marc Lasgouttes wrote: >> What about shipping a default-autotoolbars.ui file which make auto >> toolbars active? Joost> That still requires users to manually set a different UI file, Joost> which is not a very obvious thing to do when you want to have Joost> the toolbars visible. Joost> Why not put the auto toolbars in default and create a Joost> default-noautotoolbars? Because I think there will be as many people annoyed by auto toolbars then people who like them. Personally, having toolbars which flash in and out when I do pageup/down annoys me. JMarc
Re: [1.5svn] [BUG] iterator code issue
Am Dienstag, 10. Oktober 2006 01:03 schrieb Timothy Reaves: > When I click on my documents TOC button, it immediately crashes with this: > > /usr/include/c++/4.0.0/debug/safe_iterator.h:127:error: attempt to copy- > construct an iterator from a singular iterator. Could you post a backtrace? Georg PS: I hope you know that trunk is seriously broken. For real documents use the 1.4 branch, but if you want to help to fix trunk it would be very welcome.
Re: [1.5svn][BUG] Navagate menu oddness
Am Dienstag, 10. Oktober 2006 07:48 schrieb Martin Vermeer: > On Mon, Oct 09, 2006 at 07:10:42PM -0400, Timothy Reaves wrote: > > In my Navigate menu, the chapters are listed. I have 8. So there > > is Chapter 1, Chapter 2,... Except that beside (to the right) of the > > chapter number is a long integer that is different in each case; a UID > > perhaps? > > No, it's the chapter title in numeric ASCII... a failed unicode-isation > apparently. Yes. My wide stream patch I developed some weeks ago fixes that. I think I am just going to put it in tonight. Georg
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Jean-Marc Lasgouttes wrote: What about shipping a default-autotoolbars.ui file which make auto toolbars active? That still requires users to manually set a different UI file, which is not a very obvious thing to do when you want to have the toolbars visible. Why not put the auto toolbars in default and create a default-noautotoolbars? Joost
Re: [1.5svn][BUG] Navagate menu oddness
On Mon, Oct 09, 2006 at 07:10:42PM -0400, Timothy Reaves wrote: > In my Navigate menu, the chapters are listed. I have 8. So there > is Chapter 1, Chapter 2,... Except that beside (to the right) of the > chapter number is a long integer that is different in each case; a UID > perhaps? No, it's the chapter title in numeric ASCII... a failed unicode-isation apparently. - Martin pgpf9KWjMMClH.pgp Description: PGP signature
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> They are context-sensitive in trunk but not in 1.4.X yet. Ask Michael> Jean-Marc to activate them in the stable branch as well... What about shipping a default-autotoolbars.ui file which make auto toolbars active? JMarc
LyX for Windows Polish localization
Dear All! I am sorry to write that LyX 1.4.3 port for Windows has reverted to old problem that was present in 1.4.1, but removed in 1.4.2. This problem is with Polish diacritical marks in menu and dialog boxes - namely LyX erroneously displays ą (as s with inverted hat), ś and ź (thick vertical lines). Besides there are also some coding systems conflicts under Linux - LyX-QT inteface works perfectly, but if I want to use Aspell as a spellchecker, it does not recognize Polish letters and proposes to replace the words with something which apparently looks the same... (Just in case - I use updated Kubuntu Dapper distribution.) Best regards, -- Andrzej Tomaszewski Department of Economics Warsaw University PS: This mail is in ISO-8859-2 encoding and contains Polish diacritical marks as it was necessary in order to demonstrate the problem.
[1.5svn][BUG] Can't convert to PDF
When I select to convert to PDF (pdflatex), this get's logged Error returned from iconv E2BIG There is not sufficient room at *outbuf. Error returned from iconv E2BIG There is not sufficient room at *outbuf. and I get a popup window that displayes: Undefined control sequence. ...816 02 11610510910146 807739115 \3 8 737739115 11510111611610... The control sequence at the end of the top line of your error message was never \def'ed. If you have misspelled it (e.g., `
[1.5svn][BUG] Navagate menu oddness
In my Navigate menu, the chapters are listed. I have 8. So there is Chapter 1, Chapter 2,... Except that beside (to the right) of the chapter number is a long integer that is different in each case; a UID perhaps?
[1.5svn] [BUG] iterator code issue
When I click on my documents TOC button, it immediately crashes with this:
/usr/include/c++/4.0.0/debug/safe_iterator.h:127:error: attempt to copy-
construct an iterator from a singular iterator.
Objects involved in the operation:
iterator "this" @ 0x0xbfffcb1c {
type =
N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPKN3lyx10TocBackend4ItemEN10__gnu_norm6vectorIS5_SaIS5_EN15__gnu_debug_def6vectorIS5_SA_
(constant iterator);
state = singular;
}
iterator "other" @ 0x0xbfffcaf8 {
type =
N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPKN3lyx10TocBackend4ItemEN10__gnu_norm6vectorIS5_SaIS5_EN15__gnu_debug_def6vectorIS5_SA_
(constant iterator);
state = singular;
}
[1.5svn][BUG] lyxpipe file cleanup?
I get the following for both .lyxpipe.in & .lyxpipe.out LyXComm: Pipe /Users/treaves/Library/Application Support/LyX-1.4/.lyxpipe.in already exists. If no other LyX program is active, please delete the pipe by hand and try again. QApplication::notify: Unexpected null receiver
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
On Mon, Oct 09, 2006 at 10:44:41PM +0200, Joost Verburg wrote: > Currently the very useful math and table toolbars are still off by > default, which is not a good thing in my opinion. Too many things are > hidden for the normal end-user. The plan always was to introduce View->Toolbars ala other applications. It should actually be pretty easy if you're interested! regards john
Re: [PATCH] Painter::text() returns drawn text width()
On Mon, Oct 09, 2006 at 06:55:35PM +0200, Abdelrazak Younes wrote: > As the title says. I've been testing this patch for some days and I > didn't see any side effect. The contrary would be surprising as the > changes are pretty simple. Is font metrics any faster these days? There's an extra metrics call in your patch, and it used to be dog slow to get metrics. regards john
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Joost Verburg wrote: Yes, I like the idea of a "reviewing" toolbar with change tracking and notes. These things are almost always used together. Great. I will call the toolbar "Review" which is a better name than "Changes & Notes". Will it be displayed automatically when change tracking is enabled? I am afraid that you have to activate it manually. I don't think that it should be context-sensitive anyway. Even if you switch off CT (e.g. temporarily!), there may still be changes and notes in the document. Currently the very useful math and table toolbars are still off by default, which is not a good thing in my opinion. Too many things are hidden for the normal end-user. They are context-sensitive in trunk but not in 1.4.X yet. Ask Jean-Marc to activate them in the stable branch as well... Michael
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Michael Gerz wrote: Joost, do you like the idea of a combined changes & notes toolbar? I would like to commit my previous patch but first I need some positive feedback from lyx-devel. Yes, I like the idea of a "reviewing" toolbar with change tracking and notes. These things are almost always used together. Will it be displayed automatically when change tracking is enabled? We really need to have a user interface to configure whether toolbars should be on, off, or displayed when the feature is in use. Currently the very useful math and table toolbars are still off by default, which is not a good thing in my opinion. Too many things are hidden for the normal end-user. Joost
Re: [PATCH] CT revision (this time for real)
On Mon, Oct 09, 2006 at 10:34:32AM +0200, Jean-Marc Lasgouttes wrote: > > "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: > > Michael> BTW: I think there is slow progress regarding unicode. Do you > Michael> have any idea how to overcome the current situation? It seems > Michael> some people are waiting for a sign :-) > > I believe the sign will come from Denmark, soonish. I just noticed that the meeting is a week earlier than I had in mind. Lucky me lost id card & Co, otherwise I'd have bought tickets for the wrong weekend today... Andre'
Re: 1.5 compile on OS X
On Sun, Oct 08, 2006 at 10:30:47AM +0200, Abdelrazak Younes wrote: > Ha! The anonymous namespace trick does not work very well with your > compiler apparently. What version of gcc do you have? > > FYI, function in the anonymous namespace in a C file are supposedly > hidden to the rest of the world. The compiler looks broken, but in any case items from the anonymous namespace retain external linkage so they are not really unvisble. A better means to hide stuff is good ol' C's 'static', but I know someone listening here considers 'static' un-C++-ish. Andre'
Re: libtool: link: cannot find the library `'
On Mon, Oct 09, 2006 at 06:17:52PM +0200, Abdelrazak Younes wrote: > Jean-Marc Lasgouttes wrote: > >>"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: > > > >Abdelrazak> Well, I've made it faster in the past with Bennett's help. > >Abdelrazak> I am quite confident that we'll find the bottlenecks with > >Abdelrazak> some profiling report. > > > >Unless the bottlenecks are in Qt/Mac itself. > > In this case we can still turn around the bottlenecks like we did with > the font width cache. Maybe Bennett should try the array-based fontwidth cache version... Andre'
Re: When will LyX 1.5 be released?
On Sun, Oct 08, 2006 at 10:02:30PM +0200, Andreas Karlsson wrote: > I am curious on how the work on version 1.5 of LyX is progressing. When > will LyX 1.5 be released? Christmas, as usual. We are in the process of making our minds up whether this would be 2014 or 2017. Do you have any particular preference here? Andre'
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Joost Verburg wrote: However it is possible to add additional toolbars, like the change tracking toolbar Micheal created. I think these are very useful. Joost, do you like the idea of a combined changes & notes toolbar? I would like to commit my previous patch but first I need some positive feedback from lyx-devel. Michael
Re: Will commit now... (was Re: [SVN updated patch] Introduce frontends/FontMetrics virtual interface
On Sat, Oct 07, 2006 at 06:07:26PM +0200, Abdelrazak Younes wrote: > Abdelrazak Younes wrote: > >Andre Poenitz wrote: > >> > >>I think I'd prefer something like > >> > >> +x_ += theFontMetrics(font).width(&str[0], str.size()); > >> > >>Going 'optically' through four layers is not adding clarity. > > > >I can also provide this helper function if you want, no problem. But I > >guess that's not what you mean. > > I am going to commit the patch now "as is" but I will do the above > change if you confirm me that that's what you want. I can also provide > helper functions like this one for bufferList and LyXFunc. I want as few->indiretions.as_PoSiBBLe.when()->calling().a(simple)[function]. When helper functions can reduces the clutter I prfer to use them. Andre'
Re: libtool: link: cannot find the library `'
On Oct 9, 2006, at 12:04 PM, Abdelrazak Younes wrote: If you can find a sponsor that send me a Mac Powerbook for free, I sure will make it as fast as hell ;-) You're winking, but let me take you seriously. I was not very serious indeed... In the US, I can get a 400 MHz G3 iMac for under $100. That's probably about the same speed as my 466 MHz G3 iBook, which I still use regularly. If LyX runs acceptably on that, it ought to run acceptably on just about anything still in use! If I got 4 people to send you $25 each, would that be enough? (What's the used Mac market like in Europe?) Don't know... More seriously, I'll do what I can to speed up the Mac port if you help me with some profiling results (as you did in the past). Of course, it's not very efficient to profile from afar (especially with my ignorance). Would Timothy's offer of an XServ account help here? (Of course, I'm happy to continue profiling, too. Let me know when you're ready: my sense is that things haven't settled down enough yet) By the way, how fast is hell? (Perhaps it's pretty damn slow: using LyX-1.5 on Mac is like hell) Bennett
[PATCH] Painter::text() returns drawn text width()
Hello,
As the title says. I've been testing this patch for some days and I
didn't see any side effect. The contrary would be surprising as the
changes are pretty simple.
Will commit tomorrow if there's no objection.
Abdel.
Index: frontends/gtk/GPainter.C
===
--- frontends/gtk/GPainter.C(revision 15292)
+++ frontends/gtk/GPainter.C(working copy)
@@ -196,7 +196,7 @@
} // anon namespace
-void GPainter::text(int x, int y,
+int GPainter::text(int x, int y,
char_type const * s, size_t ls,
LyXFont const & f)
{
@@ -204,6 +204,8 @@
XftColor * xftClr = owner_.getColorHandler().
getXftColor(f.realColor());
XftDraw * draw = owner_.getXftDraw();
+ int textwidth = 0;
+
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
XftDrawString32(draw,
xftClr,
@@ -211,11 +213,11 @@
x, y,
reinterpret_cast(s),
ls);
+ textwidth = font_metrics::width(s, ls, f);
} else {
LyXFont smallfont(f);
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
XftFont * fontS = getXftFont(smallfont);
- int tmpx = x;
for (unsigned int i = 0; i < ls; ++i) {
// Ok, this looks quite ugly...
char_type c =
gdk_keyval_to_unicode(gdk_keyval_to_upper(gdk_unicode_to_keyval(s[i])));
@@ -223,35 +225,37 @@
XftDrawString32(draw,
xftClr,
fontS,
- tmpx, y,
+ x + textwidth, y,
reinterpret_cast(&c),
1);
- tmpx += font_metrics::width(c, smallfont);
+ textwidth += font_metrics::width(c, smallfont);
} else {
XftDrawString32(draw,
xftClr,
font,
- tmpx, y,
+ x + textwidth, y,
reinterpret_cast(&c),
1);
- tmpx += font_metrics::width(c, f);
+ textwidth += font_metrics::width(c, f);
}
}
}
if (f.underbar() == LyXFont::ON)
- underline(f, x, y, font_metrics::width(s, ls, f));
+ underline(f, x, y, textwidth);
+
+ return textwidth;
}
-void GPainter::text(int x, int y, docstring const & s, LyXFont const & f)
+int GPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
- text (x, y, reinterpret_cast(s.data()), s.size(), f);
+ return text (x, y, reinterpret_cast(s.data()),
s.size(), f);
}
-void GPainter::text(int x, int y, char_type c, LyXFont const & f)
+int GPainter::text(int x, int y, char_type c, LyXFont const & f)
{
- text (x, y, &c, 1, f);
+ return text (x, y, &c, 1, f);
}
Index: frontends/gtk/GPainter.h
===
--- frontends/gtk/GPainter.h(revision 15292)
+++ frontends/gtk/GPainter.h(working copy)
@@ -97,16 +97,16 @@
graphics::Image const & image);
/// draw a string at position x, y (y is the baseline)
- virtual void text(int x, int y,
+ virtual int text(int x, int y,
lyx::docstring const & str, LyXFont const & f);
/// draw a string at position x, y (y is the baseline)
- virtual void text(int x, int y,
+ virtual int text(int x, int y,
lyx::char_type const * str, size_t l,
LyXFont const & f);
/// draw a char at position x, y (y is the baseline)
- virtual void text(int x, int y,
+ virtual int text(int x, int y,
lyx::char_type c, LyXFont const & f);
void start();
Index: frontends/nullpainter.h
===
--- frontends/nullpainter.h (revision 15292)
+++ frontends/nullpainter.h (working copy)
@@ -57,13 +57,13 @@
///
void image(int, int, int, int, lyx::graphics::Image const &) {}
///
- void text(int, int, lyx::docstring const &, LyXFont const &) {}
+ int text(int, int, lyx::docstring const &, LyXFont const &) { return 0;
}
// ///
-// void text(int, int, char const *, size_t, LyXFont const &)
[PATCH] Even more Unicode work
Ok, I am pretty fad-up with this tedious work so I am gonna stop for a
while.
This patch is converting everything related to browsing, qt4 only. I am
not going to do either qt3 or gtk. Too tired... If we are really serious
about qt3 and gtk, this work needs to be done anyway so I will commit
the qt4 part now...
Abdel.
Index: BufferView.C
===
--- BufferView.C(revision 15292)
+++ BufferView.C(working copy)
@@ -1369,6 +1369,7 @@
if (filename.empty()) {
// Launch a file browser
+ // FIXME UNICODE
string initpath = lyxrc.document_path;
if (buffer_) {
@@ -1378,22 +1379,22 @@
initpath = trypath;
}
- FileDialog fileDlg(lyx::to_utf8(_("Select LyX document to
insert")),
+ // FIXME UNICODE
+ FileDialog fileDlg(_("Select LyX document to insert"),
LFUN_FILE_INSERT,
- make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
- string(lyxrc.document_path)),
- make_pair(string(lyx::to_utf8(_("Examples|#E#e"))),
- string(addPath(package().system_support(),
"examples";
+ make_pair(_("Documents|#o#O"),
lyx::from_utf8(lyxrc.document_path)),
+ make_pair(_("Examples|#E#e"),
lyx::from_utf8(addPath(package().system_support(), "examples";
FileDialog::Result result =
- fileDlg.open(initpath,
-FileFilterList(lyx::to_utf8(_("LyX
Documents (*.lyx)"))),
-string());
+ fileDlg.open(lyx::from_utf8(initpath),
+FileFilterList(_("LyX Documents (*.lyx)")),
+docstring());
if (result.first == FileDialog::Later)
return;
- filename = result.second;
+ // FIXME UNICODE
+ filename = lyx::to_utf8(result.second);
// check selected filename
if (filename.empty()) {
Index: frontends/controllers/ControlBibtex.C
===
--- frontends/controllers/ControlBibtex.C (revision 15292)
+++ frontends/controllers/ControlBibtex.C (working copy)
@@ -48,26 +48,26 @@
{}
-string const ControlBibtex::browseBib(string const & in_name) const
+docstring const ControlBibtex::browseBib(docstring const & in_name) const
{
// FIXME UNICODE
- pair dir1(lyx::to_utf8(_("Documents|#o#O")),
- string(lyxrc.document_path));
- FileFilterList const filter(lyx::to_utf8(_("BibTeX Databases
(*.bib)")));
- return browseRelFile(in_name, kernel().bufferFilepath(),
-lyx::to_utf8(_("Select a BibTeX database to add")),
+ pair dir1(_("Documents|#o#O"),
+ lyx::from_utf8(lyxrc.document_path));
+ FileFilterList const filter(_("BibTeX Databases (*.bib)"));
+ return browseRelFile(in_name, lyx::from_utf8(kernel().bufferFilepath()),
+_("Select a BibTeX database to add"),
filter, false, dir1);
}
-string const ControlBibtex::browseBst(string const & in_name) const
+docstring const ControlBibtex::browseBst(docstring const & in_name) const
{
// FIXME UNICODE
- pair dir1(lyx::to_utf8(_("Documents|#o#O")),
- string(lyxrc.document_path));
- FileFilterList const filter(lyx::to_utf8(_("BibTeX Styles (*.bst)")));
- return browseRelFile(in_name, kernel().bufferFilepath(),
-lyx::to_utf8(_("Select a BibTeX style")), filter,
false, dir1);
+ pair dir1(_("Documents|#o#O"),
+ lyx::from_utf8(lyxrc.document_path));
+ FileFilterList const filter(_("BibTeX Styles (*.bst)"));
+ return browseRelFile(in_name, lyx::from_utf8(kernel().bufferFilepath()),
+_("Select a BibTeX style"), filter, false, dir1);
}
Index: frontends/controllers/ControlBibtex.h
===
--- frontends/controllers/ControlBibtex.h (revision 15292)
+++ frontends/controllers/ControlBibtex.h (working copy)
@@ -14,6 +14,9 @@
#define CONTROLBIBTEX_H
#include "ControlCommand.h"
+
+#include "support/docstring.h"
+
#include
namespace lyx {
@@ -34,10 +37,10 @@
ControlBibtex(Dialog &);
/// Browse for a .bib file
- std::string const browseBib(std::string const & in_name) const;
+ lyx::docstring const browseBib(lyx::docstring const & in_name) const;
/// Browse for a
Re: libtool: link: cannot find the library `'
Jean-Marc Lasgouttes wrote: "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Well, I've made it faster in the past with Bennett's help. Abdelrazak> I am quite confident that we'll find the bottlenecks with Abdelrazak> some profiling report. Unless the bottlenecks are in Qt/Mac itself. In this case we can still turn around the bottlenecks like we did with the font width cache. Abdel.
Re: libtool: link: cannot find the library `'
> "Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes: Abdelrazak> Well, I've made it faster in the past with Bennett's help. Abdelrazak> I am quite confident that we'll find the bottlenecks with Abdelrazak> some profiling report. Unless the bottlenecks are in Qt/Mac itself. JMarc
Re: libtool: link: cannot find the library `'
Timothy Reaves wrote: Well, I'd definatly chip it; maybe even more that $25. But I have to ask: what makes anyone thing it can be made faster? Well, I've made it faster in the past with Bennett's help. I am quite confident that we'll find the bottlenecks with some profiling report. Also, I have a pretty massive XServ I co-locate, and I'm willing to give an account or two, and perhaps even set it up as an automated build server. That is interesting. Abdel.
[PATCH] compilation fix
This makes qt3 compile again. Going in now.
JMarc
Index: src/frontends/qt3/QDialogView.C
===
--- src/frontends/qt3/QDialogView.C (revision 15287)
+++ src/frontends/qt3/QDialogView.C (working copy)
@@ -19,7 +19,7 @@
namespace lyx {
namespace frontend {
-QDialogView::QDialogView(Dialog & parent, std::string const & t)
+QDialogView::QDialogView(Dialog & parent, docstring const & t)
: Dialog::View(parent,t), updating_(false)
{}
Index: src/frontends/qt3/QLToolbar.C
===
--- src/frontends/qt3/QLToolbar.C (revision 15287)
+++ src/frontends/qt3/QLToolbar.C (working copy)
@@ -174,7 +174,7 @@ QLToolbar::QLToolbar(ToolbarBackend::Too
ToolbarBackend::item_iterator it = tbb.items.begin();
ToolbarBackend::item_iterator end = tbb.items.end();
for (; it != end; ++it)
- add(it->first, it->second);
+ add(it->first, lyx::from_utf8(it->second));
}
Index: src/frontends/qt3/QDialogView.h
===
--- src/frontends/qt3/QDialogView.h (revision 15287)
+++ src/frontends/qt3/QDialogView.h (working copy)
@@ -31,7 +31,7 @@ class QDialogView : public QObject, publ
Q_OBJECT
public:
///
- QDialogView(Dialog &, std::string const &);
+ QDialogView(Dialog &, lyx::docstring const &);
///
virtual ~QDialogView() {}
///
@@ -85,7 +85,7 @@ private:
template
class QView: public QDialogView {
protected:
- QView(Dialog &, std::string const &);
+ QView(Dialog &, lyx::docstring const &);
/// update the dialog
virtual void update();
@@ -103,7 +103,7 @@ protected:
template
-QView::QView(Dialog & p, std::string const & t)
+QView::QView(Dialog & p, lyx::docstring const & t)
: QDialogView(p, t)
{}
@@ -151,7 +151,7 @@ class QController: public Base
{
protected:
///
- QController(Dialog &, std::string const &);
+ QController(Dialog &, lyx::docstring const &);
public:
/// The parent controller
Controller & controller();
@@ -161,7 +161,7 @@ public:
template
-QController::QController(Dialog & p, std::string const & t)
+QController::QController(Dialog & p, lyx::docstring const & t)
: Base(p, t)
{}
Index: src/frontends/qt3/QToc.C
===
--- src/frontends/qt3/QToc.C (revision 15287)
+++ src/frontends/qt3/QToc.C (working copy)
@@ -183,7 +183,7 @@ void QToc::updateToc(int newdepth)
- dialog_->tocLV->height() / 2);
dialog_->tocLV->setSelected(selected_item, true);
}
- setTitle(fromqstr(dialog_->typeCO->currentText()));
+ setTitle(qstring_to_ucs4(dialog_->typeCO->currentText()));
}
Index: src/frontends/qt3/QIndex.h
===
--- src/frontends/qt3/QIndex.h (revision 15287)
+++ src/frontends/qt3/QIndex.h (working copy)
@@ -28,7 +28,7 @@ class QIndex :
public:
friend class QIndexDialog;
- QIndex(Dialog &, std::string const & title, QString const & label);
+ QIndex(Dialog &, lyx::docstring const & title, QString const & label);
protected:
virtual bool isValid();
private:
Index: src/frontends/qt3/Dialogs.C
===
--- src/frontends/qt3/Dialogs.C (revision 15287)
+++ src/frontends/qt3/Dialogs.C (working copy)
@@ -216,13 +216,13 @@ Dialogs::DialogPtr Dialogs::build(string
} else if (name == "index") {
dialog->setController(new ControlCommand(*dialog, name));
dialog->setView(new QIndex(*dialog,
- lyx::to_utf8(_("Index Entry")),
+ _("Index Entry"),
qt_("&Keyword:")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "label") {
dialog->setController(new ControlCommand(*dialog, name));
dialog->setView(new QIndex(*dialog,
- lyx::to_utf8(_("Label")),
+ _("Label"),
qt_("&Label:")));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
} else if (name == "log") {
Re: libtool: link: cannot find the library `'
Bennett Helm wrote: On Oct 9, 2006, at 10:04 AM, Abdelrazak Younes wrote: Bennett Helm wrote: On Oct 9, 2006, at 8:15 AM, Timothy Reaves wrote: I can now confirm that 1.5.0 compiles with gcc-4.2.0 and Qt-4.2. When I have time, I'll rewrite the INSTALL.MacOSX file with updated instructions. Very good! (I can also confirm that it's still much too slow for anything but testing.) If you can find a sponsor that send me a Mac Powerbook for free, I sure will make it as fast as hell ;-) You're winking, but let me take you seriously. I was not very serious indeed... In the US, I can get a 400 MHz G3 iMac for under $100. That's probably about the same speed as my 466 MHz G3 iBook, which I still use regularly. If LyX runs acceptably on that, it ought to run acceptably on just about anything still in use! If I got 4 people to send you $25 each, would that be enough? (What's the used Mac market like in Europe?) Don't know... More seriously, I'll do what I can to speed up the Mac port if you help me with some profiling results (as you did in the past). Abdel.
Re: libtool: link: cannot find the library `'
Bennett Helm wrote: On Oct 9, 2006, at 10:04 AM, Abdelrazak Younes wrote: Bennett Helm wrote: On Oct 9, 2006, at 8:15 AM, Timothy Reaves wrote: I can now confirm that 1.5.0 compiles with gcc-4.2.0 and Qt-4.2. When I have time, I'll rewrite the INSTALL.MacOSX file with updated instructions. Very good! (I can also confirm that it's still much too slow for anything but testing.) If you can find a sponsor that send me a Mac Powerbook for free, I sure will make it as fast as hell ;-) You're winking, but let me take you seriously. In the US, I can get a 400 MHz G3 iMac for under $100. That's probably about the same speed as my 466 MHz G3 iBook, which I still use regularly. If LyX runs acceptably on that, it ought to run acceptably on just about anything still in use! If I got 4 people to send you $25 each, would that be enough? (What's the used Mac market like in Europe?) Bennett Well, I'd definatly chip it; maybe even more that $25. But I have to ask: what makes anyone thing it can be made faster? Also, I have a pretty massive XServ I co-locate, and I'm willing to give an account or two, and perhaps even set it up as an automated build server.
Re: libtool: link: cannot find the library `'
Bennett Helm wrote: > You're winking, but let me take you seriously. In the US, I can get a > 400 MHz G3 iMac for under $100. That's probably about the same speed > as my 466 MHz G3 iBook, which I still use regularly. If LyX runs > acceptably on that, it ought to run acceptably on just about anything > still in use! If I got 4 people to send you $25 each, would that be > enough? (What's the used Mac market like in Europe?) Prices are pretty high. Some rough estimates: http://www1.macnews.de/datenbanken/gebrauchtpreisliste/Desktop/77446.html Click on Übersicht if you want to see other models. Georg
Re: libtool: link: cannot find the library `'
On Oct 9, 2006, at 10:04 AM, Abdelrazak Younes wrote: Bennett Helm wrote: On Oct 9, 2006, at 8:15 AM, Timothy Reaves wrote: I can now confirm that 1.5.0 compiles with gcc-4.2.0 and Qt-4.2. When I have time, I'll rewrite the INSTALL.MacOSX file with updated instructions. Very good! (I can also confirm that it's still much too slow for anything but testing.) If you can find a sponsor that send me a Mac Powerbook for free, I sure will make it as fast as hell ;-) You're winking, but let me take you seriously. In the US, I can get a 400 MHz G3 iMac for under $100. That's probably about the same speed as my 466 MHz G3 iBook, which I still use regularly. If LyX runs acceptably on that, it ought to run acceptably on just about anything still in use! If I got 4 people to send you $25 each, would that be enough? (What's the used Mac market like in Europe?) Bennett
[patch] bug 1684: lyx proposes illegal and duplicate marks
http://bugzilla.lyx.org/show_bug.cgi?id=1684
The attached patch (against 1.4svn) fixes the "duplicate" part, i.e. it checks
whenever the user inserts a label/bibitem if it already exists. If so, it
pops up a warning an renames the label to something unique ("foo" -> "foo-1"
etc.).
It also works for cut and paste (where it also renames the associated
refs/citations in the pasted chunk).
Comments appreciated.
Jürgen
Index: src/insets/insetlabel.C
===
--- src/insets/insetlabel.C (Revision 15282)
+++ src/insets/insetlabel.C (Arbeitskopie)
@@ -69,6 +69,10 @@ void InsetLabel::doDispatch(LCursor & cu
cur.noUpdate();
break;
}
+ string newlabel = cur.bv().buffer()->validateLabel(
+ p.getContents(), InsetBase::LABEL_CODE);
+ if (p.getContents() != newlabel)
+ p.setContents(newlabel);
if (p.getContents() != params().getContents())
cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
p.getContents(), InsetBase::REF_CODE);
Index: src/insets/insetbibitem.C
===
--- src/insets/insetbibitem.C (Revision 15282)
+++ src/insets/insetbibitem.C (Arbeitskopie)
@@ -65,6 +65,10 @@ void InsetBibitem::doDispatch(LCursor &
cur.noUpdate();
break;
}
+ string newlabel = cur.bv().buffer()->validateLabel(
+ p.getContents(), InsetBase::BIBITEM_CODE);
+ if (p.getContents() != newlabel)
+ p.setContents(newlabel);
if (p.getContents() != params().getContents())
cur.bv().buffer()->changeRefsIfUnique(params().getContents(),
p.getContents(), InsetBase::CITE_CODE);
Index: src/mathed/math_hullinset.C
===
--- src/mathed/math_hullinset.C (Revision 15282)
+++ src/mathed/math_hullinset.C (Arbeitskopie)
@@ -1077,6 +1077,7 @@ void MathHullInset::doDispatch(LCursor &
if (!str.empty())
numbered(r, true);
string old = label(r);
+ str = cur.bv().buffer()->validateLabel(str, InsetBase::LABEL_CODE);
if (str != old) {
cur.bv().buffer()->changeRefsIfUnique(old, str, InsetBase::REF_CODE);
label(r, str);
Index: src/factory.C
===
--- src/factory.C (Revision 15282)
+++ src/factory.C (Arbeitskopie)
@@ -208,6 +208,11 @@ InsetBase * createInset(BufferView * bv,
InsetCommandParams icp;
InsetCommandMailer::string2params(name, cmd.argument,
icp);
+ // check for duplicate labels
+ string newlabel = bv->buffer()->validateLabel(
+ icp.getContents(), InsetBase::BIBITEM_CODE);
+ if (icp.getContents() != newlabel)
+icp.setContents(newlabel);
return new InsetBibitem(icp);
} else if (name == "bibtex") {
@@ -260,6 +265,11 @@ InsetBase * createInset(BufferView * bv,
InsetCommandParams icp;
InsetCommandMailer::string2params(name, cmd.argument,
icp);
+ // check for duplicate labels
+ string newlabel = bv->buffer()->validateLabel(
+ icp.getContents(), InsetBase::LABEL_CODE);
+ if (icp.getContents() != newlabel)
+icp.setContents(newlabel);
return new InsetLabel(icp);
} else if (name == "ref") {
Index: src/buffer.C
===
--- src/buffer.C (Revision 15282)
+++ src/buffer.C (Arbeitskopie)
@@ -122,6 +122,7 @@ namespace os = lyx::support::os;
namespace fs = boost::filesystem;
using std::endl;
+using std::find;
using std::for_each;
using std::make_pair;
@@ -1612,23 +1613,54 @@ void Buffer::saveCursor(StableDocIterato
}
-void Buffer::changeRefsIfUnique(string const & from, string const & to, InsetBase::Code code)
+vector const Buffer::getLabelsOrCitations(InsetBase::Code code) const
{
- BOOST_ASSERT(code == InsetBase::CITE_CODE || code == InsetBase::REF_CODE);
- // Check if the label 'from' appears more than once
vector labels;
- if (code == InsetBase::CITE_CODE) {
+ if (code == InsetBase::BIBITEM_CODE || code == InsetBase::CITE_CODE) {
vector > keys;
fillWithBibKeys(keys);
vector >::const_iterator bit = keys.begin();
vector >::const_iterator bend = keys.end();
-
for (; bit != bend; ++bit)
labels.push_back(bit->first);
} else
getLabelList(labels);
+ return labels;
+}
+
+
+string const Buffer::validateLabel(string const & label, InsetBase::Code code) const
+{
+ BOOST_ASSERT(code == InsetBase::BIBITEM_CODE || code == InsetBase::LABEL_CODE);
+
+ vector labels = getLabelsOrCitations(code);
+
+ if (find(labels.begin(), labels.end(), label) != labels.end()) {
+ // generate unique label
+ int i = 1;
+ string newlabel = label + "-" + convert(i);
+ while (find(labels.begin(), labels.end(), newlabel) != labels.end()) {
+ ++i;
+ newlabel = label + "-" + convert(i);
+ }
+ Alert::warning(_("Label names must be unique"),
+ bformat(_("The label %1$s already exists.\n"
+ "The name has been changed to %2$s."),
+ label, ne
Re: tabular lines/borders yet again (was: Re: another (?) table-editing bug)
Sven Schreiber wrote: > The first design issue is: should it be a global default or > document-specific? I guess the latter would require changing the lyx > file format, so I would stick to global -- less convenient for the user, > but more realistic in terms of implementability, and good enough IMHO. I don't think a per-document setting makes sense. If I need several similar tables in a document it is usually faster to copy an existing table. > So as you said, that implies a new lyxrc part; let's call it > \tabular_style_border. I would suggest that a style consists of a name > and of a definition (pair of strings). > > The syntax for the definition: What about denominating the borders by > 'h' and 'v' for horizontal and vertical, and indexing in python style, > i.e. 0 is the first possible border (before the first row or column), -1 > is the last one (after the last row or column), and a colon (:) is for > defining ranges. To stick with the python convention, the range would > not include the upper bound. If no upper or lower bound is given, every > border after or before is included. If some border is indexed several > times, that means several drawn lines. Note that LyX does currently not support more than two lines. > Examples: > 'h1,h1,v1,h-1' would mean a tabular with a double horizontal line under > the headings (first row), a vertical line between the first and second > columns, and a horizontal line at the bottom. > 'h:2, h-2:, h1' would have the first and last rows enclosed in > horizontal lines, where the one under the headings (first row) is doubled. > 'v:, h:, h1' would be the current default (if I'm not mistaken). > 'h0, h-1, v0, v-1' would enable all outer borders. > etc. > > So much for setting the default in the lyxrc file. Several pre-defined > styles could be distributed with lyx, for example: > > 1. the current default > 2. no borders > 3. all borders (only single lines) > 4. all horizontal lines, no vertical lines > 5. all horizontal lines, plus doubled between rows 1 and 2 > 6. lines after the first row and column respectively, and a line at the > bottom > > The pre-defined styles would have to be stored somewhere of course -- > don't know if there's an obvious place for that, or if a new config file > is needed. > > The gui way would add a 'tabular' item in the global settings dialog in > the look&feel (German: Aussehen) group. There a user could choose from > the list of pre-defined line styles, and there would be a little, say > 5x5, schematic tabular next to the drop-down list to visualize the > choices. Something like: > > initial line style for new tabulars: [drop-down-list] > (you can always adjust lines later) > > preview: > _| > | > | > | > _| > > > Later that dialog could be enhanced by an input field so that a user can > add (or load) new styles; but I think it's not needed initially, the > "tweaking community" should be satisfied with defining their new styles > in a config file for the time being. Users can share their styles on the > wiki, for example. This dialog pane for tabulars could later maybe also > hold some other table defaults like font styles etc. But that is another > story. > > Ok so much for that. Boy, all I wanted is a better default... > Now you guys better get to work ;-) I intended to comment in more detail, but am unfortunately very busy ATM. Thanks for thinking, please create a bugzilla request for this and add a link to this thread. Then we can come back later. Georg
Re: libtool: link: cannot find the library `'
Bennett Helm wrote: On Oct 9, 2006, at 8:15 AM, Timothy Reaves wrote: I can now confirm that 1.5.0 compiles with gcc-4.2.0 and Qt-4.2. When I have time, I'll rewrite the INSTALL.MacOSX file with updated instructions. Very good! (I can also confirm that it's still much too slow for anything but testing.) If you can find a sponsor that send me a Mac Powerbook for free, I sure will make it as fast as hell ;-) Abdel.
Re: libtool: link: cannot find the library `'
On Oct 9, 2006, at 8:15 AM, Timothy Reaves wrote: Any ideas on this one? make[5]: Nothing to be done for `all-am'. Making all in . /bin/sh ../libtool --tag=CXX --mode=link g++ -g -Os -framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -o lyx-qt4 main.o Bidi.o BufferView.o Bullet.o BranchList.o Chktex.o Color.o CutAndPaste.o DepTable.o FloatList.o Floating.o FontIterator.o FuncStatus.o InsetList.o LColor.o LaTeX.o LaTeXFeatures.o LyXAction.o MenuBackend.o ParagraphParameters.o PrinterParams.o Spacing.o Thesaurus.o ToolbarBackend.o author.o boost.o box.o buffer.o buffer_funcs.o bufferlist.o bufferparams.o bufferview_funcs.o changes.o chset.o converter.o counters.o coordcache.o cursor.o cursor_slice.o debug.o dimension.o dociterator.o encoding.o errorlist.o exporter.o gettext.o factory.o format.o funcrequest.o graph.o importer.o intl.o insetiterator.o kbmap.o kbsequence.o language.o session.o lengthcommon.o lyx_cb.o lyx_main.o lyx_sty.o lyxfont.o lyxfind.o lyxfunc.o lyxgluelength.o lyxlayout.o lyxlength.o lyxlex.o lyxlex_pimpl.o lyxrc.o lyxrow.o lyxrow_funcs.o lyxserver.o lyxsocket.o lyxtextclass.o lyxtextclasslist.o lyxvc.o messages.o metricsinfo.o mover.o output.o outputparams.o output_docbook.o output_latex.o output_plaintext.o paragraph.o paragraph_funcs.o paragraph_pimpl.o pariterator.o ispell.o SpellBase.o rowpainter.o sgml.o tabular.o tex-accent.o tex-strings.o texrow.o text.o text2.o text3.o TocBackend.o toc.o trans.o trans_mgr.o undo.o vc-backend.o version.o vspace.o mathed/libmathed.la insets/libinsets.la frontends/libfrontends.la frontends/qt4/libqt4.la frontends/ controllers/libcontrollers.la graphics/libgraphics.la support/ libsupport.la ../boost/libs/regex/src/libboost_regex.la ../boost/ libs/signals/src/libboost_signals.la ../boost/libs/filesystem/src/ libboost_filesystem.la ../boost/libs/iostreams/src/ libboost_iostreams.la -L/sw/lib -liconv ../intl/libintl.a -L/sw/lib -liconv -lc -lm -lz libtool: link: cannot find the library `' make[3]: *** [lyx-qt4] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all] Error 2 make: *** [all-recursive] Error 1 Did you remember to delete (or move aside) $QT4DIR/lib/*.la? I can now confirm that 1.5.0 compiles with gcc-4.2.0 and Qt-4.2. When I have time, I'll rewrite the INSTALL.MacOSX file with updated instructions. (I can also confirm that it's still much too slow for anything but testing.) Bennett
Re: [PATCH] More unicode work
Georg Baum wrote: Abdelrazak Younes wrote: Here is an updated patch for qt3 and gtk. Shall I commit that or is anybody interested in taking ownership and making sure it compiles? Please commit (and remove the FIXMEs). It is easier to go from a half working solution. OK, done. Abdel.
Re: The Hebrew translation of the LyX documents
> "Ran" == Ran Rutenberg <[EMAIL PROTECTED]> writes: Ran> Dear sirs, I have recently contacted Mr. Tzafrir Cohen, in order Ran> to help with the Hebrew translation of the document, which is Ran> quite old (the translation is dated back to 2002 and obviously Ran> the program had been updated since). Mr. Cohen wrote to me back Ran> that he does not maintain the Hebrew translation anymore. Hello, We would be very happy to see new things happening to the hebrew translations. There are actually 3 things you could help us with: - translate the interface (po/he.po) - translate the documentation (we only have intro and tutorial now) - tell us what works and what does not work in current RtL-related support. Nobody in the team is qualified to this, unfortunately. Ran> I would be more than happy to assist with the translation, and Ran> therefore, I would be glad I you can contact Mr. Cohen and if he Ran> is willing, I will be able to replace him as the contact for the Ran> Hebrew language (and therefore become the head translator into Ran> Hebrew. I think there is no problem to have you as the new lead. If Tzafrir Cohen told you he is not active anymore, the position is open! Ran> I tried to contact the documentation team but no answer came Ran> back. Yes, I saw your message, but was a bit busy. Ran> I would like to mention that Hebrew is my native-language and I'm Ran> fluent in English as well. This is very good. I propose that you start from version 1.4.x, since 1.5 is really for later. You can either grab the documentation and interface localization from 1.4.3 source, or grab latest svn with svn co svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X lyx-1.4.x Please do not hesitate to ask for help if you need to. JMarc
Re: [PATCH] More unicode work
Abdelrazak Younes wrote: > Here is an updated patch for qt3 and gtk. Shall I commit that or is > anybody interested in taking ownership and making sure it compiles? Please commit (and remove the FIXMEs). It is easier to go from a half working solution. Georg
libtool: link: cannot find the library `'
Any ideas on this one? make[5]: Nothing to be done for `all-am'. Making all in . /bin/sh ../libtool --tag=CXX --mode=link g++ -g -Os -framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz -o lyx-qt4 main.o Bidi.o BufferView.o Bullet.o BranchList.o Chktex.o Color.o CutAndPaste.o DepTable.o FloatList.o Floating.o FontIterator.o FuncStatus.o InsetList.o LColor.o LaTeX.o LaTeXFeatures.o LyXAction.o MenuBackend.o ParagraphParameters.o PrinterParams.o Spacing.o Thesaurus.o ToolbarBackend.o author.o boost.o box.o buffer.o buffer_funcs.o bufferlist.o bufferparams.o bufferview_funcs.o changes.o chset.o converter.o counters.o coordcache.o cursor.o cursor_slice.o debug.o dimension.o dociterator.o encoding.o errorlist.o exporter.o gettext.o factory.o format.o funcrequest.o graph.o importer.o intl.o insetiterator.o kbmap.o kbsequence.o language.o session.o lengthcommon.o lyx_cb.o lyx_main.o lyx_sty.o lyxfont.o lyxfind.o lyxfunc.o lyxgluelength.o lyxlayout.o lyxlength.o lyxlex.o lyxlex_pimpl.o lyxrc.o lyxrow.o lyxrow_funcs.o lyxserver.o lyxsocket.o lyxtextclass.o lyxtextclasslist.o lyxvc.o messages.o metricsinfo.o mover.o output.o outputparams.o output_docbook.o output_latex.o output_plaintext.o paragraph.o paragraph_funcs.o paragraph_pimpl.o pariterator.o ispell.o SpellBase.o rowpainter.o sgml.o tabular.o tex-accent.o tex-strings.o texrow.o text.o text2.o text3.o TocBackend.o toc.o trans.o trans_mgr.o undo.o vc-backend.o version.o vspace.o mathed/libmathed.la insets/libinsets.la frontends/libfrontends.la frontends/qt4/libqt4.la frontends/controllers/libcontrollers.la graphics/libgraphics.la support/libsupport.la ../boost/libs/regex/src/libboost_regex.la ../boost/libs/signals/src/libboost_signals.la ../boost/libs/filesystem/src/libboost_filesystem.la ../boost/libs/iostreams/src/libboost_iostreams.la -L/sw/lib -liconv ../intl/libintl.a -L/sw/lib -liconv -lc -lm -lz libtool: link: cannot find the library `' make[3]: *** [lyx-qt4] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all] Error 2 make: *** [all-recursive] Error 1 dusty >
Re: [PATCH] More unicode work
Abdelrazak Younes wrote:
Hello,
Please find attached two patches. I intent to apply the first patch and
let some volunteer (if any) continue the work on patch 2 for qt3 and gtk.
Here is an updated patch for qt3 and gtk. Shall I commit that or is
anybody interested in taking ownership and making sure it compiles?
Abdel.
Index: gtk/GAboutlyx.C
===
--- gtk/GAboutlyx.C (revision 15280)
+++ gtk/GAboutlyx.C (working copy)
@@ -152,7 +152,7 @@
GAboutlyx::GAboutlyx(Dialog & parent)
- : GViewCB(parent, "About LyX")
+ : GViewCB(parent, _("About LyX"))
{
}
Index: gtk/GBibItem.C
===
--- gtk/GBibItem.C (revision 15280)
+++ gtk/GBibItem.C (working copy)
@@ -31,7 +31,7 @@
// FIXME UNICODE
GBibItem::GBibItem(Dialog & parent)
- : GViewCB(parent,
lyx::to_utf8(_("Bibliography Entry Settings")), false)
+ : GViewCB(parent, _("Bibliography Entry
Settings"), false)
{}
Index: gtk/GBibtex.C
===
--- gtk/GBibtex.C (revision 15280)
+++ gtk/GBibtex.C (working copy)
@@ -39,7 +39,7 @@
// FIXME UNICODE
GBibtex::GBibtex(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("BibTeX
Bibliography")), false)
+ : GViewCB(parent, _("BibTeX Bibliography"),
false)
{}
Index: gtk/GBox.C
===
--- gtk/GBox.C (revision 15280)
+++ gtk/GBox.C (working copy)
@@ -40,7 +40,7 @@
// FIXME UNICODE
GBox::GBox(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("Box
Settings")), false)
+ : GViewCB(parent, _("Box Settings"), false)
{}
Index: gtk/GBranch.C
===
--- gtk/GBranch.C (revision 15280)
+++ gtk/GBranch.C (working copy)
@@ -35,7 +35,7 @@
// FIXME UNICODE
GBranch::GBranch(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("Branch
Settings")), false)
+ : GViewCB(parent, _("Branch Settings"),
false)
{}
Index: gtk/GChanges.C
===
--- gtk/GChanges.C (revision 15280)
+++ gtk/GChanges.C (working copy)
@@ -30,7 +30,7 @@
// FIXME UNICODE
GChanges::GChanges(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("Merge
Changes")), false)
+ : GViewCB(parent, _("Merge Changes"),
false)
{}
Index: gtk/GCharacter.C
===
--- gtk/GCharacter.C(revision 15280)
+++ gtk/GCharacter.C(working copy)
@@ -37,7 +37,7 @@
// FIXME UNICODE
GCharacter::GCharacter(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("Text
Style")), false)
+ : GViewCB(parent, _("Text Style"), false)
{}
Index: gtk/GCitation.C
===
--- gtk/GCitation.C (revision 15280)
+++ gtk/GCitation.C (working copy)
@@ -69,7 +69,7 @@
// FIXME UNICODE
GCitation::GCitation(Dialog & parent)
- : GViewCB(parent,
lyx::to_utf8(_("Citation")), false)
+ : GViewCB(parent, _("Citation"), false)
{}
Index: gtk/GDocument.C
===
--- gtk/GDocument.C (revision 15280)
+++ gtk/GDocument.C (working copy)
@@ -57,7 +57,7 @@
// FIXME UNICODE
GDocument::GDocument(Dialog & parent)
- : GViewCB(parent,
lyx::to_utf8(_("Document Settings")), false),
+ : GViewCB(parent, _("Document Settings"),
false),
lang_(getSecond(getLanguageData(false)))
{}
Index: gtk/GErrorList.C
===
--- gtk/GErrorList.C(revision 15280)
+++ gtk/GErrorList.C(working copy)
@@ -29,7 +29,7 @@
namespace frontend {
GErrorList::GErrorList(Dialog & parent)
- : GViewCB(parent,
lyx::to_utf8(_("Errors")), false)
+ : GViewCB(parent, _("Errors"), false)
{}
@@ -59,7 +59,7 @@
void GErrorList::update()
{
- setTitle(controller().name());
+ setTitle(lyx::from_ascii(controller().name()));
updateContents();
}
Index: gtk/GERT.C
===
--- gtk/GERT.C (revision 15280)
+++ gtk/GERT.C (working copy)
@@ -30,7 +30,7 @@
namespace frontend {
GERT::GERT(Dialog & parent)
- : GViewCB(parent, lyx::to_utf8(_("TeX
Settings")), false)
+ : GViewCB(parent, _("TeX Settings"), false)
{}
Index: gtk/GExternal.C
===
--- gtk/GExternal.C (revision 15280)
+++ gtk/GExternal.C (working copy)
@@ -297,7 +297,7 @@
GExternal::GExternal(Dialog & parent)
- : GViewCB(parent,
lyx::to_utf8(_("External Settings")), false)
+ : GViewCB(parent, _("External Settings"),
false)
{}
Index: gtk/GFloat.C
The Hebrew translation of the LyX documents
Dear sirs, I have recently contacted Mr. Tzafrir Cohen, in order to help with the Hebrew translation of the document, which is quite old (the translation is dated back to 2002 and obviously the program had been updated since). Mr. Cohen wrote to me back that he does not maintain the Hebrew translation anymore. I would be more than happy to assist with the translation, and therefore, I would be glad I you can contact Mr. Cohen and if he is willing, I will be able to replace him as the contact for the Hebrew language (and therefore become the head translator into Hebrew. I tried to contact the documentation team but no answer came back. I would like to mention that Hebrew is my native-language and I'm fluent in English as well. Sincerely, Ran Rutenberg [EMAIL PROTECTED]
[PATCH] More unicode work
Hello,
Please find attached two patches. I intent to apply the first patch and
let some volunteer (if any) continue the work on patch 2 for qt3 and gtk.
Abdel.
Patch 1 Log:
* controllers/Dialog.[Ch]
- View::title_ is now a docstring (ctor and access functions changed)
* controllers/ControlLog.[Ch]
- title() now returns a docstring
* controllers/ControlLog.[Ch]
- title() now returns a docstring
* qt4/*: adapted to above changes.
Index: frontends/controllers/ControlLog.C
===
--- frontends/controllers/ControlLog.C (revision 15280)
+++ frontends/controllers/ControlLog.C (working copy)
@@ -19,6 +19,8 @@
#include
#include
+using lyx::docstring;
+
using std::istringstream;
using std::ostream;
using std::string;
@@ -70,21 +72,21 @@
}
-string const ControlLog::title() const
+docstring const ControlLog::title() const
{
- string t;
+ docstring t;
switch (type_) {
case LatexLog:
- t = lyx::to_utf8(_("LaTeX Log"));
+ t = _("LaTeX Log");
break;
case LiterateLog:
- t = lyx::to_utf8(_("Literate Programming Build Log"));
+ t = _("Literate Programming Build Log");
break;
case Lyx2lyxLog:
- t = lyx::to_utf8(_("lyx2lyx Error Log"));
+ t = _("lyx2lyx Error Log");
break;
case VCLog:
- t = lyx::to_utf8(_("Version Control Log"));
+ t = _("Version Control Log");
break;
}
return t;
Index: frontends/controllers/ControlLog.h
===
--- frontends/controllers/ControlLog.h (revision 15280)
+++ frontends/controllers/ControlLog.h (working copy)
@@ -37,7 +37,7 @@
virtual bool isBufferDependent() const { return true; }
/// The title displayed by the dialog reflects the \c LOGTYPE
- std::string const title() const;
+ lyx::docstring const title() const;
/// put the log file into the ostream
void getContents(std::ostream & ss) const;
Index: frontends/controllers/ControlViewSource.C
===
--- frontends/controllers/ControlViewSource.C (revision 15280)
+++ frontends/controllers/ControlViewSource.C (working copy)
@@ -64,7 +64,7 @@
}
-string const ControlViewSource::title() const
+docstring const ControlViewSource::title() const
{
string source_type;
@@ -81,7 +81,7 @@
default:
BOOST_ASSERT(false);
}
- return lyx::to_utf8(_(source_type + " Source"));
+ return _(source_type + " Source");
}
} // namespace frontend
Index: frontends/controllers/ControlViewSource.h
===
--- frontends/controllers/ControlViewSource.h (revision 15280)
+++ frontends/controllers/ControlViewSource.h (working copy)
@@ -37,7 +37,7 @@
virtual bool isBufferDependent() const { return true; }
/// The title displayed by the dialog reflects source type.
- std::string const title() const;
+ lyx::docstring const title() const;
/** get the source code of selected paragraphs, or the whole document
\param fullSource get full source code
Index: frontends/controllers/Dialog.C
===
--- frontends/controllers/Dialog.C (revision 15280)
+++ frontends/controllers/Dialog.C (working copy)
@@ -21,6 +21,7 @@
#include "FuncStatus.h"
#include "lyxfunc.h"
+using lyx::docstring;
using std::string;
@@ -219,7 +220,7 @@
}
-Dialog::View::View(Dialog & parent, string title) :
+Dialog::View::View(Dialog & parent, docstring title) :
p_(parent), title_(title)
{}
@@ -231,13 +232,13 @@
}
-void Dialog::View::setTitle(string const & newtitle)
+void Dialog::View::setTitle(docstring const & newtitle)
{
title_ = newtitle;
}
-string const & Dialog::View::getTitle() const
+docstring const & Dialog::View::getTitle() const
{
return title_;
}
Index: frontends/controllers/Dialog.h
===
--- frontends/controllers/Dialog.h (revision 15280)
+++ frontends/controllers/Dialog.h (working copy)
@@ -15,6 +15,8 @@
#include "Kernel.h"
#include "lfuns.h"
+#include "support/docstring.h"
+
#include
#include
@@ -219,7 +221,7 @@
/** \param parent Dialog owning this Controller.
* \param title is the dialog title displayed by the WM.
*/
- View(Dialog & parent, std::string title);
+ View(Dialog & parent, lyx::docstring title);
virtual ~View() {}
/** \name Generic View
@@ -257,9 +259,9 @@
virtual void partialUpdate(int id);
/// sets the title of the dialog (window captio
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Jean-Marc Lasgouttes wrote: >> "Georg" == Georg Baum >> <[EMAIL PROTECTED]> >> writes: > > Georg> Am Freitag, 6. Oktober 2006 20:16 schrieb Michael Gerz: >>> If people like the toolbar enhancements, they should go into the >>> regular LyX distribution. IMHO an installer shouldn't modify core >>> application functionality. > > Georg> I agree 100%. > > With the first or the second sentence? With both. IMO the only valid reason for an installer to modify the toolbar would be some platform specific functionality that is not available on other platforms. AFAIK it does not exist, but even if it does I would prefer that enabling/disabling code to be in LyX itself. Georg
Re: Multiple indices
OK, what I meant is: if there will be more changes, it might be tricky for you to maintain your tree (because there might be conflicting changes). > we are thinking in parallel then.. My only concern is for index.sty > there are four obligatory and one optional parameter. it will be hell > of a crowded dialog.. This number reduces to two for spliidx.sty. I think the user should only see the and enter the "Index Name" parameter (which should then be visible in the index dialog dropbox). All other parameters are interal shortcuts, which are of no concern for the LyX users (because they use the combo box and they do not have to run makeindex/xindy manually). So those should be created automatically. BTW I forgot one element: The \printindex inset will also need a dialog, where the user can chose which index it represents (similar to the bibtex inset) \printindex is a bit more complex than you think.. If we use index.sty, then \printindex has two parameters: index name and preamble. In multind.sty the second parameter becomes the index title. Same as, in Splitidx.sty second param is the title of index. The preamble is handled by \setindexpreamble command. There is \printsubindex thing. Well, we don't have to support that, since user can add it as a latex entry. There is also merging indices, but I don't think I will implement it for the first version. I guess, It will not very difficult, though.. > > > - I have limited time. I mean in two months, I will probably disappear The least I can do is the port to qt3 (and testing). Jürgen thanks.. ugras > > Jürgen
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Joost Verburg wrote: > However it is possible to add additional toolbars, like the change > tracking toolbar Micheal created. I think these are very useful. > > What about a View toolbar that allows you to press a single button to > preview PDF etc.? > > And as a first step to allow a little customization, why not an add item > to the preferences window to enable/disable toolbars? Sounds like a good idea. Jürgen
Re: [PATCH] CT revision (this time for real)
Lars Gullik Bjønnes wrote: Michael Gerz <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | | >I think you can continue as you have outlined. Please try to not make | >anything (except CT) more unusable than it already is. If not it might | >create difficulties for us, when we go into "hard working mode" during | >the Denmark thing. | > | Thank you for your trust. | | BTW: I think there is slow progress regarding unicode. Do you have any | idea how to overcome the current situation? It seems some people are | waiting for a sign :-) Yeah... you would at least have expected frontend people to work on getting their frontends really ready for unicode. Well I think most of the remaining work is completely outside the frontend space. At least the most important one... Abdel.
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
> "Andreas" == Andreas K <[EMAIL PROTECTED]> writes: >> I agree that "View PDF" could be useful (and I have that myself in >> my toolbar), but I can't see that "line break" is of any use. Is >> there any use case where moving the mouse to that button is faster >> than hitting Ctrl-enter? Andreas> It is faster to move the mouse to that button if you do not Andreas> remember the shortcut commands, which often is the case. There are too many rarely-used shortcuts to make this practical. And moreover, an action for which one cannot design an easy-to-grasp icon should not be in the toolbar, IMO. Andreas> Maybe not all users would like to have that button, but it Andreas> would be good to at least have the possibility to oneself Andreas> choose to include such a button (or other buttons of one's Andreas> choice) from, e.g., a menu entry View > Toolbars > Andreas> Customize... Yes, this would definitely be nice... JMarc
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes: Georg> Am Freitag, 6. Oktober 2006 20:16 schrieb Michael Gerz: >> If people like the toolbar enhancements, they should go into the >> regular LyX distribution. IMHO an installer shouldn't modify core >> application functionality. Georg> I agree 100%. With the first or the second sentence? JMarc
Re: [patch]: bug 2744
> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes: Juergen> Jean-Marc, can I commit this patch (it's reattached for Juergen> information)? The remaining issue is not a regression (it's a Juergen> drawback of changeRefsIfUnique from the beginning), so this Juergen> could be fixed later. Yes, go ahead. JMarc
Re: [PATCH] CT revision (this time for real)
> "Michael" == Michael Gerz <[EMAIL PROTECTED]> writes: Michael> BTW: I think there is slow progress regarding unicode. Do you Michael> have any idea how to overcome the current situation? It seems Michael> some people are waiting for a sign :-) I believe the sign will come from Denmark, soonish. JMarc
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Juergen Spitzmueller wrote: I think everybody agrees with that, it's just that nobody found the time to implement it. However, I do not agree that we clutter our toolbars with all sorts of things just because we do not have a gui to customize the toolbars. An overloaded toolbar decreases usability more than it increases it. However it is possible to add additional toolbars, like the change tracking toolbar Micheal created. I think these are very useful. What about a View toolbar that allows you to press a single button to preview PDF etc.? And as a first step to allow a little customization, why not an add item to the preferences window to enable/disable toolbars? Joost
Re: Please include LyXWinInstaller's toolbar in the official LyX Windows installer
Andreas K. wrote: > It is faster to move the mouse to that button if you do not remember the > shortcut commands, which often is the case. I think Strg- is one shortcut every user should remember. > Maybe not all users would like to have that button, but it would be good to > at least have the possibility to oneself choose to include such a button > (or other buttons of one's choice) from, e.g., a menu entry View > Toolbars > > Customize... I think everybody agrees with that, it's just that nobody found the time to implement it. However, I do not agree that we clutter our toolbars with all sorts of things just because we do not have a gui to customize the toolbars. An overloaded toolbar decreases usability more than it increases it. Jürgen
