anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-22 16:04:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,836 Commits 30 Branches 171 Tags 681 MiB
a2de033405
Commit Graph

16691 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
1545219dcb squash warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32066 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-17 16:57:35 +00:00
Richard Heck
0b82638164 Handle the TEXT flavor in this switch. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32054 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-16 17:37:51 +00:00
Enrico Forestieri
935d1a3221 Clarify comment. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32051 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-16 14:11:25 +00:00
Enrico Forestieri
d3378a6b84 Style: insetCur -> inset_cursor 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32049 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-16 13:31:01 +00:00
Vincent van Ravesteijn
86a9302823 Fix bug #6240: Adding table row causes exception that triggers infinite loop in code. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32038 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-16 00:18:52 +00:00
Enrico Forestieri
7365a29fea Fix bug #6208: macro crash. 
The fix consists in not updating the macro while it is being edited,
and this is accomplished by the changes in MathData::updateMacros().
However, when clicking away with the mouse I was getting another crash,
which is cured by the changes in MathMacro::notifyCursorLeaves().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32037 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 23:54:45 +00:00
Vincent van Ravesteijn
3581c31d1b Allow PgUp and PgDwn to put the cursor on the first or last row. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32036 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 23:53:40 +00:00
Vincent van Ravesteijn
a9ae2abb7e Fix bug #6327: Crash in new file and press PgUp button. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32035 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 23:45:39 +00:00
Vincent van Ravesteijn
f4125a65c0 Fix bug #6320: LyX goes to infinite loop when selecting document parts. 
Set the boundary member correctly when the cursor goes to an 'empty' row.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32034 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 22:01:12 +00:00
Abdelrazak Younes
216f9156dc Fix MathML export for < and > special characters. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32033 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 21:45:21 +00:00
Uwe Stöhr
0b7ce1e08c - theorems-chap.module: fix a typo 
- MathsUi.ui: fix again another typo in tooltip
- po-files: remerge
- de.po: new translations


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32017 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 16:18:02 +00:00
Jürgen Spitzmüller
b83415029e * MathsUi.ui: grammar fix. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32012 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 15:47:07 +00:00
Uwe Stöhr
d291772c5a MathsUi.ui: fix another typo in tooltips 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32008 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 14:55:50 +00:00
Uwe Stöhr
57676c67aa MathsUi.ui: fix typo in tooltip 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32007 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 14:47:03 +00:00
Richard Heck
ae60474513 Get math macros working for MathML. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32004 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 12:30:26 +00:00
Richard Heck
8ad0e96631 Style. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32001 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 02:30:02 +00:00
Richard Heck
70f035b189 This can be a private method. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32000 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 01:42:49 +00:00
Richard Heck
f0a5d099b9 Style. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31999 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 01:18:13 +00:00
Enrico Forestieri
3f3bedd0d9 Fix another instance of missing buffer in math. This is needed when 
pasting a macro inside another math inset (such as \text or \hat). In
this case the buffer would not be set and getMacro() cannot be called,
such that an "internal" macro would still shadow an user defined one.
This kind of fix is now easy after Abdel's overhaul.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31998 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-15 01:03:03 +00:00
Richard Heck
8340a17e96 Typo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31997 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 23:28:50 +00:00
Richard Heck
584bca0fe8 MathML for InsetMathSpace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31994 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 21:38:28 +00:00
Richard Heck
70217ba676 Initial work on InsetMathBox. This doesn't really work yet, for reasons 
given in the FIXME.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31993 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 21:11:23 +00:00
Uwe Stöhr
60cc4f8e7f MathsUi.ui: add tooltips, the same can also be done for branch if you like, Jürgen? 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31992 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 21:07:22 +00:00
Richard Heck
ff7d0d5c6e Fix whitespace, comment. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31991 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 20:40:09 +00:00
Richard Heck
0229c21be4 Fix single character output for MathML. Kind of. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31990 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 20:38:22 +00:00
Richard Heck
9ba340b218 Fix parsing of functions and arguments for MathML. 
The enum is overkill for now, but will be useful if anyone decides
really to return to this stuff. It's apparent that there are some 
powerful tools here---like the ability to pipe expressions through
Mathematica.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31989 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 20:20:17 +00:00
Richard Heck
963c22353a Fix delimiters. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31988 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 20:18:32 +00:00
Richard Heck
177ff11cfb Whoops. Forgot to fix this. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31987 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 19:52:06 +00:00
Richard Heck
25f429d3e5 Fix external function output for MathML. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31986 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 19:41:22 +00:00
Richard Heck
90f392425f FIXME 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31984 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 16:58:32 +00:00
Richard Heck
886304a588 Little bit of fixup for math symbols. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31983 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 16:21:33 +00:00
Richard Heck
487053deb8 We need truly XHTML output to get MathML to display in Firefox, etc. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31982 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 16:21:21 +00:00
Richard Heck
83c7a5576f Fix silly bit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31981 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 15:55:51 +00:00
Jürgen Spitzmüller
b7c0fe942b * direct access from the error dialog to the LaTeX log. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31980 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 15:52:54 +00:00
Richard Heck
54b4b8e6b4 Get MathML output for XHTML working a bit. 
Turns out MathML is already here, for the most part, so this will
not be too bad at all. 

