Commit Graph

2797 Commits

Author SHA1 Message Date
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
Abdelrazak Younes
37b429e347 Add citations to Navigator.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23458 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 17:47:47 +00:00
Stefan Schimanski
cd63c1380b * remove some garbage from the "buffer in inset" change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23453 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 14:58:10 +00:00
Abdelrazak Younes
3974c5f230 add missing break, should fix the remaining problem in revision 23420.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23422 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 07:33:43 +00:00
Jürgen Spitzmüller
5fce07a02b * src/insets/InsetLabel.[cpp,h}:
* src/insets/InsetCommand{.cpp,h}:
	- rename update to updateCommand

* src/CutAndPaste.cpp:
* src/insets/InsetBibitem{cpp,h}:
	- add duplicate check. There's a remaining glitch: the warning message after setting a bibitem
	  key in the dialog to a duplicate pops up twice.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23420 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-04 06:41:47 +00:00
Abdelrazak Younes
c084b71a9b get rid of LFUN_INSET_REFRESH
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23418 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 18:06:27 +00:00
Abdelrazak Younes
017ba3c4c7 Sanitize a bit the way InsetRef and InsetCommand button are drawn.
* Inset::validate(): renamed to initView()

* InsetCommand:
- get rid of unneeded refresh() and updateButtonLabel_
- setParams(): call initView()

* InsetRef:
- implement initView()
- screenLabel(): transfer code to updateLabels()
- addToToc(): prefix name with BROKEN if the reference is broken.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23417 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 17:58:26 +00:00
Jürgen Spitzmüller
45520d7ced * src/insets/InsetLabel.cpp (doDispatch):
- typo.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23413 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 13:58:18 +00:00
Abdelrazak Younes
aef2959b26 Add "DUPLICATE:" prefix to screen labels. 1.6 won't allow them now but importing a 1.5 documents can contain duplicate labels.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23412 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 13:31:44 +00:00
Abdelrazak Younes
34d15c9150 revert 23410 and fix InsetLabel::update() instead. It seems that the const_iterator used in InsetLabel::update() did not please gcc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23411 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 13:16:23 +00:00
Jürgen Spitzmüller
6f455a916b * src/insets/InsetLabel.cpp (doDispatch):
- restore call to changeRefsIfUnique.

The references were not updated if the label name was changed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23410 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 12:22:17 +00:00
Jürgen Spitzmüller
ffc4554815 add label/refs validation on pasting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23407 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 09:35:26 +00:00
Jürgen Spitzmüller
eef138f77b * src/insets/InsetLabel.cpp:
- minor fixes to the label validation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23406 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 08:19:36 +00:00
Richard Heck
264ee9f584 Nasty mistake here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23405 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-03 04:19:50 +00:00
Abdelrazak Younes
00d6906d04 Introduce Inset::validate() for Inset validation purpose upon interactive creation. In this commit this is used to validate a newly inserted label. As an added bonus, broken cross-references will be automatically fixed if the corresponding label is created.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23399 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 18:14:12 +00:00
Abdelrazak Younes
132003aac5 Avoid duplicate labels when the user change an InsetLabel.
* InsetLabel:
- update(): new method for changing the label. Uses the Buffer reference cache instead of a lookup.
- LFUN_INSET_MODIFY: use update() instead of Buffer::changeRefIfUnique().




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23393 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 17:04:10 +00:00
Jürgen Spitzmüller
ce2a68ce8d * src/insets/InsetWrap.{cpp,h}:
- fix the fix of rev. 23390. Thanks, Abdel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23392 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 16:56:57 +00:00
Jürgen Spitzmüller
4398113ee9 * src/insets/InsetWrap.{cpp,h}:
- button label has to be set before drawing (bug 4602).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23390 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 16:34:17 +00:00
Abdelrazak Younes
8e9dc9bd2a Introduce a labels&references cache at buffer level. This cache uses the already existing updateLabels() mechanism and thus speedups labels&references toc generation. As a bonus, duplicates labels and broken references are detected and tagged with "DUPLICATE:" and "BROKEN:" in the outliner (or the navigator).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23389 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-02 15:27:35 +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
Richard Heck
6234e09063 More clone safety.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23361 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:17:28 +00:00
Richard Heck
1becd75946 These don't seem to be causing crashes at the moment, but as a matter of long-term stability, it seems worth cloning them the "canonical" way.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23360 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:16:04 +00:00
Richard Heck
7b09292cb0 Fix InsetBibitem::clone.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23359 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:12:35 +00:00
Richard Heck
991154992f Fix InsetLabel::clone.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23358 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:03:58 +00:00
Richard Heck
69191c005f Fix InsetCitation::clone.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23357 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:00:39 +00:00
Richard Heck
3431ea8753 Fix numbering.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23356 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 19:32:44 +00:00
Abdelrazak Younes
72b0b23590 Introduce BufferException so that we don't crash if a problem affects only current Buffer. Instead we now just do an emergency save and we close it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23346 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 08:10:51 +00:00
Richard Heck
2b3bd7b5f4 This is the last of the commits that hopes to enforce the distinction between "layout files" and "document classes" that was introduced by the modules code. For the most part, these changes just refactor code from TextClass between: (a) a TextClass base class; (b) a LayoutFile subclass, which represents the information in a .layout file; and (c) a DocumentClass subclass, which represents the layout information associated with a Buffer---a LayoutFile plus Modules. Methods from TextClass have been apportioned between the three classes depending upon what is needed where, and signatures have been changed where necessary so that the right kind of class is required.
At this point, there are no simple TextClass objects in the main LyX code, and it is impossible to create them, since the TextClass constructor is protected. Only LayoutFile and DocumentClass objects can be constructed, and for the most part these are constructed only by their respective containers: BaseClassList and DocumentClassBundle. There is an exception: LayoutFile does have a public default constructor, but if anyone knows how to make it go away, please do.

