Commit Graph

10017 Commits

Author SHA1 Message Date
Michael Schmitt
de35c25d8d * src/insets/InsetInclude.cpp: formatting (in response to r18445)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18517 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-26 11:25:41 +00:00
Abdelrazak Younes
3fdbf5b9c4 Sanitize cursor saving/restoring in a multi-view context.
* Inset: new destroyed signal (copy ctor and operator= needed because of a signal is not copiable)

* CursorSlice:
 - connect to inset destructor wherever possible
 - invalidate(), isValid(): new method.
 - inset_: now private

* DocIterator::fixIfBroken(): new method for properly fixing cursors.

* StableDocIterator::asDocIterator(): verify cursor sanity before creating it.

* Cursor::fixIfBroken(): now a simple wrapper around DocIterator::fixIfBroken()

* BufferView::setBuffer(): verify cursor sanity before restoring it.

* WorkArea::redraw(): verify cursor sanity of concurrent BufferView display.


 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18516 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 23:17:24 +00:00
Bo Peng
093b9452a4 Choose a delimiter for lstinline (braces can not be used for some listings version)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18513 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 16:15:02 +00:00
Peter Kümmel
af6a9552ed fix merge build src/frontends/qt4/QDocument.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 15:05:46 +00:00
Bo Peng
5b731aa6a5 InsetListings: use float for placements because of the handling differences between float and floatplacement
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18508 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 14:38:22 +00:00
Jürgen Spitzmüller
5e6391a04a fix bug 3723:
* src/Buffer.cpp (read): clear listings params.

* src/frontends/qt4/QDocument.cpp: whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18507 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 12:32:08 +00:00
Jürgen Spitzmüller
ce3eeaea1c l10n work:
* src/Buffer.cpp: 
	- make view-source string translatable

* src/frontends/controllers/ControlToc.h:
	- make getGuiName public

* src/frontends/qt4/TocWidget.cpp:
	- use getGuiName for the combo.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18505 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 09:20:35 +00:00
Bo Peng
1d99202d88 Minor fixes, in response to Lar's email
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18504 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-25 01:02:38 +00:00
Bo Peng
e5bf150a0c Use a new internal structure for InsetListingsParams, fix bugs 3713 and 3718
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18501 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 22:19:58 +00:00
Richard Heck
b28458129d Forgot to restore this before committing 18494. This fixes bug 3725.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18500 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 22:17:04 +00:00
Richard Heck
adc3d95451 Remove some calls that do nothing but print an error message.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18497 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 19:21:21 +00:00
Richard Heck
5fed0e44ed Fix stupid use of "or".
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18496 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 19:19:23 +00:00
Peter Kümmel
66e5f1bf39 revert buggy patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18495 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 17:17:35 +00:00
Richard Heck
d2fb80eec7 Fix for bugs 2199 and 3667. Most of the changes were to the logic. Buffers
that were opened for possible included LyX files need to be closed if those
files cannot be loaded, for example. A bit more work was needed to allow a
LyX file to include itself as a verbatim or listings without trying to load
itself and without relying upon loadIfNeeded() to report the problem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18494 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 17:17:04 +00:00
Stefan Schimanski
93baf8eb9b * do not lookup the same macro all the time
* only update the representation if anything was changed (this gives a
  huge speedup), fixes #2452
* minor cleanup of the code, especially setting up the coordinate
  cache. Without this can lead to crashes if the macros do not mention
  all the arguments. 
* And a last fix included makes sure that the metrics are always in
  sync with the drawing. Before it was possible to go into the macro
  with the cursor in a way that the metrics were for the viewing mode,
  but the drawing was done for editing.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18489 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 16:29:40 +00:00
Bo Peng
1561aef0b5 Increase listings counter for InsetInclude with lstinputlisting and a caption, fix bug 3708
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18486 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 14:10:35 +00:00
Stefan Schimanski
e23f96ef2e * Import newcommand/providecommand/renewcommand/def macros as MathMacros
if they are compatible (i.e. no optional arguments, no patterns)
* Recursive macros are also imported, but they only work correctly in the
  limits of the current macro implementation in LyX
