Commit Graph

79 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
531bb4e207 Bug 5562: Fix command line output of subfigure insets by introducing new OutputParams and LaTeXFeatures members that tell the insets whether they are in a (sub)float.
Later, this can be replaces by a backpointer approach, as proposed at bugzilla (note that there are already similar cases such as InComment or InTableCell, so a backpointer approach would need to adapt the OutputParams methos anyway).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28383 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-07 12:28:04 +00:00
Uwe Stöhr
4331cbf30f babel handling: revert r26857 and r26858 for the reasons I posted o the list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26870 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 17:21:18 +00:00
Abdelrazak Younes
bc8e829ce0 Simplify and optimize a bit the special babel language detection; and add a FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26857 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 07:19:43 +00:00
Uwe Stöhr
4c48e7746b BufferParams.cpp, LaTeXFeatures.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5291
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26627 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 19:18:00 +00:00
Jürgen Spitzmüller
ac1977018b ** subfig support **
* src/Buffer.cpp:
* development/FORMAT:
	- bump format to 316.

* src/insets/InsetFloat.{cpp, h}:
	- let nested floats be subfloats
	  NOTE: docbook support is missing.
* src/insets/InsetCaption.{cpp, h}:
	- handle subfigure captions
* src/insets/InsetGraphics.cpp:
* src/insets/InsetGraphicsParams.{cpp, h}:
	- remove old subfigure support

* lib/chkconfig.ltx:
* lib/doc/LaTeXConfig.lyx:
	- check for subfig instead of subfigure.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion/reversion routines for subfig -> subfloats
	  NOTE: the reversion routine still has bugs.

* src/Counters.{cpp, h}: 
	- add identifiers for subfloats

* src/LaTeXFeatures.{cpp, h}:
	- support for subfig

* src/TextClass.cpp:
	- set up subfloat counter for all custom floats.

* src/frontends/qt4/GuiGraphics.cpp:
* src/frontends/qt4/ui/GrahicsUi.ui:
	- remove subfigure UI.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23381 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 11:30:50 +00:00
Jean-Marc Lasgouttes
11bea5a763 Use a set<string> instead of a vecctor<string> for list of features. This
allows to simplify the code to some extent.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22734 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-01 15:12:04 +00:00
André Pönitz
a5263e0f92 introduce a header to forward declare std::string.
hope there are only conforming implementaions out there ;-}


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21312 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-31 22:40:34 +00:00
Abdelrazak Younes
4a53fa6e01 Allow unicode in Layout names.
* Layout.h:
  - name_, obsoleted_by_, depends_on_ are now docstrings.

