Commit Graph

3893 Commits

Author SHA1 Message Date
Richard Heck
389f85c038 Move the anonymous functions that are left closer to where they are now
used.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32924 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-09 22:30:56 +00:00
Richard Heck
62b23ac0be Make the complexLabel and basicLabel functions in InsetCitation into
private member functions. This will be useful later.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32923 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-09 22:30:12 +00:00
Richard Heck
833e7085dd A little cleanup of some of the BibTeX info access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32915 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-09 16:57:08 +00:00
Abdelrazak Younes
cda980db51 Fix multipart document background compilation. I am not fully satisfied with this solution (see FIXME in Buffer::clone()). There might be some memory leaks...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32910 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-09 14:47:47 +00:00
Richard Heck
403dccbf23 No output for nocite citations.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32897 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 18:49:32 +00:00
Richard Heck
67ddc3944c Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32895 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 18:46:09 +00:00
Richard Heck
fab1494f49 Output keys with bibliography, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32893 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 18:38:10 +00:00
Richard Heck
c90b4fcb87 Use calculated labels in XHTML output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32892 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 18:19:37 +00:00
Richard Heck
012be55afd Move the collection of citations and sorting routines into BiblioInfo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32887 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 16:40:41 +00:00
Richard Heck
eeb1c45edb Typos etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32882 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-08 14:38:31 +00:00
Richard Heck
ebfb4c09ad Make the float interface for XHTML consistent with the others.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-07 17:32:04 +00:00
Abdelrazak Younes
744ee152fa Cleanup a bit the pargraph ids generation in order to (trying to) fix
#6415
Enrico please verify that reverse dvi is fixed.

* Text and InsetText: create two private constructors and transfer some
initialisation code from InsetText.

* Paragraph: id generation is transfered to Text. May be transfered to
Buffer in the future, we'll see.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32766 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-05 13:16:55 +00:00
Richard Heck
4926639879 XHTML output for lists of figures, tables, etc.
Thanks to Abdel for making this so easy. I'm just stealing the TOCs on
the sidebar.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32734 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-01 02:41:26 +00:00
Richard Heck
228948534e A comment, and a minor change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32732 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-01 02:08:22 +00:00
Richard Heck
68db58a584 Re-organize InsetTOC to prepare for other TO*s.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32731 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-01 01:45:02 +00:00
Richard Heck
0d73ffc2fb Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32692 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 16:34:55 +00:00
Richard Heck
bb80bd78f9 Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32690 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 15:52:16 +00:00
Pavel Sanda
6aefcd7c24 Revert r32624 - forgotten and wrong patch in git commit pipe, sorry ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32626 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-23 16:06:31 +00:00
Pavel Sanda
0b5fe5494b Vincent's initial support for ERT instant preview
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32624 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-23 16:02:37 +00:00
Richard Heck
67c03d202f With ContentAsLabel, we do not need this special code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32576 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-18 01:22:24 +00:00
Richard Heck
08b63ad3c6 Enhance LyX by fixing bug 5587. We add a new ContentAsLabel tag to
InsetLayout, per Jurgen's suggestion, so that insets can be told to
display an abbreviated form of their content when closed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32575 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-18 00:29:22 +00:00
Vincent van Ravesteijn
87085fa2fd Set the current font when moving into a table or between two table cells.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:47:09 +00:00
Vincent van Ravesteijn
bf5a35a293 Remove unused include.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32561 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:16:27 +00:00
Vincent van Ravesteijn
6b96abd211 Correctly paint the background of the instant preview of a displayed equation.
For a displayed equation, the height is artificially increased by a displayMargin() in InsetMathHull::metrics if it is a displayed equation and there is a preview. 

This extra height is not covered by the preview image and what one can see is the background as drawn by the MathHull inset. The color of this background should be either Color_mathbg or Color_background depending on whether the preview is shown or not.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32560 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 14:09:37 +00:00
Richard Heck
512215606b Remove last vestiges of pre-XHTMLStream implementation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32541 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-15 13:22:38 +00:00
Richard Heck
47e591bbee Allow use of InsetLayout with InsetCaption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32533 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 17:15:32 +00:00
Richard Heck
80ce542440 A little more CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32532 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:57:54 +00:00
Richard Heck
814af09a69 Fix the height output for InsetBox.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32531 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:52:33 +00:00
Richard Heck
cbe28d9d7a Spacing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32530 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:50:17 +00:00
Richard Heck
505cccfe7d Add some CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32528 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:05:36 +00:00
Richard Heck
e71268a705 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32527 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:04:33 +00:00
Richard Heck
5f04bedb1c Fix multicolumn output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32526 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:44:49 +00:00
Richard Heck
93c121cfaa Remove dead code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32525 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:40:54 +00:00
Richard Heck
dadda4cb44 Initial XHTML support for InsetTabular.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32524 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:39:13 +00:00
Richard Heck
43207c17bc Restore XHTML output for InsetListings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32515 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-13 21:14:53 +00:00
Uwe Stöhr
c5fc91ed51 InsetQuotes.cpp: correct a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32493 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-12 20:29:47 +00:00
Uwe Stöhr
a01b8a1d1c InsetCaption.cpp: revert unintended commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32470 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 01:01:58 +00:00
Uwe Stöhr
83b1c48846 replace links to bugzilla with links to trac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32469 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-11 00:59:10 +00:00
Richard Heck
e5afe8db66 This really gets the TOC working now. We auto-generate labels for the
paragraphs the TOC targets, and link to them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32461 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 20:03:35 +00:00
Richard Heck
46e70895a9 CSS for the TOC, and a couple small fixes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32460 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 19:28:00 +00:00
Richard Heck
ffe73b795b Initial work for InsetTOC. This does actually write a TOC, but without
any links. That is the next step.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32459 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 18:30:48 +00:00
Richard Heck
69666056ca Cosmetic repairs to my updateLabels() changes, thanks to Andre's
comments. Added comments per Pavel's suggestion.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32453 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-10 13:25:31 +00:00
Uwe Stöhr
fea997f075 InsetCaption.cpp: add a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32443 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-09 23:36:59 +00:00
Vincent van Ravesteijn
03a0da1a49 Fix bug #6356: Reloading image does not work for compiling.
Refresh the file info, otherwise InsetGraphics::latex might still think that the file does not exist.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32355 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-05 02:56:19 +00:00
Richard Heck
996505c2ae This patch introduces an optional argument to Buffer::updateLabels(), so
as to allow us to call the routine when we are preparing for output and
so to do certain things we might not want to do every time. 

