Commit Graph

607 Commits

Author SHA1 Message Date
Kornel Benko
0a2c70636a Cmake build: Make PreviewLoader.cpp compilable again 2012-12-12 20:42:58 +01:00
Tommaso Cucinotta
4285b0b316 While exporting from the command-line, theApp() doesn't exist.
It was only needed for getting hex names of colors. So, get them
directly from a ColorCache object with default mapping.
2012-12-12 19:22:42 +00:00
Lars Gullik Bjønnes
43f6b1672b Use empty() to check empty and non-empty'ness not size()
Also add FormatList::empty().
2012-10-27 01:25:38 +02:00
Lars Gullik Bjønnes
62394258da WS cleanup, remove extraeneous spaces 2012-10-27 01:25:38 +02:00
Lars Gullik Bjønnes
dd2189656b More idiomatic way of checking if a shared_ptr has an associated managed object 2012-10-25 12:12:49 +02:00
Juergen Spitzmueller
63612ca99b Restore buffer parenthood if we exit already after the preamble 2012-10-05 19:26:07 +02:00
Juergen Spitzmueller
e6afdf1b2b Prevent the PreviewLoader from orphaning children 2012-10-05 18:28:38 +02:00
Scott Kostyshak
51c380440b Constify some catches and others 2012-09-17 04:05:34 -04:00
Jean-Marc Lasgouttes
a756403301 "Performance" fixes suggested by cppcheck
While cppcheck did not turn out any suspicious error messages, using
the "performance" flag highlighted several nitpicks in three categories
 * do not use it++ for iterators, ++it is better
 * do not use size() to test for emptyness, empty() is here
 * do not use "const T" as a function parameter, "const & T" is better

I doubt that any of these is a real performance problem, but the code is cleaner anyway.
2012-05-28 22:42:44 +02:00
Vincent van Ravesteijn
f0754582b8 Fix bug #8114: LyX does not retrieve negative bbox parameters
LyX fails to read the bounding box from an EPS file if it has
negative values. Adjusting the regex will overcome this problem.
Negative values do not pose big problems later on, but the GUI
doesn't handle it correctly yet (see bug #5718).
2012-04-08 23:20:01 +02:00
Georg Baum
26e5f1a8ec Use libmagic for file format detection if available.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40789 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-21 20:29:44 +00:00
Georg Baum
9fe72c3501 Move readBB_from_PSFile() out of support (no code change),
since it soon will need to use the Formats class.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40757 a592a061-630c-0410-9148-cb99ea01b6c8
2012-02-15 20:50:52 +00:00
Georg Baum
5e47fc73d5 Enable the graphics converter to copy with identical in and out file names.
This is already supported in Converters::convert() and needed e.g. for
eps2->eps conversion.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40649 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-22 14:08:53 +00:00
Richard Heck
f25e7c340b Improve argument handling for the source generation routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40069 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 20:14:48 +00:00
Julien Rioux
665405da0a Unify the handling of converters that specify the resultfile= flag.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39985 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-25 23:31:36 +00:00
Enrico Forestieri
d703d90574 Fix bug #7835 (Relative paths are not supported by the TEXINPUTS prefix)
This restores \input@path handling, which turns out to be necessary, as
the TEXINPUTS mechanism is not used with relative paths. It turns out
that both methods must be used, because \input@path does not work in all
cases (most notably with tikz).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39918 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-22 15:10:43 +00:00
Julien Rioux
35b580fb30 lyxpreview: Simplify the color handling.
Let's have this in trunk for testing. The real difference maker
when it comes to color is whether we use dvipng or ghostscript.

For dvipng:

  - The color info is passed as command-line arguments.

  - The tightpage option is not necessary, and since it adds
    ps specials to the output, we shouldn't use it.

For ghostscript:

  - The color info needs to be in the latex file.

  - The foreground color is set for each preview inset.

  - The background color is set by \pagecolor in the preamble,
    which is understood by pdflatex, but ignored in dvips mode.
    Thus dvips is handled with a ps special.

  - The tightpage option is necessary to crop the images.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39797 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:43:33 +00:00
