Commit Graph

9533 Commits

Author SHA1 Message Date
Abdelrazak Younes
d57250330d Fix compile with enable-concept-check.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13714 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-22 21:46:32 +00:00
Abdelrazak Younes
8c0bd3a77b * TocBackend.[Ch]: new files defining class TocBackend. This class contains adapted code from former toc.C
* toc.[Ch]:
    - rewritten to take advantage of new TocBackend class. The toc
    cache is implemented as a static variable:
    static map<Buffer const *, lyx::TocBackend> toc_backend_;

* buffer_funcs.C:
    updateLabels(Buffer const & buf) now calls
    "lyx::toc::updateToc(buf);"

* pariterator.h: added default constructor
    ParConstIterator(): DocIterator() {}

* insetfloat.C: added pit parameter to TocItem construction

* insetwrap.C: added pit parameter to TocItem construction

* MenuBackend.C: use a const ref instead of a copy of TocList

* ControlToc.[Ch]: optimisation of the API by using const reference instead of copy.

* qt4/TocPanel.[Ch]:
    - optimisation of the API by using const reference instead of
    copy
    - directly use of TocBackend::TocIterator instead of identification by paragraph contents.

* qt4/QToc.C:
    - optimisation of the API by using const reference instead of
    copy
    - makes use of TocBackend::Item::uid()

* qt2/QToc.C:
    - use TocItem::depth() and TocItem::str() instead of public member access.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13713 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-22 18:48:28 +00:00
Georg Baum
39de58c7a7 * src/lyxrc.C: Fix typo in LyXRC::write
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13712 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-22 16:49:19 +00:00
Georg Baum
d732249e2b Fix bug 2285 (tex2lyx is not found by lib/configure when compiling with
--with-version-suffix):

	* src/lyx_cb.C
	(reconfigure): get the configure command from package()

	* src/lyx_main.C
	(showFileError): ditto

	* src/support/package.[Ch]
	(configure_command): new, return the configure command

	* src/support/package.C.in
	(with_version_suffix): new, return the version suffix argument
	of the configure command

	* src/support/Makefile.am
	(package.C.in): substitute %PROGRAM_SUFFIX% in package.C.in

	* config/lyxinclude.m4: substitute program_suffix


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13710 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-22 11:58:02 +00:00
Martin Vermeer
11145e20eb Grey out outlining movement buttons for non-ToC
* qt2/QTocDialog.[Ch]: Add enableButtons

	* qt2/QToc.[Ch]
	(QToc::build_dialog):
	(QToc::updateType):
	(QToc::updateToc):
	(QToc::updateToc):
	(QToc::set_depth): Change update logic



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13709 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-21 22:51:39 +00:00
Georg Baum
a2457c3b5b From Angus:
Enable lib/configure.py to find tex2lyx if the path to it contains spaces.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13708 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-21 15:15:55 +00:00
Bo Peng
5cf8376ef7 Replace gzstream by boost::iostreams::gzip_(de)compressor: by Bo Peng (ben.bob@gmail.com)
* src/buffer.C, use filtering_ostream
	* src/lyxlex_pimpl.h, .C, use filtering_istreambuf
	* src/Makefile.am,  src/support/Makefile.am, src/tex2lyx/Makefile.am, use BOOST_IOSTREAMS
	* remove src/support/gzstream.h, .C
	* add needed boost files boost/boost/iostreams/device/file_descriptor.hpp,
     device/mapped_file.hpp, detail/system_failure.hpp, 
		 detail/config/windows_posix.hpp


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13706 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-21 06:42:17 +00:00
Lars Gullik Bjønnes
0b6deecd95 * Add the iostreams and range libs to our copy of boost
* Make sure that no source files in boost are executable
	* Make sure that all boost files are marked with eol-style native
	* configure.ac: setup for new iostreams boost binary lib
	* config/common.am: add boost iostreams variable


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13705 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 20:44:05 +00:00
Georg Baum
5ac63517c6 From Enrico Forestieri:
* lib/scripts/TeXFiles.sh:
	Account for Cygwin teTeX on Windows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13704 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 16:59:51 +00:00
Jürgen Spitzmüller
a3aad45f7b * src/lyxfunc.C (void LyXFunc::dispatch):
don't update the screen after saving (avoids scrolling back to 	
	cursor)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13702 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 14:51:23 +00:00
