Commit Graph

4066 Commits

Author SHA1 Message Date
Enrico Forestieri
89c1d25250 Avoid const casts by making mutable the usermacros member.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36984 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-21 14:52:18 +00:00
Richard Heck
a2111a1c50 Simplify InsetRef::forToc().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36978 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 22:47:09 +00:00
Richard Heck
2b39534042 Greyed out notes do produce output, which means that their counters need
to be treated as part of the document. For example, the footnote numbers
in LyX are wrong prior to this patch.

This will also affect word and character count, but should not affect
anything else. If that seems wrong, we can either (a) explicitly exclude
notes from the word count or else (b) introduce 
  bool countWordsInInset() const;
and call that, instead.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 22:33:12 +00:00
Richard Heck
68aa0b5b91 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36975 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 22:29:41 +00:00
Richard Heck
9e9c96035c Finish disentangling tocString(). We introduce a new method, forToc(),
that also makes sure it doesn't do more work than it needs to do, by
limiting the size to 40 characters. Previously, InsetBranch::addToToc()
would have added a string representing the entire contents of the
branch! It's hard to imagine that having to recalculate that sort of
thing doesn't cause some problems with speed, especially in documents
with lots of notes and branches and such.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:55:09 +00:00
Vincent van Ravesteijn
8adcffff0c Fix bug #7166: Insets that shouldn't appear in the TOC were included. From now on use AS_STR_INTOC as an option for Paragraph::asString() for insets that should not be included in the strings for the TOC, like IndexInset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 19:18:56 +00:00
Enrico Forestieri
8b88c3edde Refine fix for bug #7183.
Using updateMacros() entails a performance hit when loading a document
with really a lot of macros. So, revert to the original strategy of
tracking macros at creation time. In order to also account for macros
defined in a child document, the child is now loaded by the include inset
at construction time instead of after the master has finished loading.
This strategy mimics what updateMacros() was accomplishing without
incurring in its drawbacks, such that loading time is practically
unchanged even with a thousand macros.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 18:15:39 +00:00
Abdelrazak Younes
8e092e6ca6 greatly simplify and comment TeXEnvironment():
* only one for loop
* uses runparams.par_end

InsetInclude and InsetIext: initialize runparams.par_begin and runparams.par_end

Except for a few additonal empty lines the LateX exports are identical for all help files. The reason for the additional empty lines is the more consistent TeXEnvironment() call.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 13:49:39 +00:00
Stephan Witt
c7e6a677c4 fix compiler warnings in pedantic mode: remove trailing comma after last enum member
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36923 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 19:56:51 +00:00
Vincent van Ravesteijn
b90de3dc5c Fix bug #7176: Clicking TOC doesn't bring up outline
Previously LFUN_INSET_SETTINGS was misused to show the outliner. As a TOC doesn't have settings, it was no longer showed after a refactorization of LFUN_INSET_SETTINGS/LFUN_MOUSE_RELEASE because InsetToc::hasSettings() returns false.

As this is a special case, we should handle this special case in InsetTOC itself.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36907 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-17 13:12:43 +00:00
Richard Heck
832d6cd7e1 Begin undoing the tocString() mess by renaming that routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-15 01:34:04 +00:00
Richard Heck
de1655f92b Use the layout defined label for the TOC, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36888 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 23:50:50 +00:00
Richard Heck
7bc133b0a2 Abdel thinks we should just get rid of this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36887 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 23:43:45 +00:00
Richard Heck
807fc94597 Trivial cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36885 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 23:18:48 +00:00
Richard Heck
d1e0a0e4ed Allow customization of label string for note insets. We actually had
strings in the layout file, but they were not used.

Question: Should we just remove InsetNote::setButtonLabel() now? The
only purpose it is serving is to provide a backup in case no label is
defined.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36884 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-14 23:16:19 +00:00
Enrico Forestieri
573694da5f Fix bug #6538 (Figure: relative path changed to absolute on copy/paste)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36835 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-11 23:04:24 +00:00
Richard Heck
c0bb9707cb Remove support for viewing URLs from hyperlinks. This is a security
risk, due to our lack of control over the links and the program used to
view them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36789 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-09 17:55:11 +00:00
Jean-Marc Lasgouttes
838af80834 Try to finally fix #6930. All the paths that did not come from context
menus were (intentionally) missing, and it turns out they were needed.

