Commit Graph

30 Commits

Author SHA1 Message Date
Richard Heck
3b716ae11e Update all layouts to current format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35481 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-22 12:21:42 +00:00
Richard Heck
f9377c8bcc Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34595 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:28:21 +00:00
Richard Heck
e392cff392 Update layouts to format 26.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33922 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-29 18:51:41 +00:00
Richard Heck
2dfaebd243 Update layouts to format 25.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33796 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 22:21:56 +00:00
Richard Heck
99bbf5b42a Update layouts to format 24.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33634 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 23:02:24 +00:00
Richard Heck
b7d665da7f Update all layouts to format 22.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33118 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 21:01:07 +00:00
Richard Heck
082bdf47c9 Update all layout files to format 21.
Note: Anyone on *nix can do this by running development/tools/updatelayouts.sh.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33028 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 14:03:59 +00:00
Richard Heck
c48c33cf3a Update all layout files to format 19.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32369 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 22:55:38 +00:00
Jürgen Spitzmüller
637d7399a7 * Add new modules for more fine-grained control over theorem numbering.
Modules provided by Paul Rubin (#5880).
* Fix some minor module description issues.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31885 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-07 10:44:08 +00:00
Richard Heck
7035f4cabb Module categories, for Pavel.
Do free free to change the categories. I just did these ones for testing, really.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31033 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 15:20:11 +00:00
Richard Heck
7f100a1e6d Move the LaTeX proof declaration to a separate file, for inclusion elsewhere.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30912 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-07 19:20:13 +00:00
Richard Heck
286f6b302d Normalize whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30911 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-07 19:15:38 +00:00
Georg Baum
9aad4bc27f Better fix for bug 1476 (following an idea by Jean-Marc).
Don't go into an endless loop if layout2layout cannot produce the desired file format.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28529 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-17 20:25:56 +00:00
Richard Heck
a2f4949d38 Update format 10 layouts to format 11.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27042 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-23 00:28:36 +00:00
Richard Heck
b32b4a545c Update counter containing files to new format.
Actually, not all of these do contain counters, but my grepping 
wasn't sophisticated enough to catch them. Not a big deal....

I don't think there are errors here, but if you see weird
behavior with counters in some file or other, it's possible I missed 
something.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26782 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 14:58:22 +00:00
Richard Heck
64baf4dedc Update the rest to format 9, as well. The counter stuff will
need a new format, if we do it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26767 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-06 03:20:16 +00:00
Richard Heck
2bb93b6c54 Update layout format.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25881 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 16:33:04 +00:00
Richard Heck
2aa40fe939 Don't define the proof environment if it's already defined.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25877 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-24 22:28:57 +00:00
Richard Heck
0e69b297d6 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25876 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-24 22:21:30 +00:00
Richard Heck
d252730dff New AddToPreamble tag for layout files. This tag will ADD some information to the document premable rather than completely over-write it, as the Preamble tag does.
Increment layout format to 7.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23916 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:11:16 +00:00
Richard Heck
46611ba1cc Fixes to the theorem modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22502 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-12 05:17:52 +00:00
Richard Heck
d5d665482e This commit changes the way individual LyXModule's are represented, both internally and in the .lyx files. The earlier version represented them by their `descriptive name', e.g., "Endnote" or "Theorems (AMS)", these being the same names used in the UI. This was a mistake, as becomes readily apparent when one starts to think about translating these strings. The modules ought to be represented by their filename, without the extension, just as TextClass's are.
The changes that accomplish this part are in ModuleList.{h,cpp}, configure.py, and the *.module files themselves. This is a format change, and the lyx2lyx is in those files.

By itself, that change would not be major, except for the fact that we do not want the module to be represented in the UI by its filename---e.g., theorems-std---but rather by a descriptive name, such as "Theorems". But that change turns out to be wholly non-trivial. The mechanism for choosing modules was the same as---indeed, was borrowed from---that in GuiCitation: You get a list of modules, and choosing them involves moving strings from one QListView to another. The models underlying these views are just QStringListModels, which means that, when you want to know what modules have been selected, you see what strings are in the "selected" QListView. But these are just the descriptive names, and we can't look up a module by its descriptive name if it's been translated. That, indeed, was the whole point of the change to the new representation.

So, we need a more complicated model underlying the QListView, one that will pair an identifying string---the filename minus the extension, in this case---with each item. This turns out not to be terribly difficult, though it took rather a while for me to understand why it's not difficult. There are two parts:
(i)  GuiSelectionManger gets re-written to use any QAbstractListModel, not just a QStringListModel. This actually seems to improve the code, independently.
(ii) We then subclass QAbstractListModel to get the associated ID string, using the Qt::UserRole slot associated with each item to store its ID. This would be almost completely trivial if QAbstractListItem::itemData() included the QVariant associated with this role, but it doesn't, so there are some additional hoops through which to jump.

The new model, a GuiIdListModel, is defined in the files by that name. The changes in GuiSelectionManger.{h,cpp} make it more abstract; the changes in GuiDocument.{h,cpp} adapt it to the new framework. 

I've also updated the module documenation to accord with this change.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22501 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-12 04:28:12 +00:00
Richard Heck
b4341a8dae Minor tweaks, and a new module for unnumbered theorems only.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22464 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 05:14:12 +00:00
Richard Heck
8d541e3675 Fix comments. Other credits are in other files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22462 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 05:00:11 +00:00
Richard Heck
f5a5be4d18 Modularization of the AMS classes, and the theorem environments generally.
This is Part I: The changes to the layout files and modules. Part II, still
to come, will involve lyx2lyx to help people who were using the older classes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22461 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 04:58:20 +00:00
Richard Heck
7c28905b17 This commit adds some new functionality to the modules stuff. In particular, it introduces the concept of "required" and "excluded" modules: A given module may require one of some list of modules, or it may be incompatible with some other modules. (Complex Boolean combinations are not supported!!) These facts can be noted in the module file, and the UI responds appropriately: Required and excluded modules are noted in the description, and the "Add" button is enabled only if at least one of the required modules has already been selected and no excluded module is selected. Getting this to work involved a fair bit of cleanup of the existing code---including ways Angus, I think, had already pointed out were required---and also involved changing the syntax of the headers of the module files, but in ways that are probably best anyway.
None of the extant modules require any other modules, but the Theorem modules all exclude one another. (See the screenshot.) When I modularize the AMS classes---that is the next task---we'll have requires.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22456 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-09 18:51:02 +00:00
Jürgen Spitzmüller
9e5eebc14c *** Requires tag for classes, layouts and custom insets ***
* src/TextClass{cpp,h}:
	- implement Requires tag for class and InsetLayout.
* src/Layout.{cpp,h}:
	- implement Requires tag for layouts.
	- increase layouts format to 6.
* src/Paragraph.cpp:
	- request required features for paragraph layouts.
* src/LaTeXFeatures.cpp:
	- add some packages needed by modules.
	- remove Preamble method for InsetLayout. This is now done
	  in InsetFlex::validate.
* src/BufferParams.cpp (validate):
	- request required features for the class.
* src/insets/InsetLayout.h:
	- new member "requires".
* src/insets/InsetFlex.{cpp,h}:
	- implement validate method and request required features and preamble snippets.

* lib/layouts/*.{layout,module,inc}:
	- increase layouts format to 6.
	- use Requires tags in some modules (more can be done later).

* lib/doc/Customization.lyx:
	- document Requires tag.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22414 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-07 16:59:10 +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
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