Commit Graph

15976 Commits

Author SHA1 Message Date
Uwe Stöhr
a165cec754 GuiTabular.cpp: correct a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30407 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 19:24:07 +00:00
Richard Heck
3a41879cb4 Add and update some comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30405 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 15:29:33 +00:00
Richard Heck
44763a6f0f Move LFUN_TAB* handling from InsetListings to InsetCollapsable, so that
the tabkeys works as such whenever PassThru is true.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30404 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 13:25:43 +00:00
Jürgen Spitzmüller
cf7a54d6ea * NomenclUi.ui: fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30402 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 12:24:23 +00:00
Uwe Stöhr
c5208a21ec NomenclUi.ui: fix #3936 also for the description field of the nomenclature dialog as reported in #6054
OK for branch too?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30401 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 12:06:15 +00:00
Jean-Marc Lasgouttes
73f9991eec Fix #6013: SIGABRT if we spell check inside a math macro, and then hit replace
This is just a matter of checking that we are in an insettext before calling 
replaceSelectionWithString. I guess there are other good ways to fix the crash.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30399 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 10:50:27 +00:00
Vincent van Ravesteijn
1c6eea89b4 Fix previous commit for macros with arguments, again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30398 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:23:31 +00:00
Vincent van Ravesteijn
ebe7913a47 Only allow the cursor to be in lastpos for macros as editing in macro-mode is only possible at lastpos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30396 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:16:21 +00:00
Vincent van Ravesteijn
ebe9b42279 Fix crash when selecting part of a macro and trying to resume macro-mode editing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30395 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:13:07 +00:00
Jürgen Spitzmüller
bca1c1b92b * PreambleUi.ui:
- fix bug #3936: Paste into preamble gives wrong font size.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30394 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:12:28 +00:00
Vincent van Ravesteijn
abdb069f9e Remove unneeded check for cur.pos() > 0.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30393 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:12:08 +00:00
Vincent van Ravesteijn
fb57c00c0d Fix bug #6015: Macro with arguments is not finished when pressing space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30392 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 08:08:14 +00:00
Vincent van Ravesteijn
5b888f0bc9 Wrong casing...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30391 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-06 22:14:47 +00:00
Vincent van Ravesteijn
e02afb345a Fix bug #4509: Default focus of SearchUi should be "Find Next".
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30390 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-06 22:11:05 +00:00
Jean-Marc Lasgouttes
5784b88f65 Patch from Ben M.: do not accept key events if we do not know what these keys
stand for.

This fixes bug #6043: Windows multimedia keys intercepted



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30389 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-06 16:14:20 +00:00
Enrico Forestieri
14c5adf034 Better fix for #6049 and similar cases with other math insets.
In order to fix #6047, I needed a further mode other than MATH_MODE
and TEXT_MODE. In this mode, LyX should have behaved as in TEXT_MODE
but should also have allowed math mode commands. Well, this mode was
already implemented in LyX as UNDECIDED_MODE. Currently, this mode is
used nowhere except in the strange case where a math hull is not
present. It cannot be created by any other mean than editing a .lyx
file and getting rid of the $...$ math delimiters. This kind of
file can be reloaded in LyX and you would see a strange math formula
in text mode outside of mathed. Of course, trying to latex this file
would cause errors. After this commit, this strange mode is still
possible, but now all math insets correctly declare that their mode
is math mode (instead of undecided, and unless they state otherwise)
and bugs such as #6049 are fixed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30385 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-06 00:48:07 +00:00
Enrico Forestieri
e8ecb8b483 Fix bug #6049: Mathed: spacebar misbehavior while typing fractions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30384 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 23:50:16 +00:00
Jean-Marc Lasgouttes
5ba54be043 unused #includes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30373 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 13:58:25 +00:00
Enrico Forestieri
d178fabe24 Refinements to fix for bug #6041.
- Fix display of centered vertical alignment status.
- Avid else branch and simply return early (conforms to the used style).
- Smash unnecessary debug output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30372 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 13:36:34 +00:00
Jürgen Spitzmüller
668b4d8fc1 * LyX.cpp: add missing line break; spotted by Jean-Pierre Chrétien.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30367 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 08:37:44 +00:00
Jürgen Spitzmüller
56a7e127ad * InsetInclude.cpp: typo spotted by Jean-Pierre Chrétien.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30366 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 08:34:55 +00:00
Enrico Forestieri
0b219d2541 Fix bug #6041: "tabular-feature align-" in a math-matrix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30363 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 00:24:17 +00:00
Abdelrazak Younes
b8e5440bef LFUN_WORD_REPLACE: Invert replacement and searched strings in the FuncRequest argument. This is to allow replacement of current word even if it is not selected.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30360 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-04 23:02:27 +00:00
Abdelrazak Younes
b8c470d55f Spellchecker Bug fix: found word was not filled in.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30351 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-04 18:00:01 +00:00
Abdelrazak Younes
c95f44b0b1 GuiSpellchecker: add 'Find Next' and 'Replace All' buttons.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30350 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-04 17:15:27 +00:00
Enrico Forestieri
0a90c42b86 Fix bugs #6047, #4043, and #5394.
6047: Lyx 1.6.3 unable to typeset the third chemical equation of the
      file mhchem.lyx (package mhchem)
