Commit Graph

19591 Commits

Author SHA1 Message Date
Pavel Sanda
29fc2f60be InsetInfo - on VCS error we don't want localized output in .tex output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38117 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 01:43:06 +00:00
Richard Heck
aff04ce265 Refine previous commit: Forgot the break.
Also, if we're "undefined", then we should just continue reading.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38116 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 01:01:24 +00:00
Richard Heck
2a39fbb430 Continuing fix of #7080. Since we now demand "Flex:Whatever" as the name
of a flex InsetLayout, let's check for it when we hit a LyXType tag, and
refuse to honor it unless we have the right sort of name.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38115 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 00:57:07 +00:00
Richard Heck
ebe6c9287f Fix bug #7080.
- Have InsetFlex::layoutName() report "Flex:" + the inset name.
- Do some layout2layout work so that user insets that do not have
  the "Flex:" prefix get it.

Note that this will break some CopyStyle stuff, but we do not have any
decent way to do that, so users will have to make that change for
themselves. I guess we should add that to the release notes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38112 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 23:11:54 +00:00
Richard Heck
2777c336cb This "#if 0" code is very old, and obsolete.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38110 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:34:41 +00:00
Richard Heck
3f27f951cb This is intended to be a pure renaming of the Inset::name() routine,
preparatory to fixing #7080. Note that mathed uses the same routine, but
for a completely different purpose, so I did not rename it there. I have
seen no difference in behavior after testing, e.g., opening and
exporting Math.lyx, and also re-saving it and looking at the diff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38109 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:33:04 +00:00
Pavel Sanda
9c9abe843f Push r38098 again in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38108 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 22:20:41 +00:00
Pavel Sanda
8a53cc7bea revert r38098
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38099 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 21:06:46 +00:00
Richard Heck
98e317ef1d Improve conversion error message.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38098 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 20:25:35 +00:00
Richard Heck
a72642a174 Remove obsolete layout tags.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38096 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 15:11:57 +00:00
Peter Kümmel
1bd35e75f7 just to be sure: don't know if other compilers mangle the access
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38093 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:10:40 +00:00
Peter Kümmel
2874889b9b fix msvc linker error: for the linker struct and class isn't the same here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38092 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 07:06:20 +00:00
Enrico Forestieri
ca15005193 Smash compiler warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38089 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-28 05:49:35 +00:00
Enrico Forestieri
b1c7450f73 Fix make check
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38088 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 23:47:58 +00:00
Pavel Sanda
59923085b9 * doxy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38079 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 22:50:19 +00:00
Enrico Forestieri
12baf18cfa Automatically set the normal icon size on restart if the the icon set changed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38076 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 19:07:09 +00:00
Enrico Forestieri
25fe275430 Replace raw newlines with the html entity "
" otherwise lyx_pot.py
won't collect these strings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38060 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-26 00:57:00 +00:00
Jürgen Spitzmüller
76ec475e87 * GuiPrefs.cpp: default means empty string.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38051 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 15:21:35 +00:00
Jürgen Spitzmüller
6e03eb57fa GuiPrefs.{cpp,h}: use text/data interface for icon set ui.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38049 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 15:14:52 +00:00
Enrico Forestieri
7a9250df6a Fix compiler warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38048 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 14:53:20 +00:00
Enrico Forestieri
36bf758ed9 Move to PrefUi the icon set choice and solve problem with translation
of icon set names.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38046 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 14:21:28 +00:00
Jürgen Spitzmüller
68beae862f * correctly handle childs with pdflatex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38044 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 10:11:02 +00:00
Enrico Forestieri
c6564028f0 Preferences for choosing the icon set to use. It works on the fly, but
the size of icons may be wrong when switching between sets with different
normal icon size. One needs to save the preferences, restart LyX and choose
"Normal-sized icons" from the toolbar menu to have the real normal size.
A minor glitch is that the name of the icon sets is translatable, but
currently only the translation for "Default" works. The problem is that I
don't know how to ask gettext for an inverse translation when saving the
preferences. Another possibility would be hardcoding the order of the names
in the combo box (such that to not rely on their names), but that is ugly
and prone to errors if/when other sets are added.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38041 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 05:01:06 +00:00
Enrico Forestieri
a99340cd10 Infrastructure for choosing different icon sets. This currently works
through the rc setting \icon_set. Preferences dialog will follow shortly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38038 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 01:59:34 +00:00
Georg Baum
5bf72d6dca support language variants like german (old spelling) or british english
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38029 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 19:40:54 +00:00
Julien Rioux
474f19876c handle 'literate' lyx child documents (lilypond and sweave)
- don't assume that the exported file extension is .tex
   - use converter tool chain to produce a latex file for input or include

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38025 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 15:47:40 +00:00
Stephan Witt
e6f46dd08c #7379 avoid the wrap spell check question when buffer is empty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38023 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 11:49:34 +00:00
Pavel Sanda
c664b63949 Better handling checksum on samba - allow fallback to ifstream.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38022 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 10:12:55 +00:00
Abdelrazak Younes
70c603a1b2 Cleanup the SpellChecker dialog (fixes #7375 and #7379):
* Transform Spellchecker.ui into a simple QWidget
* Pimpl all we can
* Remove progress bar
* Remove Close button (as for all other dock widgets)
* Allow the dialog to stay even for empty document
* Disable the dialog when closing all documents
* always work against the current document Bufferview (as opposed to embedded bufferview).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38018 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 23:10:12 +00:00
Georg Baum
dd23151da9 Fix part 1 of bug #7351
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38017 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 21:05:44 +00:00
Georg Baum
55ef7b50b5 First version of separate translation machinery for strings that go into
exported documents.
To update the translations from the .po files, run
make ../lib/layouttranslations
from po.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38016 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 19:17:15 +00:00
Vincent van Ravesteijn
4fcbb93e39 Do not give access to the actual data of the CoordCache. This prevents the use of the stored pointers which might be invalid.
See also r38011.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38012 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 17:43:13 +00:00
Vincent van Ravesteijn
f4767138de Fix bug #7376. After deleting an inset, we try to update the screen using the singlePar optimization. One of the consequences is that the coordcache is not refreshed. Therefore, it is possible that the pointers to the insets in the coordcache are invalid and we should not access inset->name().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38011 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 16:25:43 +00:00
Pavel Sanda
40ad67e5f1 comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38006 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 14:52:18 +00:00
Pavel Sanda
44c0b9d7da Fix samba related crashes
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg166543.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38003 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 14:28:23 +00:00
Jürgen Spitzmüller
a671dc5851 try to clarify a comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38002 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-23 14:15:46 +00:00
Enrico Forestieri
64bdffbac4 Let the icon set decide what the normal size is, but bound it to the
range between the hardcoded small and large sizes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38000 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-22 23:41:26 +00:00
Jean-Marc Lasgouttes
30d9ea948b whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37987 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-21 22:30:17 +00:00
Jean-Marc Lasgouttes
5b2b94fe95 Do not forget to save menu=export format flag to LyXRC.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37986 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-21 22:25:47 +00:00
Abdelrazak Younes
c0c7729a83 coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37977 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-20 15:44:40 +00:00
Georg Baum
85df237aff fix bug 7351 part 3: Do not count inline formulas for eqn number counter
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37976 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-20 12:12:08 +00:00
Jürgen Spitzmüller
729ac126be * LaTeXFeatures.cpp (getI18nPreamble):
addition to r37974: if English is used as a secondary language, we have to propose an English translation,
	since the original string is in the document's main language!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37975 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-20 11:39:02 +00:00
Jürgen Spitzmüller
a9878d52ed * LaTeXFeatures.cpp (getI18nPreamble):
- do not propose translations for bultin floats (they are translated anyway)
	- only propose translations for floats if we have something different to the English source

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37974 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-20 10:50:43 +00:00
Vincent van Ravesteijn
19263a634b Fix bug #7314: Workareas not redrawn. This is caused because the current_workarea doesn't get updated anymore while LyX is busy. However, when LyX stops being busy, the current workarea might have changed, and we are missing out on an update.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37969 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 19:20:42 +00:00
Vincent van Ravesteijn
c07bd1ab52 Fix bug #7261: Assertion when moving up
There are two possibilities to add an Inset to the CoordCache:
- 1), use CoordCache::add(Inset * p, int x, int y),
- 2), use CoordCache::add(Inset * p, Dimension dim).

