Commit Graph

17106 Commits

Author SHA1 Message Date
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
Stefan Schimanski
f8d516c7af Revert "* compile fix"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23234 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 22:02:48 +00:00
Stefan Schimanski
1669c17c0f * compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23233 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 21:53:16 +00:00
Richard Heck
b2475f6625 Replace boost::shared_ptr<TextClass> with a global cache of sorts of the TextClass's used by Buffers---or, more strictly, constructed by BufferParams::makeTextClass(). The action is in TextClass.{h,cpp}.
I've left the typedef in TextClassPtr.h. At the moment, it's kind of silly. But I've left it mostly because it helps to identify where the TextClass's stored in the TextClassBundle are used, and maybe it'd be worth having some sort of strong typedef like the one for BaseClassIndex here.

I need to check whether the textClass_ member of InsetCollapsable is needed now. I think not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23232 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 19:31:31 +00:00
Jürgen Spitzmüller
4d20376360 * src/Makefile.am:
- mend.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23231 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 18:42:57 +00:00
Stefan Schimanski
7c5d585c84 * binary search can be tricky. I hope I got it right now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23230 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 15:09:45 +00:00
Stefan Schimanski
b6be7d908f * adapt to the changed signature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23229 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 14:25:49 +00:00
Jürgen Spitzmüller
ca6246e4da * lib/lyx2lyx/lyx_1_5.py:
- implement wrapper around normalize that handles specific cases
	  that must not be normalized (rest of bug 3313).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23227 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:32:08 +00:00
Abdelrazak Younes
962fdc2923 Change CompletionList::data() signature and cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23226 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:11:09 +00:00
Stefan Schimanski
32f9f03ebc * fix for binary search if string was not found
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23225 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:08:51 +00:00
Stefan Schimanski
159c18bfb9 * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23224 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 13:08:37 +00:00
Abdelrazak Younes
bd7cd85d04 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23222 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 09:26:46 +00:00
Abdelrazak Younes
477366d8ee Cleanup header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23221 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 09:02:35 +00:00
Abdelrazak Younes
f658224e5c Fix warnings and svn eol properties.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23220 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 08:54:51 +00:00
Abdelrazak Younes
0655e4d78f Should Fix crash on exit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23218 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 07:32:02 +00:00
Stefan Schimanski
ff2e0db6c2 * fix longest prefix algorithm for sorted models: commonPrefix(...) returns the length, not the prefix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23217 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 02:09:39 +00:00
Stefan Schimanski
9a5aba0877 * copy'n'paste fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 02:01:48 +00:00
Stefan Schimanski
c4a002d94d * this was not meant to be added
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23215 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 02:00:22 +00:00
Stefan Schimanski
f211733ef2 * set is not needed anymore here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23214 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:57:38 +00:00
Stefan Schimanski
9f21b7f9ad * high performance text completion with weighted btrees to get pseudo
random-access (i.e. O(log n)) to the n-th element in a list/set. Try
  it with 1000000 keys ... no problem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23213 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:56:53 +00:00