Anyone else think that is very cool?!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31979 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 15:25:32 +00:00
Richard Heck
5d9bfe9ccc HTML escaping for docstrings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31977 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 14:16:15 +00:00
Richard Heck
85503ec1b9 Get XHTML output for InsetRef working, again in a fairly primitive way. We just 
use the label name as associated text, and put it into square brackets. It'd be
nice to be able to do more, but for that we'd need to associate counters with
the labels, which would be nice for display, too. But we don't have that yet.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31976 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 14:12:37 +00:00
Richard Heck
cd35cebed1 Get XHTML output for InsetGraphics working, at least in a primitive way. 
At present, we do not do any sort of rotating, scaling, cropping, etc.
That should not be terribly hard to do, since we can just call ImageMagick
and get it to do it for us, but appropriate routines will have to be 
written.

I'd be thrilled if someone else wanted to do that. ;-)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31975 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 14:00:18 +00:00
Richard Heck
3ad3ad7135 Style. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31974 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 13:16:08 +00:00
Richard Heck
7814909d3b Add TEXT flavor, just in case we need it. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31973 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-14 12:54:12 +00:00
Pavel Sanda
0ed809d7b0 Please Juergen 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31971 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-13 16:25:46 +00:00
Jean-Marc Lasgouttes
7bf3d5cad0 Rename getLocalStatus to Cursor::getStatus 
Move the AtPoint handling into the Cursor dispatch machinery