In the latter case, the x and y are happily initialized as 0.
Also, when one call CoordCache::has(Inset * p), it will happily
return true because the cache knows something about this inset.

In #7261, LyX asked for the (x,y) position of an Inset and
received (0,0) as an answer, although that is not the position
of the Inset.

By adding some defaults for x,y in case of initializing with
dim only will give an extra check whether the cache really
"has" the position object.

In the long run, we might want to split the cache for
dimensions and positions.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37968 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 17:54:21 +00:00
Jürgen Spitzmüller
a360fcd220 whitespace only.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37967 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 17:52:00 +00:00
Jürgen Spitzmüller
900b896fdc * Menus.cpp: fix accelerator
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37966 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 16:16:49 +00:00
Vincent van Ravesteijn
75f45e3912 Add mnemonic.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37964 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 14:56:54 +00:00
Vincent van Ravesteijn
2b689dd834 Fix bug #7275: Overcrowding of context menus.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37963 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 14:55:32 +00:00
Vincent van Ravesteijn
49459f6fc4 Fix bug #7345: Crash when right clicking on displayed math with selection
Two things have been fixed here:
1) the selection should not be cleared when the user right clicks a math inset that is part of the selection,
2) the type of context menu should be determined at mouse-press, because that is the moment when the cursor is set. However, we should do it after setting the cursor, because setting the cursor might change the selection status and this influences the choice for the type of context menu.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37961 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 13:14:13 +00:00
Vincent van Ravesteijn
72ad0bdfbf Simplify logic in InsetRef::latex().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37960 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:37:24 +00:00
Vincent van Ravesteijn
eec88b7e5e Revert wrong previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37959 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:34:59 +00:00
Vincent van Ravesteijn
e52af5f897 Simplify logic in InsetRef::latex().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37958 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-19 10:31:43 +00:00
Georg Baum
d40c9f0548 Fix the reset buttom for the greyed out text color:
Reset to the default greyed out text color, not to the note background color


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37956 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 21:13:05 +00:00
Richard Heck
8eaed90043 Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37955 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 18:56:05 +00:00
Enrico Forestieri
397c03b433 Fix bug #7361 (Assertion when a latex error occurs in the first (empty) paragraph)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37954 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 17:26:17 +00:00
Jürgen Spitzmüller
d999c98bad * GuiPrefs.cpp: no need to exclude greyedouttext and shaded colors from prefs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37952 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 15:12:03 +00:00
Jürgen Spitzmüller
45b6349139 * GuiDocument.cpp: do not hardcode colors that can be redefined in prefs..
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37949 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 14:40:38 +00:00
Jürgen Spitzmüller
b7ac0ee143 * GuiDocument.cpp: make strings translatable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37948 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 14:11:36 +00:00
Stephan Witt
291c5c91ec #7357 correct the numbers by introducing two modes of word count
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37947 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 12:50:09 +00:00
Jürgen Spitzmüller
85f486f259 * InsetSpecialChar.cpp:
make NOBREAKDASH isLetter()

