Commit Graph

160 Commits

Author SHA1 Message Date
Richard Heck
362d6e468f This patch fixes a set of bugs reported by Philippe relating to excluded
and default modules. The lesson, in the end, is that we need to do all the
removal of modules that no longer `fit', for whatever reason, before we
do anything else. So the patch basically just moves the `removal' code
into a new routine that gets called before the routines that add default
modules and then check consistency.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27281 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:42:16 +00:00
Richard Heck
5e45cd4c44 Revert the last few patches. I'll commit a more general fix all at once.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27280 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:32:37 +00:00
Richard Heck
3a9a0fc3e6 Comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27279 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:15:09 +00:00
Richard Heck
c94d0da408 More fixes for bugs noticed by Philippe.
We want to do all the excluding before we do any of the adding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27278 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:13:25 +00:00
Richard Heck
df475c2002 Add some comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27277 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:07:52 +00:00
Richard Heck
b0035f07b1 Fix bug reported by Philippe relating to excluded modules: Excluded
modules need to be removed before anything else is done.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27276 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-05 19:01:59 +00:00
Richard Heck
9dfac74265 This patch introduces ProvidesModule and ExcludesModule layout tags.
See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145129.html.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27041 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:27:03 +00:00
Richard Heck
721b269732 Another one for Abdel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26999 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 20:45:47 +00:00
Richard Heck
2351615f0a Fix LFUN_LAYOUT_MODULE_ADD: We need to make sure that the module
isn't already added, that its requirements are satisfied, and that
it doesn't conflict with any loaded modules. Mostly, this just
moves existing code into a new routine where we can get at it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26995 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 19:48:32 +00:00
Richard Heck
5e505119fa OK, I lied. A little more. Just trying to keep the cleanup separate from
the real stuff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26925 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 17:29:01 +00:00
Richard Heck
297d5d1f4e Factorize out some of this. Just a bit more cleanup, prior to the patch
I've been promising....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26923 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 17:14:46 +00:00
Richard Heck
8bc9c319d2 Fix bug connected with excluded modules and default modules: We need to make
sure that default modules do not exclude loaded modules and also that loaded
modules do not exclude them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26922 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 15:29:56 +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
Jürgen Spitzmüller
d45ca67d1d ** fix bug 2114. Fileformat change.
** fix bug 5343 (patch from Richard, prerequisite for the other fix)

* Buffer.cpp:
	- increment format to 343
* src/BufferParams.{cpp,h}:
	- new param \use_default_options that allows to select/deselect
	  the "Other" class options defined in the layout file.
* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/LaTeXUi.ui:
	- add GUI to set \use_default_options, display predefined options in the dialog
	- update dialog correctly on class change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26860 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 09:36:00 +00:00