Julien Rioux
13b1277cd2 lyxpreview: Handle bibtex-generated references and bibliography.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39795 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-03 16:35:27 +00:00
Enrico Forestieri
5c17ce4195 Also set TEXINPUTS when launching ForkedCall processes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39742 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-24 01:32:35 +00:00
Tommaso Cucinotta
b095996dda Fix bug introduced in r39705 (was making .eps.gz not work anymore).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39720 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-20 19:45:31 +00:00
Tommaso Cucinotta
b4f97b61cf Added support for natively zipped file formats that do not need decompression for being handled by converters
(e.g., compressed dia, odg, sxd, ...). These need to be marked via the "zipped=native" flag in the RC file.
The old 'dia' configuration is automatically updated (it used to be hardcoded in the code, now it is handled
via the flag).
See also http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg170974.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39705 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-19 00:12:09 +00:00
Enrico Forestieri
a18bf3f274 Fix bug #7621 (Images are not displayed if path of temp folder contains accented characters)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39700 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-18 15:19:49 +00:00
Julien Rioux
81420e405f Merge the preview mechanism for japanese with the standard one.
- Japanese is now handled by passing the option --latex=platex
    to the standard lyxpreview script. This is done in PreviewLoader.
  - Remove obsoleted file lyxpreview-platex2bitmap.py and the
    corresponding lines in the configure script.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39659 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:23:15 +00:00
Julien Rioux
10868c31ac Merge the preview mechanism for lilypond-book with the standard one.
- Handle the preprocessing in the main lyxpreview script with the
    command-line arguments --lilypond and --lilypond-book=exe.
  - Remove the obsoleted file lyxpreview-lytex2bitmap.py and the
    corresponding lines in configure.py.

Fix for the japanese preview still to come.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39658 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:59 +00:00
Julien Rioux
2bd747fad4 Add command-line arguments to lyxpreview2bitmap.py
Add command-line arguments in a standard unix fashion, using getopt.

    Usage: ./lyxpreview2bitmap.py <options> <input file>

    Options:
      -h, --help:    Show this help screen and exit
      --dpi=<res>:   Resolution per inch (default: 128)
      --png, --ppm:  Select the output format (default: png)
      --fg=<color>:  Foreground color (default: black, ie '000000')
      --bg=<color>:  Background color (default: white, ie 'ffffff')
      --latex=<exe>: Specify the executable for latex (default: latex)

    The colors are hexadecimal strings, eg 'faf0e6'.