Stefan Schimanski
b78dbb5999 * special faster algorithms for sorted completion lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23212 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:56:30 +00:00
Stefan Schimanski
ca63ce553c * Timo Bingmann's btree v8.1, extended with weight counting.
See http://idlebox.net/2007/stx-btree/


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23211 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:56:03 +00:00
Stefan Schimanski
c3bdbe38d7 * implemention of the WordList with iterator caching for a std::set string list.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23210 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:55:50 +00:00
Richard Heck
6a10c0a9c6 Warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23209 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:50:09 +00:00
Uwe Stöhr
4a5247ee7f installer updates
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23208 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 01:24:10 +00:00
Richard Heck
dfd786e6a0 Whoops. Revert last commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23205 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 23:24:20 +00:00
Richard Heck
85408a9e96 Cosmetic.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23204 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 23:21:39 +00:00
Uwe Stöhr
9549685b3a delete French mathed.lyx as we did already for the other languages where we have a translation of the new math manual.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23203 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 22:52:30 +00:00
Richard Heck
5a45ef653b Improve comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23201 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 22:42:27 +00:00
Richard Heck
d667f7463e Doxy bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23200 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 22:40:34 +00:00
Richard Heck
4c6180d209 Try to make the distinction between base classes and text classes clearer in the code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23198 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 16:59:49 +00:00
Richard Heck
69de04feac Restore Andre's TextClassIndex, but now in the form of BaseClassIndex. It seems worth distinguishing more clearly than we do at the moment between TextClass's and BaseClass's. The latter correspond to *.layout files; the former are based upon *.layout files but may be modified by modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23197 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 16:29:40 +00:00
Bo Peng
5f18e5ea81 Fix scons/InseLayout again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23196 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 16:28:46 +00:00
Richard Heck
c7afa2d658 More cleanup from Andre.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23194 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:44:11 +00:00
Uwe Stöhr
317c76c0e9 SCons update: revert r23157 due to r23189
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23193 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:27:45 +00:00
Richard Heck
6fab0b0804 Cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23192 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:18:39 +00:00
Richard Heck
ebd4f002af Andre's s/getBaseClass/baseClass/ cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23191 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:12:41 +00:00
Richard Heck
0362c6aae7 Andre's s/getTextClass/textClass/ cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23190 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 15:06:35 +00:00
Richard Heck
2e7d1199df Revert 23154.
Sorry, Andre, but this broke not only the modules stuff but the general handling of TextClasses. I'm not opposed to doing this sort of thing, but it's going to be a little more complicated. I'll do it when I get a bit of time, or I can explain what the issue is here if you want to do it.

I'll separately re-commit some of the cleanup here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23189 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 14:59:23 +00:00
Richard Heck
2d59bf35ec Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23188 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 14:05:06 +00:00
Bo Peng
1aaa96e6f1 Load local textclass in addTextClass(), reload local layout correctly in LFUN_TEXTCLASS_APPLY and LFUN_TEXTCLASS_LOAD
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23175 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 06:14:48 +00:00
Bo Peng
3c07aff8ef fix scons for InsetLayout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23174 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 05:51:07 +00:00
Dov Feldstern
4056f0ddb1 fix a visual cursor edge-case:
Only when an LTR paragraph *ends with* an RTL chunk of text, movement was 
incorrect in two ways:

1. After moving into the pargraph from the end, and then trying to move towards
the beginning of the paragraph, the cursor would immediately jump to the 
previous pargraph.

2. If the cursor were placed inside the RTL text, and then we would move left
towards the beginning of the paragraph, upon reaching the end (beginning?) of
the RTL chunk, cursor would jump to the end of the paragraph, and then continue
as in (1).

(Same thing, of course, with the reverse situation, i.e., RTL paragraph ending
with LTR text).

We now deal with both of these cases correctly.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23173 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 01:45:51 +00:00
Stefan Schimanski
b313333c1a * setItemDelegate does not free the old delegate. So we better only create one instance and reuse that.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23172 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 00:49:57 +00:00
Richard Heck
14b7f34818 Fix drawing error on Linux, apprently caused by creation of static global instance of QItemDelegate. Fix due to STS.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23171 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-24 00:38:54 +00:00
André Pönitz
e05e2b6b19 (temporarily) add a Buffer * Inset::buffer_ membert
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23170 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:32:33 +00:00
André Pönitz
30fff63257 compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23169 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 22:21:03 +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
Stefan Schimanski
c207a8fe0b * don't forget InsetMathMBox, which is only compiled with cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23167 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 21:59:38 +00:00
Bernhard Roider
52ccb98354 Fix crash due to recursive function call when a counter references itself.
e.g.:

Counter
    Name                 Version
    LabelString          "\theVersion.0"
End


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23166 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 20:38:57 +00:00