anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,522 Commits 31 Branches 172 Tags 619 MiB
0e61a77cd0
Commit Graph

24522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Forestieri
0e61a77cd0 In the IEEEtran class, the argument of \IEEEspecialpapernotice is 
typeset in italic.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34387 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 16:11:35 +00:00
Enrico Forestieri
eb46cabc94 Fix (again) IEEEtran.layout. 
- Restored broken compatibility with old documents due to the renaming
  of MarkBoth.
- Restored ordering such that to follow the same order obtained in the
  typeset result.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34386 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 15:55:48 +00:00
Uwe Stöhr
e83550ebb9 IEEEtran.lyx: change file according to previous commit: 
- correct position of the page headings
- add author ID

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34385 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 14:42:48 +00:00
Uwe Stöhr
3d3852e254 IEEEtran.layout: 
- renamed markboth to page headins
- correct position of markboth (according to the IEEEtran example files, this has to be declared before the special paper notice)
- add style for IEEEpubid

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34384 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 14:38:09 +00:00
Enrico Forestieri
20b5f66358 Rename IEEE_special_paper_notice as Special_Paper_Notice and 
IEEE_after_title_text as After_Title_Text, and move them such
that they appear in the correct order in the layout combo.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34383 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 14:05:13 +00:00
Enrico Forestieri
ba5436faeb Fix IEEEtran.layout. 
- The default is 2 columns, so, specifying "Columns 2" suddenly changes
  the output of old documents which are now printed in one column.
- The font shape for IEEEmembership is Italic.
- As regards abstract and keywords:
  - The margin is First_Dynamic, not Dynamic.
  - The labels are "Abstract---" and "Index Terms---" with no label separation.
  - Alignment is not centered.
  - Font is small and black


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34382 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-08 00:49:42 +00:00
Uwe Stöhr
4138b6b2dd IEEEtran: update to fulfill the guidelines of IEEEtran version 1.7 (layout file is almost rewritten) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34374 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-07 03:23:00 +00:00
Vincent van Ravesteijn
5e978cf02c Disallow InsetMarginals in InsetTabulars. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34373 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-05 21:15:15 +00:00
Vincent van Ravesteijn
863e1eb35b * TextMetrics.cpp: Line length. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34372 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-05 16:23:11 +00:00
Pavel Sanda
4bfecb3287 Just a test whether lyx-cvs list works. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34371 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-05 16:12:58 +00:00
Enrico Forestieri
cf1f59dd4d Fix bug #6678: Crash when undoing backspace inside math-macro 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34370 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-04 16:16:20 +00:00
Vincent van Ravesteijn
b269eb9117 Fix a crash due to Inset**::mouse_hover_[] containing an invalid pointer to a BufferView. 
Clear the mouse_hover state when closing the BufferView. Otherwise, there will be an invalid pointer stored in the Inset and crashing LyX when the Inset's destructor is called.

See also r33908, r34117, r34348, r34353, r34354, r34363 and bug #3900.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34365 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 23:04:51 +00:00
Vincent van Ravesteijn
351808718d Fix another crash due to BufferView::last_inset_ being an invalid pointer. 
Do not clear the mouse_hover state from anywhere else then BufferView, such that the last_inset_ pointer gets nulled. Besides, there is no reason to clear the mouse_hover state on collapsing the Inset.

See also r33908, r34117, r34348, r34353, r34354 and bug #3900.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34364 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 23:01:47 +00:00
Vincent van Ravesteijn
49920e31d6 Another non-base class with a virtual destructor. Sorry for the spam (trying to learn git, but I seem to forget files :). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34363 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 22:57:28 +00:00
Vincent van Ravesteijn
86eaa6de73 Another base class without a virtual destructor. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34362 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 22:55:40 +00:00
Vincent van Ravesteijn
c9e4d6657d These should not raise the impression that children should reimplement these functions. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34361 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 22:18:00 +00:00
Vincent van Ravesteijn
cea7948698 Make destructors virtual in base classes and only there. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34360 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 21:43:46 +00:00
Vincent van Ravesteijn
8c0194ae78 Add comment just as in GuiView.cpp. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34359 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 20:08:31 +00:00
Vincent van Ravesteijn
eb78affda7 We want to check for the new value name instead for the old value cmdName_. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34358 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 17:55:44 +00:00
Vincent van Ravesteijn
9d1f1e285c *List.h: Move the class documentation into the lyx::namespace to be picked up correctly by doxy. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34357 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-03 13:36:19 +00:00
Vincent van Ravesteijn
d9fab1ecc6 * lyxfind: Remove unnecessary non-const reference as parameter. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34355 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-02 22:33:36 +00:00
Vincent van Ravesteijn
750620765f Fix another crash due to BufferView::last_inset_ being an invalid pointer. 
Now, we only want to let the last_inset_ pointer point at insets that accept the mouse_hover setting. Otherwise, the pointer is not cleared on deletion of the inset.