The changes to PreviewLoader.cpp break the preview of lilypond-book
and japanese files, but they will be handled in the next commits.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39657 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-11 18:22:43 +00:00
Enrico Forestieri
7c17e970b1 Fix bug #6170 (Latex Compiler error when lyx file is located in a path which contains a "#")
This removes \input@path handling.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39563 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-29 17:02:27 +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
Abdelrazak Younes
850e4d80c0 Graphics cleanup: get rid of Previews.{h,cpp}
The PreviewLoader is created directly by Buffer on demand. The PreviewLoader cache was complex and unneeded because there is one and only one PreviewLoader per Buffer.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39276 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-12 12:43:11 +00:00
Richard Heck
5db4b7eb16 Move a bunch of code from Buffer to BufferParams. The point of this
is contained in the next commit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38742 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-13 19:39:56 +00:00
Peter Kümmel
897edc10c0 cmake: move CMakeLists.txt into source dir (multiple steps)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38691 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:44:41 +00:00
Julien Rioux
adf6faf4d4 revert r37696 and apply a fallback mechanism to pdflatex
when latex fails with a preview. Fixes bug #7303 (IP fails with hyperref).
Patch by Ale with suggestions from Enrico

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38243 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-04 14:33:45 +00:00
Julien Rioux
adc6d258f9 we want XeTeX as the backend for previews when using nonTeXFonts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38160 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 13:50:47 +00:00
Julien Rioux
efe93782fe allow proper preview when using literate in combination with nonTeXFonts
(we can't rely on bufferFormat for this)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38147 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-30 00:34:09 +00:00
Pavel Sanda
d2873b4bc6 Add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37819 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 22:21:03 +00:00
Peter Kümmel
ca3395ec88 #7163: don't delete objects which a thread needs later on
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37818 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-01 19:39:47 +00:00
Jürgen Spitzmüller
c020978d18 * PreviewLoader.cpp:
- use pdflatex route for preview snippet generation if hyperref is used.

This works around a bug in hyperref and/or preview-latex via DVI route (bug #7303).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37696 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 16:59:22 +00:00
Vincent van Ravesteijn
d77fc1668c Fix bug #7263: Instant Preview crash.
I guess this deserves to be sorted out better, because we are doing tricky things by deleted the object from itself.

Problem:
 
PreviewImage? has a member PreviewLoader?. PreviewImage::Impl::statusChanged() calls PreviewLoader::remove. PreviewLoader::Impl::remove removes a snippet from the cache. In the cache is a map of the snippet and a shared pointer to PreviewImage?. This means that removing the snippet from the cache, destroys the PreviewImage?. When we get back to PreviewImage::Impl::statusChanged() this will start to crash.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 17:11:03 +00:00
Enrico Forestieri
c6648aaeb9 Complete integration of texrow with otexstream and allow automatic line
counting also when outputting the latex preamble.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37641 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-13 21:41:44 +00:00
Enrico Forestieri
46cb01a5e0 Fix bug #6720 (Better error handling of instant preview)
Patch from Ale revised by me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37274 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-20 23:39:08 +00:00
Jürgen Spitzmüller
0a34b1e047 fix some typos. Patch by Yuri Chornoivan.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37039 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 16:57:04 +00:00
Jürgen Spitzmüller
1899bf04fa * PreviewLoader: add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36449 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 16:09:05 +00:00
Jürgen Spitzmüller
79514a3fcd PreviewLoader: use bufferFormat() here, even if this also relies on useXetex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36446 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-23 13:18:28 +00:00
Pavel Sanda
e7dd1bf9dd Add lilypond-book module and add support for instant preview.
Patch by Julien Rioux.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg162042.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35472 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-21 16:34:30 +00:00
Richard Heck
89a9fc4c5e Implement independent output scaling for math images (and, I suppose,
for any other sort of image for which we produce a preview on export,
e.g., eventually, for InsetExternal).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35032 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-29 16:38:58 +00:00
Richard Heck
2f78698fbd First step towards fixing some issues noted by Vincent. We record in the
Buffer whether we are exporting or not, rather than rely upon isClone(),
which could be adapted to other purposes. And, of course, someone might
choose locally to disable cloning....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34999 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 21:51:33 +00:00
Richard Heck
980dfa0f3b Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34997 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 14:28:38 +00:00
Richard Heck
b8d43b05bc Support for exporting math as images with XHTML. The next step is to
allow this as a fallback. E.g., if we're unable to export as MathML,
then we try to export as an image.

There are several ways, I am sure, in which this implementation is not
ideal.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34993 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-21 13:19:52 +00:00
Richard Heck
6ddefebc09 We do need the encoding here now, due to how InPreamble works.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34679 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-15 18:26:38 +00:00
Peter Kümmel
4654a8bf96 build with GCC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34263 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 14:40:57 +00:00
Peter Kümmel
c9b9748cee msvcUsing "using namespace std" with msvc10 makes also std::tr1::shared_ptr visible and generates conflicts with boost::shared_ptr.
Solution: don't use boost::shared_ptr for msvc10 (could also be extended  to several GCC versions)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34259 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 11:37:32 +00:00
Peter Kümmel
61b2bd5e7f Using "using namespace std" with msvc10 makes also std::tr1::bind visible and generates conflicts with boost::bind.
Solution: don't use boost::bind for msvc10 (could also be extended  to several GCC versions)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34257 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 11:16:58 +00:00
Pavel Sanda
72a6c77a51 support:
frontends:
onlyFilename -> onlyFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34240 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:28 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Richard Heck
c282d14f66 Update comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34064 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-06 00:48:58 +00:00
Jürgen Spitzmüller
c2ef290547 * enable instant preview with XeTeX (requires preview-latex v.11.86) [bug #5577]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33554 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-24 10:47:35 +00:00
Enrico Forestieri
37974532f6 Fix bug #5238: LyX 1.6 fails with non-ascii chars in path (on Windows)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33524 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-21 04:51:27 +00:00
Vincent van Ravesteijn
e2d6ecff99 Compute the font_scaling_factor every time a preview is created (we can afford a few multiplications I guess). Now, the newly generated previews use the possibly updated zoom, dpi and preview_scale_factor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32563 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:25:55 +00:00
Vincent van Ravesteijn
5a530cca94 Do not hardcode the background color of the preview at two places.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32562 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:21:08 +00:00
Vincent van Ravesteijn
0acff0aa75 Add a FileName::refresh function and replace one call to lastModified which was just meant to refresh the file info.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32354 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 02:50:34 +00:00
Vincent van Ravesteijn
f19b6178a9 Fix bug #4360: Instant preview does not render formulas which contain math-macro from input file.
Patch from Stefan.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32157 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 20:50:35 +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
Uwe Stöhr
cb71b8a8de GuiPrefs:
- implement an UI to specify the size of InstantPreview images
- change the default size to 1.0 because we've got many complaints that the former default size of 0.9 was too low

Both changes fix #6176.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31425 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-21 00:44:43 +00:00
Vincent van Ravesteijn
770aa71839 Fix bug #6134: Reload context menu for graphics inset.
This shouldn't be necessary, but sometimes it is.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31014 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 17:21:59 +00:00
Vincent van Ravesteijn
d757c34e79 gcc compile fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28755 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-12 19:44:40 +00:00
Vincent van Ravesteijn
26529a1732 Fix a few peculiarities wrt graphics. E.g., an InsetGraphic with a non-existing image showed the message that the image was loaded, instead of "No file found!".
* CacheItem::Impl::tryDisplayFormat

- Enhance description of the return value.
- Negate the return values to match the description.

* CacheItem::tryDisplayFormat

- Impl::tryDisplayFormat returns whether a conversion is needed, not whether the try was successful. Therefore, we should check the status as well.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28754 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-12 19:25:07 +00:00
Stephan Witt
bb54a2be93 introduce new converter variable $$d to pass output directory pathname to converter programs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27554 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 15:07:51 +00:00
Jean-Marc Lasgouttes
0778007050 rename [io]docfstream to [io]fdocstream
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27530 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 12:21:29 +00:00
Jean-Marc Lasgouttes
9b9b14506d revert r27520 (tr1 stuff)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27528 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 11:51:42 +00:00
André Pönitz
a287184d72 try using std::tr1::shared_ptr instead of boost::shared_ptr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27520 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 00:01:41 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Jean-Marc Lasgouttes
673c2a3ec5 remove obsolete workaround
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27187 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-29 13:42:09 +00:00
Abdelrazak Younes
d25c74c0eb Simplify image creation with a new factory function: newImage().
GraphicsImage: now a pure virtual interface.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26457 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-19 12:01:01 +00:00
Abdelrazak Younes
31c1982677 * GuiImage:
- switch to QImage backend instead of QPixmap. In any case this was done internally by Qt for any image loading or transformation. This should relieve the X11 server a bit for big images.
- try to clear out the memory after a transformation by calling QImage::detach(). Unfortunately there seems to be a bug somewhere in Qt... see (http://bugzilla.lyx.org/show_bug.cgi?id=5002).

* GraphicsImage: get rid of scaledDimension()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26455 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-19 11:27:24 +00:00
Jürgen Spitzmüller
a2906cb877 ** proper implementation of pLaTeX by Tetsuya Makimura and me, fixes many remaining problems and bugs with language "japanese" (bugs 4863, 4290, 4700 and partially 4697) **
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26200 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-18 17:26:09 +00:00
Peter Kümmel
1da756723a fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26152 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-13 21:39:59 +00:00
Abdelrazak Younes
aa0a9b8316 Remove unnecessary FileName construction.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25996 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-30 06:51:50 +00:00
Abdelrazak Younes
1afed1fc88 Remove GraphicsTypes.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25838 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-23 12:19:43 +00:00
Abdelrazak Younes
8195925175 Replace home made temp file creation with safer (and cleaner) Qt' solution. Should fix http://bugzilla.lyx.org/show_bug.cgi?id=4693
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25822 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-23 05:17:31 +00:00
Abdelrazak Younes
9055871c15 Mac gcc compile fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25608 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 11:40:29 +00:00
Abdelrazak Younes
79beb91e3a Sanitize LyX singleton access by getting rid of ref() and cref() methods.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25597 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 08:35:00 +00:00
Abdelrazak Younes
647ac4a221 safeguards:
- move Previews singleton to LyX
- LyX.cpp: set singleton to zero at destruction.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25594 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 07:16:00 +00:00
Pavel Sanda
c29bd2ef53 Revert http://www.lyx.org/trac/changeset/25471 /2
This commit hasn't announced in http://bugzilla.lyx.org/show_bug.cgi?id=4749
and bring this bug in a different flavour, see comment 28.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25564 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 11:40:47 +00:00
Abdelrazak Younes
7122fd58d8 stupid me...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25533 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 11:45:16 +00:00
Abdelrazak Younes
f71ec170f7 Fix http://bugzilla.lyx.org/show_bug.cgi?id=5016
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25532 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 11:43:12 +00:00
Abdelrazak Younes
9406eb0ff9 Fix crash reported in http://bugzilla.lyx.org/show_bug.cgi?id=4873
I don't think the crash is related to that bug.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25514 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-09 09:48:59 +00:00
Abdelrazak Younes
d6ee64599c adjust comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25472 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 08:52:21 +00:00
Abdelrazak Younes
2fe39e6a2f Use png as default conversion format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25471 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-07 08:47:57 +00:00
Jürgen Spitzmüller
01c71419d9 *** Extend preview scripts to also handle PDF output (bug 2165) ***
* src/PreviewLoader.cpp:
	- add conditions for preview with pdf output

* lib/scripts/legacy_lyxpreview2ppm.py:
	- if no dvi preview file is available, check for a PDF file
	  and process that, if found
	- also produce png output, if requested.

* lib/scripts/lyxpreview2bitmap.py:
	- if no dvi preview file is available, check for a PDF file
	  and process that, if found

*  lib/scripts/lyxpreview_tools.py:
	- move some common functions here

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25419 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-02 14:42:04 +00:00
Abdelrazak Younes
f033198c3f Avoid any signal/slot communication when the graphic is directly showable on screen. This should complete the fix to http://bugzilla.lyx.org/show_bug.cgi?id=4829
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25340 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-20 16:12:48 +00:00
Abdelrazak Younes
4a1be58591 - Simplify prefs, graphics and external display options which are now true or false.
- the display combo in the prefs, external and graphics dialogs are gone
- the lyxrc display_graphics option now overrides any local inset display option
- The external template format has a new tag: Preview
- format incremented to 337


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25245 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-13 07:34:55 +00:00
Abdelrazak Younes
435e223f7c Fix http://bugzilla.lyx.org/show_bug.cgi?id=4933
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25182 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-07 09:06:18 +00:00
Abdelrazak Younes
374ec4be57 Simplify and optimize image on screen visualization. Fix one bug or two along the way WRT combined image effects (egg: rotation and grayscale).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25175 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 22:51:11 +00:00
Abdelrazak Younes
896cb74fe2 Optimize the graphics loader: don't put the image in the queue if it is directly loadable and no conversion is needed. No more temporary preview image, yeah!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25166 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 13:30:38 +00:00
Abdelrazak Younes
9d00e2ec0a Move loadableImageFormats() to the frontend.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25163 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 12:29:58 +00:00
Abdelrazak Younes
264f32ec37 Simplify image loading on screen which is not asynchronous, never was...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25162 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 11:52:02 +00:00
Abdelrazak Younes
20b45450f6 move GuiImage::loadableFormats() to support/imagetools.{h,cpp} and simplify this whole stuff. What a mess!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25161 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-06 11:34:49 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
Richard Heck
8a69ffd3bf Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got everything, but this does compile, and it seems to work at least reasonably well. Any problems should of course be reported to the list.
For the record, this developer is sorry that the problems with this code were not noticed much earlier. It's not fun to do so much work and then have it all reverted.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24373 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 03:08:11 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Abdelrazak Younes
2bf1c09376 header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23049 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-18 07:14:42 +00:00
José Matox
03fb3b0aec Patch to please gcc 4.3. Less bloat in the include headers means that
we need to include explicitly some header files now.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22846 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-07 17:04:06 +00:00
Bo Peng
06254d11df Embedding: display a pin at the top left corner of embedded figures
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22439 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-08 16:22:05 +00:00
Abdelrazak Younes
58729e1117 Following rev 21967: final touch to odocfstream:
- odocfstream: properly fix plaintext output by getting rid of ctor with std::string argument as this can be mixed up with std::ofstream(std::string) ctor where the argument is a file. UTF8 is now the default encoding.
- PreviewLoader::Impl::startLoading(): catch another potential iconv exception.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22332 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-29 18:04:43 +00:00
Abdelrazak Younes
9439b6e6e0 * get rid of support::absolutePath()
* remove FileName.h inclusion from filetools.h


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22188 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-17 16:04:46 +00:00
Abdelrazak Younes
e7bb71ff4e header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22178 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-16 22:09:28 +00:00
Abdelrazak Younes
86506a80eb Simplify FileName::tempName().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22163 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-16 09:52:36 +00:00
Abdelrazak Younes
4020357dd2 Transfer tempName() implementation to FileName.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22161 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-16 07:52:38 +00:00
Abdelrazak Younes
7c392af6ea getting rid of superfluous lyx::support:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22106 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:57:42 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:28:07 +00:00
Abdelrazak Younes
b89cc942eb 'using namespace lyx::support' instead of 'using support::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:57:56 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
Abdelrazak Younes
377ae30bd8 lyxlib.h:sum -> FileName::checksum()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21874 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-30 09:23:44 +00:00
André Pönitz
0ef0cbbf1a cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21864 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 19:56:25 +00:00
André Pönitz
1aafa6ff77 merge the Forked* machinery into a single pair of files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21863 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 19:19:39 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
André Pönitz
150cf11651 hand-crafted LyXErr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21849 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 22:12:03 +00:00
Abdelrazak Younes
f07105d0e5 * FileName:
- removeFile(): replace unlink
- copyTo(): add 'overwrite' parameter.

* getcwd.cpp: simplify.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21843 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 09:01:49 +00:00
André Pönitz
d95451ae5c s/isFileReadable/isReadableFile;
introduce isReadableDirectory
replace isReadable by either isReadableFile or isReadableDirectory
remove isReadable


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21769 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-25 11:18:16 +00:00
André Pönitz
2e79520f6b merge LoaderQueue into Loader
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21755 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 00:02:58 +00:00
André Pönitz
502125671a only called once
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21754 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 23:57:11 +00:00
André Pönitz
b89d0e2eb7 simplification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21752 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 22:57:11 +00:00
André Pönitz
c610af7ccd cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21749 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 22:15:17 +00:00
André Pönitz
4c3e546375 remove one <boost/shared_ptr.hpp>
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21707 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-22 00:03:18 +00:00
André Pönitz
5d16f8030d use strfwd.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21706 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-21 23:55:42 +00:00
André Pönitz
98ddc514da remove a few uses of boost::scoped_ptr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21705 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-21 23:47:47 +00:00
André Pönitz
d33cedef34 replace boost::noncopyable by plain C++ idiom
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21704 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-21 23:31:12 +00:00
André Pönitz
974924a5d5 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21703 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-21 22:54:10 +00:00
André Pönitz
24ec082d8e cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21699 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-21 22:04:50 +00:00
André Pönitz
e1ce2f92db reduce line noise
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21631 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-15 20:04:51 +00:00
Abdelrazak Younes
eea79637c7 Move Color::color enum to ColorCode.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21198 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-25 12:41:02 +00:00
André Pönitz
fbb3abfeac cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21085 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-20 17:35:27 +00:00
André Pönitz
f762cbf3c6 mainly cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21079 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-20 10:03:45 +00:00
André Pönitz
a02653e4dd isome more FileName shuffling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21048 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-18 23:03:51 +00:00
Abdelrazak Younes
f7b1c86393 Move Inset::Code to InsetCode.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20936 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-13 09:04:52 +00:00
André Pönitz
fad47c0fe0 boost/utility -> boost/noncopyable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20608 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-30 15:47:00 +00:00
André Pönitz
581b67b26e move ChangeLogs to the attic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-29 14:12:55 +00:00
Abdelrazak Younes
3772f193cc revert rev 20291, a better fix was found in rev 20293
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20294 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-15 17:32:11 +00:00
Abdelrazak Younes
75ce500989 Fix bug 4178:
http://bugzilla.lyx.org/show_bug.cgi?id=4178

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20291 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-15 16:50:14 +00:00
Bo Peng
81031b4cea Fix crash when a user removes the underlying figure of a graphic inset that has been copied and pasted (Bug 4108). Revert Andel's fix r19591
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19612 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-16 18:37:38 +00:00
André Pönitz
848c89564f remove lyxrc dependence from support/*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19441 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-11 22:37:09 +00:00
André Pönitz
5d80a87ceb merge {mathed,insets,graphics}/Makefile.am into src/Makefile.am
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19424 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-11 10:32:36 +00:00
André Pönitz
67e61a3956 enable building of shared libraries. reduces final linktime. also combine boost stuff into a single library
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19410 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-10 22:33:54 +00:00
Enrico Forestieri
7b392cfd2d Fix bug 3904
* src/graphics/GraphicsConverter.cpp
	(move_file, build_script): convert any path name to the local
	encoding directly in the python script.

	* src/support/tempname.cpp
	(tempName): don't pass local 8bit encoded strings to addName as
	it expects them to be utf8 encoded.

	* src/ServerSocket.cpp
	(ServerSocket::ServerSocket): ditto for setEnv.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-26 15:45:58 +00:00
Abdelrazak Younes
2f2e84a96f header cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18784 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-15 13:47:55 +00:00
Lars Gullik Bjønnes
897436efbb Whitespace cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18550 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 22:27:45 +00:00
Jürgen Spitzmüller
bd997f2cb9 * src/BufferParams.{cpp, h}
* src/graphics/PreviewLoader.cpp:
	- make member writeEncodingPreamble void.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18543 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 12:25:53 +00:00
Jürgen Spitzmüller
d2d31b9130 Fix bug 3522.
* src/BufferParams.{cpp,h} (writeLaTeX): 
	- move inputenc generation to an own function, 
	   writeEncodingPreamble

* src/graphics/PreviewLoader.cpp (startLoading):
	- use the inputenc command and encoding of the buffer
	  by using the aforementioned new function.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18538 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-28 07:43:15 +00:00
André Pönitz
32871c1284 rename InsetBase to Inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18089 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 13:39:47 +00:00
André Pönitz
51fbea02a8 Remove InsetOld
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18087 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-29 12:32:14 +00:00