* Paragraph.cpp (isWord separator):
	handle composites with hyphens as one word (i.e., "-" is not a word separator).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37946 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 09:17:09 +00:00
Richard Heck
2ae247285c Initialize variable. Possibly related to Jurgen's weird crashes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37945 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 01:28:52 +00:00
Tommaso Cucinotta
62411b7c0f Fixes a weird bug found while playing with #7363.
Indeed, unchecking ignore format in that scenario was not matching anyway while searching.
This patch fixes that behavior.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37943 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-18 00:47:42 +00:00
Stephan Witt
0afeabb969 #7357 avoid an endless loop in countWords() when the "to" position is inside skipped text (e. g. note inset)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37940 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-16 17:58:27 +00:00
Stephan Witt
07ef381914 correct shift of spell results when erasing the last character in range
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37939 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-16 13:54:36 +00:00
Edwin Leuven
571b779b23 fitcursor in r37929 was not enough for side scrolling tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37938 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 18:43:09 +00:00
Jürgen Spitzmüller
101cabc355 thinko.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37936 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 13:36:48 +00:00
Jürgen Spitzmüller
266399ef83 typos in comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37935 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 13:27:08 +00:00
Jürgen Spitzmüller
ff829bd92b Follow-up to r37932: We do not need a skipOnSearch variable, since we know the conditions anyway.
Thanks, JMarc,

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37934 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 13:19:55 +00:00
Jürgen Spitzmüller
ee6e5b784d * Inset.h: try to clarify isLetter() and isChar() a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37933 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 11:26:14 +00:00
Jürgen Spitzmüller
8fa96ceec8 Do not hardcode specific insets, but use a variable instead.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37932 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 10:46:14 +00:00
Stephan Witt
5866504aba #7350 more checks to validate the DocIterator before calling locateWord() in checkNewWordPosition()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37931 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 10:27:41 +00:00
Edwin Leuven
9d4678b663 update when cursor leaves screen while navigating large tables using the arrows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37929 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-15 08:54:46 +00:00
Peter Kümmel
6a6706ca67 add link about msvc10 bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37927 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-14 23:26:55 +00:00
Pavel Sanda
ed38744b09 Add unused string into tooltip
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37923 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 23:14:12 +00:00
Pavel Sanda
d83c44d0f2 Resave in older designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37922 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 23:14:11 +00:00
Vincent van Ravesteijn
6cb775b134 *rowpainter.cpp: Squeeze warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37919 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 21:06:16 +00:00
Richard Heck
69ab57ab89 What is output as \eqref under prettyref needs to be handled differently
under refstyle, since (a) the default refstyle.cfg defines \eqref itself
and (b) does NOT define it the way AMS does. So we simply output:
	(\ref{label})
