Commit Graph

100 Commits

Author SHA1 Message Date
Richard Heck
8df174c446 I seem to have been testing for the same thing twice, more or less.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32266 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-30 23:26:10 +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
508ee6560c Auto-escape attributes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32208 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:18:47 +00:00
Vincent van Ravesteijn
ab19ef36cc Initialize nextraw_. The first character of the outputted html file was represented as an integer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32144 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-22 00:46:23 +00:00
Richard Heck
344859e4df Don't escape the deferred stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32135 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-21 23:15:52 +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
ed7172226c This inner tag thing turns out to be a bad idea, since so few things are
allowed to go inside <span>. Probably we don't need it anyway.

The User's Guide now exports as valid XHTML 1.1, according to the XHTML 
validator at w3.org. Of course, in the present state of the code, a lot
of insets aren't being exported at all, since they've been disabled. So
there is work to do. But this is a serious start now.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32108 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:58:32 +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
5815084ff0 Fix output of LATEX_LIST_ENVIRONMENT and remove obsolete comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32101 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 22:13:44 +00:00
Richard Heck
a8ba7cc722 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32099 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 21:56:08 +00:00
Richard Heck
c5651b5e44 Two things here:
(i) We don't need (at the moment, anyway) to step list counters, since
HTML will handle those for us.
(ii) Output errors as comments to the HTML file so we can see where they
happen.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32097 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 21:50:02 +00:00
Richard Heck
6967440797 Bug fix for font output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 21:04:40 +00:00
Richard Heck
95a8e89e04 Rather than do checks for empty tags elsewhere, accept them and ignore them.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32092 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 20:39:07 +00:00
Richard Heck
021f51e19b Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32091 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 20:35:19 +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
62b6240310 Reorganize a bit, and take the new stuff out of the html namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32084 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 16:35:58 +00:00
Richard Heck
8745fd6caa This is the custom stream for XHTML output. It isn't used yet, and
lots of things that will be replaced have been left, so as not to
prevent compilation.

The point of this is that we need a good way to manage the nesting of tags,
that is, to make sure tags are properly nested. So everything here is pretty
trivial, except for XHTMLStream << EndTag.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32083 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 16:29:57 +00:00
Richard Heck
5d9bfe9ccc HTML escaping for docstrings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31977 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-14 14:16:15 +00:00
Richard Heck
c2b8eeaf96 Rename some things to improve clarity.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31765 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-27 13:29:26 +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
331d8060b5 Move the defaults to Layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31751 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 20:45:29 +00:00
Richard Heck
dfe5bd2e40 Allow the suppression of LyX's own labels.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31746 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 02:51:51 +00:00
Richard Heck
02bc0dc3bf Don't wrap empty labels.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31745 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 02:37:31 +00:00
Richard Heck
cb138c6c24 This commit does two things.
First, it introduces some sensible defaults for the html 
output; these are described in layout.h and implemented in 
the openTag, etc, routines.

Second, it modifies the way standard environments are handled.
The previous version was outputing the label for each paragraph
of e.g. a theorem.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31744 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-26 02:21:59 +00:00
Peter Kümmel
bdd92ac7a2 fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31589 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-11 10:30:00 +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
Jean-Marc Lasgouttes
95e983c382 Remove Layout::labelstring_appendix method; add a bool parameter to Layout::labelstring instead.
Fix the rest of the code, whih implies fixing a few potential bugs where the appendix status was not taken in account.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30524 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-12 21:48:50 +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
03e0c16e87 Fix bibliography output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30054 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-11 22:31:27 +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
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
e47d30e907 Fix a bug. Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29983 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 03:32:55 +00:00
Richard Heck
30b081c8f9 I have no idea why the old version of this file suddenly reappeared.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29982 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 03:22:55 +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
Richard Heck
924119797e Fix another potentially infinite loop.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29980 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 01:56:46 +00:00
Richard Heck
9fd3c8e9a4 At least for now, this has to be done differently.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29979 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 01:36:04 +00:00
Richard Heck
3e8c31d4fe Make sure the counters get updated.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29978 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 01:29:39 +00:00
Richard Heck
9001dddf80 Implement lists...though there are problems.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29977 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-06 01:27:06 +00:00
Richard Heck
c7d0862a94 How did I forget to do that?!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29969 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 19:52:22 +00:00
Richard Heck
a3915db54f Output cosmetics, mostly. Get the newlines better.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29962 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:57:33 +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
f56275e896 Better control for tag output. This helps a little.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29959 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:41:28 +00:00
Richard Heck
d9b62b3f9c Improve tag output routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29957 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 18:18:44 +00:00
Richard Heck
32fabb3f6a Forgot to add these before.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29952 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 17:49:10 +00:00