Note that the call to Cursor::getStatus is in BufferView::getStatus, while
the call to Cursor::dispatch is still in LyXFunc::dispatch. This needs to be
fixed, but the code there is a bit fragile.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31969 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-13 14:32:51 +00:00
Jean-Marc Lasgouttes
5ac479af5e constify 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31968 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-13 13:47:25 +00:00
Richard Heck
ea806d510c Remove redundant code. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31953 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-12 00:26:49 +00:00
Richard Heck
b56faec8f4 Change the order of these backends. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31952 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-11 23:50:54 +00:00
Richard Heck
af0c9adc38 Fix stupid thinko. 
It's not a good idea to be using int's as identifiers for absolutely 
everything here. It makes this kind of mistake WAY too easy.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31951 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-11 23:24:39 +00:00
Pavel Sanda
a9214c66c5 Fix #6313. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31946 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-11 13:56:23 +00:00
Uwe Stöhr
d5099c8605 - introduce option to suppress the LaTeX package mhchem, fileformat change 
The fileformat change is also needed because of our mistake that we load mhchem since LyX 1.6.4 automatically so that files created with LyX 1.6.4 won't compile under LyX 1.6.3. Now at least all files created or opened with LyX 1.7 can be reverted to the fileformat of LyX 1.6.x and can therefore be read by all LyX 1.6.x versions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31941 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-11 01:48:07 +00:00
Jürgen Spitzmüller
4b9a1e2578 * GuiAbout.cpp: 
- unmask e-mail addresses in the credits pane.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31936 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-10 14:45:21 +00:00
Richard Heck
bf8f302b64 This more or less completes the re-implementation of this class. The 
main advantage of what has been done here is that it would now be fairly
easy to return ALL the paths connecting two nodes. In practice, this
would mean that we could find ALL ways of converting one format (say,
LaTeX) into another (say, PDF), and present these to the user for her
perusal.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31927 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-10 01:18:43 +00:00
Richard Heck
db42cac3ab A bit more re-organization. 
Next to go will be the prev vector.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31925 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 17:56:34 +00:00
Richard Heck
bd47bb4fd5 Not so soon, I guess, since that FIXME was from r6305. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31924 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 16:53:40 +00:00
Richard Heck
853199c0ce One more little comment. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31921 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 14:03:10 +00:00
Richard Heck
66a9bdb291 Move the visited stuff inside the Vertex struct. 
Also, there is no good reason for the vertices_ member to be static. Indeed,
if we wanted to use this more generally....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31917 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 04:02:45 +00:00
Richard Heck
1571887511 Move the to == from test, so as to return as soon as we find a path. The 
old way, we can waste time.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31916 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 03:53:20 +00:00
Richard Heck
ac6a58071e Another minor change, but this should almost get us to the point that we 
could return all paths, not just one.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31915 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 03:43:48 +00:00
Richard Heck
dfbbb87e0b More cleanup. We introduce a struct here to keep the relevant 
information together.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31914 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 03:02:11 +00:00
Richard Heck
a79722b1c0 Const. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31913 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 03:00:19 +00:00
Richard Heck
2eee737d00 Cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31912 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 02:26:01 +00:00
Richard Heck
31d932df89 Just some cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31911 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 02:19:02 +00:00
Richard Heck
0fb63fb10e Just some style, and some comments, as I try to figure this out. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31910 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-09 00:55:37 +00:00
Richard Heck
288e249ba2 Constness. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31909 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 22:37:28 +00:00
Enrico Forestieri
f83a6cc3af Don't use updateMacros() in the math parser, in order to avoid 
performance problems when loading documents with lots of macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31907 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 18:47:33 +00:00
Enrico Forestieri
c34cff8d11 In order to avoid confusion, always use buf in Parser::parse1(), 
instead of mixed usage of buffer_ and buf.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31905 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 18:22:57 +00:00
Abdelrazak Younes
1ff07e2958 remove unneeded setBuffer(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31904 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 16:16:36 +00:00
Abdelrazak Younes
d1df0f1c13 oups... fix previous commit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31903 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 16:14:22 +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
1a915927b5 Fix crash when copying an InsetTabular. 
Buffer should not be set when cloning. If there is bug that was fixed by this line of code it should be fixed later by setting the Buffer after the cloning.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31900 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 13:41:29 +00:00
Vincent van Ravesteijn
0d016420ce Fix the new from template functionality. The templatename parameter was magically disappeared in r31704. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31899 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-08 13:20:08 +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
Pavel Sanda
dac1c003d6 Unneeded headers. 
It would be interesting to know how many headers do we actually use in our code.
Nice task for some script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31893 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-07 12:54:19 +00:00
Pavel Sanda
f57a4615cd Header sort order 
../treeview.patch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31892 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-07 12:54:08 +00:00
Peter Kümmel
daba8bda2e cmake: fix merge build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31891 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-07 12:50:30 +00:00
Pavel Sanda
90ce0c669f This is still needed for keyboard focus 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31878 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-06 15:56:15 +00:00
Pavel Sanda
d82da9a255 Fix also nomenclature dialog which was refered in #3852 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31875 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-06 15:22:21 +00:00
Pavel Sanda
5db67312e8 Fix bug #3852. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31874 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-06 15:22:17 +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
Jean-Marc Lasgouttes
b67cd61d3c Avoid undo grouping error when using Undo or Redo. This is because undo grouping has to be done also when putting stuff on the undo/redo stack. 
The solution is just to remove special code :)

I think there is a ticket for this, but I cannot find it.