All other changes results from the above string -> docstring changes. In particular, we now try to translate the layout names only if possible (i.e. if they are ASCII only).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19042 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 13:39:08 +00:00
Uwe Stöhr
80b94c6bf5 Georg's patch for bug 3043:
Introduces new encodings for the CJK-languages.
The CJK-languages can now be selected from LyX's menu.
For remaining small problems, see the thread "Help needed for bug 3043" on the devel-list.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18216 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-06 20:26:02 +00:00
Uwe Stöhr
701f204b22 LaTeXFeatures.h: fix tipo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18157 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-01 18:12:31 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +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
Michael Schmitt
1bcf8c6747 * src/LaTeXFeatures.h: isAvailable() becomes a static method
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17106 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-08 10:40:33 +00:00
Georg Baum
b9d1b797c9 Some renaming (has been discussed a long time ago)
* src/LaTeXFeatures.[Ch]
	(LaTeXFeatures::addExternalPreamble): rename to addPreambleSnippet,
	since this is not specialized for InsetExternal at all

	* src/insets/insetexternal.C
	(InsetExternal::validate): reflect name change above


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16784 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-20 17:08:39 +00:00
Georg Baum
ef2fda7500 use docstring for textclass preambles
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15808 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-08 17:22:44 +00:00
José Matox
354fb450c2 More unicode fixes for docbook.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15459 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 19:40:29 +00:00
André Pönitz
6c300f72a2 move everything into namespace lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15422 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 00:16:43 +00:00
Michael Schmitt
5a0176a6eb drop linuxdoc support (part 5)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14822 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-23 12:43:46 +00:00
Lars Gullik Bjønnes
3b9338a3a8 Whitespace cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13565 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-05 23:56:29 +00:00
Georg Baum
fc7f2d9805 Fix bug 2107:
* src/LaTeXFeatures.[Ch]: replace nice_ by runparams_

        * src/insets/insetexternal.C
        (InsetExternal::validate): Use the correct template for the desired
        output format

        * src/insets/insetgraphics.C
        (InsetGraphics::prepareFile): Record the needed files for "latex"
        or "pdflatex" format, dependant on the desired output format

        * src/insets/insetinclude.C
        (InsetInclude::latex): ditto

        * src/BufferView_pimpl.C
        (BufferView::Pimpl::getStatus): adapt to LaTeXFeatures changes

        * src/paragraph_pimpl.C
        (Paragraph::Pimpl::simpleTeXSpecialC): ditto

        * src/buffer.C
        (Buffer::makeLaTeXFile): ditto
        (Buffer::makeLinuxDocFile): ditto
        (Buffer::makeDocBookFile): ditto

        * src/paragraph.C
        (Paragraph::simpleTeXOnePar): ditto

        * src/exporter.C
        (Backends): Add "pdflatex" backend format
        (Exporter::Export): set runparams.flavor correctly for "pdflatex" format

        * lib/external_templates
        (RasterImage): Use "pdflatex" format in PDFLaTeX template
        (XFig): ditto
        (ChessDiagram): Add PDFLaTeX template
        (Date): ditto

        * lib/configure.py: Add "pdflatex" format


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13520 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-28 18:49:46 +00:00
Jürgen Spitzmüller
04a3819779 Fix output of change tracked documents (also fixes bug 1031)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9535 a592a061-630c-0410-9148-cb99ea01b6c8
2005-01-24 17:12:19 +00:00
Angus Leeming
c9f9ba315c Asger's exchanging of the class and struct keywords.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9502 a592a061-630c-0410-9148-cb99ea01b6c8
2005-01-19 15:03:31 +00:00
Angus Leeming
e978fa42e3 Whitespace, only whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9044 a592a061-630c-0410-9148-cb99ea01b6c8
2004-10-05 10:11:42 +00:00
Jean-Marc Lasgouttes
b3bed8d879 Georg\'s last patch for bug 605
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8627 a592a061-630c-0410-9148-cb99ea01b6c8
2004-04-08 10:09:09 +00:00
Jean-Marc Lasgouttes
85fa1d41ba move Buffer::nice to LaTeXFeatures
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8364 a592a061-630c-0410-9148-cb99ea01b6c8
2004-01-21 17:52:07 +00:00
Martin Vermeer
eb36b71ce3 add <string> and other small fixes to make
Lars' std::string patch compile with STLport.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7864 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-07 06:45:25 +00:00
Lars Gullik Bjønnes
44cd0fc9a1 The std::string mammoth path.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7862 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-06 15:43:21 +00:00
Angus Leeming
482c265462 Add a buffer() member function to LaTeXFeatures. Not used yet.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7791 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-18 14:13:23 +00:00
Angus Leeming
3f481c38fc Append a '_' to the names of all private member variables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7790 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-18 14:01:02 +00:00
Angus Leeming
0705dae8a3 Finish the task of removing all cruft from the header files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7703 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-07 21:25:37 +00:00
Angus Leeming
236ea81bc5 Replace LString.h with support/std_string.h,
Lsstream.h with support/std_sstream.h,
support/LIstream.h with support/std_istream.h,
support/LOstream.h with support/std_ostream.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7685 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-05 17:23:11 +00:00
Angus Leeming
4da67cb792 Store LaTeXFeatures' externalPreambles as a list<string> rather than a string.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7658 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-04 01:49:21 +00:00
Angus Leeming
0be0fcfd59 If I ever see another licence blurb again, it'll be too soon...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7598 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-23 00:17:00 +00:00
Angus Leeming
5d429a45a3 Get rid of the global use_babel variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7026 a592a061-630c-0410-9148-cb99ea01b6c8
2003-05-23 11:18:43 +00:00
Jean-Marc Lasgouttes
d7599e9da1 move some code from buffer.C to bufferparams.c
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6172 a592a061-630c-0410-9148-cb99ea01b6c8
2003-02-16 00:54:43 +00:00
Lars Gullik Bjønnes
99d1627a47 dont use pragma impementation and interface anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6138 a592a061-630c-0410-9148-cb99ea01b6c8
2003-02-13 16:53:15 +00:00
Jean-Marc Lasgouttes
1dc25c472f time to recompile everything: I removed #include directives from headers here and there... Not sure what the net effect is, but it cannot be worse
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4736 a592a061-630c-0410-9148-cb99ea01b6c8
2002-07-21 21:21:06 +00:00
Jean-Marc Lasgouttes
8a91f206c6 implement DependsOn tag for layout files; more uninteresting cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4729 a592a061-630c-0410-9148-cb99ea01b6c8
2002-07-20 20:47:54 +00:00
Lars Gullik Bjønnes
b593556d91 language patch from dekel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4150 a592a061-630c-0410-9148-cb99ea01b6c8
2002-05-10 12:58:07 +00:00
Lars Gullik Bjønnes
8283e978f8 ws cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3803 a592a061-630c-0410-9148-cb99ea01b6c8
2002-03-21 17:27:08 +00:00
Lars Gullik Bjønnes
dbd7a961fc layout as string
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3640 a592a061-630c-0410-9148-cb99ea01b6c8
2002-03-02 16:39:54 +00:00
Lars Gullik Bjønnes
b922cdd796 2001-12-28 Lars Gullik Bj�nnes <larsbj@birdstep.com>
* Makefile.am: added the new files to sources, removed layout.C