Abdelrazak Younes
4d4ee5d7a6 Factorize out the hardcoded babel tests. This whole thing is a real mess...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26858 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 07:56:06 +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
d30e01fd08 Support for Mongolian, fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26848 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-11 23:52:31 +00:00
Uwe Stöhr
19c27c8714 BufferParams.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26842 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-11 12:47:51 +00:00
Richard Heck
2078e09e67 The default modules should be kept in order.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26801 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-07 15:53:05 +00:00
Uwe Stöhr
dfcd6fb7ea make Latvian documents compilable, fixes http://bugzilla.lyx.org/show_bug.cgi?id=5324
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26752 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-05 19:12:12 +00:00
Uwe Stöhr
8d11bc23be BufferParams.cpp: make Lithuanian documents compilable, fixes http://bugzilla.lyx.org/show_bug.cgi?id=5323
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26746 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-05 13:42:37 +00:00
Uwe Stöhr
ce09194e43 GuiDocument.cpp, BufferParams.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5294
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26628 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 19:33:37 +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
André Pönitz
e5ae1a4b75 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-21 19:27:20 +00:00
Uwe Stöhr
eb963540d4 various listings fixes by Vincent, see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg143302.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26341 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-08 21:51:38 +00:00
Jürgen Spitzmüller
db9885f882 final touch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26207 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-19 07:48:24 +00:00
Jürgen Spitzmüller
5da25426f5 * adjust line lengths
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26206 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-19 07:30:09 +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
Richard Heck
163d827729 Support for removing "default" modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25917 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 17:46:27 +00:00
Richard Heck
a28c584064 Move the default module loading from makeDocumentClass() to setBaseClass().
This makes the Document>Settings dialog behave better.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25882 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 16:48:48 +00:00
Richard Heck
56a35c2c61 Add UseModule tag for layout files. This allows the AMS files, in particular, to "require" the
theorems-ams module, which is what most users will want. A later commit will allow users also
to "exclude" this module, in case they wanted to do that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25880 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 15:51:27 +00:00
Uwe Stöhr
ffa15bc301 BufferParams.cpp: clarify the babel loading logic: treat jurabib the same as hyperref, japanese, and vietnamese
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25707 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-18 22:22:17 +00:00
Jürgen Spitzmüller
ce13748eae Restore 1.5.x babel loading order (bug 5024)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25632 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-15 13:08:27 +00:00
Richard Heck
f854295dab 'Default'-->'Empty' in Bo's recent commit. Default means something else in the code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25556 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 03:41:56 +00:00
Bo Peng
763ef015ce Improve the local layout feature by better handling of unknown textclass, unknown layouts, and switch between textclasses.
* src/TextClass.h[.cpp]: add addLayoutIfNeeded() and createDefaultLayout()
	* src/Layout.h[.cpp]: add unknown_ to mark if a layout is a default layout for an unknown one.
	* src/LayoutFile.cpp: add addDefaultClass and change addLayoutFile to addLocalLayout.
	* src/Text.cpp: add unknown layouts that are not recognizable by a new textclass.
	* src/frontends/qt4/GuiToolbar.cpp: display (unknown) for unknown layouts.
	* src/frontends/qt4/GuiDocument.cpp: restore 'browse layout' button.
	* src/frontends/qt4/ui/LaTeXUi.ui: restore 'browse layout' button.
	* src/CutAndPaste.cpp: do not convert unknown layouts from pasted text
	* src/BufferParams.cpp: add a default textclass when a document with unknown textclass is loaded.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25555 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 02:43:02 +00:00
Enrico Forestieri
1e801d0361 Fix bug 2721
http://bugzilla.lyx.org/show_bug.cgi?id=2721


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25409 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-01 12:46:46 +00:00
Jean-Marc Lasgouttes
d3bf7155b8 rewrap long lines
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25404 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-30 11:02:21 +00:00
Jürgen Spitzmüller
d7eaaba900 ** support for CJK font argument. File Format change **
* src/BufferParams.{cpp,h}:
	- new param fontsCJK (font_cjk).

* src/output_latex.cpp:
	- use fontsCJK param.

* src/Buffer.cpp:
	- increase file format

* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/FontUi.ui:
	- GUI for the CJK font param

* lib/lyx2lyx/lyx_1_6.py:
	- remove font_cjk param on reversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25135 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 06:18:34 +00:00
Richard Heck
3e28f0fc57 Add some constness where we can.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24883 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-22 14:02:35 +00:00
Uwe Stöhr
b2b4cb1fe3 BufferParams.cpp: fix the order for page sizes, fileformat change is needed, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4868
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24792 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 22:54:13 +00:00
Uwe Stöhr
2a18b2a5cc BufferParams.cpp: follow Jürgen's advice to load subfig after \PassOptionsToPackage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24753 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-13 20:46:49 +00:00
Uwe Stöhr
842587a1a6 BufferParams.cpp: load the subfig package conditionally to make it work with the caption package
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24746 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-13 01:23:50 +00:00
Enrico Forestieri
c4bcdf837a Make it less ugly and safer, as when adding to the preamble one doesn't
have to check whether \makeatletter has already been added or not.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24713 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-10 22:35:17 +00:00
Jürgen Spitzmüller
764b5cf859 support for default master document.
file format change.

This is the last feature for today. Promised.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24540 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-28 16:38:56 +00:00
André Pönitz
b35b731fbf move citation enums into header of their own
remove biblio:: namespace


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24385 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 15:00:11 +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
Bo Peng
76d272da30 Embedding: revert embedding options and extra_embedded_files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24328 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-18 17:06:03 +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
e1453ef687 lexer cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24134 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-05 21:24:57 +00:00
Enrico Forestieri
fd0e789dea Only add \makeatletter and \makeatother to the preamble when actually needed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24068 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-31 01:26:57 +00:00