anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 13:46:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,822 Commits 31 Branches 172 Tags 616 MiB
83df2047c5
Commit Graph

3580 Commits

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