There will be one or two more commits along these lines, but these will be simple renamings. For example, BaseClassList should be LayoutFileList.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23343 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 02:45:33 +00:00
Richard Heck
cef5f40f47 Fix oddity in bibtotoc handling.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23339 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 21:25:57 +00:00
Uwe Stöhr
5e853c1803 Richard, I have to revert r23332 to be able to compile trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23338 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 21:09:18 +00:00
Richard Heck
2c382f2f47 More work towards type safety regarding TextClass's. A couple bugs have been fixed here, too, discovered along the way.
Note that we no longer rely upon BaseClassList to be sorted. This would allow layout descriptions---such as "article (AMS)"---to be translated, and the ordering of the list in Document>Settings will then follow the translations.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23334 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 21:04:55 +00:00
Richard Heck
265434519e Type safety sure will be nice.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23332 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 19:21:20 +00:00
André Pönitz
36ec5a880f uses canonical foprm of clone()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23331 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 19:04:13 +00:00
Richard Heck
224e6ad0a3 baseclasslist --> BaseClassList singleton. Prep for further type safety.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23322 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 14:49:01 +00:00
Abdelrazak Younes
cfb2fe0a8f * Inset::buffer(): change to an ErrorException as this can be bad enough to provoke a crash.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23310 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 12:29:33 +00:00
Abdelrazak Younes
d4cacf3642 Fix crash on exit because of static dummy Buffer.
* Inset::buffer(): replace dummy buffer with exception throwing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23306 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 07:58:00 +00:00
Richard Heck
49eebd7b08 Minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23303 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 04:00:24 +00:00
Richard Heck
d8a6b5bfd0 Remove TextClassPtr without losing the type safety it provided.
See these threads:
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136112.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg136062.html
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg135997.html
for some background.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23299 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 01:42:02 +00:00
André Pönitz
768cfbb308 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23296 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 23:11:50 +00:00
André Pönitz
1cca0a86bd API cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23295 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 23:03:26 +00:00
André Pönitz
9b39c142b6 remove Buffer & argument in functions realted to embedded files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23292 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 21:51:29 +00:00
André Pönitz
f3e89bc3c9 s/cellstruct/CellData/g
s/rowstruct/RowData/g
s/columnstruct/ColumnData/g

closer to the current naming convention.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23290 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:59:44 +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
Abdelrazak Younes
aede435746 doubly stupid bug fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23288 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 18:00:32 +00:00
Abdelrazak Younes
9fb8d72d62 stupid bug fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23287 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 17:51:33 +00:00
Abdelrazak Younes
e14a0ad50f InsetRef::addTocToc(): add an entry for the referenced label if not already present. Next step is to rebuild the Toc in InsetLabel::addTocToc() for this case.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23286 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 17:02:17 +00:00
Abdelrazak Younes
9b9080c0e9 Bug fix: Adjustment for multiple reference to the same label. The solution is still not optimal as any reference to a label after the reference will not get notice. This is because addToToc() is called iteratively through the document so the toc entry for the label is still not created... any idea to fix this is welcome.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23285 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 16:44:57 +00:00
Abdelrazak Younes
c05db366bb He he he, something I've been dreaming of for a long time: label and reference navigator!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23284 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 16:23:27 +00:00
Abdelrazak Younes
7307e07108 fix bug: an Inset label is not editable of course.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23283 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 15:54:30 +00:00