* Fixes http://bugzilla.lyx.org/show_bug.cgi?id=21


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18483 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 06:52:08 +00:00
Richard Heck
c9da76f1f5 Fix whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18482 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-24 05:29:45 +00:00
Edwin Leuven
630fe09637 - introduces toolbar_toggle lfun
- adds a "toggle math toolbar" and "toggle table toolbar" buttons to the main toolbar
 (i also moved "toggle toc" there)
- adds a "toggle math panels" button to the math toolbar
- reshuffles the Big Operators panel to avoid confusion with the sum icon on the math toolbar
- adds some icons

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18478 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 22:08:07 +00:00
Bo Peng
f8b1ce4ada Allow listing the lyx file itself, fix bug 3707
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18477 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 19:24:06 +00:00
Jean-Marc Lasgouttes
e499a5428e Fix bug 3301 (selecting buttons (e.g. a citation) with the mouse opens dialog)
* insets/InsetExternal.cpp (doDispatch):
	* insets/InsetGraphics.cpp (doDispatch):
	* insets/InsetInclude.cpp (doDispatch):
	* insets/InsetCommand.cpp (doDispatch):
	* insets/InsetVSpace.cpp (doDispatch): do not open dialog if a 
	selection is set.

	* insets/InsetRef.cpp (doDispatch):
	* insets/InsetCharStyle.cpp (doDispatch): act on mouse release, not
	mouse press.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18473 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 10:35:57 +00:00
