Commit Graph

3406 Commits

Author SHA1 Message Date
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