]>
git.lyx.org Git - lyx.git/log
Enrico Forestieri [Fri, 30 Apr 2010 22:23:19 +0000 (22:23 +0000)]
Implement LFUN_UNICODE_INSERT in mathed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34351
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 30 Apr 2010 15:56:54 +0000 (15:56 +0000)]
Correctly enable/disable the filter label and textfield in the TocWidget. Also, shorten the code a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34350
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 30 Apr 2010 15:37:19 +0000 (15:37 +0000)]
Compile fix for r34348.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34349
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 30 Apr 2010 14:55:37 +0000 (14:55 +0000)]
Fix bug #3900: Mathed corners displayed without mouse hover.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34348
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 30 Apr 2010 14:47:46 +0000 (14:47 +0000)]
Mouse hover property should be dependent on the specific bufferview. If there are 2 views showing the same buffer, an Inset can be shown as hovered in only one view.
This is also in preparation of a decent fix for bug #3900.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34347
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 30 Apr 2010 14:11:46 +0000 (14:11 +0000)]
Fix bug #6677: GUI button disappears in external template inset.
Initialize the preview_mode variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34346
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 30 Apr 2010 09:52:00 +0000 (09:52 +0000)]
* GuiSpellchecker.cpp: fix bug 6676.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34345
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Fri, 30 Apr 2010 08:27:03 +0000 (08:27 +0000)]
There is no reason for inhibiting the symbols dialog in mathed.
The dialog only offers symbols defined in the unicodesymbols file
and they will be wrapped in \text{} when inserted in math mode,
so there is no risk that an untypesettable symbol gets inserted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34344
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Thu, 29 Apr 2010 22:01:50 +0000 (22:01 +0000)]
Spanish Math.lyx: translations by Ignacio
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34342
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 22:02:41 +0000 (22:02 +0000)]
French and Spanish Math.lyx: small but important typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34339
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 28 Apr 2010 21:50:06 +0000 (21:50 +0000)]
typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34338
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 28 Apr 2010 21:48:10 +0000 (21:48 +0000)]
Unify "* space" into "* Space", its just double work for translators.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34337
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 28 Apr 2010 21:48:08 +0000 (21:48 +0000)]
Unify QQaud strings.
Inside math toolbars we use "Quadratin". Dunno if this difference is intention.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34336
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 28 Apr 2010 21:48:03 +0000 (21:48 +0000)]
Unify Inter-word and Interword space strings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34335
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 21:42:11 +0000 (21:42 +0000)]
German UserGuide.lyx: harmonize it with the other language versions:
- update/cleanup of document preamble
- don't require the package wasysym to compile this file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34332
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 21:39:23 +0000 (21:39 +0000)]
Math.lyx: the LaTeX-packages cancel and braket are no longer part of LaTeX standard installations (since this February)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34331
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 19:39:15 +0000 (19:39 +0000)]
eu.po: translation updates for trunk by Iñaki Larrañaga Murgoitio
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34329
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 15:49:00 +0000 (15:49 +0000)]
The character dialog was disabled in r30810 for solving an assertion
due to a missing buffer and because the "dialog is only useful in texted".
The problem with the buffer member has been solved since then, and while
it is true that the character dialog is not much useful in mathed, it
is the only way for coloring only parts of equations. Given that this
would also be a regression with respect to 1.6, I am re-enabling it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34327
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 13:19:09 +0000 (13:19 +0000)]
Don't hardcode Color_math, such that decorations and other math
elements can be drawn in the right color on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34326
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 11:38:01 +0000 (11:38 +0000)]
Also account for colors in math macros.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34325
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 28 Apr 2010 04:51:05 +0000 (04:51 +0000)]
Fix bug #6614: Preview Other Format Button Greys Out After Preview.
getStatus() returns false for LFUN_BUFFER_VIEW when a previewing process is running. So, if this process has finished we should free the menu item.
P.S. on windows, the item does not get disabled anyway.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34324
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 28 Apr 2010 04:27:10 +0000 (04:27 +0000)]
Fix bug #6619 : Display (Version Control) in Window Title.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34323
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 02:15:46 +0000 (02:15 +0000)]
This is a dummy commit for posting the real changelog for the the last
two commits. Sorry guys, I should have really gone to sleep...
r34320
In mathed, preserve the color in a proper way, such as to not interfere
with the colors normally used to represent math objects.
When changing the color of a chunk of text containing math formulas,
now the formulas are rendered on screen in the chosen color, too.
r34321
Assure that constructs such as \mathbf{a\ensuremath{b}} are correctly
rendered on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34322
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 01:58:11 +0000 (01:58 +0000)]
Index: src/mathed/InsetMathEnsureMath.cpp
===================================================================
--- src/mathed/InsetMathEnsureMath.cpp (revisione 34304)
+++ src/mathed/InsetMathEnsureMath.cpp (copia locale)
@@ -13,8 +13,9 @@
#include "InsetMathEnsureMath.h"
-#include "MathStream.h"
#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
#include <ostream>
@@ -34,7 +35,8 @@ Inset * InsetMathEnsureMath::clone() con
void InsetMathEnsureMath::metrics(MetricsInfo & mi, Dimension & dim) const
{
- FontSetChanger dummy(mi.base, "mathnormal");
+ bool really_change_font = isTextFont(from_ascii(mi.base.fontname));
+ FontSetChanger dummy(mi.base, "mathnormal", really_change_font);
cell(0).metrics(mi, dim);
metricsMarkers(dim);
}
@@ -42,7 +44,8 @@ void InsetMathEnsureMath::metrics(Metric
void InsetMathEnsureMath::draw(PainterInfo & pi, int x, int y) const
{
- FontSetChanger dummy(pi.base, "mathnormal");
+ bool really_change_font = isTextFont(from_ascii(pi.base.fontname));
+ FontSetChanger dummy(pi.base, "mathnormal", really_change_font);
cell(0).draw(pi, x, y);
drawMarkers(pi, x, y);
}
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34321
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Wed, 28 Apr 2010 01:40:11 +0000 (01:40 +0000)]
Index: src/mathed/InsetMathHull.cpp
===================================================================
--- src/mathed/InsetMathHull.cpp (revisione 34304)
+++ src/mathed/InsetMathHull.cpp (copia locale)
@@ -328,6 +328,23 @@ docstring InsetMathHull::standardFont()
}
+docstring InsetMathHull::standardColor() const
+{
+ docstring color;
+ switch (type_) {
+ case hullRegexp:
+ color = from_ascii("foreground");
+ break;
+ case hullNone:
+ color = from_ascii("foreground");
+ break;
+ default:
+ color = from_ascii("math");
+ }
+ return color;
+}
+
+
bool InsetMathHull::previewState(BufferView * bv) const
{
if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
@@ -417,8 +434,11 @@ void InsetMathHull::draw(PainterInfo & p
return;
}
+ bool const really_change_color = pi.base.font.color() == Color_none;
+ ColorChanger dummy0(pi.base.font, standardColor(), really_change_color);
FontSetChanger dummy1(pi.base, standardFont());
StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+
InsetMathGrid::draw(pi, x + 1, y);
if (numberedType()) {
Index: src/mathed/MathSupport.cpp
===================================================================
--- src/mathed/MathSupport.cpp (revisione 34311)
+++ src/mathed/MathSupport.cpp (copia locale)
@@ -653,6 +653,13 @@ bool isMathFont(docstring const & name)
}
+bool isTextFont(docstring const & name)
+{
+ fontinfo * f = lookupFont(name);
+ return f && f->color_ == Color_foreground;
+}
+
+
FontInfo getFont(docstring const & name)
{
FontInfo font;
Index: src/mathed/MathSupport.h
===================================================================
--- src/mathed/MathSupport.h (revisione 34311)
+++ src/mathed/MathSupport.h (copia locale)
@@ -51,6 +51,8 @@ bool isFontName(docstring const & name);
bool isMathFont(docstring const & name);
+bool isTextFont(docstring const & name);
+
// converts single cell to string
docstring asString(MathData const & ar);
// converts single inset to string
Index: src/mathed/InsetMathHull.h
===================================================================
--- src/mathed/InsetMathHull.h (revisione 34304)
+++ src/mathed/InsetMathHull.h (copia locale)
@@ -197,6 +197,8 @@ private:
void changeCols(col_type);
///
docstring standardFont() const;
+ ///
+ docstring standardColor() const;
/// consistency check
void check() const;
/// can this change its number of rows?
Index: src/MetricsInfo.cpp
===================================================================
--- src/MetricsInfo.cpp (revisione 34312)
+++ src/MetricsInfo.cpp (copia locale)
@@ -235,11 +235,15 @@ FontSetChanger::FontSetChanger(MetricsBa
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
+ docstring const oldname = from_ascii(save_.fontname);
mb.fontname = name;
mb.font = sane_font;
augmentFont(mb.font, from_ascii(name));
mb.font.setSize(oldsize);
- mb.font.setColor(oldcolor);
+ if (string(name) != "lyxtex"
+ && ((isTextFont(oldname) && oldcolor != Color_foreground)
+ || (isMathFont(oldname) && oldcolor != Color_math)))
+ mb.font.setColor(oldcolor);
}
}
@@ -252,11 +256,15 @@ FontSetChanger::FontSetChanger(MetricsBa
save_ = mb;
FontSize oldsize = save_.font.size();
ColorCode oldcolor = save_.font.color();
+ docstring const oldname = from_ascii(save_.fontname);
mb.fontname = to_utf8(name);
mb.font = sane_font;
augmentFont(mb.font, name);
mb.font.setSize(oldsize);
- mb.font.setColor(oldcolor);
+ if (name != "lyxtex"
+ && ((isTextFont(oldname) && oldcolor != Color_foreground)
+ || (isMathFont(oldname) && oldcolor != Color_math)))
+ mb.font.setColor(oldcolor);
}
}
@@ -294,17 +302,21 @@ WidthChanger::~WidthChanger()
//
/////////////////////////////////////////////////////////////////////////
-ColorChanger::ColorChanger(FontInfo & font, string const & color)
- : Changer<FontInfo, string>(font)
+ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
+ bool really_change_color)
+ : Changer<FontInfo, ColorCode>(font), change_(really_change_color)
{
- save_ = lcolor.getFromLyXName(color);
- font.setColor(lcolor.getFromLyXName(color));
+ if (change_) {
+ save_ = font.color();
+ font.setColor(lcolor.getFromLyXName(to_utf8(color)));
+ }
}
ColorChanger::~ColorChanger()
{
- orig_.setColor(lcolor.getFromLyXName(save_));
+ if (change_)
+ orig_.setColor(save_);
}
Index: src/MetricsInfo.h
===================================================================
--- src/MetricsInfo.h (revisione 34312)
+++ src/MetricsInfo.h (copia locale)
@@ -222,12 +222,16 @@ public:
// temporarily change the used color
-class ColorChanger : public Changer<FontInfo, std::string> {
+class ColorChanger : public Changer<FontInfo, ColorCode> {
public:
///
- ColorChanger(FontInfo & font, std::string const & color);
+ ColorChanger(FontInfo & font, docstring const & color,
+ bool really_change_color = true);
///
~ColorChanger();
+private:
+ ///
+ bool change_;
};
} // namespace lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34320
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 00:55:58 +0000 (00:55 +0000)]
UserGuide.lyx: fix another typo (sorry for the commit spam)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34318
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 00:44:16 +0000 (00:44 +0000)]
Customization.lyx: update fileformat because this manual already contains LyX 2.0-specific stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34316
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 00:42:58 +0000 (00:42 +0000)]
- Additional.lyx, Math.lyx, UserGuide.lyx: fix typos
- EmbeddedObjects.lyx: fix typos and some English style fixes by J.R. Hudson
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34315
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 28 Apr 2010 00:15:05 +0000 (00:15 +0000)]
Spanish EmbeddedObjects.lyx, UserGuide.lyx: translation updates by Ignacio
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34314
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 27 Apr 2010 21:31:28 +0000 (21:31 +0000)]
Changing only the shape does not always work. For example,
\mathbb{\underbar{a}} is not correctly rendered on screen.
We really have to change the font set, but not always.
This cannot be done using an "if" statement, as when
the FontSetChanger scope ends, everything is restored,
defeating our change. Thus, this has to be done in the
FontSetChanger class itself. This is easily accomplished
by introducing a boolean with a default value of true
for really changing a font set.
This will also be useful in other cases that I am discovering.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34312
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 27 Apr 2010 19:23:31 +0000 (19:23 +0000)]
The check for Color_math would fail if the font color is changed
in mathed, so implement a strategy which is immune to color changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34311
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 27 Apr 2010 18:46:42 +0000 (18:46 +0000)]
In mathed, also preserve the color when changing a font set,
otherwise symbols and font changes such as \mathit{a} are not
drawn in the selected color on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34310
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Tue, 27 Apr 2010 00:41:24 +0000 (00:41 +0000)]
- chkconfig.ltx:
- fix the check for arabi
- add lithuanian, mongolian and turkmen
- LaTeXConfig.lyx: introduce new section about language packages
(I purposely did not add vntex (Vietnamese) because this would be another 10 MB to download for every LyX on Windows user. The other language packages are not larger than 120 kB.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34300
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Mon, 26 Apr 2010 23:47:20 +0000 (23:47 +0000)]
installer: detect JabRef 2.6, drop support for JabRef 2.2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34298
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Mon, 26 Apr 2010 20:20:49 +0000 (20:20 +0000)]
Change only the shape and not the whole font, otherwise constructs
such as \mathbf{\hat{a}} would not be correctly rendered on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34297
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 14:57:27 +0000 (14:57 +0000)]
Fix bug #6141: Scrolling error with insets at top of file.
Fix the regression introduced in r28397 while fixing bug #5573.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34296
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 10:26:06 +0000 (10:26 +0000)]
Tweak for X11.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34294
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 10:03:09 +0000 (10:03 +0000)]
Fix bug #3871: Shortcut to switch from TOC to text pane.
M-o now switches to the TOC pane, and Esc always returns from any DockView to the main window.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34293
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 02:12:10 +0000 (02:12 +0000)]
Fix bug #6451 (last part): Crash when interacting with buffer-dependent dialog with no buffer open.
- First, the comment for isBufferDependent is corrected. It seems that the actual use of this function differs from the comment. As the comment said, I decided to close all dialogs that were buffer dependent, but this didn't seem to be correct for the view source pan, the outliner, and find-and-replace.
- Second, the dialogs that are buffer dependent are now closed, but dockviews are not, except for the spellchecker pane, which really depends on an open buffer, but I can't test that.
So, please test whether the spellchecker dockviewed window behaves as one expects.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34291
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 01:36:24 +0000 (01:36 +0000)]
Make sure the Table of Contents is always on top in the model combobox of the TocWidget.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34290
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Mon, 26 Apr 2010 01:23:19 +0000 (01:23 +0000)]
- EmbeddedObjects.lyx, UserGuide.lyx: updates in the description of cross-references
- French EmbeddedObjects.lyx: translations by Jean-Pierre
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34288
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 26 Apr 2010 00:43:08 +0000 (00:43 +0000)]
Fix bug #6672 (part 2): Add tooltips to the outliner.
At some point we should implement that the tooltips are only shown when they are not completely shown in the outliner. However, this requires extending the QTreeView class.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34287
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 25 Apr 2010 22:18:46 +0000 (22:18 +0000)]
Fix bug #6672 (part 1): Notes, Footnotes, and Marginals are unnecessarily truncated.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34286
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Sun, 25 Apr 2010 13:54:07 +0000 (13:54 +0000)]
installer: update MiKTeX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34284
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Fri, 23 Apr 2010 13:20:28 +0000 (13:20 +0000)]
cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker error on win32
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34283
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 23 Apr 2010 13:17:55 +0000 (13:17 +0000)]
- EmbeddedObjects.lyx: add notes about prettyref and varioref
- UserGuide.lyx: style change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34282
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Fri, 23 Apr 2010 12:58:17 +0000 (12:58 +0000)]
cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker error on win32
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34280
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Fri, 23 Apr 2010 12:52:39 +0000 (12:52 +0000)]
cmake: remove recursive call, even if it breaks merged builds with GCC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34279
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 23 Apr 2010 11:46:24 +0000 (11:46 +0000)]
Fix bug #6664: InsetInfo: lyxrc information broken.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34278
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Fri, 23 Apr 2010 09:10:35 +0000 (09:10 +0000)]
cmake: more merged build fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34274
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Fri, 23 Apr 2010 08:13:48 +0000 (08:13 +0000)]
cmake has its own merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34273
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 23 Apr 2010 01:40:59 +0000 (01:40 +0000)]
EmbeddedObjects.lyx: English fixes from J.R. Hudson, part 2/2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34271
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Thu, 22 Apr 2010 23:43:08 +0000 (23:43 +0000)]
scons_manifest.py: add missing files, thanks Peter
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34270
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 22:04:21 +0000 (22:04 +0000)]
don't forget to pack numpunct_lyx_char_type.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34269
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Thu, 22 Apr 2010 19:36:03 +0000 (19:36 +0000)]
Fix bug #5543: InsetInfo gives wrong result for textclasses.
InsetInfo only returned whether a layout file was available for a class, not whether the LaTeX document class was available.
This might be caused by the maybe misleading name of the "LayoutFileList::haveClass()" function.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34268
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 16:01:23 +0000 (16:01 +0000)]
add new files to Makefile.am.
numpunct_lyx_char_type.h is msvc specific.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34265
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 15:56:20 +0000 (15:56 +0000)]
don't pollute the global namespace, move bind and shared_ptr into the lyx scope.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34264
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 14:40:57 +0000 (14:40 +0000)]
build with GCC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34263
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 14:28:52 +0000 (14:28 +0000)]
build with msvc10. Seems there is a bug in their STL code:
// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 32 bit
// so we can't import it and must define it but then the compiler complains.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34262
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 12:02:43 +0000 (12:02 +0000)]
change was committed by accident.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34261
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 11:45:34 +0000 (11:45 +0000)]
Seems boost also includes all std headers. Not including boost therefore produces errors.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34260
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 11:37:32 +0000 (11:37 +0000)]
msvcUsing "using namespace std" with msvc10 makes also std::tr1::shared_ptr visible and generates conflicts with boost::shared_ptr.
Solution: don't use boost::shared_ptr for msvc10 (could also be extended to several GCC versions)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34259
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 11:19:49 +0000 (11:19 +0000)]
at least compile with msvc10.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34258
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Thu, 22 Apr 2010 11:16:58 +0000 (11:16 +0000)]
Using "using namespace std" with msvc10 makes also std::tr1::bind visible and generates conflicts with boost::bind.
Solution: don't use boost::bind for msvc10 (could also be extended to several GCC versions)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34257
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Thu, 22 Apr 2010 00:16:16 +0000 (00:16 +0000)]
Japanese example files: again a bunch of updates and some new translated files by Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34255
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 21 Apr 2010 23:54:28 +0000 (23:54 +0000)]
Japanese documentation files: a bunch of updates and some new translated files; all by Koji
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34253
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Wed, 21 Apr 2010 15:20:31 +0000 (15:20 +0000)]
UI for XHTML options. I removed the xml line from OutputUi.ui
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34251
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Wed, 21 Apr 2010 15:18:25 +0000 (15:18 +0000)]
New XHTML math options. Format change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34250
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Wed, 21 Apr 2010 14:19:22 +0000 (14:19 +0000)]
Minor formatting. Really a test.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34249
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 21 Apr 2010 13:12:40 +0000 (13:12 +0000)]
Remove boundary parameter from BufferView::coordOffset(). The first DocIterator parameter already contains this information.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34248
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 21 Apr 2010 13:03:04 +0000 (13:03 +0000)]
Remove boundary parameter from BufferView::getPos(). The first DocIterator parameter already contains this information.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34247
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 21 Apr 2010 01:54:08 +0000 (01:54 +0000)]
Exporter.cpp: revert r34230 because this interferes with Enrico's new LyXVC feature to setup what LyX should do on export
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34246
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:36 +0000 (01:19 +0000)]
Last bits.
Trunk should be funcFileName consistent now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34245
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:35 +0000 (01:19 +0000)]
BranchList:
*FilenameSuffix -> *FileNameSuffix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34244
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:33 +0000 (01:19 +0000)]
Buffer::getAutosaveFilename -> Buffer::getAutosaveFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34243
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:31 +0000 (01:19 +0000)]
support:
isLyXFilename -> isLyXFilename
isValidLaTeXFilename -> isValidLaTeXFileName
isSGMLFilename -> isSGMLFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34242
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:30 +0000 (01:19 +0000)]
Dialog::bufferFilepath -> Dialog::bufferFilePath
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34241
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:28 +0000 (01:19 +0000)]
support:
frontends:
onlyFilename -> onlyFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34240
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:26 +0000 (01:19 +0000)]
DocFileName::unzippedFilename -> DocFileName::unzippedFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34239
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:25 +0000 (01:19 +0000)]
DocFileName.outputFilename -> DocFileName.outputFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34238
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:23 +0000 (01:19 +0000)]
Forgot these two.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34237
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:22 +0000 (01:19 +0000)]
FileName.mangledFilename -> FileName.mangledFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34236
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:20 +0000 (01:19 +0000)]
Filename.relFilename -> Filename.relFileName
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34235
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Wed, 21 Apr 2010 01:19:09 +0000 (01:19 +0000)]
Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Wed, 21 Apr 2010 00:00:48 +0000 (00:00 +0000)]
EmbeddedObjects.lyx: English fixes from J.R. Hudson, part 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34233
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Tue, 20 Apr 2010 23:00:05 +0000 (23:00 +0000)]
Exporter.cpp: make overwriting file on export the default, as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34230
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 20 Apr 2010 16:49:49 +0000 (16:49 +0000)]
Fix bug #2844: Need option to overwrite without dialog popup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34229
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 20 Apr 2010 11:09:51 +0000 (11:09 +0000)]
Coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34228
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Tue, 20 Apr 2010 09:59:16 +0000 (09:59 +0000)]
* GuiThesaurus: do not show irritating messages if nothing is to be looked up.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34227
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Tue, 20 Apr 2010 07:30:58 +0000 (07:30 +0000)]
* Thesaurus.cpp: fix thesaurus (bug #6656)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34226
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Tue, 20 Apr 2010 00:58:48 +0000 (00:58 +0000)]
Update man page.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34225
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Mon, 19 Apr 2010 23:53:23 +0000 (23:53 +0000)]
Introduce a switch for overwriting files during a batch export.
Using "-f all", or simply "-f", all files are silently overwritten.
Using "-f main", only the main file is overwritten.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34224
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 19 Apr 2010 21:36:32 +0000 (21:36 +0000)]
Fix more of bug #5446: Enable to copy the contents of an InsetInfo through the context menu.
This introduces a new LFUN LFUN_INSET_COPY_AS, which copies a certain Inset to the clipboard. For InsetInfo this is the text that is visible, but this could also replace LFUN_LABEL_COPY_AS_REF, by copying the INSET to the clipboard as a reference, and also a Math inset to copy to the clipboard as latex (including $'s or \[..\]).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34223
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Mon, 19 Apr 2010 20:44:57 +0000 (20:44 +0000)]
Extend Alert::prompt such that 4 buttons are possible. Thus, when
exporting, the extra dialog appearing when choosing to overwrite a
file is not necessary anymore.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34222
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Mon, 19 Apr 2010 19:55:15 +0000 (19:55 +0000)]
QThreadPool was introduced in Qt 4.4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34221
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 19 Apr 2010 17:11:43 +0000 (17:11 +0000)]
Use the AtPoint mechanism for the LFUN_INSET_EDIT and LFUN_LABEL_COPY_AS_REF.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34220
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 19 Apr 2010 16:05:40 +0000 (16:05 +0000)]
Fix bug #6661: Outliner filter bar should not be case sensitive.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34219
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Mon, 19 Apr 2010 03:58:48 +0000 (03:58 +0000)]
installer: some special settings for the alpha/beta releases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34218
a592a061 -630c-0410-9148-
cb99ea01b6c8
Pavel Sanda [Sun, 18 Apr 2010 23:52:08 +0000 (23:52 +0000)]
Add Skim to hints.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34217
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 18 Apr 2010 23:47:11 +0000 (23:47 +0000)]
Better(?) fix for bug #6659: InsetInfo context menu disabled unless cursor immediately in front.
(see r34215 for the previous fix.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34216
a592a061 -630c-0410-9148-
cb99ea01b6c8