* layout.C: removed file

* layout.h: remove LYX_DUMMY_LAYOUT

* lyxtextclasslist.C (NumberOfLayout): do not special case dummy
layout.

* lyxlayout.[Ch]:
* lyxtextclass.[Ch]:
* lyxtextclasslist.[Ch]: new files

* include order changes to a lot of files, also changes because of
the six new files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3269 a592a061-630c-0410-9148-cb99ea01b6c8
2001-12-28 13:26:54 +00:00
André Pönitz
d659612225 reduction of header dependencies, part II (use new types
lyx::layout_type and lyx::textclass_type all ovcer the place)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3117 a592a061-630c-0410-9148-cb99ea01b6c8
2001-11-29 17:12:21 +00:00
Jean-Marc Lasgouttes
fcc833018c latexfeatures path from Michael
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3041 a592a061-630c-0410-9148-cb99ea01b6c8
2001-11-19 15:34:11 +00:00
Jean-Marc Lasgouttes
9d0ba3ddf2 cleanups from John and Michael
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2995 a592a061-630c-0410-9148-cb99ea01b6c8
2001-11-09 13:44:48 +00:00
Jean-Marc Lasgouttes
60ca300e1d skak support, John's ERT fixes, loclae blunder fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2955 a592a061-630c-0410-9148-cb99ea01b6c8
2001-10-31 15:19:49 +00:00
José Matox
922ed31d7a Cleaned the preamble generation for linuxdoc/docbook.
Added lyx generated SGML entities (now only for the menu separator).
Cleaned the code from XML-ism.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2921 a592a061-630c-0410-9148-cb99ea01b6c8
2001-10-23 09:42:14 +00:00
Lars Gullik Bjønnes
e952d33e0b insetfloat work + stuff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2388 a592a061-630c-0410-9148-cb99ea01b6c8
2001-07-30 11:56:00 +00:00
Angus Leeming
50b65ca806 Merge natbib branch into head
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2286 a592a061-630c-0410-9148-cb99ea01b6c8
2001-07-19 14:12:37 +00:00
Lars Gullik Bjønnes
d1182f17da LyX Drinkers Union: patch 1
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2141 a592a061-630c-0410-9148-cb99ea01b6c8
2001-06-25 00:06:33 +00:00