anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-30 15:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,710 Commits 31 Branches 172 Tags 630 MiB
734e22c4d3
Commit Graph

381 Commits

Author SHA1 Message Date
Richard Heck
df08a4e4b8 Move logical markup to a module, per Martin. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20342 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 16:29:38 +00:00
Richard Heck
8a42fa39c2 Add a note to the theorem module descriptions. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20341 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 16:27:14 +00:00
Richard Heck
c7e92d1cff Remove endnote from stdcustom.inc, as it is now in the endnotes module. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20340 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 16:24:36 +00:00
Richard Heck
1da3290453 Add decoration to endnotes module. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20339 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 16:23:46 +00:00
Uwe Stöhr
62a9ce0dd6 amsmaths.inc: fix copy and paste bug spotted by Georg, see http://www.lyx.org/trac/changeset/20257 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20264 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-13 18:33:06 +00:00
Martin Vermeer
ef743fc5d5 Add XML elements as a third flex inset variant 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20105 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-06 14:45:17 +00:00
Martin Vermeer
6c73681b07 Add error fallback to custom insets 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20030 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-04 03:48:24 +00:00
Martin Vermeer
ed6f900552 Use Minimalistic for branches 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19973 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 11:40:09 +00:00
Richard Heck
2607927e2f Modularize the theorem modules. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19952 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-31 15:01:17 +00:00
Richard Heck
8a947f63da This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree. 
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.

This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.

The GUI will come next.

Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-29 17:59:49 +00:00
Martin Vermeer
794ff76622 Add some more logical charstyles 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19892 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-29 16:04:56 +00:00
Martin Vermeer
12210a88fb Oops... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19851 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 14:33:44 +00:00
Martin Vermeer
18299149f5 some more inclusions of stdinsets.inc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19850 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 14:32:06 +00:00
Martin Vermeer
77b575e562 Move background colour into the layout files -- for all collapsables 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19813 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-26 20:32:58 +00:00
Martin Vermeer
8eb22fd082 Updated versions to 5; added stdinsets.inc where I felt confident 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19804 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-26 09:10:52 +00:00
Martin Vermeer
9fe6ea87b2 fixed some classes to include inset defs, updated some version nrs 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19802 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-26 08:33:03 +00:00
Martin Vermeer
e31d201dd6 Decoration added 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19795 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-25 18:41:58 +00:00
Martin Vermeer
30506f8e11 Clean-up in CharStyles, externalize detection of undefined styles to 
layout files



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19790 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-25 14:43:59 +00:00
Martin Vermeer
d9a7f647c8 Oops -- thanks Richard 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19773 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-24 15:15:38 +00:00
Martin Vermeer
540f3564f0 Inset configurability: separate charstyle and custom insets 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19769 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-24 12:45:40 +00:00
Martin Vermeer
e38b581bcb add preamble snippets to charstyles 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19732 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-22 18:55:03 +00:00
Martin Vermeer
612af5c5f0 inset configurability: ERT 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19702 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-21 21:29:13 +00:00
Martin Vermeer
005c3ea9c0 charstyle update for beamer 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19697 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-21 19:44:47 +00:00
Martin Vermeer
1bd92eb2f1 The necessary changes to these XML layouts (charstyle new format) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19696 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-21 19:43:10 +00:00
Martin Vermeer
e710636ee8 Symbolic colour names work\! 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19664 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-20 18:57:48 +00:00
Martin Vermeer
96336caed7 make these definitions useful for latex 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19656 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-20 14:22:39 +00:00
Martin Vermeer
ff682ec3e4 partial merge of charstyle and insetlayout stuff, part 2 (lyx2lyx) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19622 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-17 15:48:41 +00:00
Jean-Marc Lasgouttes
f86fc8d88c The counters labelstring patch. Part 3: adapt some layout files and documentation 
* numarticle.inc:
	* numreport.inc: 
	* stdcounter.inc:
	* stdsections.inc:
	* stdstarsections.inc:
	* stdclass.inc:
	* scrbook.layout:
	* amsmath.inc: adapt: remove most of the LabelString in layouts,
	add the necessary stuff to counters.

	* lib/doc/Customization.lyx: document the new stuff.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19604 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-16 11:16:07 +00:00