This is an abuse of updateLabels(), in a way, but updateLabels() long
ago became the general recurse-through-the-Buffer routine, and to
implement the sort of thing I want to do here in validate(), say, much
of the code in updateLabels()---in particular, the counter-update
code---would have to be duplicated. So I believe this is the best, and
easiest, way to go.

Actual use of the new argument will follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32318 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 03:03:38 +00:00
Uwe Stöhr
55b61a0c9f Inset.h: fix whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32317 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 02:11:54 +00:00
Richard Heck
f3b5dacaeb Fix comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32316 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 02:05:38 +00:00
Richard Heck
4843a76603 Get counter from InsetLayout, as elsewhere.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32310 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 23:22:45 +00:00
Richard Heck
d964e6bdb9 Style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32309 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 23:10:08 +00:00
Richard Heck
e70c04b350 CSS for InsetBibtex. We include this via the validate mechanism, and
borrow the LatexFeatures::addPremableSnippet() method to do it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32301 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 21:06:41 +00:00
Richard Heck
3b7fd0c806 Forgot this.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32299 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 20:19:06 +00:00
Richard Heck
22452958f9 The BibTeX bibliography only includes BibTeX entries.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32296 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 19:54:12 +00:00
Richard Heck
451e926b84 Restore XHTML output for InsetGraphics.
To make this really good, we'd want to be able to rotate, crop, etc, the
images, as well as convert them to suitable output formats. This should
not be too difficult, since we do this sort of thing for display,
anyway. But I don't myself know how to do it. Anyone?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32295 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 19:52:46 +00:00
Richard Heck
879e5d3504 Revert previous commit. Wrong fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32294 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 19:46:24 +00:00
Richard Heck
ca6f5978c3 Fix bibitem bug for XHTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32293 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-03 19:43:00 +00:00
Richard Heck
a2de033405 Forgot that unique() doesn't actually erase anything.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32263 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 23:08:24 +00:00
Richard Heck
26006c8ffc Restore XHTML output for InsetCitation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32262 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 22:59:18 +00:00
Richard Heck
8b382928e2 Add some space, move a comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32261 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 22:49:37 +00:00
Richard Heck
6adbf95f61 Restore XHTML output for InsetBibtex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32260 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 22:48:10 +00:00
Richard Heck
6acadc3530 Fix silly omission.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32258 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 22:45:32 +00:00
Richard Heck
d3365ebbe7 Restore XHTML output for InsetBibitem.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32257 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 22:28:54 +00:00
Richard Heck
304f884930 Restore XHTML output for InsetInclude.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32249 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 17:34:01 +00:00
Richard Heck
bad0994dcd Restore XHTML output for InsetCaption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32247 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 17:27:10 +00:00
Richard Heck
83df2047c5 Restore XHTML output for InsetFloat.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32246 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 17:20:37 +00:00
Richard Heck
aa1f01777e There's an easier way....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32245 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 17:20:10 +00:00
Richard Heck
d88e9655be A bit of renaming, plus default values for htmlTag() and htmlClass().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32244 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 17:08:56 +00:00
Richard Heck
c5738e5af6 Restore XHTML output for InsetLabel and InsetRef. There are a couple
other fixes in here, too.