4043: mhchem support
5394: support for the mhchems's \ce command
The \ce and \cf insets are text mode environments that allow entering
spaces and mathmode commands. LyX leaves them alone and doesn't try to
be smart, i.e., the behaviour is exactly the same we had in the old days
with text-in-math mode environments, before the introduction of the
\ensuremath and \lyxmathsym macros. This means that in those environments
one has to know what he is doing, as LyX will not offer any protection.
The hack of enclosing \ce and \cf in a \text{} environment in order to
be able to enter spaces is no longer necessary.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30338 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-03 00:05:58 +00:00
Jürgen Spitzmüller
7664ae5347 * PrefLanguageUi.ui: correct tooltip.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30329 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-01 08:26:06 +00:00
Pavel Sanda
f5df95c8b6 Make Vincent happy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30326 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-30 18:33:33 +00:00
Jürgen Spitzmüller
7720592b2d * GuiApplication.cpp (readUiFiles):
- only reset settings if a file with Toolbars has changed. This should significantly decrease
	  the number of circumstances where the settings are lost unnecessarily.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30317 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-30 11:00:16 +00:00
Vincent van Ravesteijn
c4feab5f13 Cosmetics, squeeze some warnings, remove unused code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30310 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-30 00:10:55 +00:00
Vincent van Ravesteijn
c0ac23512e Cosmetics and constify.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30309 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-29 23:43:23 +00:00
Jean-Marc Lasgouttes
4594b1425b add onoff support for "inset-modify changetype xxx" in include inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30305 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-29 12:41:43 +00:00
Jürgen Spitzmüller
2efcbb74d6 * do not change name of QSettings config file on LyX version change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30301 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-29 08:44:32 +00:00
Pavel Sanda
4c15e3fb55 Squash warn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30294 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 22:12:16 +00:00
Pavel Sanda
0bde349a04 Capitalize
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30293 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 22:02:47 +00:00
Pavel Sanda
336164a9ce typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30292 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 21:53:31 +00:00
Pavel Sanda
ee863456a1 Save translators work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30284 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 11:14:27 +00:00
Pavel Sanda
8a5b5b2e35 Keep numbering
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30281 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 10:37:34 +00:00
Jürgen Spitzmüller
3a16b6dbf7 Implement LFUN_OUTLINE_DRAGMOVE.
Contribution by Rob Oakes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30278 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 08:40:34 +00:00
Pavel Sanda
5fdfa59131 Cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30270 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-26 12:40:08 +00:00
Pavel Sanda
db18ee7c8c Set it in both cases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30269 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-26 12:40:07 +00:00
Pavel Sanda
7d2331fc17 Shouldn't be needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30267 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-26 12:30:22 +00:00
Pavel Sanda
b627182bb4 Move to tristate version of locking property
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30265 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-26 12:25:51 +00:00
Pavel Sanda
7355a53a73 Guify setting of svn locking property
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30255 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-25 14:48:11 +00:00
Enrico Forestieri
5415144621 Fix bug #6033: Initial character sometimes eaten by math-insert
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30246 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 18:01:31 +00:00
Jean-Marc Lasgouttes
042c5bf425 Fix bug http://www.lyx.org/trac/ticket/6026
LyX crashes when backward selecting during formula writing

The problem is basically that the anchor is not set (because there is no
selection going on) and BufferView::mouseSetCursor does not handle this.

 * Cursor.cpp (anchor): return immediately when there is no selection.

 * BufferView.cpp (mouseSetCursor): reset anchor before setting cursor



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30245 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 14:54:35 +00:00
Jean-Marc Lasgouttes
7e5bdec673 fix assertion when inserting math inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30244 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 14:47:29 +00:00
Jean-Marc Lasgouttes
01b290e2dd Fix part of bug http://www.lyx.org/trac/ticket/2566
We use Inset::producesOutput to skip things like notes and inactive
branches.

	* buffer_funcs.cpp (countWords): align code style with countChars;
	skip insets for which producesOutput() is false.
	(countChars): honor Inset::producesOutput.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30242 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 09:46:48 +00:00