Georg Baum
2bbe7e5b89 Make MathBigInset working
* src/cursor.C
        (LCursor::plainInsert): combine the previous math atom with the new
        one to a MathBigInset if possible

        * src/mathed/math_biginset.[Ch]
        (MathBigInset::name): implement
        (MathBigInset::isBigInsetDelim): new, test whether a given token is
        a valid MathBigInset delimiter

        * src/mathed/math_biginset.C
        (MathBigInset::size): handle Big, Bigg and Biggg
        (MathBigInset::increase): ditto
        (MathBigInset::draw): fix deco drawing
        (MathBigInset::write): append space if necessary

        * src/mathed/math_factory.C
        (createMathInset): handle l->inset == "big"

        * src/mathed/math_parser.C
        (Token::asInput): return a token as input, stolen from tex2lyx
        (void Parser::parse1): Create a MathBigInset when needed

	* src/mathed/math_support.C:
	(deco_table): add lbrace and rbrace

        * src/mathed/math_nestinset.C
        (MathNestInset::interpret): combine the previous math atom with the
        new character to a MathBigInset if possible

        * src/ParagraphParameters.C
        (findToken): move from here

        * src/support/lstrings.[Ch]
        (findToken): to here

        * lib/symbols: add MathBigInset symbols


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13700 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 09:55:45 +00:00
Georg Baum
c9b081f6f9 Fix bug 2476:
* src/CutAndPaste.C
	(resetOwnerAndChanges): rename to resetParagraph and reset the
	language of ERT paragraphs, too
	(copySelectionHelper): adapt to changes above
	(cutSelection): ditto
	(copySelection): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13699 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 08:42:01 +00:00
Martin Vermeer
f6848c168b * lyx_1_4.py
(convert_minipage): Proper handling of default height and 
	vertical position (bug report Garst Reese)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13697 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 07:43:29 +00:00
Martin Vermeer
c8f549bb4e * BufferView_pimpl.C
(BufferView::Pimpl::dispatch): prevent crash with section header 
	not in the main lyxtext



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13696 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 06:50:26 +00:00
Abdelrazak Younes
fc57e5e4ad Two ways toc navigation:
* Toc.[Ch]: new function getCurrentTocItem()
* ControlToc.[Ch]: new function getCurrentTocItem()
* QToc.[Ch]: new function getCurrentIndex()
* QTocDialog.C
  - QTocDialog::update() calls QToc::getCurrentIndex()



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13695 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 14:48:22 +00:00
John Spray
70fb7833dd Commit Bernhard Reiter's implementation of GExternal
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13694 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 09:13:54 +00:00
John Spray
35948be234 Changes to External controller for GTK implementation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13693 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 09:11:25 +00:00
Abdelrazak Younes
9db70c5346 * ControlToc.[Ch]
- bool ControlToc::canOutline(): new method to test if outline is possible.
* TocModel: new class
* QToc is now the controller (inheriting ControlToc directly) and the model (using TocModel)
* QTocDialog is now only the view (inheriting Dialogs::View directly)
* Dialogs.C: updated toc controller and view correspondingly



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13692 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-18 09:57:47 +00:00
Georg Baum
4700431096 * src/frontends/qt2/QWorkArea.C: fix compilation on OS X
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13690 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-17 16:44:37 +00:00
Abdelrazak Younes
f6bcac7285 * src/buffer_funcs.[Ch]
- updateCounters renamed to updateLabels
 - void updateLabels(Buffer const & buf,
   ParIterator & it): new convenience function
 - void updateLabels(Buffer const & buf,
   ParIterator & from, ParIterator & to): new convenience function
 - setCounter renamed to setLabel
 - bool tryToUpdateCurrentLabel(Buffer const & buf,
   ParIterator & it): new method
 - needsUpdateCounters: deleted

* src/BufferView_pimpl.C
* src/CutAndPaste.C
* src/frontends/controllers/ControlDocument.C
* src/lyxfunc.C
* src/text.C
* src/text2.C
* src/text3.C
 - fixed the calls to updateLabels


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13689 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-16 14:19:25 +00:00
Jürgen Spitzmüller
a90ee19486 * src/frontends/qt4/QTocDialog.C: Hide the pointless QHeader
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13688 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-16 08:33:30 +00:00
Jürgen Spitzmüller
9d8aadcc64 * src/frontends/qt4/QTocDialog.C
(updateToc, populateItem): fix the logic of depth calculation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13687 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 17:56:20 +00:00
Abdelrazak Younes
d6aad3f95c add -D_CYGWIN_WIN whenever cygwin without x is selected.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13686 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 16:19:15 +00:00
Jürgen Spitzmüller
436adb1605 * src/frontends/qt4/ui/QTocUi.ui: lay out in a grid.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13685 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 15:50:13 +00:00
Jürgen Spitzmüller
6e836024f5 Don't jump back to cursor on inset clicking:
* src/insets/insetcollapsable.C
	(void InsetCollapsable::doDispatch): undispatch cursor after lmb button click.