There is an issue here which I guess I'll deal with later, namely, that
the name attribute for <a> is unavailable in XHTML 1.1, which is what we
need for MathML support, at least in Firefox. Firefox will deal with it
if it's there, but the document won't validate. I'll figure out what to
do about this later.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32226 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-28 21:37:47 +00:00
Richard Heck
c1b4b30ab5 Output target if name is not defined.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32225 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-28 21:32:46 +00:00
Richard Heck
91be848e33 Fix output for InsetSpecialChar. These shouldn't be escaped.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32224 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-28 20:37:01 +00:00
Richard Heck
ce1566de1b Fix InsetNewpage: <br /> has to be within a block-level item.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32223 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-28 20:33:19 +00:00
Richard Heck
dc88d6ecd2 Restore XHTML for InsetBox.
I guess that this should be "inline", that is, appear where it appears
in the LyX file, as opposed to being deferred until after the current
paragraph is output. But I'm not sure about this. If anyone has a view,
let me know.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32215 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-26 16:38:26 +00:00
Richard Heck
b389ce6b1d Restore XHTML output for InsetHyperlink.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32209 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:19:59 +00:00
Richard Heck
40fcb745a9 Restore XHTML output for InsetLine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32207 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:07:17 +00:00
Richard Heck
ceedc90c55 Restore XHTML for InsetSpecialChar.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32206 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:04:41 +00:00
Richard Heck
fa79ab2c0b Come to think of it, we should do this differently: the way it's done
with InsetVSpace. Typically, this will appear on a line by itself, and
we do not really want <div><br /></div>.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32205 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:02:58 +00:00
Richard Heck
dce1439e40 Restore XHTML output for InsetNewpage.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32204 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:00:29 +00:00
Richard Heck
b8f05bdd50 Restore XHTML for InsetNote.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32203 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 21:58:18 +00:00
Vincent van Ravesteijn
2c32b53923 Access the correct cell function.
Fixes a bug introduced in r32157 while fixing bug #4360.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32200 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 19:57:57 +00:00
Richard Heck
5499281403 Use that again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32199 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 16:53:02 +00:00
Richard Heck
3870c6ae40 Kill a gazillion warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32158 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 21:29:20 +00:00
Vincent van Ravesteijn
f19b6178a9 Fix bug #4360: Instant preview does not render formulas which contain math-macro from input file.
Patch from Stefan.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32157 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 20:50:35 +00:00
Vincent van Ravesteijn
f961b60575 Move the contents of a row into the caption when setting a row as a longtable caption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32156 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 18:39:48 +00:00
Vincent van Ravesteijn
e4f66e1032 Unset all caption rows and dissolve all captions in a long-table when converting to a normal table.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32155 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 18:37:08 +00:00
Vincent van Ravesteijn
8384fa4123 Better fix for bug #5754: Caption inset not dissolved when unsetting longtable caption.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32153 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 17:10:56 +00:00
Richard Heck
77c771e3b6 InsetOptArg and InsetPhantom disabled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32142 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:31:13 +00:00
Richard Heck
99e17b265f InsetNomencl still disabled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32141 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:29:29 +00:00
Richard Heck
5282dc14ca InsetPrintIndex disabled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32140 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:28:20 +00:00
Richard Heck
47b763efb3 InsetExternal doesn't work. But it didn't work before, either.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32139 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:26:10 +00:00
Richard Heck
3d07ead18b InsetBranch works again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32138 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:24:21 +00:00
Richard Heck
1f42ca0df9 Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32137 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:22:23 +00:00
Richard Heck
b3ad108bed Fix up InsetVSpace a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32136 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:16:04 +00:00
Richard Heck
1cce8edf32 Get InsetVSpace working again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32134 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:02:59 +00:00
Richard Heck
4b2fb6a5c0 Get InsetWrap working again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32133 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 22:57:40 +00:00
Richard Heck
502e764584 In certain cases, we are going to need to write the outer tag, etc, in a
derived class and then will not want to write it again here. So this
gives us that ability.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32132 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 22:56:42 +00:00
Vincent van Ravesteijn
902c377ee3 Do not allow a program listing to be in a font changing command.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32124 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 14:49:41 +00:00
Richard Heck
603b94966a InsetQuote works again.
Is this simple stream modifier thing OK?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32112 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 23:29:07 +00:00
Richard Heck
6d4db0ee44 Restore InsetNewline.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32110 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 23:04:10 +00:00
Richard Heck
c71a1d9185 Restore InsetQuote.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32109 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 23:02:47 +00:00
Richard Heck
ed22deac3a The default HTML tag for an InsetLayout should depend upon MultiPar.
This allows us to simplify stdinsets.inc again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:49:30 +00:00
Richard Heck
d62c5cf02e Sorry, I didn't mean to commit all that. Let's try again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32105 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:47:22 +00:00
Richard Heck
b8743dd2ed The default tag for an InsetLayout should depend upon MultiPar.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32104 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:41:31 +00:00
Richard Heck
fa2f219d92 In non-MultiPar insets, we do not want to output paragraphs at all.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:31:52 +00:00
Richard Heck
45479198f4 Disable InsetIndex again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:03:15 +00:00
Richard Heck
bd79544d7b Disable ERT again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 21:52:18 +00:00
Richard Heck
e8ee20e5d7 Enable InsetText for XHTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32094 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 21:05:34 +00:00
Richard Heck
502dc7ca52 Inset::xhtml(XHTMLStream &, ...)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32089 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 20:22:04 +00:00
Richard Heck
ad132e2e99 Restore basic paragraph output for XHTML. The insets are all disabled still.
Much of the point of this is to allow us properly to handle what LyX does as:
  <em>This is <strong>bold and italic</em> and now just bold.</strong>
We output:
  <em>This is <strong>bold and italic</strong></em><strong> and now just bold.</strong>
which is valid.

Note how much easier this would have been if emphasis and boldness were insets
rather than ranges. ;-)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32086 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 18:24:19 +00:00
Richard Heck
7aebcc787f I am now going to proceed to break XHMTL output, and then reconstruct it
a piece at a time, using the new XHTMLStream.

This just gets the basic structures working, and fixes a bunch of iconv
errors in the process. 