in this case, to match what we say in the UI.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37918 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 20:29:52 +00:00
Abdelrazak Younes
c9e4d86b4c Temporally fix #7321 until a better solution is found. The auto scrolling is very bad but at least it does not crash nor assert.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37916 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 16:41:47 +00:00
Abdelrazak Younes
8d06c1ebda TextMetrics::editXY(): don't continue executing code when asserting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37915 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 16:38:36 +00:00
Abdelrazak Younes
076151f508 Trying to fix #7321: add some assertions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37914 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 16:26:57 +00:00
Abdelrazak Younes
00a10facd2 Trying to fix #7321: SyntheticMouseEvent() only works within text.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37913 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 16:26:03 +00:00
Jürgen Spitzmüller
82eee13e42 * LyXRC.cpp: fix typo. although these strings are not used at all.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37910 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 12:06:54 +00:00
Jürgen Spitzmüller
34651dfd6b * LaTeX.cpp: fix another variant of bug #7344 (delete aux files and rerun LaTeX if hyperref has been toggled)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37909 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-13 11:57:01 +00:00
Vincent van Ravesteijn
aed9e6c3f1 Fix bug #7352: Statusbar of Compare dialog is wrongly placed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37904 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-12 17:02:03 +00:00
Enrico Forestieri
6d425078a7 When an error occurs, don't highlight more than necessary.
Currently, if an inset outputs a newline, the new latex row is still
associated with a previous id/pos. Now, if a latex error occurs before
this newline, we would still highlight everything associated to that
id/pos, even if it is extraneous to the error.
This is avoided by associating the new latex row with the id/pos in
effect right before entering the inset. If an inset does not output
a newline, it is not excluded from the selection, consistent with the
fact that the text of the inset does appear in the error description.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37903 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-12 01:40:01 +00:00
Stephan Witt
ad1dc2fd6b now the user has control over the width of the text cursor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37901 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-11 06:11:55 +00:00
Enrico Forestieri
c4d1c0943b When an error occurs inside an inset, the content rather than the inset
as a whole gets highlighted. Now, the error list carries information
about the starting id/pos and ending pos, but not about the ending id.
So, when computing the range to be highlighted as range = pos_end - pos_start,
if id_start != id_end, the result 1 means one inset and only the first
character in the inset would be highlighted. Thus, when id_start != id_end,
let pos_end = 0, such that the whole content will be highlighted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37900 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-10 22:11:34 +00:00
Stephan Witt
6118beae8d better fix for regression introduced by r37463: crash when dissolving an inset. then the saved cursor slices of new_word_ are out of sync, add a check for count of nested insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37899 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-10 20:15:34 +00:00
Enrico Forestieri
32ea651007 Revert r37801 and r37870. They are superseded by r37894.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37895 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-10 04:10:21 +00:00
Enrico Forestieri
732212f233 Make sure to associate each line of the exported latex code to the id/pos
of the first call of TexRow::start(), rather than the last before a newline.
This is what was causing some recent grief (bug #7325, for example).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37894 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-10 04:05:49 +00:00
Stephan Witt
c530a2d1a2 avoid the automatic word selection for language change when at the word boundaries, this will stop the automatic selection for words with length of one character
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37886 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-09 14:15:34 +00:00
Jürgen Spitzmüller
cf6c0c8192 * Inset.h: fix typo in comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37885 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 16:12:35 +00:00
Stephan Witt
1c58de4cc7 #7266 drawing of dotted lines with QPen and line width of 0.5 does not work well - restore line width 0 for thin line
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37884 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 15:35:24 +00:00
Jürgen Spitzmüller
427b8e3f97 * LaTeX.cpp: fix bug #7344 (delete aux files and rerun LaTeX if hyperref has been toggled)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37883 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 15:14:13 +00:00
Jean-Marc Lasgouttes
53e8746b47 In the case of non-null paragraph separation, replace the hardcoded test for ERT and LISTINGS insets by proper check for newLineIsParBreak.
This fixes the display of sweave Chunks in sweave.lyx example, which uses parskip instead of indent.

The rest of the changes are just white space


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37881 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 14:41:01 +00:00
Jürgen Spitzmüller
d3d4d31880 PDFOptions.cpp: correct fix for bug #7048.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37880 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 13:15:26 +00:00
Jürgen Spitzmüller
0bb6e39ef1 PDFOptions.cpp: whitespace only.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37879 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-08 13:00:48 +00:00
Enrico Forestieri
d5f56e67e0 Each line of the exported latex code is associated to a particular par.id()
of a lyx document. What par.id() is associated to the line depends on the
last call of TexRow::start() before a newline is actually issued.
If the par.id() of an ert is the one associated to the exported line,
when an error occurs, that ert is always returned by Buffer::getParFromID()
(and thus would be highlighted) whether the error actually occurred there
or elsewhere in the same paragraph.
So, better highlighting the whole paragraph when the error seems to have
occurred in ert.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37870 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-07 20:15:04 +00:00
Enrico Forestieri
c0437db8e9 Fix bug #7343 (No warning for missing child documents)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37869 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-07 14:36:22 +00:00
Pavel Sanda
02dbb905ee Fix bug #7338
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37866 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-07 00:37:26 +00:00
Tommaso Cucinotta
e1d4a68904 Commit r37853 was missing FindAndReplace.h.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37860 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-05 16:06:54 +00:00
Peter Kümmel
b1d043e915 compile. TODO: review default parameter for replace_all
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37859 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-05 13:45:39 +00:00
Tommaso Cucinotta
a17d3460f6 Implements functionality of the replaceAll button on Advanced F&R.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37853 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 22:19:19 +00:00
Tommaso Cucinotta
aa431bf8bf Fix bug when retrieving allRelatives() of a buffer (when invoked from a
child, the returned list had no master and twice the child itself).
(was causing misbehavior in Advanced Find & Replace with scope=Document).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37852 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 22:14:52 +00:00
Enrico Forestieri
299745b635 Force a paragraph update after lyxserver communication (part of bug #6871)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37851 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 21:57:42 +00:00
Pavel Sanda
f8d1586364 Glitch with new line breaking from Qt.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37847 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 18:30:40 +00:00
Enrico Forestieri
655a99f8c2 As improbable as it may be, an error could occur in both master and child
at the same line. Given that we know where the error occurred, don't
unnecessarily check the master first.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37846 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 13:52:01 +00:00
Enrico Forestieri
2e18f6a671 Fix bug #7331 (No error highlighting in child documents)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37845 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 13:37:14 +00:00
Enrico Forestieri
33d853d1aa Fix bug #7330 (No error notification with 'View master document')
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37843 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-03 16:00:40 +00:00
Enrico Forestieri
b8cdbc7be8 Partial fix for bug #7330 (No error notification with 'View master document')
With this patch, the bug is fixed when export-in-thread is disabled.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37842 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-03 13:57:46 +00:00
Pavel Sanda
78e483710d * doxy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37841 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-03 12:15:35 +00:00
Pavel Sanda
e15d8a850f FloatPlacementUi was broken elsewhere.
At document prefs there was undeleted first empty line.
This was due to the spacer which has no visibility property.
However, removing spacer breaks alignment in float dialog
so we need to set up stretch of combo box to full width.

I have no better idea.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37838 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 23:15:04 +00:00
Pavel Sanda
c0a426ee7d Resave FloatPlacementUi.ui in older designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37837 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 23:15:02 +00:00
Pavel Sanda
ac105fadc1 Current float settings dialog is really ugly.
This makes it little bit more narrow, bit it still remains ugly.
Hopefully other dialogs are not worse (tried some;)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37836 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 22:38:33 +00:00
Pavel Sanda
19838cea26 Add tooltips for InsetParamsUi buttons. I guess some users will
be little bit shocked what are all these buttons and checkboxes about...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37835 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 22:38:32 +00:00
Pavel Sanda
8aaf3593f6 Resave InsetParamsUi.ui in older dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37834 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 22:38:30 +00:00
Peter Kümmel
4620034eda Fix crash when using msvc10's regex, seems boost's regex couldn't replaced by msvc's in ECMAScrip mode.
Solution: use boost also for msvc10

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37832 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 21:28:36 +00:00
Jean-Marc Lasgouttes
d2720fa200 In InsetText::fixParagraphsFont, differentiate the case of pass thru paragraphs for which fonts should be reset, and paragraph that disable paragraph customization. In the later case, only paragraph parameters are reset.
This improves the fix in r37328 and allows centered sweave chunks, for example (although this does not work yet for other reasons)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37831 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 14:43:50 +00:00
Pavel Sanda
f098abd832 Make colors pane consistent with others
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37830 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 10:27:51 +00:00
Pavel Sanda
e40e402170 Resave ColorUi in older designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37829 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 10:27:50 +00:00
Pavel Sanda
4d8d962a62 Fix ugly resize on second dialog show.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37828 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 10:10:30 +00:00
Pavel Sanda
95f5ab04eb Resave PrefFileformatsUi.ui in older designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37827 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 10:10:28 +00:00
Enrico Forestieri
55dccca79f Qt performs its own formatting to assure a maximum line length of the
descriptive text in alerts. Thus, doing it by ourselves is both unnecessary
and counterproductive.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37825 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 00:26:34 +00:00
Pavel Sanda
e16f7142e3 * doxy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37822 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 23:49:42 +00:00
Pavel Sanda
76c588d532 Fix #7311. And all my fun is gone...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37820 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 23:49:39 +00:00
Pavel Sanda
d2873b4bc6 Add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37819 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 22:21:03 +00:00
Peter Kümmel
ca3395ec88 #7163: don't delete objects which a thread needs later on
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37818 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 19:39:47 +00:00
Jürgen Spitzmüller
5f96251222 * GuiPrefs.cpp: fix forward search command for Okular
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37817 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 12:42:14 +00:00
Enrico Forestieri
25e98edd00 Please Abdel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37802 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 15:45:53 +00:00
Enrico Forestieri
2761cd67bb Fix bug #7325 (ASSERTION when moving paragraph down in info inset)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37801 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 15:35:29 +00:00
Enrico Forestieri
a079d95038 Initializing the gui_ member of the cloned buffer has strange side effects
with Qt/X11 (obscure X errors). Better avoiding it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37797 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 03:39:43 +00:00
Enrico Forestieri
2969cb53e2 Fix bug #7324 (Latex export silently fails with uncodable characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37796 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 01:50:13 +00:00
Enrico Forestieri
a889fd0438 Fix #7326 (Latex export of child docs silently fails with uncodable characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37795 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-28 01:14:19 +00:00
Enrico Forestieri
7edf2691ae Fix bug #7310 (Greek symbols inside ERT cause unreported compile failure)
Note that View->Source now shows that a character cannot be encoded.
However, the error is still unreported due to bug #7324.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37791 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-27 12:16:17 +00:00
Stephan Witt
f6e7fbefce #6920 paint single characters only when Qt4.7 or better, otherwise automatic kerning breaks cursor positioning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37781 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-24 21:38:12 +00:00
Enrico Forestieri
f8446ecd41 Improve comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37780 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-24 02:01:31 +00:00
Enrico Forestieri
3891b7ae06 If a paragraph has zero size, highlight the previous one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37779 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-24 01:31:20 +00:00
Peter Kümmel
4397faba8f fix wrong preprocessor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37778 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-23 21:06:15 +00:00
Stephan Witt
e9d943aeb8 #7292 make the modifiers Option and Control act on there own on mac - adjust the key bindings to apple standards where possible
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37770 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-23 14:30:41 +00:00
Georg Baum
f176a18434 Fix bug #6919 by splitting Inset::noFontChange() into inheritFont() and
resetFontEdit(). The former is used for on-screen and export formatting,
and the latter is used for interactive editing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37761 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-22 19:41:04 +00:00
Enrico Forestieri
bdf4a016f7 Increase normal toolbar icon size to 16x16 pixels, as this seems uncontroversial
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37755 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-22 00:40:47 +00:00
Enrico Forestieri
9866d2a097 Compile fix for those systems where pos_type is not typedef'd to int.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37751 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-21 16:08:02 +00:00
Enrico Forestieri
624f725acb Fix bug #7316 (Crash editing commands in math mode)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37750 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-21 15:26:28 +00:00
Enrico Forestieri
a6ed69049d If the latex log points to an error at the end of a paragraph, we highlight
the last thing in the paragraph (an inset, generally), as the end of
paragraph cannot be highlighted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37749 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-21 10:27:50 +00:00
Stephan Witt
587337ae5e use unique LyX language name for map to apple spell checker language
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37747 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-21 06:22:37 +00:00
Georg Baum
a750126b54 prevent endless loop
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37744 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 18:57:13 +00:00
Stephan Witt
aedbdb6ce4 native spell checker of Mac OSX Tiger does not support language enumerate - assume true to get some spell check going
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37743 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 18:28:12 +00:00
Stephan Witt
269450b2e0 make it compilable for Mac OSX Tiger (again)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37738 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 11:12:35 +00:00
Stephan Witt
66d0d61b0c #7299 correct Buffer::saveCheckSum() method for new created files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37737 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-20 10:53:07 +00:00