Normally all invocations of INSET_MODIFY should trigger a recordUndo now.
Of course all cases have not been tested, but it should be working.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36770 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-08 09:24:04 +00:00
Pavel Sanda
c420c81ec2 Replay r36748
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36757 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 00:13:19 +00:00
Pavel Sanda
c68d754a74 Revert commits from 36745
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36749 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 00:05:40 +00:00
Stephan Witt
430d03811e #7026 substitute isDigit() by isDigitASCII() and ditch isDigit(); introduce isNumber() and use it in spell checker; change isdigit() to isDigitASCII() otherwise
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36748 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-06 22:35:15 +00:00
Pavel Sanda
82b712c1fc Revert r36654.
I'm not going to wait more, since we want to freeze trunk.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg163934.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36727 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-04 23:01:59 +00:00
Richard Heck
3fffe51506 Revert r36696: We can't collect BibTeX information during the
updateBuffer() traversal. The reason is simple: InsetCitation needs
access to the BibTeX info to calculate its label. But we won't have it
until we get to the bibliography.
I don't think there is any way around that.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36710 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-04 03:15:53 +00:00
Abdelrazak Younes
dc5ade6436 typos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36701 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 21:03:36 +00:00
Abdelrazak Younes
92bfa2b82d Work around bugs #6814 and #6949:
The issue is that RenderGraphics calls updateFrontend() even if within a CutAndPaste stask.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36699 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 21:00:15 +00:00
Richard Heck
840f2baf91 Simplify some of the bibliography update code. There is really no reason
to be passing the BiblioInfo structure around this way. (That's an old
holdover.) That lets us get rid of the non-const masterBibInfo() again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36697 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 20:08:04 +00:00
Richard Heck
66be58b074 Proper fix now for bug #6846. The idea, due to JMarc, is to collect
bibliography information in updateBuffer(), rather than doing a wholly
separate traversal. We still do a separate traversal in two cases, as a
full updateBuffer() call just isn't needed there.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36696 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 19:29:46 +00:00
Vincent van Ravesteijn
328e8b2627 Fix bug #2100: No display equations allowed in a non-fixed width tabular cell.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36673 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 02:44:16 +00:00
Vincent van Ravesteijn
663029f55a Fix bug #7130: Painting problem with closed Phantom Inset. The label is now updated when the type is changed, and the arrows are correctly painted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36660 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-02 18:00:33 +00:00
Richard Heck
65192d6cf8 Fix crash reported by keytest.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36657 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-02 15:14:44 +00:00
Uwe Stöhr
0838992dcd ExternalSupport.cpp: fix #4398 (omit the newline in the LaTeX output behind the ExternalInset inset if the inset type is a date)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36654 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-02 04:05:35 +00:00
Vincent van Ravesteijn
08cad4b087 Hmm.. I don't think people do like this red color I introduced accidentally in r36639.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36640 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-01 00:35:35 +00:00
Vincent van Ravesteijn
e7ef325db5 Fix the painting of the labels of InsetCaption insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36639 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-01 00:32:30 +00:00
Vincent van Ravesteijn
c145665832 Really fix bug #6908.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36618 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 05:02:12 +00:00
Vincent van Ravesteijn
bd47057c20 Fix 'inset-toggle assign' for InsetBranch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36610 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 00:21:08 +00:00
Vincent van Ravesteijn
5cc077c571 Automatically append the InsetCollapsable context menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36609 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 00:05:06 +00:00
Vincent van Ravesteijn
80c1e18bda Compile fix: solve the merge conflicts in the correct way ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36607 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 23:47:55 +00:00
Vincent van Ravesteijn
c42a61c5ac Fix bug #6642: Concatenate the context menus for: InsetCollapsables without a button, InsetTexts which have a custom context menu and InsetTabulars. Override the default behaviour for InsetInfo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36606 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 23:21:52 +00:00
Vincent van Ravesteijn
e7f2bbe1ee Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn't need all the parameters and we split the functionality of choosing which context menu to return, from the functionality of supplying the name for the Inset itself. Now, the InsetText context menu is returned for InsetCollapsables when the button is not hit by the mouse. There is no (intended) change in functionality for insets without a button, collapsed insets. This fixes partly bug #6642. A fix for InsetTabular and for insets with no button will follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 21:27:25 +00:00
Vincent van Ravesteijn
5eb7add409 Fix bug #6315: counters in insets that don't produce output have ghost values.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36603 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 19:11:38 +00:00
Vincent van Ravesteijn
f814bb14bb Properly check for the value of an enum. Unexpected things will happen whenever the enum itself changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36599 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 17:14:38 +00:00
Vincent van Ravesteijn
dc9d39dafe Add missing cur.forceBufferUpdate() to LFUN_BRANCH_(DE)ACTIVATE.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36598 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 16:50:22 +00:00
Jean-Marc Lasgouttes
4439f6144f Fix bug #6768: inset-toggle points cursor after inset
Strangely enough, the code to go after the inset is here explicitely (so somebody thought at some time that it was a good idea. However, it is not active in 1.6.x...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36595 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 15:19:20 +00:00
Jean-Marc Lasgouttes
f75569d08c fix #6930: ERT inset should not act on INSET_MODIFY requests directed to someone else
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36592 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 13:30:17 +00:00
Jean-Marc Lasgouttes
574931dcdb Fix bug #6930: no undo for inset type changing
THis is a consequence of the new AtPoint mechanism. In the old
world, recordUndoInset was called before INSET_MODIFY. I reintroduced
manual recordUndoInset calls in all places that matter. I suspect
that this issue should be revisited later.

Note that recordUndoInset can now take an optional parameter that tells
what inset is concerned. This is useful because the cursor can be
either just inside the inset or in front of it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36580 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 09:47:46 +00:00
Jürgen Spitzmüller
72f24353fa * InsetInclude.cpp:
- if a master is compiled with XeteX or LuaTeX, all children must have plain utf8 encoding
	  (bug #6774).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36554 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-28 14:20:45 +00:00
Richard Heck
c9f9cb88c0 Not sure why I introduced this test at r28378, but it causes pasting to
fail e.g., of URLs in math, since tocString() is called by
Paragraph::asString() to give us the contents of insets. Probably, I was
misled by the name, and the comment in Inset.h. That means, at least,
that this method is misnamed, but it probably means we do the wrong
thing in other cases.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36517 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:08:40 +00:00
Richard Heck
9a272ec26d We need to do the sanity check here, too, as we do in
Inset::getLayout(). Fixes the crash in bug #7069. My bad.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36515 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 16:45:58 +00:00
Richard Heck
a3e8adde24 Remove obsolete comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36513 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 16:35:08 +00:00
Vincent van Ravesteijn
73a1a11018 Fix bug #7077: Listings validator doesn't recognize 'breakatwhitespace'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36496 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 00:08:07 +00:00