Abdelrazak Younes
8a421dcd37 Really spellcheck continuously.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30241 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 09:17:39 +00:00
Abdelrazak Younes
5d40a42f60 Paragraph::collectWords() and MenuDefinition::expandSpellingSuggestions(): reuse Paragraph::spellCheck().
Paragraph::collectWords() now also collects spellchecker suggested words for inline word completion.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30240 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 08:54:21 +00:00
Pavel Sanda
ae9bcc7760 Fix of fix of fix of fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30239 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-23 08:20:10 +00:00
Abdelrazak Younes
e8d462799c Proper fix for the warning that Pavel noticed. The problem was that the local variable d shadowed the private d one.
And I of course also put back the semi-colon fix.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30233 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 22:08:04 +00:00
Abdelrazak Younes
369b0714d6 Crash fix: end of doc check was wrong following previous cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30232 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:49:48 +00:00
Abdelrazak Younes
5e01b2dfa1 Buffer::Spellcheck(): Fix infinite loop when a math inset is met... stupid me!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30231 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:43:39 +00:00
Abdelrazak Younes
2f4f246512 A word have a non zero size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30230 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:27:51 +00:00
Abdelrazak Younes
76aaecb221 MSVC: Add safety checks.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30229 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:06:25 +00:00
Pavel Sanda
f9621a5255 http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg152311.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30228 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:06:00 +00:00
Abdelrazak Younes
5b2ba34ac6 Buffer::spellCheck(): don't spellcheck math.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30227 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 21:00:48 +00:00
Abdelrazak Younes
d9ce39844f Fix MSVC crash.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30226 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 20:59:56 +00:00
Abdelrazak Younes
14864ab16a Bug fix?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30225 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 20:16:08 +00:00
Abdelrazak Younes
59cd6fd17c Spellchecker: Fix ignore button.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30224 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 17:40:09 +00:00
Abdelrazak Younes
c75fb1f6e0 First fix the spellchecker. Now, it find the next misspellec word.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30223 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 17:30:57 +00:00
Abdelrazak Younes
694399b16c Simplify Buffer::spellCheck() by using Paragraph::spellCheck().
Paragrah::isMisspelled() is split in two.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30222 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 16:38:11 +00:00
Enrico Forestieri
d4f00122eb Fix bug #6020: Reverse DVI/PDF search fails with child documents.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30214 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-22 05:09:01 +00:00
Enrico Forestieri
e31e71a7a9 Fix bug #6030: LyX does not take into account BOM in user layout files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30213 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 18:23:10 +00:00
Abdelrazak Younes
f4f5178d4f Revert previous to this file, stupid copy&paste bug fix, sorry.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30212 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 14:33:13 +00:00
Abdelrazak Younes
5387379c24 Introduce Paragraph::isWordSeparator() and use it instead of Paragraph::isLetter(). Note here a change in behavior WRT to word selection: a deleted character is not considered a word separator. This new behavior will impact word finding and spellchecking.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30211 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 14:30:57 +00:00
Abdelrazak Younes
7a4668b25e Paragraph::isLetter(): Fix word selection in ERT. The check had nothing to do with spellchecking. This method is misnamed, it should perhaps be renamed to 'canBePartOfWord()'.
NB: I am not sure this escape character preference is something useful to keep. If some language has some special escape characters beside the single quote one we should support that out of the box and not asking the user to define it or them in the preference dialog.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30210 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 13:43:34 +00:00
Jürgen Spitzmüller
5a54d11157 * Pop up error dialog if issuing master-buffer-[view|update] and errors occured.
Navigating in such dialogs does not work yet, but at least the user is informed
  at all that LaTeX wasn't succesful.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30209 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 12:26:41 +00:00
Jürgen Spitzmüller
9388e76dc0 * Buffer.cpp:
- make LaTeX logfile dialog work for child documents and master-buffer-[view|update]:
	  if there's only a master file log or if the master file log is newer, it is displayed.
* Buffer.h: typo.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30206 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-21 09:44:10 +00:00
Jürgen Spitzmüller
5f7c6b8964 * LaTeX.cpp (deplog):
- fix regex so that rexeg_search finds more than one match in a line.
	  This fixes a bug where files which were output in the log file in a 
	  line which already listed another file were not dependency tracked.
	  I.e., cases such as
	  (./child1.tex) (./child2.tex)
	  (bug 6024).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30198 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-20 13:02:12 +00:00
