anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-15 07:16:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,029 Commits 31 Branches 172 Tags 617 MiB
9231f19340
Commit Graph

3762 Commits

Author SHA1 Message Date
Richard Heck
caa4e94bf0 Get rid of some magic booleans in updateLabels() and related routines. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33110 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-20 19:42:12 +00:00
Richard Heck
22dc345e8c Better XHTML output for InsetRef. 
The idea here is to implement something like \refstepcounter for LyX. We
do this by tracking the "active" counter in Counters.cpp. We also have
to track when we go in and out of environments to which counters are
local, and so on and so forth.

This all gets done in updateLabels(), but only if we are producing
output, which is why I added the output boolean a while ago.

I expect there are bugs in here, though it seems to work pretty well
with the documents I've tested.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33108 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-20 19:03:17 +00:00
Richard Heck
e12d2b8b58 Move comments to functions, not private members. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33104 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-20 17:51:07 +00:00
Richard Heck
3e654186d2 Move the StartTag, EndTag, and CompTag classes into the html namespace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33099 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-19 22:08:04 +00:00
Richard Heck
557c705cbb Fix listings XHTML output: No paragraphs in there. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33096 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-19 19:11:12 +00:00
Jürgen Spitzmüller
9a63a02956 * InsetIndex.{cpp,h}: 
- add index name to button label (part of #6455).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33074 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-17 14:47:45 +00:00
Jean-Marc Lasgouttes
e88b91116f remove bad and unused #include 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33049 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-15 16:37:17 +00:00
Richard Heck
9f2e85d565 Revert r33039, which did not work at all. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33045 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-14 23:45:53 +00:00
Richard Heck
59c04f7096 The fortoc argument I introduced earlier should all along have gone into 
OutputParams. So now it is there.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33044 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-14 22:24:43 +00:00
Richard Heck
d2dc4652fa Character styles should have MultiPar = false, by default. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33041 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-14 21:43:44 +00:00
Richard Heck
e0eaa73224 Minor InsetLayout cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33039 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-14 21:31:27 +00:00
Richard Heck
1d6b666431 Finish the output of the index for XHTML. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33037 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-14 20:01:53 +00:00
Richard Heck
2e349ff103 This sorts the index entries and writes each one's tags together, like: 
AMS Math 1, 2, 3
where the numbers are links.

The only thing left to do here is to parse the index entries so that we
can do something with "this ! that" and similar things.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33001 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-12 21:06:55 +00:00
Richard Heck
7349e6e29b Initial work for XHTML output of the index. It just occurred to me the 
other day that this would be easy, since the Index is in the TOC. There
is more to be done here still, though.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33000 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-12 20:44:39 +00:00
Richard Heck
2f728e45f8 Remove the test for "tableofcontents", since that is the only thing this 
inset supports right now.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32999 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-12 20:25:33 +00:00
Richard Heck
a12cd4eedc Simplify InsetTOC::xhtml now. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32992 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-12 19:39:07 +00:00
Jean-Marc Lasgouttes
ceb50a253c get rid of notes-mutate and explain that inset-forall can do the same 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32986 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-12 15:54:33 +00:00
Richard Heck
782db81f77 Author-year citations for XHTML output. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32969 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-11 16:11:55 +00:00
Jürgen Spitzmüller
8214670316 * InsetInclude{.cpp, h}: 
- indicate if a child document has been un-included (via the includeonly feature).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32941 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-10 15:10:40 +00:00
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