anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,168 Commits 31 Branches 172 Tags 618 MiB
fd1ee3b424
Commit Graph

94 Commits

Author SHA1 Message Date
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
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
Richard Heck
e8631bf7ed Default CSS for InsetLayout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31771 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 14:33:01 +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
Jean-Marc Lasgouttes
3dad722072 set better defaults for inset layouts: allow paragraph customization and do not force plain layout 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30590 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-07-14 21:08:48 +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
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
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
André Pönitz
20d5148dca move ColorSet to a header of its own to reduce #include dependencies 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28426 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-09 23:30:24 +00:00
Richard Heck
5ee35ace6f Introduce the InToc tag for InsetLayout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28377 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-06 17:54:33 +00:00
Richard Heck
fa6d2fd93d Currently, a second InsetLayout declaration of a given inset completely 
overwrites the existing definition, instead of updating it, as our Style
declarations do. This patch fixes this behavior, so that e.g.:

#\DeclareLyXModule{ERT}
#DescriptionBegin
#Make ERT Classic
#DescriptionEnd

Format 11

InsetLayout ERT
	Decoration classic
End

will do as advertised.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27900 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-12-16 16:11:15 +00:00
Richard Heck
6172a07a9d Constness and a typo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27894 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-12-16 14:13:02 +00:00
Richard Heck
90d118cf56 Fixme comment. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27112 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 15:25:46 +00:00
Richard Heck
976a59af1b Fix another part of 5403, again to do with case sensitivity. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27109 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 14:02:25 +00:00
Richard Heck
53252839ea Style. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27105 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 13:41:02 +00:00
Richard Heck
70d5f953c9 Fix for another part of 5403, and related bugs, anyway. The InsetLayout 
tags should not be so case-dependent, and we ought to use an Enum instead.
of relying upon string comparisons.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27104 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 13:32:54 +00:00
Richard Heck
bdc1d80151 More general fix for part of 5403. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27100 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 12:49:49 +00:00
Pavel Sanda
e4808961c9 Another selection painting patch, PainterInfo::backgroundColor introduced. 
Patch by Vincent.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145438.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27097 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 10:47:38 +00:00
Uwe Stöhr
bed3844f30 InsetLayout.cpp: fix part of http://bugzilla.lyx.org/show_bug.cgi?id=5403 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27095 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-25 01:55:55 +00:00
Richard Heck
244cda474c Add a FIXME. We need to be more careful here. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26766 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-06 03:16:26 +00:00
Richard Heck
94bc5c3086 Further to r26743, add CustomPars and ForcePlain layout tags to InsetLayout, 
so that the allowParagraphCustomization() and forcePlainLayout() features can
be independently controlled.

At present, these are active only for InsetFlex. In future, they should be made
active for InsetCollapsable, in general. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26757 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-05 19:38:22 +00:00
Richard Heck
5d95df6e39 Add CopyStyle tag for InsetLayout, per request of Steve Litt. 
Update documentation for new tag.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25933 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-28 15:14:37 +00:00
Pavel Sanda
dcc50a2454 Fix include orderings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25309 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-06-18 18:54:31 +00:00
André Pönitz
e1453ef687 lexer cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24134 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-05 21:24:57 +00:00
André Pönitz
e7645f2439 use simpler parser interface 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24122 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-05 10:34:29 +00:00
André Pönitz
c88e7a7ef6 simplify Lexer handling a bit more 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24106 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-03 20:55:09 +00:00
André Pönitz
11a0458d3f next try... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24100 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-02 23:06:22 +00:00
André Pönitz
2012beb58e revert last patch. there's something wrong, possibly unrelated to this 
patch, but as this was rather largish...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24099 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-02 22:44:33 +00:00
André Pönitz
7677e9487c simplify Lexer use a bit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24098 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-02 22:14:45 +00:00
Richard Heck
94e0c24753 Make decoration default to, uh, Default. Flex insets will then default to conglomerate. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23886 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-21 18:49:23 +00:00
Jean-Marc Lasgouttes
72c26ac6d1 two uninitialized variables uncovered by valgrind, and a gcc warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23707 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-13 10:28:02 +00:00
Richard Heck
264ee9f584 Nasty mistake here. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23405 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-03 04:19:50 +00:00
Richard Heck
2812202c2b Move the enum into InsetLayout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23136 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-22 16:24:55 +00:00
Richard Heck
2c357c1d23 This should be the last of the commits refactoring the InsetLayout code. 
This one just moves the Decoration enum into InsetLayout, changing the names
to avoid possible conflicts now that it is in the lyx namespace.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23135 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-22 16:15:21 +00:00
Richard Heck
7889ccc0eb More headers. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23119 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-22 03:39:10 +00:00
Richard Heck
20cf42b741 This is the second commit in the process of making InsetLayout a real class. 
Here, we move TextClass::readInsetLayout() to InsetLayout::read().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23117 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-22 03:27:42 +00:00