Commit Graph

3454 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
30360e1b19 move more functions from InsetCollapsable::getStatus to Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30566 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 15:27:48 +00:00
Jean-Marc Lasgouttes
7a0107f4df move tab-insert/delete from InsetCollapsable to Text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30565 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 14:52:11 +00:00
Jean-Marc Lasgouttes
f8f814c3c4 move some code from InsetCollapsable::doDispatch to InsetText
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30564 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 13:32:36 +00:00
Jean-Marc Lasgouttes
e84d752414 move some code fro, InsetCollapsable::read to InsetText
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30563 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 13:05:13 +00:00
Jean-Marc Lasgouttes
e33095f10d Move special handling of paste function from InsetCollapsable to InsetText
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30562 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 13:00:42 +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
Uwe Stöhr
b015528fca update author settings for the files I recently notably modified
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30553 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 23:25:47 +00:00
Jean-Marc Lasgouttes
defe820a8a note to self: always compile before committing
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30550 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 15:57:08 +00:00
Jean-Marc Lasgouttes
d0cb2cc0b7 The most important change in this changeset is that InsetCollapsable::getLayout
is commented out, so that the documentclass is queried every time instead of
using the layout_ cache. For now I have kept the setLayout calls, but they are 
inoperant. 

Other changes:
 * remove non-const usePlainLayout methods
 * move InsetCollapsable::allowSpellCheck and allowMultiPar to InsetText
 * move InsetCollapsable::isFreespacing and forceLTR to Inset

Freespacing support could be moved to insettext, but I have to check who 
uses it. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30549 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 15:47:40 +00:00
Jean-Marc Lasgouttes
9d857249b0 one less explicit test against FLEX_CODE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30543 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 14:06:05 +00:00
Jean-Marc Lasgouttes
58182c5860 Small cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 13:53:58 +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
Jürgen Spitzmüller
c878519ca9 * InsetExternal.cpp (xhtml): fix compiler warning and formatting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30532 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 06:34:05 +00:00
Jean-Marc Lasgouttes
067a685263 remove BufferParams parameter from Inset::accept/rejectChanges; adapt rest of code accordingly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30531 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 00:57:51 +00:00
Jean-Marc Lasgouttes
081fad9557 First step of InsetLayout cleanup.
Get rid of Inset::getLayout(BufferParams), since all insets have access to
their own buffer. Inset::getLayout() does the same now.

Get rid of InsetCollapsable::getLayout(BufferParams) too, and remove most references to InsetCollapsable::layout_. For now IC::getLayout() still returns layout_, but the idea is to change this (provided there is no performance problem).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30530 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 00:28:22 +00:00
Uwe Stöhr
802067ecdc support for matrix decoration in the MathMatrix dialog;
introduces a new LFUN and fixes #4620

This can in principle also go to branch when new LFUNs are there allowed, Jürgen?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30523 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 21:39:21 +00:00
Jean-Marc Lasgouttes
e9d19b82d4 Make sure that the new caching mechanism for flattened labels respects languages.
* Counters.cpp (flatLabelString): return a cache of the flattened strings for each used language
 * Counters.cpp (theCounter, counterLabel, flattenLabelString): add a lang parameter; in theCounter, populate the cache as needed.

 * insets/InsetCaption.cpp:
 * insets/InsetFoot.cpp:
 * insets/InsetBibitem.cpp:
 * insets/InsetCollapsable.cpp:
 * Paragraph.cpp:
 * Buffer.cpp: pass a language argument to counter methods.

 * Paragraph.cpp (translateIfPossible): use the function with same name in gettext.cpp.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30520 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 20:09:53 +00:00
Jean-Marc Lasgouttes
c355edfb6d revert r30515: too many files there
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30516 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 17:30:56 +00:00
Jean-Marc Lasgouttes
834bfe5e21 fix a couple warnings after the number localization patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30515 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 17:28:46 +00:00
Uwe Stöhr
dbf1f87bd7 InsetTabular.cpp: coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30504 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 14:36:42 +00:00
Jürgen Spitzmüller
d3a17d2d5e * correct bug reference.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30503 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 13:47:06 +00:00
Jürgen Spitzmüller
4dfca52307 * InsetTabular.cpp: fix bug 6057: longtable captions must always be in a first header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30500 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 13:43:05 +00:00
Uwe Stöhr
8a3a2baf6d - GuiTabular.cpp: longtables cannot have a vertical alignment
- InsetTabular.cpp: write the alignment as last features (to match the existing tex2lyx routines)
- InsetTabular.h: fix indexes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30482 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 14:33:05 +00:00
Uwe Stöhr
ce143b21e6 InsetTabular.cpp: whitespace again, sorry
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30480 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:47:19 +00:00
Uwe Stöhr
0d75c1117f InsetTabular.cpp: whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30479 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:44:13 +00:00
Uwe Stöhr
6776598761 InsetTabular.cpp:
- longtables cannot have a valignment, tables not a longtablealignment