Abdel, could you please validate my thinking?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31869 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-06 13:32:58 +00:00
Edwin Leuven
c5b63235f0 reduce line noise 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31864 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-05 19:51:17 +00:00
Vincent van Ravesteijn
5ebc733ff3 Fix bug #6237: The boundary has to be set correctly when moving up with a selection. If not, the cursor will remain on the same row when there are two e.g. displayed equations after each other. This will cause an infinite loop when SCREEN_UP is executed. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31863 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-05 12:58:25 +00:00
Vincent van Ravesteijn
d63403205b Fix bug #5968: Assertion while reading a document with multiple equation labels. 
This is another ad-hoc solution for the problem of a zero buffer pointer while reading a document or when using cut&paste.

This simple solution would be suitable for branch.

see also e.g. r29085, r28319, bug #5688.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31861 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-05 00:38:09 +00:00
Jean-Marc Lasgouttes
5ea9cd8b91 Be careful to take in account buffer closing in command-sequence 
This is a regression wrt 1.6. Abdel, please double-check.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31859 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-04 16:28:52 +00:00
Vincent van Ravesteijn
d833a023f6 Add a FIXME to a piece of unreachable code. This dates back to r8251. 
see http://www.lyx.org/trac/changeset/8251.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31858 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-04 15:30:35 +00:00
Vincent van Ravesteijn
a4ccbf67c3 Fix (again) bug #5754: Caption inset not dissolved when unsetting longtable caption row. 
I forgot that inset-begin jumps out of the Inset if the cursor is already at the begin.