Abdelrazak Younes
5112e0f821 Fix crash with collapsable insets and multiple views
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18471 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 07:43:16 +00:00
Stefan Schimanski
78378912a3 * fix http://bugzilla.lyx.org/show_bug.cgi?id=3668:
\input{foo} means to input foo.tex, so add the .tex extension. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18470 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 07:27:13 +00:00
Jürgen Spitzmüller
43215a323f two small missing bits for rev18468
* src/frontends/qt4(QDocument.spp:
*src/frontends/qt4QInclude.spp:
	- add missing toqstr conversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18469 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 04:09:09 +00:00
Bo Peng
b78c1db290 Make listings dialog translatable (mostly strings from InsetListingsParams), fix bug 3645
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18468 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 02:09:58 +00:00
Bo Peng
1cfc04f4ae Add dialect support and showstringspaces parameter to the listings dialog, fix bug 3664. Mostly from Jurgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18467 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-23 02:05:01 +00:00
Bo Peng
eaaaefb6a9 Add proper name for list of listings under navigation menu, fix bug 3633
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18462 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 20:29:58 +00:00
Richard Heck
9ad8985149 Fix minor bug involving overlapping citation strings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18455 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 15:20:19 +00:00
Jean-Marc Lasgouttes
a9a3b79528 revert r17737; it was designed to fix bug 2993, but it created bug 3503. Consequently I will mark bug 2993 as wontfix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18454 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 14:06:40 +00:00
Georg Baum
7930b9e5b6 fix bug 1973 (hopefully)
* src/Text2.cpp
	(Text::setCharFont): Assert
	(Text::setInsetFont): New, set the font recursively in insets
	(Text::setFont): Call setInsetFont instead of setCharFont if needed

	* src/DocIterator.cpp
	(DocIterator::forwardIdx): Implement

	* src/Text.h
	(Text::setInsetFont): New, set the font recursively in insets
	(Text::setCharFont): Document



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18452 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 10:51:38 +00:00
Jürgen Spitzmüller
cddcdd08ea make InsetListings ready for dialects, part 1 (joint work with Bo Peng):
* src/insets/InsetListingsParams.cpp:
	- complete list of languages/dialects
	- fix some typos
	- (validate): check for braces

* src/frontends/qt4/QListings.cpp:
	- fix list of languages (not yet complete)
	- make it possible to enter [dialect]language in the advanced widget

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18451 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 04:43:30 +00:00
Bo Peng
2d90c65500 Detect if file is actually a directory in support/lyxsum.cpp, fix bug 3622
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18449 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-22 00:27:56 +00:00
Richard Heck
4318b4def2 Partial fix for bug 1474 (crashes on recursive includes) and complete fix for
bug 3659 (crash when file contains only an InsetInclude). 

Added checks for self-inclusion. The reason this is not a complete fix is that
recursive input could arise from something other than self-inclusion. Checking
for that will be much more complicated, however.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18445 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-21 15:34:29 +00:00
Jürgen Spitzmüller
68a71fcde1 * src/frontends/qt4/QDocument.cpp (validate_listings_params):
* src/frontends/qt4/QListings.cpp (validate_listings_params):
	- care for the apply button as well.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18444 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-21 14:32:10 +00:00
Jürgen Spitzmüller
0d1a0c9b27 Cleanup the listings dialog and make its content translatable (bug 3645):
* src/frontends/qt4/QListings.cpp:
	- make widget entries translatable
	- clean up and shuffle around some code

* src/frontends/qt4/ui/ListingsUi.ui:
	- set isEditable here, not in QListings.cpp

* src/frontends/qt4/QDocument.cpp:
* src/frontends/qt4/QInclude.cpp:
	- make Listings strings translatable

Fix bug 3654 (by Bo Peng):

* src/frontends/qt4/QListings.h:
	- new slot on_numberSideCO_currentIndexChanged

* src/frontends/qt4/QListings.cpp:
	- use this slot and enable(disable the appropriate widgets

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18432 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 14:31:15 +00:00
Stefan Schimanski
145834bfcc * avoid mallocs by only increasing the points array by at least a constant factor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18430 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 08:50:54 +00:00
Jürgen Spitzmüller
5cb3e19200 * src/insets/InsetListings.{cpp,h}:
- implement metrics and draw, fix font initialization
	(fix bug 3653)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18429 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 05:53:49 +00:00
Bo Peng
e658f71f07 Remove color dependency of framed note, fix bug 3598
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18428 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 02:53:19 +00:00
Stefan Schimanski
a1802a2a96 * markers2 are drawn below the inset, hence increase the descent instead of ascent by the frame size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18426 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-19 19:45:55 +00:00
Richard Heck
dfd9a1d53d Fix for bug 3650. Made changes to the Paragraph::checkBiblio() routine,
which now returns 1 if an InsetBibitem was inserted (and the cursor needs
to be incremented) or -POS if an InsetBibitem was deleted at position POS
(and the cursor needs to be decremented if it was past POS). Otherwise, it
returns 0. Made the corresponding changes in TextMetrics.cpp.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18424 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-19 19:29:50 +00:00
Stefan Schimanski
472902f3c9 * revert r18422. There are polylines much longer than 16
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18423 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-19 16:48:29 +00:00
Stefan Schimanski
17544b1fa8 * avoid one malloc by using a static array
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18422 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-19 13:15:08 +00:00
Stefan Schimanski
96860ffe93 * only antialias the whole polyline or no segment at all
* Sqrt and Root draw their vertical horizontal line with a single line command to make them showup non-antialiased.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18419 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-19 10:52:47 +00:00
Bo Peng
f672df5dc2 BUG 3649: display float listings inline, like other float insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18413 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 20:01:56 +00:00
Bo Peng
d848a5e393 BUG 3598: display framed and shaded notes in a separate paragraph, require package color also for framed note
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18412 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 20:00:19 +00:00
Jürgen Spitzmüller
4d5c28c305 * src/frontends/qt4/QListings.cpp:
- add Apply button
* src/frontends/qt4/ui/ListingsUi.ui:
	- add Apply button
	- add accelerators

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18409 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 18:35:28 +00:00
Jürgen Spitzmüller
51b657c6cc * src/frontends/qt4/ui:
- make dialog non-modal (fix bug 3636)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18408 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 15:44:07 +00:00
Bo Peng
150d08f03e InsetListings: turn off inline/float when another is clicked, fix bug 3641 and 3642
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18407 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 15:26:42 +00:00
Jürgen Spitzmüller
a42d3e670b Fix for bug 3637, joint work of Bo Peng and myself:
* src/insets/InsetListingsParams.{cpp,h}
	- implement getParamValue that returns the value of a listings param

* src/insets/InsetInclude.cpp:
	- (getLabelList): pass listings label to the list, if available
	- doDispatch: implement changeRefsIfUnique for listing labels

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18405 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 14:40:39 +00:00
Bo Peng
73849af5df InsetListings: change the interface of diaplay function and allow AlignLeft. Applied to InsetListings. Fixes bug 3617, 3618
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18404 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 14:32:29 +00:00