Commit Graph

59 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
71001a8087 Fix bug 6179 ("|" in index entries not embraced in ERT by lyx2lyx).
* OutputParams.{cpp,h}:
	- new param inIndexEntry
* InsetIndex.cpp (latex):
	- set param.
* InsetErt.cpp (plainText):
	- output active chars in IndexInsets

* lib/lyx2lyx/lyx_1_6.py:
	- embrace "|" in ERT when converting old index entries to collapsables.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31360 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-10 12:07:42 +00:00
Jürgen Spitzmüller
f562e05942 * InsetIndex.cpp: add some FIXMEs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31250 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-31 12:32:39 +00:00
Jean-Marc Lasgouttes
5bf8df4fbc Remove the layout_ cache in InsetCollapsable.
Remove setLayout methods and all the calls to it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 12:07:51 +00:00
Jean-Marc Lasgouttes
4dbe411ba9 Remove all BufferParam arguments in InsetXXX methods (since insets know about their Buffer)
Add an assertion in Inset::dispatch that checks that buffer() == *cur.buffer()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30540 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 12:56:20 +00:00
Jürgen Spitzmüller
bbfc419c10 Finally make the label color of multiple index entries work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30533 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 06:46:52 +00:00
Richard Heck
67e70c6c02 Well, it turns out that we need a different return value for the xhtml
routines, one that allows us to "defer" certain material, e.g., a float
that ought to appear in a div but can't simply be put into the middle
of a paragraph.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30079 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:23:17 +00:00
Richard Heck
675925f659 This patch introduces wrapped tooltips for some more insets.
New method wrapParas() in support, deployed in various
insets.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29564 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 18:04:05 +00:00
Jürgen Spitzmüller
dd930b4535 * final splitindex feature addition: support for \printindex* and \printsubindex*
File format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29419 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-27 06:10:25 +00:00
Jürgen Spitzmüller
0bd5c5fca8 * Add support for splitindex's \printsubindex command. File format change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29409 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-26 11:24:38 +00:00
Vincent van Ravesteijn
2bc9c7c9c4 * Revert the noise.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29376 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 21:02:05 +00:00
Vincent van Ravesteijn
4c9fe33c83 * Move handling of LFUN_INSET_SETTINGS to Inset,
* Remove the EDITABLE enum,
* add functions hasSettings() for all insets.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29375 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 20:55:13 +00:00
Jürgen Spitzmüller
521577ba4c * InsetIndex.cpp:
- fix InsetPrintIndex::getStatus logic (detected by Vincent).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29316 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-18 16:20:08 +00:00
Vincent van Ravesteijn
6192d3dbbf InsetPrintIndex: Fix getStatus() for INSET_MODIFY.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29315 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-18 16:02:36 +00:00
Jürgen Spitzmüller
d12426a340 New inset dialog for InsetPrintIndex (only used with multiple indices)..
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29290 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-17 14:29:32 +00:00
Jürgen Spitzmüller
de22184d97 New inset dialog for InsetIndex (only used with multiple indices)..
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29285 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-17 09:22:44 +00:00
Jürgen Spitzmüller
c52bd08442 Introduce splitindex support. File format change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29255 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-16 07:29:01 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Jean-Marc Lasgouttes
4804b60f1c do not show Index contents in ToC (note that Inset::textString is only for this use)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27326 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-07 13:06:20 +00:00
Jürgen Spitzmüller
473e365a07 * InsetIndex (latex):
- latex is supposed to return the number of _rows_, so do not count the characters
	  (fix bug 5378).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-19 11:28:23 +00:00
Abdelrazak Younes
45cd1149e4 Full text in toc for index entries.
* Text::asString(): new method.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26601 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-28 17:10:16 +00:00
Abdelrazak Younes
2f271f61bc fix warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26416 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 16:20:12 +00:00
Jürgen Spitzmüller
d17f1a298a * src/InsetIndex.cpp:
- fix LaTeX output with unrepresentable characters in current encoding (bug 5022). 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26412 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-15 14:19:00 +00:00
Richard Heck
4d506d21b6 Fix bug 5113.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26065 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-05 14:25:32 +00:00
Jürgen Spitzmüller
1d0bac1144 Fix bug 5040:
* src/support/lstrings.{cpp,h}:
	- new optional param "bool keepemtpy" in getVectorFromString. 
	  By default, empty content between two delimiters was/is not added to the vector.
	  This can be changed with this bool.

* src/insets/InsetIndex.cpp:
	- care for the case when plaintext returns nothing (e.g when ERT is used)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25616 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 16:09:59 +00:00
Jürgen Spitzmüller
f67a9fac2e * src/insets/InsetIndex.cpp (output_latex):
- sanitize the handling of index levels (most of bug 5014).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25596 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 08:20:24 +00:00
Abdelrazak Younes
3803473627 Fix toc generation after rev25096.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25097 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-03 11:33:13 +00:00
Abdelrazak Younes
1e51e87f68 Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator. The idea is to have more accurate navigation in the paragraph. But this doesn't work yet.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24747 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-13 08:23:44 +00:00
Jürgen Spitzmüller
71f8cee976 * src/InsetIndex: further corrections od LaTeX output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24696 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-09 09:50:18 +00:00
Jürgen Spitzmüller
7bf20758b5 fix bug 4837.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24682 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 09:43:27 +00:00
Jürgen Spitzmüller
0c59c26b08 some index fixes:
* src/insets/InsetIndex.{cpp,h} (latex):
	- a more general method to get the index sorting of
	  formatted strings and macros right (bug 4800).