Jean-Marc Lasgouttes
1c1a1eca82 fix file format 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19592 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-15 19:25:59 +00:00
Jean-Marc Lasgouttes
b0d1a6b717 Fix bug 409 (Add support for numbered footnotes) 
* src/insets/InsetFoot.cpp (updateLabels): number the footnote if
	(1) the footnote counter exists and (2) it is not in a title
	layout

	* lib/layouts/stdcounters.inc: add a footnote counter.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19524 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-13 20:29:33 +00:00
Martin Vermeer
2bd998c29e Prepare for inset configurability 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19498 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-13 12:13:17 +00:00
José Matox
29d106fbf7 Convert layout files to utf8 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19189 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-07-24 17:16:35 +00:00
Uwe Stöhr
ab507ec444 elsart.layout: fix Acknowlegments enviroment 
(bug 3931: http://bugzilla.lyx.org/show_bug.cgi?id=3931)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18937 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-28 22:37:15 +00:00
Uwe Stöhr
6b7436766c moderncv: update layout and example to version 0.6 of moderncv.layout 
This means:
 - added subsection style in moderncv.layout
 (I had to promise to JMarc when I added the moderncv support to add this as soon as the new noderncv version is out.)
 - actualize preamble of modernCV.lyx to make it compile with the new version
 - better explanation of customization possibilities in the preamble of modernCV.lyx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18808 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-17 00:21:35 +00:00
Enrico Forestieri
8561f4f2ca Better fix for bug 3510 (by me, Juergen, and Jean-Marc) 
* lib/layouts/IEEEtran.layout: Add a proper definition to the
	preamble when using the MarkBoth environment (fix bug 3510).
	Allow inserting an optional argument for theorem like environments.
	Remove white space from begin of line in preamble stuff.

	* lib/templates/IEEEtran.lyx: Reintroduce the MarkBoth environment
	in the document body thanks to the fix above. Use optional argument
	instead of ERT in Theorem environment. Use the new --Separator--
	environment for splitting biography environments.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18767 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-13 22:50:17 +00:00
Bo Peng
dad101c2e3 Add --Separator-- environment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18764 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-13 15:09:28 +00:00
Uwe Stöhr
fddca82d95 add layout and template for iopart 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18745 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-12 01:09:49 +00:00
Jürgen Spitzmüller
b5eb31d698 * lib/layouts/amsdefs.inc: 
- fix whatever went wrong on r18712.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18713 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-08 07:26:37 +00:00
Jürgen Spitzmüller
13f6e7b912 * lib/layouts/amsdefs.inc: 
- allow optional argument in title (from Paul A. Rubin).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18712 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-08 07:19:47 +00:00
Michael Schmitt
3fa2f90800 * lib/layouts/*.layout: harmonize text class names 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18694 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-07 06:32:46 +00:00
Uwe Stöhr
221b6a8452 clean up the CV document class layouts 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18686 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-05 22:07:15 +00:00
Michael Schmitt
00925e923b * lib/layout/ijmpd.layout: remove yet another trailing space 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18664 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-04 18:28:39 +00:00
Michael Schmitt
fe300cf3f7 * lib/layouts/ijmpc.layout: 
* lib/layouts/beamer.layout: remove trailing spaces


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18663 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-04 18:26:06 +00:00
Michael Schmitt
f4f593495c * lib/layouts/beamer.layout: harmonize LabelSeps as suggested by 
Jürgen; "xx" looks best


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18660 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-04 18:00:03 +00:00
Michael Schmitt
de3b6cc172 * lib/layouts/beamer.layout: cleanup labels 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18659 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-06-04 17:48:31 +00:00
Uwe Stöhr
738e0dd8be Add powerdot layout and example 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18463 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-22 21:35:22 +00:00
Jürgen Spitzmüller
4950edc72d * lib/layouts/beamer.layout: 
- add optional arguments to farmes, lists, pause and part.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18440 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-21 11:29:46 +00:00
Martin Vermeer
df73111092 polishing 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18365 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-16 09:52:09 +00:00
Jürgen Spitzmüller
20fd0f9cf3 * lib/layouts/extarticle.layout: 
* lib/layouts/extbook.layout:
* lib/layouts/extletter.layout:
* lib/layouts/exrteport.layout:
	- add missing font sizes (10,11,12)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18345 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-15 15:03:05 +00:00
Martin Vermeer
1184b0be29 Reorder and clean up the beamer layout 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18343 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-15 14:52:12 +00:00
Jürgen Spitzmüller
e5640f93ac * unify class naming scheme: class (type) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18342 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-15 13:32:07 +00:00
Bo Peng
72e0b87a90 Separate caption and label from InsetListingsParams and handle them separately in listings and Include dialog, from Jurgen 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18324 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-14 20:42:14 +00:00
Martin Vermeer
fd70aabcc8 Add charstyles Alert and Structure to beamer 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18322 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-14 19:56:05 +00:00
Jean-Marc Lasgouttes
f5a33ae2a1 remove class cv, now that it has been superceded by simplecv 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18169 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-02 10:41:05 +00:00
Jean-Marc Lasgouttes
d0d04210e5 remove useless SubSection declaration 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18168 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-02 10:31:55 +00:00
Uwe Stöhr
227f80157c file format change: support for Armenian 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18155 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-01 17:48:04 +00:00
Jean-Marc Lasgouttes
766000a7d8 new textclass simplecv 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17974 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-25 07:54:07 +00:00
Michael Schmitt
9e74a7480a * layouts/g-brief2.layout: return to static margins 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17851 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-18 16:06:49 +00:00
Uwe Stöhr
11c3615d0a fix typo in g-brief2 support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17812 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-14 17:28:23 +00:00
Michael Schmitt
930c959a82 * layouts/*.layout: put all LabelStrings in quotes; in the past, we 
faced some problems with trailing spaces. The quotes turned out to be
	a good means to avoid these problems


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17807 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-14 11:19:24 +00:00
Richard Heck
bb44b23486 Moved std* includes before customizations. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17750 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-06 17:48:54 +00:00
Jean-Marc Lasgouttes
04efe3c40a New framework for declaring generic features in textclasses. 
* src/LaTeXFeatures.C (mustProvide): new method; returns true when
	isRequired is true and the feature is not provided by the
	textclass. 
	(getPackages, getLyXSGMLEntities): use mustProvide when relevant.

	* src/bufferparams.C (getEngine):
	* src/buffer.C (validate): adapt to change below.

	* src/lyxtextclass.C (read): replace tags ProvidesNatbib,
	ProvidesMakeidx, ProvidesUrl and ProvidesAmsmath by a generic
	"Provides".
	(provides): take a string as argument.
	
	* lib/scripts/layout2layout.py (convert): convert "ProvidesXxx" tags
	to "Provides xxx".

	* lib/layouts/*: update to format 4.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17740 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-06 09:02:23 +00:00
Uwe Stöhr
238c087a71 - layouts/stdstruct.inc: fix tipo 
- templates/modernCV.lyx: small cleanup


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17725 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-05 01:02:31 +00:00
Uwe Stöhr
dc294b6136 europecv: - fix bibliography and wrong address layout 
- change layout file because europecv doesn't support bibitems

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17724 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-05 01:01:03 +00:00
Uwe Stöhr
9ad5bde3c6 support for europecv: Layout file and template 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17714 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-04 01:35:15 +00:00
Uwe Stöhr
566d5270f5 moderncv: - reworked layout and template file 
- reduce ERT to minimum

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17713 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-04 01:30:54 +00:00
Uwe Stöhr
c36c0b6cf2 g-brief2.layout: whitespace 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17712 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-04 01:21:38 +00:00
Uwe Stöhr
c94c3a0f1c add bibitem support for moderncv 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17710 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-03 20:51:27 +00:00
Uwe Stöhr
228c92e6b4 support for moderncv: Layout file and template as we currently have no CV template but as discusses some times ago on the users list we need one for the beginners. 
(The next days I'll also prepare support for europecv, the second nicht CV class that is also required to use in some fields.)

I hope I'm not too rash here.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17700 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-03 01:52:34 +00:00
Uwe Stöhr
828343c3e8 - g-brief2 cleanups: Make Standard style the default as Letter style as default causes LaTeX errors when you accidentally have two of them 
(since years now used by me successfully)
- new template for g-brief2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17699 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-03 01:37:39 +00:00
Jean-Marc Lasgouttes
48a77862c4 remove useless provide tags 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17608 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-28 12:41:11 +00:00
Martin Vermeer
88542bc2ee Get ProvidesNatbib working correctly, esp. for egs.layout. 
* insetcite: call getEngine()
* bufferparams: move getEngine() here, and let it sense the 
provides(natbib)
flag
* ControlBibtex, ControlCitation: correct getEngine() call
* biblio: remove old getEngine()



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17505 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-22 07:22:16 +00:00
Georg Baum
bd02196f4d convert to utf8 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17330 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-02-24 19:42:28 +00:00
Michael Schmitt
382963abcd * layouts/beamer.layout: 
* layouts/isprs.layout: remove obsolete comments regarding caption style


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16985 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-01-31 19:04:55 +00:00
Michael Schmitt
ff521787b2 * layouts/*.inc: update to format 3 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16984 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-01-31 19:02:52 +00:00
Michael Schmitt
2f9bf6b92b * layouts/*.layout: update to format 3 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16983 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-01-31 18:58:41 +00:00
Bo Peng
93f1f8bdac Fix beamer.layout (remove .cls in DeclareLaTeXClass) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16852 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-01-25 17:00:56 +00:00
Uwe Stöhr
51255d6598 require needed packages for beamer class 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16752 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-01-18 19:20:32 +00:00
Jean-Marc Lasgouttes
ec4ff5e1a8 New textclass 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16428 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-12-29 13:40:50 +00:00
Jean-Marc Lasgouttes
5d356a862f Add layout AltAffiliation ; add optional argument support for Author Email and 
Author URL


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16345 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-12-20 14:03:25 +00:00
Jürgen Spitzmüller
ed71ed4fab * lib/layouts/amsart.layout: 
- reenable Address paragraph style to fix bug 2890
	  (as discussed on bugzilla)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16160 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-12-03 15:36:06 +00:00
Georg Baum
9f4cc3c9f0 Convert to new format 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15652 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-11-01 08:41:31 +00:00
Georg Baum
6af710094e Add beamer layout file and examople, fresh from the beamer CVS. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15647 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-31 20:56:42 +00:00
Martin Vermeer
6c77c9ae41 New layout for International Society for Photogrammetry and Remote Sensing 
journals

        * lib/layouts/isprs.layout: the layout
        * lib/doc/LaTeXConfig.lyx.in: the documentation



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15319 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-13 04:59:00 +00:00
Michael Schmitt
2a71306d77 drop linuxdoc support (part 4) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14821 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-08-23 11:16:08 +00:00
Michael Schmitt
ee452c0f38 * src/tex2lyx/test.ltx: 
* lib/layouts/revtex4.layout: refer to tex2lyx rather than
        reLyX in comments


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14627 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-08-12 20:05:28 +00:00
Jean-Marc Lasgouttes
1d14cdd0ea 2006-06-01 Panayotis Papasotiriou <papasot@physics.upatras.gr> 
* Makefile.am:
	* templates/ijmpc.lyx: 
	* layouts/ijmpc.layout: new textclass for International Journal of
	Modern Physics C. 

	* templates/ijmpd.lyx
	* layouts/ijmpd.layout: update.

	* LaTeXConfig.lyx.in:
	* Extended.lyx: update for ijmpc/d textclasses.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13977 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-01 13:13:16 +00:00
Jürgen Spitzmüller
28fa2c0efa fix bug 2623: 
* lib/layouts/memoir.layout:
	add ProvidesMakeindex

* src/LaTeX.C (run):
	rerun latex im idx file is empty (needed by memoir)
	fix typo in comment
* src/LaTeXFeatures.C (getPackages):
	whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13950 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 14:49:08 +00:00
Georg Baum
4d71376ec0 * lib/layouts/IEEEtran.layout: Add biographynophoto style 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13755 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-04-27 07:27:01 +00:00
Georg Baum
98595ca7c2 From Jean-Marc: Make sure that standard sectioning styles have proper counters 
* lib/layouts/stdsections.inc: include numarticle.inc here instead
	of the following files:
	* lib/layouts/kluwer.layout
	* lib/layouts/aapaper.layout
	* lib/layouts/llncs.layout
	* lib/layouts/docbook.layout
	* lib/layouts/article.layout
	* lib/layouts/IEEEtran.layout
	* lib/layouts/ijmpd.layout
	* lib/layouts/paper.layout
	* lib/layouts/aa.layout
	* lib/layouts/aastex.layout
	* lib/layouts/cl2emult.layout
	* lib/layouts/docbook-section.layout
	* lib/layouts/svjour.inc
	* lib/layouts/amsart.layout
	* lib/layouts/spie.layout
	* lib/layouts/docbook-chapter.layout
	* lib/layouts/aguplus.inc
	* lib/layouts/scrartcl.layout
	* lib/layouts/dtk.layout
	* lib/layouts/agu-dtd.layout
	* lib/layouts/elsart.layout
	* lib/layouts/mwart.layout
	* lib/layouts/seminar.layout


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13589 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-04-07 15:43:56 +00:00
Jürgen Spitzmüller
3035b9b3e3 fix LaTeX error with AMS classes (bug 2363) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13327 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-03-10 15:37:21 +00:00
Jürgen Spitzmüller
9f2c265640 Map labeling to list (bug 2246) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13320 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-03-10 14:07:11 +00:00
Georg Baum
7adc8beb4d Convert bib_environment in layout2layout 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10715 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-01-08 15:35:38 +00:00
Jean-Marc Lasgouttes
49de27a95f Fix bibliography layout for CV textclass 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10711 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-01-06 10:23:34 +00:00
Michael Schmitt
464413fffe layouts/amsart-seq.layout: fix typo in counter 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10700 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-01-02 19:15:25 +00:00
Jean-Marc Lasgouttes
062e4d0151 fix abstract in paper class (from Bennett) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10672 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-12-19 12:06:56 +00:00
Georg Baum
3e885523c3 layout file converter for layout files in old format 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10565 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-10-21 16:11:36 +00:00
Martin Vermeer
e16d163582 Fix bug 1971 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10394 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-08-10 12:24:36 +00:00
Michael Schmitt
f6b917140d Various text message changes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10279 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 12:39:56 +00:00
Michael Schmitt
d55d5d1fb0 remove spaces from label strings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10272 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 10:48:55 +00:00
Michael Schmitt
4a7f4fb7bf remove spaces from label strings, part 2 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10269 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 09:56:22 +00:00
Michael Schmitt
a250929930 remove spaces from label strings; part 1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10267 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 09:22:25 +00:00
Michael Schmitt
b12b9a5677 fix left margins of labelstrings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10264 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 00:51:31 +00:00
Jean-Marc Lasgouttes
15d00ff3ed fix bad comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10166 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-12 10:33:43 +00:00
Jean-Marc Lasgouttes
38cf9e66f4 get rid of scrmacros.inc and obsolete.inc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10091 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-06-20 13:18:27 +00:00
Jean-Marc Lasgouttes
4894a7be98 put labelstrings in quotes (from Michael) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10055 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-06-13 09:36:58 +00:00
Jean-Marc Lasgouttes
971d9986b7 fix bug 1807: New on-screen translations do not work 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9960 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-05-20 09:13:42 +00:00
Jean-Marc Lasgouttes
d33531c567 various small fixes to layout files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9933 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-05-11 09:49:02 +00:00
Martin Vermeer
3956781c54 Ungoose (degoose?) bibliography 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9909 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-05-05 18:33:50 +00:00
Jean-Marc Lasgouttes
076c15b63c fix translation of layout names with spaces 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9885 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-04-28 13:08:05 +00:00
Jean-Marc Lasgouttes
a682330716 unify toclevel for articles and reports/books; proper numbering of Paragraph/SubParagraph layouts 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9830 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-04-19 09:00:32 +00:00
Martin Vermeer
1b2e0411ef Clean up around character styles 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9827 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-04-18 18:09:57 +00:00
Jean-Marc Lasgouttes
31a1809f72 indicate that the revtex4 class provides lib 
natbib and url functionality


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9747 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-03-25 16:27:26 +00:00
Jean-Marc Lasgouttes
1e7112db43 fix counters updating mechanism 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9682 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-02-25 11:55:36 +00:00
Jean-Marc Lasgouttes
4e100ec148 update to aastex 5.2 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9600 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-02-08 10:41:58 +00:00
Jürgen Spitzmüller
64df828719 use the new 2-opt-arg code in the memoir class 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9273 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-11-19 17:09:28 +00:00
José Matox
73f9c7a43e add allowed non alphanumeric chars in ids. (leftover from last commit). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9171 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-11-04 22:39:29 +00:00
José Matox
942ca65a5d Add more character styles to docbook. 
Fix partially bug 1726.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9149 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-30 19:26:52 +00:00
José Matox
a590b1e0d2 Replace CDATA argument as innertag. 
Use CDATA if environment requires PassThru.
The code now feels more natural, as there is one less exception.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9148 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-30 18:44:55 +00:00
José Matox
5b859a8e9a Remove SGML paragraph type. (docbook) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9147 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-30 18:17:31 +00:00
José Matox
2d9a5e9adc replace most &dquot;...&dquot; by <...> 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9139 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-28 14:56:08 +00:00
Angus Leeming
46ee486bda Whitespace, only whitespace. Part II. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9138 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-28 14:35:53 +00:00
José Matox
c984a235eb slight changes for the new counter support in agu. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9136 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-28 11:30:18 +00:00
José Matox
d4d6267991 Fix counters for docbook. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9133 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-27 18:42:14 +00:00
José Matox
f0c7ef825b Star sections just look like, don't act as real section... (docbook) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9117 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-24 20:41:27 +00:00
José Matox
99f82e6460 Add missing quotes in starsections. (docbook) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9106 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-22 14:49:06 +00:00
José Matox
f3d4201138 add Email character style (docbook). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9105 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-22 13:52:16 +00:00
José Matox
f65b01c798 Brigehead doesn't need a title. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9099 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-21 22:21:34 +00:00
José Matox
4e2940c3d8 Replace <programlist> with <screen>, as it is more general. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9096 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-18 22:48:58 +00:00
José Matox
3459c60293 fill definitions for star sections (docbook). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9091 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-15 16:22:43 +00:00
José Matox
e3ed0adb16 Rename classes to be consistent with AGU and docbook. 
SGML (LinuxDoc xxxx) -> LinuxDoc xxxx (SGML)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9088 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-13 21:31:36 +00:00
José Matox
29c177a282 load docbook specialization in the end. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9003 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-09-24 17:09:35 +00:00
José Matox
e69c9c8363 layouts/elsart.layout: fixed its permission settings and readded 
to layouts.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8894 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-08-13 09:42:39 +00:00
José Matox
d20f999c04 no more need to specific docbook counters. remove temporarily elsart.layout to fix its permission settings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8893 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-08-13 09:38:04 +00:00
Angus Leeming
c4e43d0557 Correct spelling of "Acknowledgments" in the APA layout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8877 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-08-09 10:40:53 +00:00
José Matox
33243f7003 clean code to export between different flavours, output different code for sgml to deal with incomplete implementation, clean code 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8755 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-05-14 15:47:35 +00:00
José Matox
5a87b2a21c Some cosmetic changes for docbook article, cleaner style with Char Styles 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8750 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-05-12 07:57:51 +00:00
José Matox
34b9ed8ac9 whitespace, bugfixes, and convertions dependent on the document type, if need. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8749 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-05-11 16:13:33 +00:00
Angus Leeming
a61e00a55d Fix counters bug in scrlettr textclass. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8727 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-05-03 14:24:46 +00:00
Jürgen Spitzmüller
1a62b30353 include counters in scrlltr2.layout 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8722 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-05-03 09:49:24 +00:00
Jean-Marc Lasgouttes
fff9cb2dbc add romanian splash; add svglobal layout (+fixes to svjour) [bug 1430]; update CREDITS 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8455 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-02-23 14:48:01 +00:00
Martin Vermeer
fb7248979d Add Affiliation layout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8413 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-02-06 15:06:51 +00:00
Jean-Marc Lasgouttes
5a8d168db4 Small fix 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8320 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-01-07 15:50:32 +00:00
Jean-Marc Lasgouttes
d98ffe9eb4 credit Roman Maurer ; fixes to g-brief2 support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8297 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-01-05 15:47:21 +00:00
Martin Vermeer
6c176e40e3 moving LatexParam functionality into .layout files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8290 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-31 08:44:42 +00:00
Jean-Marc Lasgouttes
b02ecd9f24 rename g-brief2-en to g-brief2; remove g-brief2-de 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8285 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-29 14:17:20 +00:00
Martin Vermeer
ed4864c114 More AGU header stuff 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8273 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-22 17:33:46 +00:00
Martin Vermeer
2b21af9a42 AGU header stuff 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8264 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-18 12:42:02 +00:00
Jean-Marc Lasgouttes
b1fcee4365 add g-brief2 support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8225 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-10 16:01:55 +00:00
Martin Vermeer
ee31454d59 Conglomerate-style CharStyles 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8210 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-12-06 09:31:30 +00:00