- squash a compiler warning

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30478 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:41:34 +00:00
Uwe Stöhr
424943af89 - support for longtable alignment, fileformat change
- GUI support for table alignment

(all comments to the polished layout of the table dialog welcome)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30477 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 13:09:45 +00:00
Pavel Sanda
4a7bb9541f Fix setting via context menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30458 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 00:11:59 +00:00
Pavel Sanda
29ff62face Fix status check of branch (de)activation from the child, when master
has no info about that branch.

Context menu still does not work.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30457 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-11 00:10:18 +00:00
Richard Heck
43945090c1 Fix for bug 5522, by Sergiu Carpov.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30453 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-10 16:21:47 +00:00
Jürgen Spitzmüller
5fdd2daa9c * Add ability to rename branches (bug 4128).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30442 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-10 06:49:51 +00:00
Jürgen Spitzmüller
7d1b297e7e * InsetBranch.cpp:
- fix display of "child only" suffix, and "undefined" suffix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30423 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-09 11:45:19 +00:00
Jürgen Spitzmüller
17986e7509 Ease the pain with unknown branches:
* on paste, ask if unknown branches shall be added to the branch list
	  (entails new LFUN_BRANCH_ADD)
	* add a list of undefined branches to the buffer and the GUI

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30419 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-09 09:48:34 +00:00
Richard Heck
44763a6f0f Move LFUN_TAB* handling from InsetListings to InsetCollapsable, so that
the tabkeys works as such whenever PassThru is true.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30404 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-07 13:25:43 +00:00
Jean-Marc Lasgouttes
5ba54be043 unused #includes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30373 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 13:58:25 +00:00
Jürgen Spitzmüller
56a7e127ad * InsetInclude.cpp: typo spotted by Jean-Pierre Chrétien.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30366 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-05 08:34:55 +00:00
Enrico Forestieri
0a90c42b86 Fix bugs #6047, #4043, and #5394.
6047: Lyx 1.6.3 unable to typeset the third chemical equation of the
      file mhchem.lyx (package mhchem)
4043: mhchem support
5394: support for the mhchems's \ce command
The \ce and \cf insets are text mode environments that allow entering
spaces and mathmode commands. LyX leaves them alone and doesn't try to
be smart, i.e., the behaviour is exactly the same we had in the old days
with text-in-math mode environments, before the introduction of the
\ensuremath and \lyxmathsym macros. This means that in those environments
one has to know what he is doing, as LyX will not offer any protection.
The hack of enclosing \ce and \cf in a \text{} environment in order to
be able to enter spaces is no longer necessary.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30338 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-03 00:05:58 +00:00
Jean-Marc Lasgouttes
4594b1425b add onoff support for "inset-modify changetype xxx" in include inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30305 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-29 12:41:43 +00:00
Richard Heck
83a89711b0 Fix captions, in accord with observations by Abdel and JMarc.
Note that we will sometimes use the "caption trick", still in 
listings, for example.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30194 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 18:32:50 +00:00
Richard Heck
1ef0168dd4 Not sure how that happened.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30193 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 17:51:17 +00:00
Richard Heck
16f119cab5 XHTML output for InsetInclude.
Here's the deal:
* With verbatim, we include it verbatim. This would allow the inclusion of 
  other HTML files.
* With listings, we include it verbatim, wrapped in <pre>.
* With Input and Include, we check if it's a LyX file. If not, we don't do
  anything, since we don't know how to include (say) a TeX file in the HTML
  output. (Wanna call tex4ht, anyone?) If it is a LyX file, we let it write
  itself as HTML, and include it.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30191 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 15:11:33 +00:00
Richard Heck
1898db6aca Fix warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30190 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:42:16 +00:00
Richard Heck
25bc89f2a8 Clean up a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30189 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:21:43 +00:00
Richard Heck
cb9b7406b0 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30188 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 14:10:41 +00:00
Richard Heck
3b707bc0ed Polish some of the recent changes in accord with suggestions
of JMarc's.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30186 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:50:19 +00:00
Richard Heck
51d4d42906 XHTML output for InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30185 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:37:14 +00:00
Richard Heck
33c6656769 Move these, too, so they can be used in InsetListings, and maybe
even elsewhere.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30184 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:16:27 +00:00
Richard Heck
3579d53108 Move getCaptionInset() to InsetCollapsable, so it can be used in InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30182 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 13:12:02 +00:00
Richard Heck
4ad536375f XHTML output for floats and captions.
NOTE: Again, I'm not increasing the layout format, though I have added
a couple new things here. If anyone thinks I really do need to do that,
then I will. But I don't think it's necessary, as no-one ought to be using
this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30178 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 12:49:08 +00:00