I hate iconv errors.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32085 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 17:51:06 +00:00
Richard Heck
0b82638164 Handle the TEXT flavor in this switch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32054 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-16 17:37:51 +00:00
Vincent van Ravesteijn
86a9302823 Fix bug #6240: Adding table row causes exception that triggers infinite loop in code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32038 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-16 00:18:52 +00:00
Richard Heck
ae60474513 Get math macros working for MathML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32004 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-15 12:30:26 +00:00
Richard Heck
85503ec1b9 Get XHTML output for InsetRef working, again in a fairly primitive way. We just
use the label name as associated text, and put it into square brackets. It'd be
nice to be able to do more, but for that we'd need to associate counters with
the labels, which would be nice for display, too. But we don't have that yet.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31976 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 14:12:37 +00:00
Richard Heck
cd35cebed1 Get XHTML output for InsetGraphics working, at least in a primitive way.
At present, we do not do any sort of rotating, scaling, cropping, etc.
That should not be terribly hard to do, since we can just call ImageMagick
and get it to do it for us, but appropriate routines will have to be 
written.

I'd be thrilled if someone else wanted to do that. ;-)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31975 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 14:00:18 +00:00
Abdelrazak Younes
1ff07e2958 remove unneeded setBuffer().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31904 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:16:36 +00:00
Abdelrazak Younes
d1df0f1c13 oups... fix previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31903 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:14:22 +00:00
Abdelrazak Younes
882e2eeb7b InsetCommand ctor: Pass 'Buffer *'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31902 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:10:34 +00:00
Abdelrazak Younes
82c7e15e64 Uniformize Inset construction (passing Buffer * everywhere). Lots of cleanup to do still...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31901 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 15:53:21 +00:00
Abdelrazak Younes
1a915927b5 Fix crash when copying an InsetTabular.
Buffer should not be set when cloning. If there is bug that was fixed by this line of code it should be fixed later by setting the Buffer after the cloning.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31900 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 13:41:29 +00:00
Abdelrazak Younes
ff4460603e Make Buffer argument mandatory in most of the InsetMath based class... boring work...
Math manual loads and save correctly it seems but expect some instability period.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31898 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 11:45:46 +00:00
Vincent van Ravesteijn
a4ccbf67c3 Fix (again) bug #5754: Caption inset not dissolved when unsetting longtable caption row.
I forgot that inset-begin jumps out of the Inset if the cursor is already at the begin.

see r31823.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31839 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-03 13:06:52 +00:00
Abdelrazak Younes
938f99cf00 Fix gcc warning.
Richard, please check this out!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31829 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 15:15:47 +00:00
Vincent van Ravesteijn
3533becc2e Fix bug #6240: Adding table row causes exception that triggers infinite loop in code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31826 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 07:25:05 +00:00
Vincent van Ravesteijn
3b409626f0 Move CollapseStatus from Inset to InsetCollapsable (where it belongs IMO).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31824 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 05:03:09 +00:00
Vincent van Ravesteijn
da8c15d4c3 Fix (partly) bug #5754: Caption inset not dissolved when unsetting longtable caption row.
This removes the caption-inset, which is made possible by the clean-up of the LFUN_INSET_DISSOLVE (see r31822 and r31756). This assumes that there is nothing else in the row than the caption inset. I think that should be the case, but this is not yet guaranteed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31823 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 04:31:06 +00:00
Vincent van Ravesteijn
33dbbc15a9 Fix some remains of handling INSET_DISSOLVE (see r31756):
- change cur.inset().nargs() to nargs() as we might actually be in the inset called nextInset(),
- set the enabling flag of the status struct, don't return this value,
- return whether we handled this request.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31822 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 04:01:45 +00:00
Vincent van Ravesteijn
d4e864dda2 Standard Layout should be MultiPar. Now, because LFUN_BREAK_PARAGRAPHS really uses the MultiPar property, it is necessary to set it correctly.
see r31793.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31798 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-30 00:33:56 +00:00
Richard Heck
bc0c63c8ee What we mean by a label in HTML output and what LyX means by a label
aren't the same thing, so we won't be generating default CSS for those.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31778 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:51:30 +00:00
Richard Heck
df0fdb0d53 We should have a default tag for InsetLayout, too, I think. So here it is.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31777 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:46:47 +00:00
Richard Heck
001b0d529d Put the InsetLayout default CSS stuff to use.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31776 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 19:17:52 +00:00
Richard Heck
6a1bf700b4 A bit more cleanup, after JMarc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31773 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 18:23:53 +00:00
Jean-Marc Lasgouttes
0c1ff6d89e Move some functions that only required a FontInfo parameter from Font.*
to FontInfo.*

This allows tex2lyx to use the plain FontInfo object (via Layout), and to remove
several '#ifdef TEX2LYX' in the code

Reorder a bit the makefile in tex2lyx


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31772 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 16:16:15 +00:00
Richard Heck
e8631bf7ed Default CSS for InsetLayout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31771 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 14:33:01 +00:00
Vincent van Ravesteijn
6e8312d1a4 Move (part of) LFUN_DISSOLVE_INSET into InsetText.
- put the InsetFlex specific part into InsetFlex,
- honor the argument given to the LFUN also for normal Insets as the description already stated,
- fix bug #6285: context menu action goes to the wrong inset.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31756 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 23:49:43 +00:00
Vincent van Ravesteijn
1bcb0d38e6 * InsetTabular.h: Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31755 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 22:21:07 +00:00
Richard Heck
5faa75408b Try to deal with one of the big problems here, namely, that we
can't just output Standard as <p>, or anything else, because we
have structures like:
  this is text <branch>and more text</branch> and more