Richard Heck
83a89711b0 Fix captions, in accord with observations by Abdel and JMarc.
Note that we will sometimes use the "caption trick", still in 
listings, for example.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30194 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 18:32:50 +00:00
Richard Heck
1ef0168dd4 Not sure how that happened.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30193 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 17:51:17 +00:00
Jean-Marc Lasgouttes
2eaac90ca5 fix output of abnormally short lines in .lyx files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30192 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 15:32:51 +00:00
Richard Heck
16f119cab5 XHTML output for InsetInclude.
Here's the deal:
* With verbatim, we include it verbatim. This would allow the inclusion of 
  other HTML files.
* With listings, we include it verbatim, wrapped in <pre>.
* With Input and Include, we check if it's a LyX file. If not, we don't do
  anything, since we don't know how to include (say) a TeX file in the HTML
  output. (Wanna call tex4ht, anyone?) If it is a LyX file, we let it write
  itself as HTML, and include it.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30191 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 15:11:33 +00:00
Richard Heck
1898db6aca Fix warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30190 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:42:16 +00:00
Richard Heck
25bc89f2a8 Clean up a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30189 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:21:43 +00:00
Richard Heck
cb9b7406b0 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30188 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:10:41 +00:00
Richard Heck
3b707bc0ed Polish some of the recent changes in accord with suggestions
of JMarc's.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30186 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:50:19 +00:00
Richard Heck
51d4d42906 XHTML output for InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30185 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:37:14 +00:00
Richard Heck
33c6656769 Move these, too, so they can be used in InsetListings, and maybe
even elsewhere.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30184 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:16:27 +00:00
Richard Heck
3579d53108 Move getCaptionInset() to InsetCollapsable, so it can be used in InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30182 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:12:02 +00:00
Richard Heck
4ad536375f XHTML output for floats and captions.
NOTE: Again, I'm not increasing the layout format, though I have added
a couple new things here. If anyone thinks I really do need to do that,
then I will. But I don't think it's necessary, as no-one ought to be using
this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30178 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 12:49:08 +00:00
Richard Heck
dd11fc928f Factor out some code for later use (and to remove duplication).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30177 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 12:18:38 +00:00
Uwe Stöhr
c4675cc4be tex2lyx/preamble.cpp: support for fileformat 264 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30173 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:37:05 +00:00
Uwe Stöhr
6b85e6f99f tex2lyx/preamble.cpp: support for fileformat 263: support for the document languages Brazilian and Portuguese
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30172 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:28:20 +00:00
Uwe Stöhr
e06029fda5 tex2lyx/preamble.cpp: support for fileformat 262 (nothing to do for tex2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30171 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:10:18 +00:00
Uwe Stöhr
1b16d1545b tex2lyx/preamble.cpp: comment out no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30169 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 00:00:46 +00:00
Uwe Stöhr
0aa4d9d25e tex2lyx/preamble.cpp: remove no longer used code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30166 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:41:55 +00:00
Uwe Stöhr
1bcba82d8d tex2lyx/preamble.cpp: fix a bug reported by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30165 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 23:35:49 +00:00
Richard Heck
4a86c407d9 Disable XHTML output for InsetExternal---for the time being.
As said in the comment, someone who knows what these are supposed
to do should have a look, please. It may be very easy to get these
to work, but I don't know.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30164 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 20:44:38 +00:00
Georg Baum
9c662bf442 - fix requirements of \dddot
- add support for \ddddot
- add partial support for inverse diagonal dots (i. e. they are recognized and
  displayed correctly, but the needed package is not loaded, because it would
  need an off/auto/on setting as amsmath, and that calls for a general solution)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30162 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 20:04:27 +00:00
Jean-Marc Lasgouttes
dae70977a0 get rid of the \use_escape_chars pref, which was not used
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30161 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 15:53:49 +00:00
Jean-Marc Lasgouttes
889fdbd39b get rid of the \use_alt_language pref, which was not used. Instead, we test whether \alt_language is empty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30159 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 15:31:43 +00:00
Jean-Marc Lasgouttes
9cd55dbe5c fix reading of obsolete prefs (the argument never got discarded)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30158 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 15:04:55 +00:00
Jean-Marc Lasgouttes
539fa60a80 fix a few compilation warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30157 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 14:28:13 +00:00
Jean-Marc Lasgouttes
c676b24359 prefs \use_personal_dictionary and \personal_dictionary are not used anymore (ispell only)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30156 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 13:30:28 +00:00
Jean-Marc Lasgouttes
6b92b1c6ae pref \use_input_encoding is not used anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30155 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 10:56:33 +00:00
Jürgen Spitzmüller
0898e385a7 * LogUi.ui: cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30154 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 10:20:20 +00:00
Jürgen Spitzmüller
8e109a4153 * GuiLog.{cpp,h}:
* LogUi.ui:
	- add some basic navigation facilities.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30153 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 09:35:51 +00:00
Jürgen Spitzmüller
a842957959 * Paragraph.cpp:
- we do not output alignment begin for the default alignment,
	  so we must not output the end tag (bug 5995)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30151 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 06:52:38 +00:00
Enrico Forestieri
4559c29eeb Reintroduce workaround due to nested math hulls as it is not
guaranteed that LyX is always able to replace $...$ constructs
with \ensuremath{...}.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30145 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-16 21:22:32 +00:00
Pavel Sanda
a45c849f3b Refactorize GuiView::showView.
This way we get rid of pop-uping of widgets when ~/.config/LyX is re-created
and yet we still have title and enabling status correct when widgets are
restored from session.
Some details in bug #5082.

This is candidate for branch too.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30144 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-16 17:22:43 +00:00
Pavel Sanda
65f641ac1d Better fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30143 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-16 14:33:29 +00:00
Pavel Sanda
bb9721cbd1 Not needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30142 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-16 14:29:20 +00:00
Jürgen Spitzmüller
934308286d * Paragraph.cpp:
- do not embrace list items. According to the comment, 
	  this was only done to escape brackets, but brackets
	  are embraced anyway.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30112 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 15:57:54 +00:00
Pavel Sanda
9e9fdd57c3 Fix crash http://www.lyx.org/trac/ticket/6000
Juergen?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30109 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 13:22:19 +00:00
Jean-Marc Lasgouttes
471e25647f fix crash when pressing Down in command buffer and the history is empty
(reported by John McCabe-Dansted's monkey test)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30107 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 09:08:18 +00:00
Uwe Stöhr
8bda8d10b8 tex2lyx/text.cpp: \linebreak and \pagebreak are first supported by LyX with fileformat 300
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:54 +00:00
Uwe Stöhr
693b64674b tex2lyx/preamble.cpp: textcomp is also supported by LyX since we support Unicode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30105 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:33:05 +00:00
Uwe Stöhr
d69af206ee tex2lyx/preamble.cpp: forgot this in last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30104 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:21:34 +00:00
Uwe Stöhr
affc633c38 tex2lyx/preamble.cpp:
- better whitespace preamble output (still not perfect)
- support for fileformat 258
- proper solution how to treat LyX specific preamble stuff; this solves long standing issues (the old solution failed when more than one LyX specific command was used in a file)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:16:31 +00:00
Uwe Stöhr
0eb2e5c22c tex2lyx/test/test-insets.tex: correct code for nomenclatures
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30102 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-15 00:15:13 +00:00
Uwe Stöhr
36e82b8d45 tex2lyx/text.cpp: tipo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30101 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 23:58:37 +00:00
Uwe Stöhr
868ffa3864 tex2lyx: whitespace and typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 21:29:24 +00:00
Uwe Stöhr
14021f7233 tex2lyx: support for fileformat 257: command inset instead of layout inset for captions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:21:20 +00:00
Uwe Stöhr
f1a2bf1c66 test/test-structure.tex: add caption with OptArg
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30097 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 14:20:22 +00:00
Uwe Stöhr
c9a726bd43 tex2lyx/preamble.cpp: support for fileformat 256
- the code for \clear***page was already there
- tex2lyx allows already to use any input encoding

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30096 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:39:07 +00:00
Uwe Stöhr
6f1cd6eba2 tex2lyx/preamble.cpp: using amsmath and esint automatically is safer than not to use them. The automatic usage is also our default when you create a new LyX file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30095 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:25:17 +00:00
Uwe Stöhr
a65af1e391 tex2lyx/preamble.cpp: support for fileformat 254: esint
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30094 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 12:21:30 +00:00
Uwe Stöhr
1e4def9460 tex2lyx:
- correct the conversion of InsetCommand
- code optimization
- support for format 253: nomenclature is now recognized

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:16:51 +00:00
Uwe Stöhr
6dad0a4cd7 test/test-structure.tex: add nomenclature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30092 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-14 02:14:42 +00:00
Pavel Sanda
4c60c41731 Add missing gui element for autocorrection rc
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg147374.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30090 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 22:23:19 +00:00
Pavel Sanda
1c2a1da163 Fix sorting of enum LyXRCTags
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30089 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 22:23:16 +00:00
Uwe Stöhr
5858128386 tex2lyx/text.cpp: code optimization as also suggested by JMarc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30087 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-13 15:34:31 +00:00
Abdelrazak Younes
51f9ee6155 MSVC compil fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30082 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 21:26:28 +00:00
Richard Heck
9fcd1a6c6a XHTML for InsetWrap.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30080 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:26:48 +00:00
Richard Heck
67e70c6c02 Well, it turns out that we need a different return value for the xhtml
routines, one that allows us to "defer" certain material, e.g., a float
that ought to appear in a div but can't simply be put into the middle
of a paragraph.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30079 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:23:17 +00:00
Richard Heck
12f57a57bd The return value for xhtml() is not going to be needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30078 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 16:11:33 +00:00
Richard Heck
819a0172f7 HTML output for InsetVSpace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30075 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 15:07:04 +00:00
Richard Heck
bd5cccbb34 Lengths for HTML. Use them for InsetBox.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30074 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 14:42:33 +00:00
Jürgen Spitzmüller
fc63c87e2e * BiblioInfo.cpp:
- convert author/editor to proper unicode.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30072 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 14:29:39 +00:00
Enrico Forestieri
411b7a1dec Fix display of BibTeX entries in the info field of the citation
dialog by only converting text mode latex macros to unicode points.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30070 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 14:03:57 +00:00
Uwe Stöhr
ebda762af9 test/test-structure.tex: add labeling list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30069 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 13:07:20 +00:00
Jürgen Spitzmüller
bd4c74b3b7 * add support for the applemac encoding. File format change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30064 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 08:47:38 +00:00
Uwe Stöhr
b2f0d517e2 GuiCitation.cpp: fix #5987
OK also for branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30061 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 00:17:13 +00:00
Uwe Stöhr
f2d0a94b91 tex2lyx/test/test-insets.tex: more tests
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30060 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:56:48 +00:00
Uwe Stöhr
f8d655d4e2 tex2lyx/text.cpp: tex2lyx supports now fileformat 252
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30059 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:46:41 +00:00
Uwe Stöhr
be48e7f9e5 tex2lyx/preamble.cpp:
- support for url, varioref, prettyref
- reduce the sometimes huge amount of whitespace in the preamble after importing files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30058 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 23:45:17 +00:00
Richard Heck
e28c88767b OK, now here's a big one: XHTML output for InsetBibtex. It's not perfect---
see the notes---but it does work reasonably well. And it will work a lot
better when an unrelated patch of mine goes in: one that generally improves
the display of BibTeX-derived information.

Note how we use the TOC here, which has already gathered the information we
need. This can also be done for other things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30056 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 22:39:16 +00:00
Richard Heck
03e0c16e87 Fix bibliography output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30054 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 22:31:27 +00:00
Richard Heck
21121f3fb5 It is convenient for me to change this for use in XHTML output, but I also
have been wanting to change it for a while. It is not very useful to have
a bunch of years listed in the citations TOC (which you get if you have used
\citeyear very often. Better, it seems to me, to see the citation keys.

Of course, this can be switched again if need be, and I can figure out a 
different way to handle my own problem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30053 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:23:18 +00:00
Richard Heck
cde33577df Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30051 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:13:41 +00:00
Richard Heck
3de92f551a Get XHTML output for InsetCitation working, at least in a primitive way.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30049 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:04:15 +00:00
Richard Heck
09177238e6 Bug.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30048 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:03:54 +00:00
Richard Heck
f50c47d4be Introduce a field for keeping track of the citation label.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30047 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 20:29:37 +00:00
Richard Heck
5e8d08cb9e Get InsetBibitem working, and the output for LATEX_BIB_ENVIRONMENT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30045 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 20:08:39 +00:00
Uwe Stöhr
5742cf9ce6 tex2lyx: testfiles modified as preparation for the upcoming tex2lyx work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30044 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 17:56:05 +00:00
Enrico Forestieri
170d7a2ab1 The QFileInfo::refresh() bug is fixed in Qt 4.5.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30036 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-09 20:39:41 +00:00
Georg Baum
e0acb978ff fix bug 5798: Translate float names
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30035 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-09 18:16:43 +00:00