See also r33908, r34117, r34348, r34353 and bug #3900.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34354 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-02 19:12:25 +00:00
Vincent van Ravesteijn
9c8e7429fa Fix the assertion assert introduced in r34348 which got fired when eg. deselecting an InsetCommand: 
- we have to have a copy constructor in InsetCommand to clear the mouse_hover_ map and not to copy it,
- there is no need to have mouse_hover_() in the initialisation list,
- there is no need to copy the auto_open_ map.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34353 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-01 23:04:08 +00:00
Enrico Forestieri
60466235fe Avoid compiler warning about unused parameter. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34352 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-01 11:38:05 +00:00
Enrico Forestieri
7d4ca5033e Implement LFUN_UNICODE_INSERT in mathed. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34351 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 22:23:19 +00:00
Vincent van Ravesteijn
b24862e754 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
 2010-04-30 15:56:54 +00:00
Vincent van Ravesteijn
d7b4aacb2e Compile fix for r34348. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34349 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 15:37:19 +00:00
Vincent van Ravesteijn
708b73cab7 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
 2010-04-30 14:55:37 +00:00
Vincent van Ravesteijn
4c611e5745 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
 2010-04-30 14:47:46 +00:00
Vincent van Ravesteijn
0833a4a94c 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
 2010-04-30 14:11:46 +00:00
Jürgen Spitzmüller
4a4d7a57f2 * GuiSpellchecker.cpp: fix bug 6676. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34345 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 09:52:00 +00:00
Enrico Forestieri
a03faee92d 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
 2010-04-30 08:27:03 +00:00
Uwe Stöhr
13fe74ee51 Spanish Math.lyx: translations by Ignacio 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34342 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-29 22:01:50 +00:00
Uwe Stöhr
26e0238982 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
 2010-04-28 22:02:41 +00:00
Pavel Sanda
b3870eac50 typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34338 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 21:50:06 +00:00
Pavel Sanda
11510dbfc7 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
 2010-04-28 21:48:10 +00:00
Pavel Sanda
11e7cc2344 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
 2010-04-28 21:48:08 +00:00
Pavel Sanda
ea24773537 Unify Inter-word and Interword space strings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34335 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 21:48:03 +00:00
Uwe Stöhr
70b3c144c7 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
 2010-04-28 21:42:11 +00:00
Uwe Stöhr
c61723b36c 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
 2010-04-28 21:39:23 +00:00
Uwe Stöhr
ccb301d748 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
 2010-04-28 19:39:15 +00:00
Enrico Forestieri
ba4e75f11c 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
 2010-04-28 15:49:00 +00:00
Enrico Forestieri
9b3aadbe22 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
 2010-04-28 13:19:09 +00:00
Enrico Forestieri
beb3fa70e8 Also account for colors in math macros. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34325 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 11:38:01 +00:00
Vincent van Ravesteijn
6c4de0377c 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
 2010-04-28 04:51:05 +00:00
Vincent van Ravesteijn
25a41486d6 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
 2010-04-28 04:27:10 +00:00
Enrico Forestieri
71b4fd0431 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
 2010-04-28 02:15:46 +00:00
Enrico Forestieri
d9bcbe5de6 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
 2010-04-28 01:58:11 +00:00
Enrico Forestieri
6c33aa2e5b 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
 2010-04-28 01:40:11 +00:00
Uwe Stöhr
7d834d2568 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
 2010-04-28 00:55:58 +00:00