Commit Graph

509 Commits

Author SHA1 Message Date
Enrico Forestieri
10d5897327 Don't allow inserting two consecutive separators. 2014-05-18 18:04:53 +02:00
Enrico Forestieri
0616c8fe32 Disregard font properties changes when inserting a separator.
This allows to output a simple blank line instead of strange constructs.
2014-05-18 17:34:11 +02:00
Enrico Forestieri
a919cd8c68 Take into account that a blank line is always output before a command. 2014-05-18 17:31:58 +02:00
Enrico Forestieri
c668ebf611 Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.

Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.

Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 23:25:11 +02:00
Richard Heck
0a6ff99f28 Typos and style. 2014-04-21 11:51:59 -04:00
Jean-Marc Lasgouttes
220fe66a67 Remove duplicate call to Cursor::selHandle 2014-03-17 10:55:49 +01:00
Jean-Marc Lasgouttes
a8c05f20be Whitespace only. 2014-03-14 14:22:26 +01:00
Juergen Spitzmueller
0dc4f4636f Enable environment-split for standard classes (#9023) 2014-03-07 08:58:24 +01:00
Jean-Marc Lasgouttes
ad56bded03 Bug #9005: various things that do not work as intended in passthru paragraphs
* disable branch-add-insert in pass thru paragraphs

* when it is not possible to input a quote inset, insert a single
  ascii quote when argument to quote-insert is "single"

* handle "mathspace" dialog in Text::getStatus

* disable insertion of newline inset in pass thru paragraphs

* handle "mathdelimiter" and "mathmatrix" dialogs in GuiView::getStatus.
2014-03-04 11:56:03 +01:00
Richard Heck
7b46aa8fbb Forgot in previous commit to deal with case. As I'm doing it now,
it's easy to use the existing docstring routine, so I've commented
out the string version of lowercase I had introduced. I've left the
code in case someone else needs it later.
2014-02-23 12:04:56 -05:00
Richard Heck
e5ea535952 If the selection is some sort of URL, then make it the target, not
the name, in the hyperlink. Fixes bug #8792.

This also fixes a bug discovered while working on this code: The
params passed to GuiHyperlink were never used.
2014-02-23 11:36:54 -05:00
Jean-Marc Lasgouttes
e7a1cce551 Rename some LFUN names to match their text name
Also, rename copy-label-as-reference to label-copy-as-reference and update LFUNs.lyx accordingly.
2014-02-13 13:50:33 +01:00
Juergen Spitzmueller
5a3f1a731f Extend environment-split to an 'outer' split function
This fixes a major beamer UI flaw reported by several users.
2014-01-27 08:01:24 +01:00
Georg Baum
c0ea37f337 Fix image pasting regression
I introduced a regression in c14b9e67 for pasting images:
If an image is on the clipboard both as PNG and HTML with just an url,
but no plain text, pasting would fail. The reason for this was that
text contents was detected (the HTML code), nd preferred, but actually
pasting it resulted in an empty string, since the HTML import could not
handle the url This error was not checked.
The solution is first to try text paste if both text and image content
is present, and then  try image paste if the text failed.
2013-07-13 22:44:20 +02:00
Vincent van Ravesteijn
97405fa623 Fix bug 7673 by reverting changes to BufferView::checkDepm
This reverts commit 210a4406 and a part of 5577e877.
2013-05-19 22:17:14 +02:00
Richard Heck
d79225ae98 Remove all messages to user related to assertions. We'll just use
a basic message which is defined in lassert.cpp now.
2013-04-27 17:52:55 -04:00
Richard Heck
1b1f8dd235 Audit all the LASSERT calls, and try to do something sensible at
each failure.

There are several places I was not sure what to do. These are marked
by comments beginning "LASSERT:" so they can be found easily. At the
moment, they are at:

Author.cpp:105: // LASSERT: What should we do here?
Author.cpp:121: // LASSERT: What should we do here?
Buffer.cpp:4525:        // LASSERT: Is it safe to continue here, or should we just return?
Cursor.cpp:345:         // LASSERT: Is it safe to continue here, or should we return?
Cursor.cpp:403:         // LASSERT: Is it safe to continue here, or should we return?
Cursor.cpp:1143:                // LASSERT: There have been several bugs around this code, that seem
CursorSlice.cpp:83:     // LASSERT: This should only ever be called from an InsetMath.
CursorSlice.cpp:92:     // LASSERT: This should only ever be called from an InsetMath.
LayoutFile.cpp:303:                     // LASSERT: Why would this fail?
Text.cpp:995:           // LASSERT: Is it safe to continue here?
2013-04-25 17:27:10 -04:00
Georg Baum
c14b9e67bc Implement paste from LaTeX and HTML (bug #3096)
As discussed on the list. No automatic contents detection is done, the user
needs to use the special paste menu instead. I used the new TempFile class
for safe temporary file handling.
The documentation would go into section 2.2 of UserGuide.lyx, but I am not
allowed to edit that document.
2013-04-14 19:45:36 +02:00
Georg Baum
c61ef8b205 Support \caption* (bug #3209)
This was a low hanging fruit which would have to wait for a long time because
of a file format change if it was not implemented before 2.1.
2013-03-22 22:23:38 +01:00
Richard Heck
57d8b059e0 Remove references to Counter LabelType from source code. The
intention is to use Static in its place, and we now expand the
label for these, as well.
2013-02-09 13:44:05 -05:00
Jean-Marc Lasgouttes
db025be5ae Consider deleted text when inserting quote inset.
This bug was reported against the ubuntu build:
  https://bugs.launchpad.net/bugs/1100046

Additionally, some extra code for avoiding double undo entries has
been removed, since this is handled by grouped undo now.
2013-01-21 14:49:45 +01:00
Juergen Spitzmueller
c246076ed5 Fix the 'caption inset mess' (bug #4647) 2012-12-30 18:29:02 +01:00
Juergen Spitzmueller
7c9254b723 LFUN_ENVIRONMENT_SPLIT: simplification 2012-12-24 11:22:23 +01:00
Juergen Spitzmueller
3e8bfd8bd6 Convenience LFUN to split an environment 2012-12-23 18:57:32 +01:00
Vincent van Ravesteijn
bec9c1325e Introduce Layout::args() and simplify code 2012-12-17 22:26:11 +01:00
Juergen Spitzmueller
e5ebe17b92 AutoInsert option also for flex insets 2012-12-17 13:32:40 +01:00
Juergen Spitzmueller
dd21e57bd3 Option to auto-insert a paragraph style option, particularly useful for specific mandatory arguments (such as beamer block or frame titles) 2012-12-16 13:37:14 +01:00
Juergen Spitzmueller
dcaab11b09 Correctly handle environment sequences in TOC
Only the first paragraph in those sequences goes into the TOC, since the environment is merged.

This is needed to handle the forthcoming beamer environments properly in the outliner.
2012-12-15 16:50:08 +01:00
Juergen Spitzmueller
99ee47f0cd Disallow the insertion of multiplenon-item arguments of the same type in a sequence of merged environment pars 2012-12-10 09:19:56 +01:00
Juergen Spitzmueller
1500e44cba Support for \item arguments 2012-11-29 15:34:20 +01:00
Richard Heck
1252c22fd3 Some minor cleanup of new InsetArguments stuff that I did while
reading the patch....
2012-11-23 20:40:38 -05:00
Juergen Spitzmueller
99e611b2d8 Allow arguments in PassThru environments (bug #7646) 2012-11-20 16:58:51 +01:00
Juergen Spitzmueller
0f866762b2 Fix function disabling 2012-11-20 15:48:59 +01:00
Juergen Spitzmueller
2e69c66195 InsetArgument revision, first working version 2012-11-19 14:21:02 +01:00
Juergen Spitzmueller
e3e6befc54 Ronen's patch for lfun language set
This adds an optional 'set' argument to the language lfun and reintroduces toggling.

Additions by me reintroduce the possibility to reset to the document language via 'language reset' or just 'language'
2012-10-03 07:27:36 +02:00
Juergen Spitzmueller
31c7ccd4b3 Trigger preview when inserting preview inset on selection 2012-09-30 18:36:22 +02:00
Pavel Sanda
541828ebf5 Another witch hunting case: break-paragraph -> paragraph-break. 2012-09-29 18:06:42 +02:00
Juergen Spitzmueller
ee1fc9130a Add support for some basic non-unicoded IPA macros
We now support everything on the IPA chart via the toolbar
2012-08-23 17:42:53 +02:00
Richard Heck
394e559ffc Add a FIXME about when the appendix should be enabled. 2012-07-21 14:19:10 -04:00
Jean-Marc Lasgouttes
c7549c1b54 Fix bug #8027: Edit->Paste Special->... does not replace selected text
Delete the selection before all paste-like lfuns. This was previoulsy done
only for LFUN_PASTE, the others at best unset the selection.
2012-06-07 18:14:17 +02:00
Jürgen Spitzmüller
f626cfb7a3 Implement a native IPA inset (bug #2591) with instant preview.
Currently only basic functionality (our math-tipa functionality plus multipar input). Further enhancements (such as proper unicode input and a specific toolbar) are planned. DocBook and XHTML output also need to be audited.

The lyx2lyx reversion routine surely can be improved (help appreciated), and I don't know  tex2lyx enough to handle this file format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40867 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-06 07:54:22 +00:00
Jürgen Spitzmüller
b965edbb02 Fix crash when putting a float around multiple display maths (bug #7974).
This also fixes other float-related bugs, such as this:

* select two floats in two consecutive paragraphs and insert a new float around them
=> the master float's caption is put into the lower subfloat instead of below the subfloats.

In the long term, doInsertInset needs a thorough cleanup.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40639 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-21 07:02:09 +00:00
Richard Heck
210a440609 Attempt to fix #7673 in a more "interesting" way than in branch (where
we will be cautious, of course). The problem was that we were issuing
the Buffer::changed() signal before we did updateBuffer(), and this
caused an inconsistency. The idea here is to defer issuing this signal
until we call processUpdateFlags(). We know we need a redraw if we've
deleted a whole paragraph.

This should work properly, so long as checkDepm is called from within
the dispatch mechanism. There may, however, be other paths, and I've
noted one explicitly with a FIXME in Text2.cpp. I've tested a few
different variations, however, and I haven't seen any problems. But if
we do run into problems, we can go ahead and do the update there that we
were previously doing in checkDepm itself.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40352 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-03 22:42:09 +00:00
Richard Heck
01dc4e4b83 Didn't mean to include this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40241 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-22 18:49:16 +00:00
Richard Heck
d38d332d9f Fix bug #7905. We don't want to move out of the inset unless
we've put something into it. (We also don't need to copy an
empty string into it.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40240 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-22 18:40:01 +00:00
Tommaso Cucinotta
824d640227 Adding the capability to paste as simple unformatted text.
Documentation (and perhaps menu items) need still to be a bit
clarified in order to distinguish the various paste options
for the average user.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40060 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 15:42:01 +00:00
Georg Baum
8e8c214bef Fix some bugs related to spaces in math:
- Interpret argument of LFUN_SPACE_INSERT correctly
- Use InsetMathSpace instead of InsetMathSpecialChar for "\ " (bug # 7728)
- Use InsetMathSpace instead of InsetMathChar for ~ (bug # 7728).
  This fixes also the display in LyX (previously a literal ~ was displayed).
Using InsetMathSpace enables also the "Insert Formatting" menu entries.
No file format change is needed, since the LaTeX export is unchanged.
Note that there are still some bugs related to spaces in math:
#7746, #7747, #7749, #7842


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39947 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 20:19:49 +00:00
Stephan Witt
d14f5a75af #7778 avoid toggle of languages when LFUN_LANGUAGE is executed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39735 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-23 16:50:18 +00:00
Abdelrazak Younes
6056db3212 Header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39300 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-14 17:00:35 +00:00
Stephan Witt
934cadd381 improve the method naming for "mark new word position", move the mark operation out of bookmarkEditPosition up one level to LFUN_SELF_INSERT of the text inset dispatch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38181 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-01 05:49:04 +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
Richard Heck
57deff6c3d Just some renaming, preparatory to disentangling two jobs the current
NeedsFloatPkg tag does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37429 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 22:15:52 +00:00
Stephan Witt
64c4ccbeed remove duplicate check for current selection
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37428 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 20:36:43 +00:00
Richard Heck
5dcac0b5c5 Fix #7274.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37423 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 16:43:02 +00:00
Stephan Witt
83c06abbc0 apply change of languange to the word under cursor if there is no selection
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37415 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 10:55:17 +00:00
Stephan Witt
5eed97b56b restore the correct behavior of suppression of misspelled marker for word at cursor position - the change r37340 broke it
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37363 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 12:28:02 +00:00
Jean-Marc Lasgouttes
370044551c Unify handling of pass thru insets and paragraphs by introducing Paragraph::isPassThru. Many lfuns are now disabled in sweave chunks.
Also, fix #7175 (do not output \noindent in passthru pars)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37328 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-26 11:04:42 +00:00
Richard Heck
4def4c34de Fix #7238.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37201 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 15:46:53 +00:00
Vincent van Ravesteijn
996b707a6f Fix bug #7125: Insertion of a math macro cannot be undone.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37088 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-03 20:39:14 +00:00
Vincent van Ravesteijn
a3a7c046be Fix bug #7200: Crash when replacing newline by InsetQuote.
We have to call cap::replaceSelection before determining whether we can insert an InsetQuote or a normal quote.

At least we should have updated the par variable after calling cap::replaceSelection, because the paragraph might have been deleted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37063 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-02 12:07:33 +00:00
Stephan Witt
fca5a8ce2a fix typo: double semicolon at line end of code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37044 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 21:34:33 +00:00
Stephan Witt
29d849f251 more careful check for mathed to normal text change and vice versa for correct display of misspelled markers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37020 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-28 13:20:20 +00:00
Stephan Witt
6be43c24f4 fix a crash when moving cursor from text to a math inset with spellcheck_continuously on
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37018 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-27 21:59:17 +00:00
Stephan Witt
fab1507221 fix for #7081: the painting of misspelled marker is suppressed for the word at cursor position
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36990 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-22 07:29:16 +00:00
Stephan Witt
c12ab2f090 fix typo: duplicate semicolon at line end of code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 12:01:12 +00:00
Georg Baum
4736356bf9 fix remaining bits of bug #6709
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36718 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-04 16:43:41 +00:00
Georg Baum
7edd656f21 Fix inserting subscript/superscript with nonempty selection by creating a dedicated lfun:
inset-insert simply swallows the selection, while box-insert, note-insert etc.
put the selection inside the new inset.
As a side effect the toolbar icons get better names, as requested by Uwe.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36451 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 20:09:08 +00:00
Georg Baum
dea050cb93 fix bug 3008: Add subscript/superscript inset for text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 17:00:12 +00:00
Richard Heck
13fa0dda1b Fixed bug #7037. Don't need these updateBuffer() calls.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36339 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-17 15:54:51 +00:00
Vincent van Ravesteijn
c5b9664476 Remove the name parameter from string2params and params2string. We can always derive the name with insetName(params.code()).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35891 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:25:28 +00:00
Vincent van Ravesteijn
573500dd04 Remove unneccessary uses of dynamic_cast from the code.
A dynamic_cast is necessary when:

- the object to be casted is from an external library because we can't add Qxxx::asXxxx() to Qt e.g.:
    * QAbstractListModel to GuiIdListModel,
    * QValidator to PathValidator,
    * QWidget to TabWorkArea,
    * QWidget to GuiWorkArea;

- the object is to be casted from an interface to the implementing class, because the Interface does not know by whom it is implemented:
    * ProgressInterface to GuiProgress,
    * Application to GuiApplication.

A dynamic_cast can be replaced by:
  - already existing as***Inset() functions, e.g.:
    * asHullInset(),
    * asInsetMath()->asMacro(),
    * asInsetText();

  - a static_cast when we are sure this can't go wrong, e.g.:
    * we are sure that CellData::inset->clone() is an InsetTableCell,
    * in cases where we explicitly check it->lyxCode().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35855 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-26 15:03:51 +00:00
Vincent van Ravesteijn
ba19e8b5dd Fix bug #1839: Ctrl+arrows don't move to next/prev table cell.
Patch from Punyashloka Biswal.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35812 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 01:18:48 +00:00
Vincent van Ravesteijn
f35d1a2a4c Fix bug #6869: Crash when unindenting empty lines in listings inset.
- Remove some duplicated code;
- Do not call par.getChar(0) when the par is empty.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35702 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-18 10:48:29 +00:00
Richard Heck
3af1fa5abb I am basically trying here to get rid of random calls to
processUpdateFlags. This one is easy.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35650 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-14 14:47:33 +00:00
Richard Heck
6a80ce62ca DispatchResult::update() ==> DispatchResult::screenUpdate()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35631 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 17:28:55 +00:00
Abdelrazak Younes
d8981b13ae * Get rid of LFUN_TOC_INSERT: we use LFUN_INSET_INSERT "toc".
* Fix usage of "inset-insert type" without CommandInset arguments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35345 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-12 07:56:08 +00:00
Abdelrazak Younes
a648c39b70 Get rid of LFUN_LINE_INSERT: we use LFUN_INSET_INSERT "line".
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35344 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-12 07:01:24 +00:00
Uwe Stöhr
0e7ab29f49 InsetLine: support for the LaTeX command \rule; kick out the hardcoded \lyxline; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35299 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-07 00:41:00 +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
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
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
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
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
3417702346 * FuncStatus: unify naming of functions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34160 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-16 10:51:20 +00:00
Vincent van Ravesteijn
108a67ed43 Make Cursor::anchor_ private and make an access function Cursor::realAnchor() to stress the fact that this is thus not the normalAnchor().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 18:16:07 +00:00
Richard Heck
b79d8e5e2d Make members of FuncRequest private, per the FIXME there. Again, this is
basically a massive renaming, with no real changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 19:00:42 +00:00
Richard Heck
4c7a5d0024 This is just a giant renaming of member variables in FuncRequest,
preparatory to making them private.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 18:15:17 +00:00
Vincent van Ravesteijn
bb69584112 Introduce InsetPreview.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33890 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-28 13:47:50 +00:00
Vincent van Ravesteijn
69f46cf1b2 Use LASSERT instead of BOOST_ASSERT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-28 13:20:57 +00:00
Richard Heck
75454ca8c5 Disable lists of floats we don't know how to generate.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33635 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 23:47:33 +00:00
Richard Heck
d65020b293 s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-03 22:13:45 +00:00
Abdelrazak Younes
377cdd5f6c Transfer LyXfunc code to GuiApplication::dispatch() and getStatus(). Now
a lot of simplification is possible. Except some instability period...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33389 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 16:11:13 +00:00
Jürgen Spitzmüller
707935ab23 * store the full Language in WordLangTuple.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33378 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 11:26:49 +00:00
Jürgen Spitzmüller
a61eeb1fb2 Allow to switch buffer languages via the menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33366 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-08 17:15:00 +00:00
Jean-Marc Lasgouttes
b4d588e78a cleanup handling of LFUN_REGEXP_MODE ; cleanup Text::getStatus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33363 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-08 11:19:48 +00:00
Vincent van Ravesteijn
61eecb8a44 Expand the string "regexp" to something user will better be able to understand.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33250 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 19:56:12 +00:00
Vincent van Ravesteijn
f68fcc98a9 Fix bug #6477: LFUN_OUTLINE_* don't work anymore.
This code was erroneously killed in r33050.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33229 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-26 16:57:29 +00:00
Jürgen Spitzmüller
3a714c6057 * ADD LFUN_SPELLING_ADD and LFUN_SPELLING_IGNORE (bug 6102).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33089 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 08:21:56 +00:00
Pavel Sanda
17e2928374 Kill LFUN_OUTLINE_DRAGMOVE.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg157155.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33050 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-15 19:13:24 +00:00
Vincent van Ravesteijn
2a257eca85 Fix bug #6426: Language not set correctly when inserting an Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32750 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-03 01:13:55 +00:00
Vincent van Ravesteijn
b3128dc63b Fix second part of bug #6400: After selecting a word by double-clicking it, extending the selection by a single mouse-click should also select only whole words.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32580 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-18 14:18:10 +00:00
Uwe Stöhr
83b1c48846 replace links to bugzilla with links to trac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32469 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 00:59:10 +00:00
Abdelrazak Younes
882e2eeb7b InsetCommand ctor: Pass 'Buffer *'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31902 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:10:34 +00:00
Abdelrazak Younes
82c7e15e64 Uniformize Inset construction (passing Buffer * everywhere). Lots of cleanup to do still...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31901 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 15:53:21 +00:00
Abdelrazak Younes
ff4460603e Make Buffer argument mandatory in most of the InsetMath based class... boring work...
Math manual loads and save correctly it seems but expect some instability period.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31898 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 11:45:46 +00:00
Enrico Forestieri
a1a34443ef Fix bug #5530: LyX expansion in math-macro overwritten by default one.
This patch initializes the buffer_ member of a MathHull inset in most
(but not all) cases. The problems with buffer_ should be greatly
allievated now, but there still can be some corner case.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31873 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-06 15:18:48 +00:00
Vincent van Ravesteijn
0152d08232 These shouldn't be there as they have nothing to do with the layout of the Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31794 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:13:48 +00:00
Vincent van Ravesteijn
71d29d14b7 Text3.cpp: fix unintended fall-throughs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31793 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-29 22:08:05 +00:00
Vincent van Ravesteijn
6e8312d1a4 Move (part of) LFUN_DISSOLVE_INSET into InsetText.
- put the InsetFlex specific part into InsetFlex,
- honor the argument given to the LFUN also for normal Insets as the description already stated,
- fix bug #6285: context menu action goes to the wrong inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31756 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 23:49:43 +00:00
Abdelrazak Younes
1cd45c2ae1 Transfer all keyboard related code and actions from LyXFunc to GuiApplication. Part of it should be transfered later to GuiView and BufferView. This code can probably be simplified a lot...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31518 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-04 20:58:20 +00:00
Abdelrazak Younes
b20e92dd24 Header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31459 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-23 19:53:37 +00:00
Abdelrazak Younes
66dc054c6f * Transfer LFUN_SERVER_GOTO_FILE_ROW to GuiView and clean it up a bit.
* Add a recenter() call to BufferView::setCursorFromRow() in order to get the screen centered around the found position.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31455 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-23 13:45:58 +00:00
Abdelrazak Younes
1d7d54a4a7 Move LFUN status check to where they belong.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31378 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-12 21:12:24 +00:00
Vincent van Ravesteijn
c11f031df6 Fix bug #5991: Select function in environments.
C-M-a now selects the contents of an inset, if the whole inset is already selected, it will jump out the inset and selects everything in that inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31200 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-22 14:44:08 +00:00
Vincent van Ravesteijn
9bb61acfd5 Fix inset-begin and inset-end. Now, if the cursor was at the beginning of a paragraph in the middle of the inset, inset-begin would jump out of the inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31199 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-22 14:34:50 +00:00
Uwe Stöhr
f7aa1c1c5d Text3.cpp: fix crash reported in #6133, patch from Tommaso
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31070 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 22:53:15 +00:00
Abdelrazak Younes
cd8e483f3a Text::dispatch(): the spellchecking code is now uneeded.
TextMetrics::drawParagraph(): really check the whole row and not only the first word.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30971 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-10 21:17:08 +00:00
Abdelrazak Younes
673ff83263 outline(): avoid paragraph copying by using RandomAccessList::splice().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30961 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 20:25:20 +00:00
Abdelrazak Younes
1a27aaca77 RandomAccessList: new swap() method for swapping two elements without any copy.
LFUN_PARAGRAPH_MOVE_UP and LFUN_PARAGRAPH_MOVE_DOWN: use that.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30958 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 19:51:12 +00:00
Abdelrazak Younes
2b9e44cb01 Move contents of paragraph_funcs.* to Text.h and Text.cpp.
The goal is to simplify the code afterwards.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30955 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 17:30:41 +00:00
Abdelrazak Younes
2bf63aa652 Get rid of some Paragraph::inInset() access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30953 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 17:01:04 +00:00
Abdelrazak Younes
f35561d055 Cleanup: Replace a bunch of Cursor arguments with DocIterators.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30951 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 16:49:41 +00:00
Abdelrazak Younes
5425c53fd1 Now that Text knows its owner, use the associated Buffer access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:29:34 +00:00
Vincent van Ravesteijn
3114ce609c Some small code simplications.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30866 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-04 23:01:06 +00:00
Vincent van Ravesteijn
690878bd4a Fix #6045: Possible to insert table floats to figure floats.
The lfuns, LFUN_FLOAT_INSERT and LFUN_WRAP_INSERT are now only enabled when they should be.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30740 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-21 20:04:52 +00:00
Vincent van Ravesteijn
77d67595fd In r30560, the setLayout function was removed from InsetCollapsable. This function also set the buttonLabel for the inset. After removing the setLayout calls in this place, the button label is not initialized for Notes, Boxes and Phantoms.
This commit restores the behaviour as it was, such that the labels are initialized again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30677 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-18 19:35:27 +00:00
Pavel Sanda
091e3908b0 Kill LFUN_PARAGRAPH_SPACING in favour of LFUN_PARAGRAPH_PARAMS.
We don't want duplicit code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 22:55:23 +00:00
Richard Heck
0facb603fe Give inset codes to all the math insets, so we get more information when
we run into assertions.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30634 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 19:00:24 +00:00
Jean-Marc Lasgouttes
41003ea0eb remove some explicit tests against ERT_CODE; more to come
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30625 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 10:08:13 +00:00
Jean-Marc Lasgouttes
0e8b1dc29a define InsetText::insetAllowed properly and rely on it for inset insertion in Text::dispatchsvndiff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30593 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 21:56:22 +00:00
Jean-Marc Lasgouttes
bec171ed32 logic was reversed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30569 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 16:00:22 +00:00
Jean-Marc Lasgouttes
30360e1b19 move more functions from InsetCollapsable::getStatus to Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30566 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 15:27:48 +00:00
Jean-Marc Lasgouttes
7a0107f4df move tab-insert/delete from InsetCollapsable to Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30565 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 14:52:11 +00:00
Jean-Marc Lasgouttes
e33095f10d Move special handling of paste function from InsetCollapsable to InsetText
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30562 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 13:00:42 +00:00
Jean-Marc Lasgouttes
95bd716cdf replace gratuitously complicated code by sane one, and make cursor leave inset after inserting an index
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30561 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 12:21:35 +00:00
Jean-Marc Lasgouttes
5bf8df4fbc Remove the layout_ cache in InsetCollapsable.
Remove setLayout methods and all the calls to it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 12:07:51 +00:00
Jean-Marc Lasgouttes
4dbe411ba9 Remove all BufferParam arguments in InsetXXX methods (since insets know about their Buffer)
Add an assertion in Inset::dispatch that checks that buffer() == *cur.buffer()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30540 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 12:56:20 +00:00
Jean-Marc Lasgouttes
081fad9557 First step of InsetLayout cleanup.
Get rid of Inset::getLayout(BufferParams), since all insets have access to
their own buffer. Inset::getLayout() does the same now.

Get rid of InsetCollapsable::getLayout(BufferParams) too, and remove most references to InsetCollapsable::layout_. For now IC::getLayout() still returns layout_, but the idea is to change this (provided there is no performance problem).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30530 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 00:28:22 +00:00
Uwe Stöhr
802067ecdc support for matrix decoration in the MathMatrix dialog;
introduces a new LFUN and fixes #4620

This can in principle also go to branch when new LFUNs are there allowed, Jürgen?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30523 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 21:39:21 +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
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
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
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
Jürgen Spitzmüller
e9cbe2f80f A GUI for nomencl settings. Adds the possibility to enter a custom length.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29779 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-22 16:26:15 +00:00
Vincent van Ravesteijn
a7d545170b Fix bug #5888. Yes, I do shame.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29665 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-14 12:35:04 +00:00
Richard Heck
d6966dd5f5 Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29601 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 21:58:16 +00:00
Vincent van Ravesteijn
b946e2209a Fix bug #5930: Crash when undoing info-insert in math mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29598 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 21:02:14 +00:00
Vincent van Ravesteijn
ba37ec9813 Fix bug #5435: DEPM is not executed when leaving an inset.
Now, it is fixed for char-forward and char-backward.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29585 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 16:56:49 +00:00
Jürgen Spitzmüller
74784942ed * disable some invalid insets in description items (covers bug 5937).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29584 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 16:53:51 +00:00