see r31823.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31839 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-03 13:06:52 +00:00
Abdelrazak Younes
1ff6b1122b Fix gcc warnings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31830 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 15:20:36 +00:00
Abdelrazak Younes
938f99cf00 Fix gcc warning. 
Richard, please check this out!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31829 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 15:15:47 +00:00
Vincent van Ravesteijn
3533becc2e Fix bug #6240: Adding table row causes exception that triggers infinite loop in code. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31826 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 07:25:05 +00:00
Vincent van Ravesteijn
8f5c3b6219 Fix bug #6144: Remover RegExp from them Menu and give the user the possibility to insert an empty RegExp in the Search field by choosing User defined.. in the Match.. combobox (what use does this option have ?). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31825 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 06:55:40 +00:00
Vincent van Ravesteijn
3b409626f0 Move CollapseStatus from Inset to InsetCollapsable (where it belongs IMO). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31824 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 05:03:09 +00:00
Vincent van Ravesteijn
da8c15d4c3 Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption row. 
This removes the caption-inset, which is made possible by the clean-up of the LFUN_INSET_DISSOLVE (see r31822 and r31756). This assumes that there is nothing else in the row than the caption inset. I think that should be the case, but this is not yet guaranteed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31823 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 04:31:06 +00:00
Vincent van Ravesteijn
33dbbc15a9 Fix some remains of handling INSET_DISSOLVE (see r31756): 
- change cur.inset().nargs() to nargs() as we might actually be in the inset called nextInset(),
- set the enabling flag of the status struct, don't return this value,
- return whether we handled this request.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31822 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 04:01:45 +00:00
Vincent van Ravesteijn
8245ec900b Fix bug #5063: We don't want the combo boxes to adjust to the contents. Also, make the logic exactly the same for all comboboxes. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31821 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-02 02:21:10 +00:00
Uwe Stöhr
8e3736c7b8 GuiBox.cpp: fix typo is comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31820 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-01 23:23:54 +00:00
Vincent van Ravesteijn
d3c786eed6 Fix bug #6297: Use of Fraktur font in boxed equation does not automatically include amssymb. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31819 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-01 22:16:49 +00:00
Vincent van Ravesteijn
86b6bb9d18 Fix r31814: we have to close the tab not hide it. Also rename the closeCurrentTab() function to hideCurrentTab(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31815 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-31 18:14:21 +00:00
Vincent van Ravesteijn
e8ec788924 Close the correct tab when clicking one while the active tab is in another tabworkarea. This was fixed in r31072 for the cornerbutton; now it is fixed for the buttons on the tabs themselves. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31814 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-31 18:10:18 +00:00
Vincent van Ravesteijn
25e5dfe330 Do not issue the warning introduced in r31809 if we are setting the parent for the first time, or we are removing the parent. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31810 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-30 15:33:54 +00:00
Vincent van Ravesteijn
0379518340 Issue a warning if a document has two parents. We should do something smart then, but what? 
- Do we want to ask the user which of the parents he would like to be the document's parent ?
- Do we want to disable any functionality related to parents ? Like references, bibliography, document outline etc.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31809 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-30 15:24:35 +00:00
Vincent van Ravesteijn
10e4c1aa7c * LyXaction.cpp: typo and an improved description for LFUN_COMMAND_EXECUTE. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31807 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-30 15:14:23 +00:00
Vincent van Ravesteijn
1cf4251488 Fix LyX after r31772 (bug #6294). 
The declaration should match the definition.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31806 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-30 14:57:21 +00:00
Vincent van Ravesteijn
d4e864dda2 Standard Layout should be MultiPar. Now, because LFUN_BREAK_PARAGRAPHS really uses the MultiPar property, it is necessary to set it correctly. 
see r31793.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31798 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-30 00:33:56 +00:00
Vincent van Ravesteijn
d156d11738 Fix part of bug #6251: When closing a buffer, only close the direct children. All grandchildren will be closed recursively by the children _and_ before it will be close by the grandparent. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31797 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 23:28:08 +00:00
Vincent van Ravesteijn
fb2b817346 Dissect closeWorkArea and closeBuffer. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31796 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 23:22:50 +00:00
Vincent van Ravesteijn
8fd507ccf2 Remove parameter from cur.reset(). All calls had buffer().inset() as parameter. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31795 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 22:46:04 +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
5d9fdda299 Move the call to LFUN_SET_COLOR from the handling of LFUN_BRANCH_ADD_INSERT to LFUN_BRANCH_ADD. Now, the sequence "branch-add A" + "branch-insert A" doesn't result in an undefined branch Inset in the document. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31792 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 22:06:27 +00:00
Vincent van Ravesteijn
cd15ffd9a9 Another fix for bug #5061: A slight correction of the patch shown described in http://permalink.gmane.org/gmane.editors.lyx.devel/113507. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31791 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 21:02:19 +00:00
Vincent van Ravesteijn
d0859f23d0 Fix bug #6292: Ensure the current language is set correctly after dissolving an Inset. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31790 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 13:36:22 +00:00
Enrico Forestieri
424e3da04c Better fix for bug #6270. The outer braces are swallowed only for user 
defined macros, so better use a brace inset only when strictly needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31789 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-29 13:24:02 +00:00
Pavel Sanda
e5098a6f0c CompareUi: set scaledContents, resave in 4.4 designer 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31785 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-28 18:35:46 +00:00
Jean-Marc Lasgouttes
0a868fb846 remove special TEX2LYX code in Spacing,h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-28 10:07:10 +00:00
Richard Heck
bc0c63c8ee What we mean by a label in HTML output and what LyX means by a label 
aren't the same thing, so we won't be generating default CSS for those.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31778 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 19:51:30 +00:00
Richard Heck
df0fdb0d53 We should have a default tag for InsetLayout, too, I think. So here it is. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31777 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 19:46:47 +00:00
Richard Heck
001b0d529d Put the InsetLayout default CSS stuff to use. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31776 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 19:17:52 +00:00
Richard Heck
9afbd6d68d Update layout format. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31774 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 19:03:30 +00:00
Richard Heck
6a1bf700b4 A bit more cleanup, after JMarc. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31773 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 18:23:53 +00:00
Jean-Marc Lasgouttes
0c1ff6d89e Move some functions that only required a FontInfo parameter from Font.* 
to FontInfo.*

This allows tex2lyx to use the plain FontInfo object (via Layout), and to remove
several '#ifdef TEX2LYX' in the code

Reorder a bit the makefile in tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31772 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 16:16:15 +00:00
Richard Heck
e8631bf7ed Default CSS for InsetLayout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31771 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 14:33:01 +00:00
Richard Heck
4c004e0485 Forgot this in a previous commit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31770 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 14:32:45 +00:00
Richard Heck
2e871e1ae3 Renaming. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31769 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 14:14:24 +00:00
Richard Heck
e90add4f15 We need to do some cleanup on the layout name before we can 
use it as a class name.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31768 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:58:23 +00:00
Richard Heck
80cc7e99f2 Add routine to create default CSS for layouts. 
JMarc (or others), please check the #ifdef here. If you'd prefer to 
do this some other way, let me know.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31766 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:30:53 +00:00
Richard Heck
c2b8eeaf96 Rename some things to improve clarity. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31765 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:29:26 +00:00
Richard Heck
1d9b4956c3 Since LyX uses "INHERIT" as a default, we do not want it for HTML. 
Also reformat things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31764 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:27:26 +00:00
Richard Heck
66fb89d976 Fix typo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31763 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:04:13 +00:00
Richard Heck
e4096caf26 Clearer function names, thanks to Abdel. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31762 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 12:13:34 +00:00
Vincent van Ravesteijn
d9ab7302a6 Fix bug #6193: Crash when navigating away from an empty super/subscript. 
I still don't know why it is that bad that this call is made below, but this seems to fix the problem.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31758 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 00:11:56 +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
Vincent van Ravesteijn
1bcb0d38e6 * InsetTabular.h: Whitespace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31755 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 22:21:07 +00:00
Richard Heck
8a38179d6d Initial work for the layout2css stuff. Basically, we have a routine 
here, and lots of support, that writes font information to CSS format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31754 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 21:35:35 +00:00
Richard Heck
5faa75408b Try to deal with one of the big problems here, namely, that we 
can't just output Standard as <p>, or anything else, because we
have structures like:
  this is text <branch>and more text</branch> and more
which would then come out as:
  <p>this is text <p>and more text</p> and more</p>
So we use the OutputParam html_in_par to try to signal when we
are already in a paragraph. It is expected that we will need to
do some bug fixing here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31753 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:53:46 +00:00
Richard Heck
9a19a312ba Rename one output param and add a new one. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31752 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:47:12 +00:00
Richard Heck
331d8060b5 Move the defaults to Layout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31751 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 20:45:29 +00:00
Richard Heck
67b7ca00a0 Some framework stuff for default-generated CSS. 
The actual generation is still to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31749 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 16:13:09 +00:00
Jean-Marc Lasgouttes
546f91ac9e fix linking of Compare.o with autotools 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31748 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 15:45:33 +00:00
Jean-Marc Lasgouttes
32f1905660 fix Ui of GuiCompare to work with Qt 4.2 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31747 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 15:45:01 +00:00
Richard Heck
dfe5bd2e40 Allow the suppression of LyX's own labels. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31746 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:51:51 +00:00
Richard Heck
02bc0dc3bf Don't wrap empty labels. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31745 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:37:31 +00:00
Richard Heck
cb138c6c24 This commit does two things. 
First, it introduces some sensible defaults for the html 
output; these are described in layout.h and implemented in 
the openTag, etc, routines.

Second, it modifies the way standard environments are handled.
The previous version was outputing the label for each paragraph
of e.g. a theorem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31744 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-26 02:21:59 +00:00
Vincent van Ravesteijn
ed98a0000d Remove const modifier from the correct function. 
see r31737.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31738 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 14:00:29 +00:00
Vincent van Ravesteijn
bdf69de113 Don't set the read-only flags of the documents. The GuiCompare is modal anyway, so the user shouldn't be able to change something. 
This reverts part of r31736.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31737 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 13:56:44 +00:00
Vincent van Ravesteijn
7227566e86 Call the Compare thread from the GuiCompare dialog. 
Furthermore:
- increase safety, 
- improve error handling,
- minor cleanups,
- set documents to read-only while running the thread.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31736 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 13:41:46 +00:00
Vincent van Ravesteijn
18483e6362 Adds the threaded Compare class, which will eventually do the comparison between two documents. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31734 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 10:43:16 +00:00
Pavel Sanda
221bd56fae Fix warnings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31728 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 09:28:02 +00:00
Jürgen Spitzmüller
d78bea45b4 * PrefDisplayUi.ui: add tooltip. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31725 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 09:15:18 +00:00
Richard Heck
d603b55b52 A couple comments and some very minor cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31720 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 02:22:36 +00:00
Richard Heck
14bb003b7e Add an HTML output flavor, and do something with it. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31719 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-25 01:48:14 +00:00
Richard Heck
d7d1b39adc More typos. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31718 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-24 20:25:35 +00:00