which would then come out as:
  <p>this is text <p>and more text</p> and more</p>
So we use the OutputParam html_in_par to try to signal when we
are already in a paragraph. It is expected that we will need to
do some bug fixing here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31753 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 20:53:46 +00:00
Richard Heck
9a19a312ba Rename one output param and add a new one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31752 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 20:47:12 +00:00
Pavel Sanda
221bd56fae Fix warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31728 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 09:28:02 +00:00
Richard Heck
d603b55b52 A couple comments and some very minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31720 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 02:22:36 +00:00
Richard Heck
14bb003b7e Add an HTML output flavor, and do something with it.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-25 01:48:14 +00:00
Vincent van Ravesteijn
f09a4ac03c Fix bug #6280: Wrong context menu is opened in an auto-opened inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31697 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-24 00:02:41 +00:00
Enrico Forestieri
ba9d500de4 The current buffer is the master of an included file, not the grandmaster.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31677 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-19 10:29:15 +00:00
Enrico Forestieri
128e349191 Restore the master language at the end of an included child document
instead of the child document language.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31665 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-18 21:48:13 +00:00
Jürgen Spitzmüller
ba7efd136e * InsetInclude.cpp:
- use bformat for syntactically proper translatable message. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31586 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-11 09:34:13 +00:00
Jürgen Spitzmüller
5f982b8c83 * InsetExternal.cpp:
* GuiExternal.cpp:
	- do not crash if the list of external templates is empty (bug #3974).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31569 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-09 12:40:34 +00:00
Abdelrazak Younes
09f96833bf Transfer LFUN_DIALOG_SHOW_NEW_INSET to BufferView and put InsetCommand related code to new function decodeInsetParam() in InsetCommand.cpp.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31468 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-26 17:19:18 +00:00
Jürgen Spitzmüller
71001a8087 Fix bug 6179 ("|" in index entries not embraced in ERT by lyx2lyx).
* OutputParams.{cpp,h}:
	- new param inIndexEntry
* InsetIndex.cpp (latex):
	- set param.
* InsetErt.cpp (plainText):
	- output active chars in IndexInsets

* lib/lyx2lyx/lyx_1_6.py:
	- embrace "|" in ERT when converting old index entries to collapsables.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31360 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-10 12:07:42 +00:00
Vincent van Ravesteijn
ffb8c7ca09 Revert r31219.
This is wrong and should have been reverted long ago and since r31340 it even doesn't have any function because addToToc isn't called for an internal buffer anymore.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31355 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-09 04:46:32 +00:00
Jürgen Spitzmüller
f562e05942 * InsetIndex.cpp: add some FIXMEs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31250 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-31 12:32:39 +00:00
Vincent van Ravesteijn
5a02843ab2 Another fix for r30560.
When setLayout() disappeared, also the call to setButtonLabel() disappeared. Now, when changing a Note into a Comment, the button label is no longer updated. This is because labelstring_ is not empty, so the line: 

return labelstring_.empty() ? getLayout().labelstring() : labelstring_; 

introduced in r30570 has no effect.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31225 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-25 00:04:47 +00:00
Vincent van Ravesteijn
efc0435157 Fix bug #6175: Footnotes in title not translated.
see the bug for details.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31224 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-24 23:29:37 +00:00
Tommaso Cucinotta
476fce263a This fix suppresses the "BROKEN:" tag on references to labels, when the reference is within an "internal" buffer, i.e., associated to an Embedded WorkArea (such as the Advanced Find&Replace Find... or Replace with... boxes).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31219 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-24 11:41:58 +00:00
Vincent van Ravesteijn
6bc8b8c592 Fix bug #6158: Crash when entering math in tabular.
We have to determine whether we are in an empty cell before we dispatch the lfun to the inset. Otherwise we determine whether the math is empty and if so, we then go to the next cell in the math inset. This cell doesn't exist probably.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31121 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 18:34:22 +00:00
Vincent van Ravesteijn
770aa71839 Fix bug #6134: Reload context menu for graphics inset.
This shouldn't be necessary, but sometimes it is.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31014 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 17:21:59 +00:00
Jean-Marc Lasgouttes
1c867a17b2 small simplification and speedup for InsetFoot::updateLabels
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30966 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-10 12:51:27 +00:00
Abdelrazak Younes
8c053ea10c Move depthHook(), outerHook(), isFirstInSequence(), outerFont() to Text methods.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30957 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 18:35:39 +00:00
Abdelrazak Younes
2b9e44cb01 Move contents of paragraph_funcs.* to Text.h and Text.cpp.
The goal is to simplify the code afterwards.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30955 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 17:30:41 +00:00
Abdelrazak Younes
df0072228f Text: Get rid of BufferParams arguments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30945 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:52:33 +00:00
Abdelrazak Younes
5425c53fd1 Now that Text knows its owner, use the associated Buffer access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:29:34 +00:00
Abdelrazak Younes
e8674d6141 General cleanup: Text is (or should be) nothing more than InsetText private implementation. We need access to the owner InsetText property in many cases where we instead take the Paragraph owner inset, which is the same of course. Next step is to avoid this indirection whenever possible.
I also updated InsetMathMBox so that it remains compilable, even if not used.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30940 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-09 15:05:36 +00:00
Vincent van Ravesteijn
8b237b49cd Fix bug #6125: Float positioning dialog enables invalid options for subfloats.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30877 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-06 22:42:42 +00:00
Vincent van Ravesteijn
93e39157b6 Add const versions of Inset::asInsetMath.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30819 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-01 21:39:14 +00:00
Abdelrazak Younes
76a7314279 InsetText::fixParagraphsFont(): return early and save Font instantiation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30811 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-01 16:53:58 +00:00
Richard Heck
e5dfb57a9f Improve debugging info slightly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30755 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-23 15:33:54 +00:00
Vincent van Ravesteijn
690878bd4a Fix #6045: Possible to insert table floats to figure floats.
The lfuns, LFUN_FLOAT_INSERT and LFUN_WRAP_INSERT are now only enabled when they should be.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30740 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-21 20:04:52 +00:00
Uwe Stöhr
0b33b9d090 allow to use glue lengths in the HSpace dialog; file format change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30724 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-21 11:51:43 +00:00
Richard Heck
35b4e73a11 Disable this assertion for now, and replace it with
some messages.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30715 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-20 18:21:26 +00:00
Jürgen Spitzmüller
03270dd2a6 * InsetSpace.cpp: prevent another (potential) null pointer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30666 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-18 12:19:31 +00:00
Pavel Sanda
091e3908b0 Kill LFUN_PARAGRAPH_SPACING in favour of LFUN_PARAGRAPH_PARAMS.
We don't want duplicit code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 22:55:23 +00:00
Richard Heck
0facb603fe Give inset codes to all the math insets, so we get more information when
we run into assertions.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30634 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 19:00:24 +00:00
Jean-Marc Lasgouttes
408b96bb92 un-revert r30531, after Richard told me how to avoid the crash. Now, before
accepting changes in a clipboard copy (CutAndPaste.cpp), we set the buffer
of insets (and we reset them later).

Doing this makes sense because we know this is the only operation on these
out-of-document paragraphs that will require access to a buffer.

Also, this commit gets rid of one explicit test against ERT_CODE and 
LISTING_CODE.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30623 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 08:37:32 +00:00
Vincent van Ravesteijn
a333697538 * InsetCollapsable: simplification.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30621 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 07:44:35 +00:00
Jean-Marc Lasgouttes
8b1ce114e5 remove unused headers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30620 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 07:26:52 +00:00
Jürgen Spitzmüller
87b701a06b * attempt to fix polytonic Greek (with mutli-accents) [bug 5976].
* add extended Greek chars to unicodesymbols [bug 4997].

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30619 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-16 06:19:25 +00:00
Vincent van Ravesteijn
2e715112b9 Oops..
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30612 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 20:40:03 +00:00
Vincent van Ravesteijn
243da49ee9 Remove nonsense comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30611 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 20:32:16 +00:00
Vincent van Ravesteijn
371eb63816 Remove nonsense assert.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30610 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 20:01:06 +00:00
Richard Heck
93593f8c15 Fix crash related to empty buffer_ argument.
Restore assertion removed at r30602.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30609 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 19:20:53 +00:00
Jean-Marc Lasgouttes
c3be74085f revert r30531, which causes a crash when copying an inset.
Basically, insets in cut stack do not have a buffer, and therefore cannot
acess to buffer parameters. What is annoying here is that acceptChanges 
requires this buffer params only to be able to read a font in moveItem,
in order to read the buffer language, and I doubt this is really needed...

Another change in this patch is that Inset::getLayout now returns a 
plainLayout when the inset does not have a buffer_. This fixes a remaining 
crash where dEPM reads isFreeSpacing() for an inset in the clipboard, but
this looks like a fragile situation. And it will not do the right thing when
doing depm in a freespacing inset.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30605 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 14:19:10 +00:00
Jean-Marc Lasgouttes
5d904d95e7 comment out assertion enabled in r30540. It triggered when entering a math inset with the mouse. I have not been able to understand why exactly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30602 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-15 13:53:26 +00:00
Jean-Marc Lasgouttes
0e8b1dc29a define InsetText::insetAllowed properly and rely on it for inset insertion in Text::dispatchsvndiff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30593 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 21:56:22 +00:00
Jean-Marc Lasgouttes
0585f2b2b4 This commit terminates the great InsetCollapsable shrink party
* rename InsetLayout::isForceLtr to forceLTR
 * move InsetCollapsable::xhtml to InsetText
 * move InsetCollapsable::tocString to InsetText.
 * move forcePlainLayout and allowParagraphCustomization from IC to IT
 * use isPassThru instead of forceLTR in places where it seems to make 
   sense (was introduced in r21285)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30591 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 21:14:39 +00:00
Jean-Marc Lasgouttes
3dad722072 set better defaults for inset layouts: allow paragraph customization and do not force plain layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30590 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 21:08:48 +00:00
Jean-Marc Lasgouttes
435a1f67b4 move InsetCollapsable::docbook to InsetText; move InsetCollapsable::undefined to Inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30589 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 20:25:25 +00:00
Pavel Sanda
56aca11ce9 Andre's remark
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30587 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 19:46:17 +00:00
Jean-Marc Lasgouttes
78c45693ef remove all trace of editMessage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30585 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:56:13 +00:00
Jean-Marc Lasgouttes
5077b1ff11 streamline InsetERT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30584 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:30:13 +00:00
Jean-Marc Lasgouttes
ace4f7d3b8 move the the latex and validate methods from InsetCollapsable to InsetText; small cleanups
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30582 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 18:27:54 +00:00
Jean-Marc Lasgouttes
c1b89e4d68 fix button label of insets like InsetMarginal
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 16:01:07 +00:00
Pavel Sanda
1b22f12b14 Hopefully fix bug #6077
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30567 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-14 15:51:21 +00:00
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
Richard Heck
dd11fc928f Factor out some code for later use (and to remove duplication).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30177 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-19 12:18:38 +00:00
Richard Heck
4a86c407d9 Disable XHTML output for InsetExternal---for the time being.
As said in the comment, someone who knows what these are supposed
to do should have a look, please. It may be very easy to get these
to work, but I don't know.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30164 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-18 20:44:38 +00:00
Abdelrazak Younes
51f9ee6155 MSVC compil fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30082 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 21:26:28 +00:00
Richard Heck
9fcd1a6c6a XHTML for InsetWrap.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30080 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:26:48 +00:00
Richard Heck
67e70c6c02 Well, it turns out that we need a different return value for the xhtml
routines, one that allows us to "defer" certain material, e.g., a float
that ought to appear in a div but can't simply be put into the middle
of a paragraph.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30079 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 17:23:17 +00:00
Richard Heck
12f57a57bd The return value for xhtml() is not going to be needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30078 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 16:11:33 +00:00
Richard Heck
819a0172f7 HTML output for InsetVSpace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30075 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 15:07:04 +00:00
Richard Heck
bd5cccbb34 Lengths for HTML. Use them for InsetBox.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30074 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 14:42:33 +00:00
Richard Heck
e28c88767b OK, now here's a big one: XHTML output for InsetBibtex. It's not perfect---
see the notes---but it does work reasonably well. And it will work a lot
better when an unrelated patch of mine goes in: one that generally improves
the display of BibTeX-derived information.

Note how we use the TOC here, which has already gathered the information we
need. This can also be done for other things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30056 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 22:39:16 +00:00
Richard Heck
21121f3fb5 It is convenient for me to change this for use in XHTML output, but I also
have been wanting to change it for a while. It is not very useful to have
a bunch of years listed in the citations TOC (which you get if you have used
\citeyear very often. Better, it seems to me, to see the citation keys.

Of course, this can be switched again if need be, and I can figure out a 
different way to handle my own problem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30053 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:23:18 +00:00
Richard Heck
3de92f551a Get XHTML output for InsetCitation working, at least in a primitive way.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30049 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:04:15 +00:00
Richard Heck
09177238e6 Bug.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30048 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 21:03:54 +00:00
Richard Heck
f50c47d4be Introduce a field for keeping track of the citation label.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30047 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 20:29:37 +00:00
Richard Heck
5e8d08cb9e Get InsetBibitem working, and the output for LATEX_BIB_ENVIRONMENT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30045 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 20:08:39 +00:00
Jean-Marc Lasgouttes
626d14aa54 fix a few compiler warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30032 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-09 13:17:07 +00:00
Richard Heck
16e52cb601 Disable InsetIndex XHTML output, for now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29986 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 04:25:20 +00:00
Richard Heck
3910e6772a Some real easy ones.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29985 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 04:20:57 +00:00
Richard Heck
9577dae301 Now we can restore the old (and better) behavior of descriptions.
The CSS for lists isn't quite right, but I'm not sure what to do.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29984 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 04:09:14 +00:00
Richard Heck
ccf91c3bf0 Add a couple more HTML* tags to InsetLayout, in a way that improves the
footnote output and allows a lot more flexibility. (In some ways, this now
seems to be more like what docbook does.)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29981 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 03:02:43 +00:00
Pavel Sanda
da3668dd98 Fix compilation on win
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29976 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 00:31:58 +00:00
Richard Heck
eda7b787b9 XHTML for InsetNote.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29970 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:58:23 +00:00
Richard Heck
70899f0c15 Separate HTML preamble information. This could be used for javascript,
or anything else one would like to add to the header.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29967 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:42:56 +00:00
Richard Heck
6bbe691b92 InsetFootnote XHTML output. Of course the CSS can be modified, but
this is pretty cool, I think.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29965 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:25:49 +00:00
Richard Heck
6ef03cc4ac Get InsetCollapsable working, at least to some extent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29963 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:57:53 +00:00
Richard Heck
47b796d41f Revert unintended commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29961 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:47:22 +00:00
Richard Heck
37a9bbebff Cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29960 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:45:23 +00:00
Richard Heck
f61bebd7fb HTML output code for a handful of easy insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29951 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 17:48:14 +00:00
Richard Heck
92a69bb790 Basic output routines for HTML.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29950 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 17:44:35 +00:00
Richard Heck
51607100ab InsetLayout infrastructure.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29948 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 17:36:51 +00:00
Richard Heck
658457b847 Rationalize the handling of InsetLayout's preamble and requries. That is,
bring it into line with the handing of Layout's preamble and requires. This
will make information about used InsetLayout's avaiable elsewhere.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29914 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-03 23:44:31 +00:00
Vincent van Ravesteijn
c6d26a3ddd Fix the placement of the cursor when right-clicking on an inset inside a branch inset.
see:
http://www.mail-archive.com/lyx-users@lists.lyx.org/msg74184.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29892 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-30 20:57:43 +00:00
Uwe Stöhr
97c9ef7184 InsetNomencl.cpp: remove the check to not undergo the predefined label width as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29833 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-23 14:39:30 +00:00
Jürgen Spitzmüller
caf8a509fa InsetBibitem.cpp: fix bibitemWidest.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29805 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-23 05:59:44 +00:00
Jürgen Spitzmüller
e4f95b890c We cannot access theFontMetrics in command line mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29804 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-23 05:47:40 +00:00
Uwe Stöhr
42715a37f0 InsetNomencl.cpp: remove hardcoded symbol width
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29797 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-22 23:23:09 +00:00
Jürgen Spitzmüller
e9cbe2f80f A GUI for nomencl settings. Adds the possibility to enter a custom length.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29779 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-22 16:26:15 +00:00
Jürgen Spitzmüller
72ae399fad * InsetNomencl.cpp (nomenclWidest):
- use FontMetrics to determine widest string.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29776 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-22 09:25:31 +00:00
Jürgen Spitzmüller
18cfe15b64 file format change due to r29770.
No automatic width calculation is done for old documents, because these might rely on settings in
nomencl.cfg.

A GUI to alter this is needed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29775 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-22 08:31:43 +00:00
Uwe Stöhr
ce473c810a InsetNomencl.cpp: assure that the label width is never below the predefined value and that there is always enough space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29773 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-21 22:18:08 +00:00
Uwe Stöhr
8f3acbb484 remove unused includes of convert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29772 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-21 21:02:14 +00:00
Uwe Stöhr
ec5e4b26f5 InsetNomencl: calculate the needed symbol width for \printnomenclature, fixes #5909
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29770 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-21 19:33:09 +00:00
Uwe Stöhr
42e16892c3 InsetBibitem.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29744 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-19 21:29:30 +00:00
Uwe Stöhr
23998a89c0 InsetFloat.cpp: remove unneeded include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29743 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-19 21:26:23 +00:00
Jürgen Spitzmüller
06cdeb86f5 * InsetTabular.cpp (getStatus):
- allow again to set allocate multiple header attributes to a row,
	  since this is valid (fix bug 5950).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29721 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-18 06:22:25 +00:00
Uwe Stöhr
629b07b72f InsetCollapsable.cpp, factory.cpp: sorting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29720 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-17 21:28:35 +00:00
Vincent van Ravesteijn
3cc18261ef Fix bug #4952: Multiple cells pasting fails if cells are selected.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29719 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-17 21:22:02 +00:00
Jürgen Spitzmüller
8179094fa9 whitespace and typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29710 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-17 11:27:44 +00:00
Jürgen Spitzmüller
e71be32d2a * InsetCollapsable.cpp (doDispatch):
- reset paragraph fonts also after LFUN_SELECTION_PASTE.
	  This assures lang is set to latex in ERTs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29690 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-16 15:39:03 +00:00
Vincent van Ravesteijn
8996be1208 Restore Object.Event order for:
- LFUN_LABEL_COPY_AS_REF,
- LFUN_LABEL_INSERT_AS_REF.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-15 21:05:19 +00:00
Vincent van Ravesteijn
7083f02b1d Prevent two more assertions due to non-absolute filename as a parameter of file-insert-plaintext.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29638 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-12 00:15:16 +00:00
Vincent van Ravesteijn
71f9d3600c Fix bug #5890: Assertion when reducing the view size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29597 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-09 20:26:04 +00:00
Richard Heck
675925f659 This patch introduces wrapped tooltips for some more insets.
New method wrapParas() in support, deployed in various
insets.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29564 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 18:04:05 +00:00
Richard Heck
cca51a04c2 Move the word-wrapping code to support, so that it can be re-used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29559 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 12:23:12 +00:00
Enrico Forestieri
128c2b31d8 Avoid ugly macros in the preamble and protect underlined \cite commands
in a clever way.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29558 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 10:57:52 +00:00
Jean-Marc Lasgouttes
36a811cba2 keep a cast for later
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29551 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-06 13:41:35 +00:00
Pavel Sanda
6fde8f8067 Introduce double underline and wavy underline styles from ulem
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg150803.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-05 09:26:28 +00:00
Pavel Sanda
381b86788d Introduce strikeout text style (strike-through)
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg150743.html

Somewhat related to http://www.lyx.org/trac/ticket/4248 .


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29523 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-03 22:45:14 +00:00
Enrico Forestieri
ccc77c73da Speed up FileName operator== (Georg's solution).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29498 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-02 17:12:31 +00:00
Abdelrazak Younes
f665e65071 Forgot to commit this in previous rev. Sorry.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29467 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-01 10:30:16 +00:00
Jürgen Spitzmüller
dd930b4535 * final splitindex feature addition: support for \printindex* and \printsubindex*
File format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29419 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-27 06:10:25 +00:00
Jürgen Spitzmüller
0bd5c5fca8 * Add support for splitindex's \printsubindex command. File format change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29409 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-26 11:24:38 +00:00