* src/insets/insettabular.C
	(void InsetTabular::doDispatch):  undispatch cursor after rmb click.
* src/insets/insetref.C
	(void InsetRef::doDispatch):  undispatch cursor after rmb click.
* src/text3.C
	(void LyXText::dispatch): set cursor also after rmb click.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13684 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 15:10:03 +00:00
Georg Baum
a355878e2c From Enrico Forestieri:
* src/support/os_win32.C
	(init, latex_path, cygwin_path_fix): Add support for cygwin tetex.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13683 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 14:46:12 +00:00
Bo Peng
2f3ac2d20f Initial Qt4 support for view-source feature (r13610), from Bo Peng (ben.bob@gmail.com)
* add src/frontend/qt4/QViewSource.h/C, QViewSourceDialog.h/C, ui/QViewSourceUi.ui
	* modify corresponding qt4/Makefile.am Makefile.dialogs, Dialogs.C


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13682 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 14:13:41 +00:00
Jürgen Spitzmüller
1bed69439f Much better performance when using natbib (bug 2460):
* src/BufferView_pimpl.C
	(bool BufferView::Pimpl::dispatch): update bibfiles cache after adding or
	deleting a bib database
* src/buffer.C
	(bool Buffer::readDocument): update bibfiles cache after the document 
	was read
* src/buffer.[Ch]
	(void Buffer::updateBibfilesCache): new method to build or update a cached
	vector with all used bibtex databases. 
	(void Buffer::getBibfilesCache): new method that returns the actual cache.
	(Buffer * Buffer::getMasterBuffer): new (non-const) method to get the buffer 
	of the master document

* src/insets/insetbibtex.C
	(void InsetBibtex::doDispatch): update the bibfiles cache after the inset has
	been modified.
* src/insets/insetinclude.C.
	(void Insetinclude::doDispatch): update the bibfiles cache after the inset 
	has Been modified.
* src/insets/insetinclude.[Ch]:
	(void Insetinclude::updateBibfilesCache): new method to build or update 
	a cached vector with all used bibtex databases. 
	(void Insetinclude::getBibfilesCache): new method that returns the actual 
	cache.
