Uwe Stöhr
5f62c2ed6a
InsetGraphics.cpp: fix a comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35131 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-13 00:17:12 +00:00
Uwe Stöhr
f6f59757ac
Color.cpp: use the same frame color for inset frames and captions frames
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35130 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-12 12:31:05 +00:00
Jean-Marc Lasgouttes
60445ede53
remove unused headers
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-12 09:38:22 +00:00
Richard Heck
06b1525f7d
buffer_ --> buffer()
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35117 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:44:59 +00:00
Richard Heck
700c3dc0ef
loadIfNeeded() returns a pointer to the loaded child, so it's silly to
...
throw away its return value and then go find a pointer to the loaded
child!!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35116 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:39:12 +00:00
Richard Heck
89e50feaf2
Invalidate caches when the parent is reset.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35115 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:37:06 +00:00
Richard Heck
b28eca7476
buffer_ --> buffer()
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35114 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:28:24 +00:00
Richard Heck
856b01b6da
Comments on the caching mechanism.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35113 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:26:34 +00:00
Richard Heck
2203d7aa0a
Fix some bugs in the bibinfo caching mechanism. Comments to follow.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35112 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-10 14:12:48 +00:00
Richard Heck
0ac2636d28
Missing invalidations of bibfile cache.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35111 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 21:35:44 +00:00
Jean-Marc Lasgouttes
6aa26820fd
Introduce new tag ParbreakIsNewline in Layout and InsetLayout (not yet used)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 21:20:29 +00:00
Jean-Marc Lasgouttes
920798c4d6
fix bug #6786 : InsetLayout name containing spaces is incompatible with keybindings/toolbars
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35109 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 20:37:31 +00:00
Richard Heck
350b82fd62
Revert r35106.
...
Help needed here. Why isn't this equivalent?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35108 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 19:17:44 +00:00
Richard Heck
35f3f7cbc4
Don't need this argument, since it was only ever called thus:
...
it->fillWithBibKeys(d->bibinfo_, it);
This could be useful later, if we decide to try to do the work that
fillWithBibKeys did from updateLabels().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 18:00:46 +00:00
Richard Heck
506716a1d2
Change error message. Reason why appears later.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 17:33:43 +00:00
Richard Heck
2a6109e972
Minor cleanup. We don't need the deleted call, as that is done at the
...
beginning of updateBuffer() anyway.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35104 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 17:14:45 +00:00
Richard Heck
e992140685
More work toward speeding up the bibfile caching stuff.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35103 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 17:01:51 +00:00
Richard Heck
4509607bf6
Do not invalidate cache unless we find some BibTeX insets. Part of
...
#6846 .
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35102 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 16:18:57 +00:00
Jean-Marc Lasgouttes
b01fcee92d
Finish implementation of "use system colors" checkbox.
...
ColorCache:
* method isSystem() allows to know whether a color can be overridden by system colors
* method get() has a variant that accepts a bool (system color or not)
* code simplifications
GuiPrefs:
* hide colors set from the system when they are inherited
* syncronize list of colors and checkbox
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35101 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 12:15:02 +00:00
Jean-Marc Lasgouttes
aba279a928
cut and paste error
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35100 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-09 09:41:36 +00:00
Jean-Marc Lasgouttes
17729b9346
Add new pref use_system_colors (defaults to true).
...
What is missing is some feedback on what colors are
set from the system (they should be disabled in the
color list).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35096 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-08 23:11:02 +00:00
Jean-Marc Lasgouttes
088059724d
Remove DPI from preference dialog. The variable is kept in
...
LyXRC, since we do need the value in the code. If this is
a problem, I can define some QApplication::getDPI() and give
up configurability altogether.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35095 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-08 20:32:26 +00:00
Jean-Marc Lasgouttes
a2230142fa
Replace ugly wavy line with a dotted line for misspelled words.
...
I hope this one is not going to be controversial.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35094 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-08 17:41:28 +00:00
Jean-Marc Lasgouttes
fde0a4bb26
spacing
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35093 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-08 14:48:15 +00:00
Jean-Marc Lasgouttes
c77b7483ea
fix oversight
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35092 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-08 14:34:59 +00:00
Jean-Marc Lasgouttes
1a18cdfb39
Clean-up the code with respect to PassThru insets and layouts.
...
The goal is first to remove explicit testing against ERT_CODE,
and second to allow to define layouts with the same properties as ERT insets.
This commit does not change behaviour
* rename OutputParams::verbatim to pass_thru
* disable encoding switch inside pass_thru layouts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35091 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 22:07:49 +00:00
Jean-Marc Lasgouttes
8a9d765739
Bug #6842 , part II
...
Make sure that Package can be initialized several time.s
Make sure that Package is not used before being initialized.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35080 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 11:42:27 +00:00
Jürgen Spitzmüller
a84925bebe
* GuiPrefs.cpp:
...
- do not allow to change a format's short name if the format is used by a converter (fixes crash issue #6815 ).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35079 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 11:31:28 +00:00
Jean-Marc Lasgouttes
547773f0d0
set locale correctly before parsing command line (bug #6842 )
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35078 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 11:18:04 +00:00
Jean-Marc Lasgouttes
d10b46ffbd
set more colors from qt palette
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35077 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 10:48:32 +00:00
Jean-Marc Lasgouttes
3e99283f2b
Make sure that the current undo element is finished before marking stacks dirty
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35075 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 10:40:25 +00:00
Jean-Marc Lasgouttes
c2dfd50705
Fix default colors for workarea.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35074 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 09:21:44 +00:00
Uwe Stöhr
7547cf9e5f
- InsetTabular.cpp: floats must not be inserted to tables, fixes #6844
...
- InsetCaption.cpp: margin notes and footnotes are not allowed in captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35073 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 03:16:38 +00:00
Jean-Marc Lasgouttes
f8eda52820
Fix bug #3733 : 'undo' does not revert 'changed' status for file
...
* src/LyXAction.cpp: add ReadOnly flag to LFUN_UNDO and LFUN_REDO, since
we do not want the dispatch mechanism to mark buffer dirty after them.
* src/BufferView.cpp: handle "by hand" the activation of undo/redo
* src/Undo.cpp: add lyx_clean member to UndoElement and make sure to
maintain it with undo operations; add a new markDirty() member for UndoStack
* src/Buffer.cpp: when saving a document, mark the undo and redo stacks
elements as dirty.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35068 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-06 23:54:04 +00:00
Richard Heck
3d050130a2
Forgot this file.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35062 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-06 11:30:18 +00:00
Richard Heck
64f979cb06
A UI for document-local layout information. LyX has supported this for a
...
while, but without any UI for it. (There has been local layout in the
Customization manual for a long time, in fact.)
Yes, this is an advanced feature. But, absent a layout editor, it is the
one thing that will make it easier, and possible, for "normal users" to
experiment with layout without having to go through reconfiguration,
etc, etc. To keep too many people from shooting themselves, we validate
the layout information before allowing the user to apply it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35061 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 22:47:42 +00:00
Jean-Marc Lasgouttes
e1fa4c9eb3
Initialize some LyX colors from Qt. Currently what is done is plain text and selection (both font and background).
...
I am not sure that there is something else that we can get from QPalette. Maybe
cursor color, if someone tells me how to get it.
Only tested on mac. I can revert if this causes problems on linux or windows.
I have to check too that it still works in non-gui mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35060 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 22:41:34 +00:00
Richard Heck
63e26fa778
Make sure the layout has actually been closed. Otherwise, you can have:
...
Style NewStyle
all by itself at the end of a file, and LyX is perfectly happy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35059 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 21:32:19 +00:00
Richard Heck
87600d4d84
Remove unused variables, add questions. Anyone know?
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35058 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 20:25:29 +00:00
Richard Heck
5ee70976de
Renaming.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35057 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 20:25:04 +00:00
Richard Heck
fc6492a20f
Improve the error message a bit. LyX CAN produce output in such cases,
...
just not PDF, etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35056 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 20:15:29 +00:00
Jean-Marc Lasgouttes
e4f2484cb5
Implement LFUN_SPELLING_REMOVE (patch from switt)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35055 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 20:10:40 +00:00
Jean-Marc Lasgouttes
79346452c7
silence some warnings by removing unused parameters
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35053 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 19:00:57 +00:00
Richard Heck
b2b811fcd7
Remove \Nameref entry. Forgotten before....
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35050 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-05 02:17:07 +00:00
Jean-Marc Lasgouttes
4c3333d1df
tiny simplification
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35045 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-03 22:31:16 +00:00
Jean-Marc Lasgouttes
b221b0e1fd
Fix bug #6736 : 2.0.0 alpha 3, spell check on the fly bug
...
This bug is related to the fact that the cusor remember the current font.
The on-the-fly spell status should really not be kept in the Font object, but
rather in metrics, IMO.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35041 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-02 21:20:59 +00:00
Jürgen Spitzmüller
15f9312d80
* GuiLog.cpp: refine warning detection:
...
- detect "LaTeX Font Warning"
- detect "Class X Warning"
- package warnings can contain dots ("Package pdftex.def Warning")
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35040 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-02 16:38:41 +00:00
Richard Heck
23a984b258
Style and a sanity check.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35039 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-02 15:40:33 +00:00
Richard Heck
1c0514b07c
Add a comment.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35036 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-30 15:50:42 +00:00
Richard Heck
56c500bae5
Update comments a bit.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35035 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 16:55:02 +00:00
Richard Heck
89a9fc4c5e
Implement independent output scaling for math images (and, I suppose,
...
for any other sort of image for which we produce a preview on export,
e.g., eventually, for InsetExternal).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35032 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 16:38:58 +00:00
Richard Heck
a7f7530bd2
MathML and HTML definitely can't handle MathUnknown!!
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35028 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:48:01 +00:00
Richard Heck
f1d941098c
MathML and HTML can't handle XYArrow.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35027 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:46:26 +00:00
Richard Heck
b520657039
HTML for xarrows.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35026 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:44:17 +00:00
Richard Heck
c8bc76b333
MathML and HTML definitely can't handle XYMatrix.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35025 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:38:01 +00:00
Richard Heck
7a8a1eca21
Framework for math export exceptions. We can throw these if we find
...
something we don't know how to handle and fall back to images.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35024 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:37:42 +00:00
Richard Heck
e48fb0b661
Allow images to be export even when LyXRC says no previews.
...
I'll try to figure out how to get rid of the magic booleans.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35022 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 15:17:58 +00:00
Richard Heck
833ef6352f
Comment.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35021 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 14:29:54 +00:00
Richard Heck
35327c0b5b
I guess I like this better.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35020 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 00:00:37 +00:00
Richard Heck
523056c092
Move the error message out of LayoutFileList::load() and have it be
...
reported by the caller. Otherwise, you could get the error message the
first time, and then it would succeed the second!!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35019 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-28 21:03:27 +00:00
Uwe Stöhr
306ebdf80b
Length.cpp: fix sort order - in all other files we have PTH before PPH
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35012 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-25 00:17:48 +00:00
Enrico Forestieri
0d78b79311
Refine fix for bug #1337 .
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35009 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-23 07:34:26 +00:00
Enrico Forestieri
976307231d
Fix bug #1337 : LyX confused on $ symbol in math equations
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35008 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 23:19:52 +00:00
Stephan Witt
710bb42049
correct typo in RC_SCROLL_WHEEL_ZOOM text
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35004 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 14:51:35 +00:00
Richard Heck
3d6fb3bd1d
Try again with LaTeX output for XHTML math.
...
The previous attempt messed up the inheritance hierarchy somehow. I
think.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35002 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 02:47:12 +00:00
Richard Heck
80aca38970
Partially revert r34995, which broke math output. Not sure why yet....
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35001 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-22 02:20:12 +00:00
Richard Heck
06445c964e
Next step in fixing problems noted by Vincent: Remove magic boolean from
...
updateMacros().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35000 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 21:58:54 +00:00
Richard Heck
2f78698fbd
First step towards fixing some issues noted by Vincent. We record in the
...
Buffer whether we are exporting or not, rather than rely upon isClone(),
which could be adapted to other purposes. And, of course, someone might
choose locally to disable cloning....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34999 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 21:51:33 +00:00
Richard Heck
980dfa0f3b
Comment.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34997 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 14:28:38 +00:00
Richard Heck
9803d7a2a6
Prepare for the use of exceptions to catch occasions when we can't
...
export as MathML, etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34996 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 14:02:46 +00:00
Richard Heck
c036ecb649
Tweak the math-as-LaTeX output, including the correct tags for jsMath.
...
We don't yet write info to load the jsMath files, though.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34995 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:43:35 +00:00
Richard Heck
e7bb1e616e
Re-organize code from a last commit a bit.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34994 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:26:48 +00:00
Richard Heck
b8d43b05bc
Support for exporting math as images with XHTML. The next step is to
...
allow this as a fallback. E.g., if we're unable to export as MathML,
then we try to export as an image.
There are several ways, I am sure, in which this implementation is not
ideal.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:19:52 +00:00
Richard Heck
096cf9f2e8
Whitespace only (two tabs at end of each line?).
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34991 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-20 19:45:36 +00:00
Peter Kümmel
815ec52ab8
merged build: macro name has changed
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34981 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 21:23:26 +00:00
Stephan Witt
0498aa1dcb
correct OR when checking modifiers
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:18:22 +00:00
Richard Heck
7441f370c0
Revert r34969.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34973 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:09:06 +00:00
Richard Heck
0903700db3
Update comment a bit further.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34972 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 12:04:36 +00:00
Richard Heck
88329a656c
Fix problem reported by Vincent, that absence of python can cause
...
failure to load the empty class.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34971 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:58:38 +00:00
Richard Heck
9034323d59
Renaming and typo.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34970 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:52:12 +00:00
Uwe Stöhr
ab85e493c7
GuiWorkArea.cpp: make it compilable
...
Stephan, please check if this is correct
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 11:49:34 +00:00
Stephan Witt
e99bd868f9
use "alt" instead of "option" for modifier keyword
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 10:04:59 +00:00
Stephan Witt
0d386d7c25
make mouse scroll wheel zoom configurable
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:29:42 +00:00
Peter Kümmel
30bae1710a
cmake: fix merged build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:24:30 +00:00
Vincent van Ravesteijn
da45f74df2
Compile fix for r34950.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34952 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:22:32 +00:00
Vincent van Ravesteijn
d8351db924
* ModuleList.cpp:
...
- it makes no sense to output the real filename if it is empty.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34951 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:19:46 +00:00
Vincent van Ravesteijn
dd08dd8d0a
* LayoutFile.cpp:
...
- it makes no sense to output the real filename if it is empty,
- success is already false.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34950 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 21:12:48 +00:00
Enrico Forestieri
161af56f4e
By default, overwrite the main file on export, but allow changing default
...
behavior through the environment variable LYX_FORCE_OVERWRITE.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34946 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 17:55:46 +00:00
Uwe Stöhr
d8523cc229
GuiFontLoader.cpp: forgot this in r34941
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34944 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:16:47 +00:00
Peter Kümmel
c09d33120d
UNDO: enc
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:09:26 +00:00
Uwe Stöhr
72292b98a6
support for formal math script
...
- fileformat change
- fixes #2340
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34941 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 15:51:11 +00:00
Richard Heck
fd03b1280e
Allow for "Provides babel 1".
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34937 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 14:49:30 +00:00
Pavel Sanda
59598a0d25
Fix tarball creation
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 14:17:44 +00:00
Peter Kümmel
56a7a67783
add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:26:11 +00:00
Pavel Sanda
3e64ec2c9d
comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 09:53:29 +00:00
Richard Heck
7d4c560f87
Remove Nameref support. Too many issues involving translation, quotes,
...
etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34920 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 15:19:04 +00:00
Enrico Forestieri
be3fba333b
Remove left over.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34919 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:43:12 +00:00
Enrico Forestieri
952a31a43e
Fix output to terminal when LyX is launched from a GUI on *nix
...
aka
Surrender to Windowsisms
aka
Resistance is futile, you will be assimilated
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34918 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 14:30:46 +00:00
Peter Kümmel
2467a88cde
no output to stdout when redirecting, cleanup
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34915 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 09:57:46 +00:00
Peter Kümmel
146b1083a1
fix stupid renaming error
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34914 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 08:14:00 +00:00
Peter Kümmel
7c4122cc4b
lyx sytle
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34912 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 08:09:38 +00:00
Peter Kümmel
52e58a3700
CamelCase
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34911 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 06:08:12 +00:00
Peter Kümmel
48dca70f9e
only guard terminal output.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34910 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-16 05:55:31 +00:00
Richard Heck
17166837d7
Revert last commit. I was confusing two things.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34890 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 14:13:47 +00:00
Richard Heck
e611cc2d4a
Enhance LyX by fixing #6760 . New preference to set minimum length of
...
automatically spellchecked words.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 14:08:44 +00:00
Richard Heck
f27ea2457d
These didn't get committed with r34884 because I forgot to "svn
...
resolved" them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34888 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 14:02:57 +00:00
Richard Heck
47db764ccc
Nameref support.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34884 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 03:23:29 +00:00
Uwe Stöhr
e2e63b4b1b
support for the ISO C-series paper formats; fileformat change
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34883 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 01:06:20 +00:00
Vincent van Ravesteijn
9be7c2a0ec
Fix unnecessary dependencies on GuiDocument.h.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34882 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 21:42:25 +00:00
Richard Heck
2c19192582
Clarify error message slightly.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34881 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 18:11:26 +00:00
Richard Heck
530b1faad9
Make this translatable.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34880 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-12 17:40:54 +00:00
Stephan Witt
aebcaa74b0
correct result array use in makeSuggestionAppleSpeller
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34862 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 22:04:29 +00:00
Stephan Witt
7b34b13b71
avoid LYX_PLATFORM_DARWIN10 macro
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34861 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 21:30:47 +00:00
Richard Heck
c2a4932ce0
Small improvement to RefPrefix.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34854 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 13:36:19 +00:00
Richard Heck
5577e877bb
Try to move all updateBuffer() calls to a central location. We now use
...
DispatchResult to store a flag that tells us whether we need a buffer
update or not.
So: If you find a missing one, go to an appropriate place in the
dispatch and call cur.forceBufferUpdate() or, if you don't have a cursor
but do have a DispatchResult, call dr.forceBufferUpdate().
There is one remaining call I could not move, in
TextMetrics::redoParagraph. But this looks like an emergency call when
the macro context has not been set. There are also a couple calls that
are connected with buffer creation that I commented out, since the same
call is done again almost immediately. But I'm not positive about those.
Now the nice thing would be to do the same for updateMacros().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34826 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 14:37:00 +00:00
Jürgen Spitzmüller
be70a8eb11
* LaTeX.cpp: understand Biblatex's polite rerun request.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34822 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 08:40:03 +00:00
Richard Heck
0e14f379f3
Rename a couple routines. This will avoid confusion with a forthcoming
...
patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34816 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 20:04:35 +00:00
Richard Heck
c0cc803e55
Warning.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34815 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 20:01:17 +00:00
Stephan Witt
f4aedbe672
correct ifdef+defined construct
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34813 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 10:39:24 +00:00
Stephan Witt
7276f04fa1
provide native spell checker for Mac OS X
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34812 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 07:56:29 +00:00
Stephan Witt
b12da1968a
add APPLESPELL orthogonal to ASPELL
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34811 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 07:54:42 +00:00
Jean-Marc Lasgouttes
4f735babe2
fix compilation of applespell with autotools
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34810 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 07:44:34 +00:00
Uwe Stöhr
07e8f2e1bc
InsetBox.cpp: only shaded boxes can have a non-plain layout when there is no inner box
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34809 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 03:01:50 +00:00
Uwe Stöhr
142caff833
InsetBox.cpp: only shaded boxes can have multiple paragraphs when there is no inner box
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34808 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 02:42:36 +00:00
Stephan Witt
0a326e90f7
provide native spell checker for Mac OS X
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34801 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-07 17:40:50 +00:00
Uwe Stöhr
76ad72221c
ColorUi.ui: remove unnecessary window title
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34796 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-07 00:43:47 +00:00
Vincent van Ravesteijn
1541a7f756
GuiBox.cpp: Remove some unnecessary negated logic.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34780 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-06 12:01:09 +00:00
Enrico Forestieri
67f6e68e8d
Add last missing inner-hull grid type environments.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34766 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 17:30:03 +00:00
Jean-Marc Lasgouttes
3a5b4b8008
Fix bug 6533: Spell-as-you-type stops checking words when they are already wrong
...
The problem was in FontList::setMisspelled, where an optimization looked at the first character of the word in order to return early when the misspelled flag is already correct. This does not work when the first letters of the word have this flag but not the last one.
If this optimization was really useful, it can be reimplemented properly in terms of font spans.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34765 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 15:15:13 +00:00
Enrico Forestieri
7049447fd7
Correct refinement fix for #6595 . The problem was not adding \\ to the last
...
empty line of substack, tabular and xymatrix, but not calling delEmptyLastRow
for them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34763 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 12:31:18 +00:00
Enrico Forestieri
d546a9b286
Revert r34761 because that was not the right fix that is going to be
...
committed shortly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34762 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 12:25:48 +00:00
Enrico Forestieri
7eeb664bbb
Refine fix for #6595 . Don't add \\ to the last empty line of substack,
...
tabular and xymatrix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34761 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 10:03:56 +00:00
Stephan Witt
598d185ada
more correct check of thesaurus file format
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34760 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-05 09:20:45 +00:00
Enrico Forestieri
d9ddc95ab8
Refine fix for #6595 . It turns out that the last empty line is to be
...
deleted not only for "array" but also for all inner-hull grid types.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34752 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-04 18:08:14 +00:00
Enrico Forestieri
9536afe742
Fix bug #6595 : empty last row of matrix or eqnarray vanishes.
...
This patch essentially reverts r30795 and also provides the correct fix
for #2969 .
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34751 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-04 16:31:53 +00:00
Stephan Witt
333485fa34
add check for version 1 index files - skip them if present
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34750 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-03 16:26:47 +00:00
Stephan Witt
55afdeb980
restore original version
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34749 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-03 16:25:15 +00:00
Uwe Stöhr
ebcef496a5
- new support for makebox; fileformat change
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34748 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-03 13:14:15 +00:00
Jean-Marc Lasgouttes
a174f43bc5
Fix nasty memory bug signalled by valgrind while looking at another bug.
...
The string passed to Aspell has been already released, since it is the return value of a function. This problem does NOT exist in branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34745 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-02 12:41:14 +00:00
Jean-Marc Lasgouttes
6f82f85228
style
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34744 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-02 12:38:39 +00:00
Jean-Marc Lasgouttes
62d537b5da
uninitialized variable
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34743 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-02 11:04:36 +00:00
Stephan Witt
2bb7b6d4ea
add checks for empty word list to avoid crashes later in MyThes::binsearch()
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34742 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-02 07:03:15 +00:00
Jean-Marc Lasgouttes
50117dc8ea
fix scroll wheel on mac (bug #6775 )
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34731 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-30 12:38:39 +00:00
Jean-Marc Lasgouttes
af928c503d
rework regexp processor magic ; make tr1 work with autotools
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34730 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-30 11:04:30 +00:00
Peter Kümmel
69036ced37
TR1: move TR1 check to config.h / buildsystem
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34729 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-30 10:53:45 +00:00
Peter Kümmel
103310c401
TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems, no support of regex in gcc 4.4
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34728 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-30 08:47:41 +00:00
Peter Kümmel
615d42d357
TR1: use std::tr1 regex with msvc10
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 17:09:40 +00:00
Peter Kümmel
86172fbebe
mingw fix
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34724 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 17:08:17 +00:00
Joost Verburg
23df7e16a9
Include io.h only on Windows
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34723 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 13:23:33 +00:00
Joost Verburg
e6254e6fb2
Launch external Windows processes for e.g. display image conversion using CreateProcess with a CREATE_NO_WINDOW flag, allowing LyX to be compiled as a GUI application without console windows popping up.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34721 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-28 17:45:04 +00:00
Richard Heck
456827950b
Support "Provides fontenc".
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34720 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-28 17:23:48 +00:00
Uwe Stöhr
7d031e1fef
GuiBox.cpp: fix this issue: horizontal box alignment is only possible without inner box and simple frame (the same as with pagebreaks)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34713 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-26 21:02:14 +00:00
Uwe Stöhr
cacad71fa2
BufferParams.cpp: fix typo
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34710 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-26 17:03:47 +00:00
Jürgen Spitzmüller
3e2ca552af
* GuiBoc.{cpp,h}:
...
- compare against combo box data instead of l7n string.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34709 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-26 07:57:54 +00:00
Jürgen Spitzmüller
ecfe108cde
* GuiBoc.{cpp,h}:
...
- use proper combo box data instead of the current int mumbo jumbo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34708 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-25 17:39:53 +00:00
Jürgen Spitzmüller
0a137e315a
* TextMetrics.cpp: fix metrics calculation with preceeding blank in free spacing context (bug #6746 )
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34705 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-25 14:07:55 +00:00
Jürgen Spitzmüller
807d618a96
GuiSpellchecker.cpp: typo
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34704 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-25 14:06:12 +00:00
Vincent van Ravesteijn
fb99c8115a
Fix the enabling/disabling of the custom latex font encoding lineedit.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34694 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-25 03:33:15 +00:00
Vincent van Ravesteijn
f616126668
Remove the boldness of the XHTML Output Options string in GuiDocument. We nowhere use bold headers.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34693 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-25 03:32:08 +00:00
Uwe Stöhr
a0eea97e44
LyX.cpp: clarify comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34686 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-19 14:24:38 +00:00
Vincent van Ravesteijn
f27ccb580b
Better fix for bug #5942 : proper multi-window usage is restored again. Now, LyX only switches to a buffer in a different view if open in tabs is disabled and there is already a document open in the current view and the buffer is already opened in another view.
...
see r34618.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34684 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-17 21:18:08 +00:00
Richard Heck
6ddefebc09
We do need the encoding here now, due to how InPreamble works.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34679 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 18:26:38 +00:00
Richard Heck
84a4ec80ab
Paragraph::latex() always returned false. So remove the return value.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34676 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 15:49:24 +00:00
Richard Heck
c952f9a7be
Fix InPreamble. I must have committed an incomplete patch.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34675 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 15:37:39 +00:00
Pavel Sanda
9b1ed66dbe
Paragraphs start from 0
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34673 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 13:54:49 +00:00
Pavel Sanda
35058f35a9
Remember navigate back bookmark through sessions
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34672 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 13:44:20 +00:00
Stephan Witt
32dc99100a
#6767 fix another crash in hasDictionary
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34670 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 08:35:41 +00:00
Vincent van Ravesteijn
41cd987dc5
Fix bug #4464 : Missing autoscroll when selecting by mouse drag.
...
It's not very fast, but I guess that's a general problem with our scrolling. At least it works now, but it's not perfect.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34659 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 22:14:05 +00:00
Vincent van Ravesteijn
7f593196fc
Add an update parameter to BufferView::scrollToCursor and BufferView::scrollDocView. This parameter indicates whether a repaint is requested
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34658 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 21:48:23 +00:00
Vincent van Ravesteijn
e1ba93a068
*BufferView: Remove default parameter value.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34657 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 21:38:38 +00:00
Stephan Witt
94c113d24f
#6767 fix the crash when given language is not supported
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34656 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 19:33:43 +00:00
Pavel Sanda
88fa080978
File missing in the tarball
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34655 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 18:16:23 +00:00
Jürgen Spitzmüller
aab87ddb8f
* InsetIndex.cpp (validate):
...
- fall through to InsetCollapsable (bug #6715 )
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34654 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 14:10:07 +00:00
Jürgen Spitzmüller
c8faa01f4f
make branch-add-insert aware of the separator ("|") [bug #6621 ]
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34653 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 13:39:08 +00:00
Jürgen Spitzmüller
47aeddab07
whitespace
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34652 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 12:52:19 +00:00
Jürgen Spitzmüller
143ea9b490
* InsetListings.cpp:
...
- do not switch the encoding with XeTeX (bug #6766 )
- some minor formatting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34649 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 12:13:36 +00:00
Edwin Leuven
c2e4c79f6e
bit of cleanup to avoid ambiguities (in the sense of cell vs column)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34648 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 10:42:42 +00:00
Edwin Leuven
7b51fb74a7
columnWidth returns the col width of a cell, which is not what we want here (should fix tables flying of the screen)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34647 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-13 20:27:28 +00:00
Richard Heck
732e1cfed7
Remove obsolete comment. An attempt to start doing what is suggested
...
here ran into insufferable problems: I.e., a Cursor IS-A DocIterator in
the code now, whether it was before or not.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34646 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-13 18:29:00 +00:00
Edwin Leuven
b031ac1e66
do not use cells without decimals when calculating column widths and cell text offsets
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34645 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-12 16:44:50 +00:00
Richard Heck
e6ab2b0442
Whitespace.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34644 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-12 14:00:43 +00:00
Edwin Leuven
c64fb28046
add new lyx funcs introduced in r34598 to doxy
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34643 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-12 10:29:12 +00:00
Richard Heck
8f54bac004
...this value. As the comment says, this is the value we need to expose
...
in the preferences to solve bug #6760 .
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34641 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 21:04:57 +00:00
Richard Heck
ae2f979947
More minor cleanup, while looking for...
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34640 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 21:02:47 +00:00
Richard Heck
d205cd4b68
Minor cleanup.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34639 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 20:56:42 +00:00
Enrico Forestieri
0c26995be6
Fix bug #6756 : import problem with \ (no space following)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34638 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 20:13:11 +00:00
Richard Heck
81228c90fc
Fix bug #6759 . Thanks to Vincent.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34637 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 17:02:55 +00:00
Richard Heck
cd78e02a24
Minor code cleanup.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34636 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 15:14:22 +00:00
Richard Heck
22c1d47b02
Fix bug #6762 . Silly mistake.
...
Also, disable corresponding code for required arguments. tex2lyx does
not produce a high enough file format yet for this to make sense, I
don't think.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34635 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 15:08:04 +00:00
Stephan Witt
2052c1e7cc
correct in LFUN_MATH_NUMBER_TOGGLE the conversion of display state to enabled state
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34634 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-09 12:04:25 +00:00
Jean-Marc Lasgouttes
df62af4323
fix warnings
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-08 13:38:12 +00:00
Vincent van Ravesteijn
2ebf8cdc6c
Fix bug #6685 : Assertion when quitting LyX with a Reference List in the Advanced Find Dialog
...
During the deletion of pimpl_, one don't want the assert LASSERT(singleton_) to fire in one of the the***() functions. In this case it is theBufferList(), which is needed by the dtor of BibItem?.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34623 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 22:12:22 +00:00
Vincent van Ravesteijn
068d87a711
Constify GuiView::busy().
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34622 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 22:09:59 +00:00
Vincent van Ravesteijn
a26a9be9bc
Fix the storage of the last opened files list when having multiple windows. We need to know whether a view is closed by the user pressing the x (clearing the last-opened list of previous closed windows), or whether the view is closed in a cascade of all views (no clearing of the last-opened list).
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34621 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 22:07:38 +00:00
Richard Heck
0345bef67b
Renaming: \\begin_inset OptArg to \\begin_inset Argument.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34619 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 21:58:27 +00:00
Vincent van Ravesteijn
098f722a1f
Fix part of bug #5942 :
...
- buffer-switch does open tabs even when open in tabs is disabled;
- buffer-switch open the document in a new tab even if it is already opened in another view.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34618 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 21:57:37 +00:00
Richard Heck
5c0a1e5c4e
Use new RequiredArgs tag to improve Beamer UI. Also includes a dummy
...
format bump so we can convert old Beamer files, which are otherwise
broken by the new layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34615 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 21:26:56 +00:00
Vincent van Ravesteijn
abbfb45998
Fix bug #6751 : Assert when changing number of columns in 'simple' math-inset.
...
In r33495, "LFUN_TABULAR_FEATURE" was replaced by "LFUN_INSET_MODIFY tabular". However, the status of LFUN_INSET_MODIFY is always enabled while a lot of insets are not allowed to change the number of columns etc.
There we need to disable the "LFUN_INSET_MODIFY tabular" status.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34613 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 20:54:10 +00:00
Peter Kümmel
ddc38c93ca
don't block GUI when showing all debug messages
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34612 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 20:25:41 +00:00
Edwin Leuven
fea446303d
simplify some conditions
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34611 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 09:39:04 +00:00
Stephan Witt
f6071af49d
avoid preprocessor macros for path constants
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34610 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 19:10:10 +00:00
Enrico Forestieri
fe7196a545
The delimiters '<' and '>' can also be used as big delimiters. They are
...
equivalent to \langle and \rangle, which were already taken into account.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34607 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 18:11:15 +00:00
Peter Kümmel
f50127ffe8
compile with GCC 4.4.3
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34605 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 10:07:49 +00:00
Enrico Forestieri
e0a5cda787
Add GUI support for big delimiters variants without 'l', 'm' or 'r' endings.
...
They differ from their cousins only for the space left around them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-06 00:42:33 +00:00
Peter Kümmel
807fc1443a
also use TR1 code for bind and shared_ptr when compiling with GCC >= 4.4
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34600 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 11:06:13 +00:00
Edwin Leuven
f403c0a601
get rid of some missing enum warnings after r34598
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34599 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 08:26:00 +00:00
Edwin Leuven
0ebe0ff37e
add support for decimal alignment in tables
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34598 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 07:44:44 +00:00
Richard Heck
319ca06167
Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34597 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:53:44 +00:00
Richard Heck
8480d1dd9a
Rename InsetOptArg as InsetArgument.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34596 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:44:58 +00:00
Richard Heck
9aa9dacb4f
Fix silly initialization bug.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34594 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:17:28 +00:00
Richard Heck
b0097bcddb
Introduce a new "RequiredArgs" tag for layouts. This functions much as
...
the OptionalArgs tag does and is implemented by the now misnamed
InsetOptArgs, except that its content gets wrapped in "{}" rather than
"[]". Required arguments do not actually have to be provided, but they
are always output.
This will allow e.g. beamer's Block environment to be implemented
without ERT.
Documentation to follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34591 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 21:50:08 +00:00
Vincent van Ravesteijn
8bbd8bc44c
Fix bug #6606 : Crash when reverting a document with a not available document class.
...
If the document class is not available, we now issue a warning for the user. This triggers a focusInEvent of the WorkArea and the cursor is issued to start blinking. However, when reverting a document the cursor is probably invalid and there has been no chance yet to fix it as we are still reading the file.
The solution is to not show the cursor when the view is still busy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34590 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 13:24:03 +00:00
Peter Kümmel
acbfa35458
fix bug #6748 : queue LyXErrMessages so any other stuff is done
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34589 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-03 21:24:20 +00:00
Jean-Marc Lasgouttes
b25d19435a
fix compilation on F13 and binutils/gold by rewriting specialized X11 code
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34588 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-03 07:26:19 +00:00
Vincent van Ravesteijn
a948d13333
Fix bug #6744 : Crash when copying an inset from a deleted section.
...
We need to reject the changes in when copying from a fully deleted section.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34583 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 16:13:54 +00:00
Vincent van Ravesteijn
f642e45a39
Fix the warning message "TocModel.cpp: type not found" when (re-)loading a file.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34571 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 09:56:07 +00:00
Enrico Forestieri
41db28dd45
Fix bug #6739 : Loading in a 1.6.5 file causes 1.6.6-1 to crash
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34563 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:20:30 +00:00
Enrico Forestieri
a2d888496b
Still white space.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34562 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:12:07 +00:00
Enrico Forestieri
c4faa16f20
Only white space.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34561 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 23:02:04 +00:00
Richard Heck
50a81deff4
Simplify the graph code a bit. This also will allow us easily to find
...
all paths from point A to point B, which we'll want to do later.
This should also get rid of an annoying bug that I couldn't figure out.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34560 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 21:27:17 +00:00
Richard Heck
6fe2fec87d
Minor change to unfortunate codepath.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34559 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-31 20:20:57 +00:00
Stephan Witt
042e8bb4d0
consolidate dictionary lookup of spellchecker and thesaurus, prepare builtin distribution of dictionaries
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34540 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-29 14:36:51 +00:00
Uwe Stöhr
c1bde420f8
GuiBox.cpp:
...
- fix another bug: shaded boxes can have a specified width when there is an inner box
- code optimizations according to http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg160048.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34532 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-28 03:01:18 +00:00
Richard Heck
25e960b8fd
Thought I'd committed this. Anyway, missing from earlier commit.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34525 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-27 15:00:33 +00:00
Pavel Sanda
85d9812dcc
Move hints from designer to code
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34501 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-25 11:53:58 +00:00
Pavel Sanda
053b905e08
Add output_sync icon to view/update toolbar
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34499 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-25 11:36:02 +00:00
Pavel Sanda
9f9104d9c4
Introduce output_sync ui for forward/reverse search
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34498 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-25 11:36:00 +00:00
Richard Heck
cfce27108c
Output these params only when they are not default. (In the case of
...
html_latex_*, we'll put the default elsewhere.)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34492 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-24 19:38:14 +00:00
Richard Heck
b174e5616e
Simplify storage of html_latex_* info.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34491 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-24 19:34:43 +00:00
Peter Kümmel
07d0ccfdc7
remove explicit boost::ref call
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34489 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-24 15:21:17 +00:00
Peter Kümmel
52c51e5485
msvc10 work around: use complete std:numpunct<char> implementation otherwise it crashes
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34488 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-24 15:17:08 +00:00
Pavel Sanda
555df7e2a1
*doxy
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34487 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-24 13:38:15 +00:00
Uwe Stöhr
0176f8e04c
InsetBox.cpp: fix #4776 ; the additional \makebox is superfluous because \makebox and \framebox are equivalent, except that the latter draws a frame
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34472 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-23 18:13:23 +00:00
Uwe Stöhr
643803d0e2
GuiBox.cpp: fix #6721
...
Also for branch?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34471 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-23 16:36:06 +00:00
Pavel Sanda
d7b88d3f5b
Fix doxy generation
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34463 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-23 11:25:18 +00:00
Jürgen Spitzmüller
050d2f077d
* restore correct indendation.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34460 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-23 09:37:51 +00:00
Enrico Forestieri
604ed2571f
Fix bug #6712 : LyX 2 does not restore encoding after a text inset
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34456 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 22:42:32 +00:00
Uwe Stöhr
3d91ff0e40
BufferParams.cpp: fix #6714
...
OK also for branch?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34451 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 13:05:07 +00:00
Uwe Stöhr
edd8a321bf
InsetRef.h: fix #6711
...
Also OK for branch?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34450 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 02:01:47 +00:00
Uwe Stöhr
634a00c9db
Inset***.h: fix typo in comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34449 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 02:00:41 +00:00
Uwe Stöhr
106d31cd67
InsetMathHull.h: fix typo in comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34445 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-22 00:46:57 +00:00
Uwe Stöhr
326e228107
LyXRC.cpp: add new page sizes to known sizes, thanks JMarc
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34443 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-21 22:10:57 +00:00
Uwe Stöhr
8a8b59a68b
BufferParams.cpp: the default paper format of course don't require the geometry package; patch by Rob Oakes
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34442 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-21 01:33:50 +00:00
Uwe Stöhr
84bc1aa4b4
GuiDocument.cpp: code simplifications; thanks Vincent
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34436 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 21:08:06 +00:00
Enrico Forestieri
60860ba7e2
Fix bug #5247 : physical paper size settings are not honoured by pdflatex export
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34435 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 18:10:54 +00:00
Jean-Marc Lasgouttes
edc0ec3fab
fix bugs #6696 and #6697
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34434 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 13:59:59 +00:00
Pavel Sanda
e946282535
Comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34433 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 09:45:25 +00:00
Uwe Stöhr
665dac3f53
GuiDocument.cpp: remove superfluous comment
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34430 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 02:59:48 +00:00
Uwe Stöhr
0600e656f8
* GuiDocument:
...
- fix #6699 ; use_geometry now only means that the user don't want to have custom margins; that geometry also needs to be loaded for some paper formats is already done in BufferParams.cpp
- remove portraitChanged() because this was useless - A4 landscape is still A4 and still uses the default margins
* BufferParams.cpp: only output the margins if the option "Default margins" is not checked - this was a bug in the margins UI
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34429 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 02:56:36 +00:00
Uwe Stöhr
10dc64bd18
- paper.h: fix comment
...
- BufferParams.cpp: fix the default case
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34428 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 01:34:07 +00:00
Uwe Stöhr
700447301c
support for all page sizes that are supported by the geometry package; fileformat change
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34427 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-18 01:22:08 +00:00
Pavel Sanda
ffb189f0a9
Typo from Sven
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34425 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-17 20:56:12 +00:00
Pavel Sanda
7ee7b892d0
Coding style, thanks Abdel.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34417 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-17 08:15:04 +00:00
Pavel Sanda
7bc7f16c3c
Next attempt on correct newlines in Message pane
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34416 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-16 22:02:15 +00:00
Pavel Sanda
9488a18569
Keep the string in synchro with the code around
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34415 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-16 22:02:13 +00:00
Uwe Stöhr
1ef3692019
- BufferParams.cpp: change string to make it more clear (requested by Jean-Pierre)
...
- GuiView.cpp: fix grammar/logic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34406 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-15 02:58:23 +00:00
Pavel Sanda
27c79955e9
#6694 - reset line spacing to single if no custom size is defined
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34405 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-14 19:12:59 +00:00
Pavel Sanda
6996d40dc3
* doxy
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34401 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-11 12:00:59 +00:00
Vincent van Ravesteijn
ff129f2555
Fix crashes when the list of formts is empty.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34393 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-10 21:30:57 +00:00
Jean-Marc Lasgouttes
033c2a9468
fix warning
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34392 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-10 12:34:34 +00:00
Vincent van Ravesteijn
c6b08b9077
Fix bug #6686 : Navigate back does not trigger a repaint
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34391 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-10 11:02:45 +00:00
Enrico Forestieri
08f2841940
Fix reverse search when the filename contains a forbidden character
...
(including, but not only, spaces).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34390 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-08 23:53:35 +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
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
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
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
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
Enrico Forestieri
c88eaf877e
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
2010-04-27 21:31:28 +00:00
Enrico Forestieri
dbb5ac93ea
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
2010-04-27 19:23:31 +00:00
Enrico Forestieri
26ebe0865c
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
2010-04-27 18:46:42 +00:00