This fixes bug #1560.
The diverse setBuffer / updateLabels calls need auditing. See FIXMEs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33249 a592a061-630c-0410-9148-cb99ea01b6c8
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
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
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
- 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
#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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
- 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
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
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
- 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
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
* 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
* 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
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
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
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
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
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
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
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
* 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
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
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
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
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
* 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
- 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
- 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
- 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
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
* 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
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
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
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
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
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
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
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
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
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
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