Please test, everybody. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24515 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-27 08:52:43 +00:00
Jürgen Spitzmüller
96b0466c49 some index fixes:
* src/insets/InsetIndex.{cpp,h} reimplement ::latex in order to:
	- un-\protect the index entry (fixes bug 4600).
	- handle formatted index entries (bug 4800). 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24513 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-26 14:24:28 +00:00
André Pönitz
75999ba650 make code look a bit more uniform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23468 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 00:21:05 +00:00
André Pönitz
a694476ac6 try to pass a Buffer & to inset construction if some buffer(param)
access is needed


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23465 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 22:28:18 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Richard Heck
2fb02d20f1 Per Abdel's suggestion that we focus on bug-fixing at this point, this will be the last patch in this series for a bit. But I wanted to get this done before I forget what it is I was doing, so here it is.
The idea behind this patch is to make real key-value support for InsetCommand parameters possible. This should be particularly useful for the listings version of InsetInclude, though we would need some kind of UI for it before it would really be helpful. (See below for some thoughts.) This doesn't substantially change anything else, though some things do get re-arranged a bit.

Basically, the idea is this. First, we introduce a whole range of parameter types: Normal LaTeX optional and required parameters; ones for LyX's internal use (like embed); and finally, in connection with keyval, ones that represent keys and ones that represent optional and required arguments where the keyval stuff will appear. (I'm assuming here that there will always be exactly one of those, and that it will accept only keyval-type material.) The parameters themselves are stored in a map, so it's really only the output routines that need to care about the different types of parameters.

Regarding the frontend, it seems to me that something like the following would work:
(i) scan the parameter list for LATEX_KEY type parameters
(ii) the dialog will have a series of lines, each of which has a combo box listing the acceptable keys and a QLineEdit for entering its value, as well as a "delete" button of some sort for removing this key and its value
(iii) there should be an "add line" button to add a new line, activated only when all other lines are filled with values
Probably not even too hard.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23235 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 22:13:45 +00:00
Richard Heck
8e9410b3d0 After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of all of this being to make things more flexible, with the ultimate goal being biblatex support and a kind of InsetCommandFlex that will allow user-definable such things. The next step, really, is to fix up CiteEngine so that we can have different sets of parameters for InsetCitation depending upon what engine is in use. (Something like this also needs doing with InsetInclude.)
This patch reworks the machinery that holds information about what parameters there are and what their values are. There's enough flexibility here that true keyval support ought to be fairly easy at this point. I'll have a peek at that shortly.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23168 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:01:02 +00:00
Abdelrazak Younes
c3a8b3a566 * Inset: Prepare for an eventual merge of updateLabels() and addToToc()
* TocBackend: add non const toc() and tocs() access methods.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23018 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-15 10:13:32 +00:00
Abdelrazak Younes
d8ee26ec6c * InsetXXX::addToToc(): properly use passed ParConstIterator.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23015 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-15 08:39:58 +00:00
Abdelrazak Younes
6c14a1c406 Add list of Indexes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22975 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-13 13:19:39 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:28:07 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
André Pönitz
688c186614 we assume (more or less) conforming compilers nowadays.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21482 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-06 21:45:24 +00:00
Abdelrazak Younes
c51f1cffaa * InsetCollapsable:
- InsetCollapsable(): Move labelfont initialisation to InsetCollapsable::setLayout().
- read(): reset the inset layout.

All other insets: get rid of redundant setLayout() calls.

This commit fixes the multiple crashes in trunk but the color used for text and background are completely wrong...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21382 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 17:47:51 +00:00
Martin Vermeer
3d443b4c9d Implement ForceLtR; cleanup of collapsable insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21285 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-30 12:30:46 +00:00
Abdelrazak Younes
5ddc612b73 Splitup Font in saner bits:
* Font::FontBits -> FontInfo
* Font::FONT_XXX -> all enums transfered to FontEnums.h and renamed to FontXxx

I've replaced Font uses with FontInfo were the language() member was not needed, basically all draw() and metrics methods. There's one problematic cases with InsetQuotes which I solved by taking the Buffer main language.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-28 18:51:54 +00:00
Richard Heck
4ca3a3d59c InsetIndex is no longer an InsetCommand.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21210 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-25 22:29:45 +00:00
Richard Heck
07b6198f4c Move the findInfo() and defaultCommand() routines out of InsetCommand and into its subclasses, so that the subclasses know what parameters they want, etc. Also, introduce an "isCompatibleCommand()" routine, so the subclasses can tell us which commands they are prepared to accept.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21194 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-25 04:13:56 +00:00
Richard Heck
13d7df639b Rationalize lyxCode().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20990 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-16 16:48:21 +00:00
Abdelrazak Younes
f7b1c86393 Move Inset::Code to InsetCode.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20936 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-13 09:04:52 +00:00