* src/insets/insetcite.C
	(string const getNatbibLabel): store a map of timestamps for all used bibtex 
	files (buffer's bibfiles cache) and rebuild the list of keys only if the timestamps
	or the list of files have changed. This is the actual performance boost. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13681 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 11:46:17 +00:00
Georg Baum
3072b1111e Implement \phantom, \hphantom and \vphantom in math (bug 1473):
* src/mathed/math_factory.C
	(createMathInset): handle \phantom, \hphantom and \vphantom
	* src/mathed/Makefile.am: add math_phantominset.[Ch]
	* src/mathed/math_phantominset.[Ch]: new phantom inset


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13680 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 09:54:24 +00:00
Abdelrazak Younes
948ecfe7e3 * get rid of the --export-all-symbol in order to speed-up linking time
* put two TODO in comments

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13679 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-14 15:10:16 +00:00
Jürgen Spitzmüller
786a8e1ab8 * src/LaTeXFeatures.C
(char const * simplefeatures[]): add tipa

        * src/mathed/math_fontinset.C
        (void MathFontInset::validate): textipa requires tipa


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13677 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-14 14:30:43 +00:00
Abdelrazak Younes
e2ddbdca5c use const_cast<QWorkArea*> instead of C-style cast
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13673 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 20:44:38 +00:00
Abdelrazak Younes
544d542c7d compilation fixes following rev 13671
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13672 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 20:39:42 +00:00
Lars Gullik Bjønnes
67d576f75e * frontends/WorkArea.h(workAreaResize, scrollDocView, workAreaKeyPress,
dispatch, selectionReuqested, selectionLost): remove signals

* BufferView.[Ch] (selectionRequested, selectionLost, workAreaResize,
  workAreaKeyPress, workAreaDispatch): add forwarding functions to the pimpl

* BufferView_pimpl.C (Pimpl): Remove the setup of the now deleted signals,
  also remove corresponding connection objects.

* frontends/xforms/XWorkArea.h:
* frontends/qt2/QWorkArea.h:
* frontends/qt4/QWorkArea.h:
* frontends/gtk/GWorkArea.h: add LyXView as class variable view_ (qt
  classes also get view() medthod)

* frontends/qt2/QWorkArea.C:
* frontends/qt2/QContentPane.C:
* frontends/qt4/QWorkArea.C:
* frontends/xforms/XWorkArea.C:
* frontends/gtk/GWorkArea.C: Change from calling signals to call
  the functions directly through view_.view()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13671 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 18:58:48 +00:00
Jean-Marc Lasgouttes
b5cdc90ef9 update german userguide
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13670 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 17:53:09 +00:00
Jürgen Spitzmüller
e384a917c7 add missing include (from r13663)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13668 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 17:09:30 +00:00
Jürgen Spitzmüller
d27e1b9dd7 * src/paragraph.h (public): new enum ChangeTracking,
indicating if ct is used in the current buffer.
	(cleanChanges): pass enum ChangeTracking.

        * src/paragraph_pimpl.C (cleanChanges): delete ct marks from
	paste content if ct is of in the buffer. Set content INSERTED
	if ct is on (bug 2207).

        * src/CutAndPaste.C (pasteSelectionHelper): pass information 
	about the current change tracking state to cleanChanges.

        * src/paragraph_pimpl.h (cleanChanges): pass enum ChangeTracking.

        * src/paragraph.C (cleanChanges): pass enum ChangeTracking.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13666 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 16:47:57 +00:00
Jürgen Spitzmüller
6fb5b5cd4e * src/insets/insettabular (doDispatch): use insertAsciiString in
LFUN_PASTESELECTION. Simplifies the code a lot and fixes 
	wrong language settings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13665 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 14:19:12 +00:00
Lars Gullik Bjønnes
3b44c08e43 * lyxfunc.h:
* BufferView_pimpl.h: delete LyXKeySymPtr typedef

* kbmap.h: include LyXKeysym.h and remove forward declaration of LyXKeySym,
  and delete LyXKeySymPtr typedef

* kbsequence.h:
* frontends/WorkArea.h: delete LyXKeySymPtr typedef, include LyXKeySym.h
   and don't include boost/shared_ptr.hpp, remove forward declaration of
   LyXKeySym.

* frontends/LyXKeySym.h: include boost/shared_ptr.hpp, and add typedef
  for LyXKeySymPtr


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13663 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 12:18:42 +00:00
Jean-Marc Lasgouttes
2fcae62a4d * math_xarrowinset.C (validate):
* math_splitinset.C (validate): new methods; require amsmath (bug
	2149).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13662 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 10:31:32 +00:00
Georg Baum
ad7e91e684 * lib/scripts/layout2layout.py
(convert): Change "LabelType Static" to "LabelType Itemize" for
	itemize environments
	(convert): Change "LabelType Counter_EnumI" to "LabelType Enumerate"
	for enumerate environments


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13659 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 08:54:50 +00:00
Martin Vermeer
7db0b5ae00 * math_nestinset.C
(MathNestInset::doDispatch): replace recordUndo by recordUndoInset for
	LFUN_DELETE, to fix undo behaviour



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13658 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 08:40:11 +00:00
Jean-Marc Lasgouttes
637a28fe60 Compilation fix: Replace MakeAbsPath with makeAbsPath
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13657 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-12 14:02:23 +00:00
Abdelrazak Younes
5b66bd5d4c Compilation fix: Replace MakeAbsPath with makeAbsPath
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13656 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-12 13:53:01 +00:00
Jean-Marc Lasgouttes
c981e04e67 add header <sys/time.h> for DragonFly BSD
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13655 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-12 09:58:09 +00:00
Jean-Marc Lasgouttes
807c2d5310 tweak compression setting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13652 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 15:27:27 +00:00
Georg Baum
e8ec07a066 fix bug 2036:
* src/mathed/math_amsarrayinset.C
	(metrics): use ArrayChanger to change the style
	(draw): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13648 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 13:57:05 +00:00
Abdelrazak Younes
5b448e549e Fix enableCustom
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13645 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 10:51:59 +00:00
Abdelrazak Younes
9960bf9278 Fix related to r13635
closePB renamed to cancelPB

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13644 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 10:13:17 +00:00
Abdelrazak Younes
1ddacf35e0 added "none" color special case.
TODO: see how to get rid of these special cases...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13642 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 09:59:56 +00:00