anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,121 Commits 31 Branches 172 Tags 618 MiB
a07a541a8c
Commit Graph

168 Commits

Author SHA1 Message Date
Richard Heck
181fee91e3 Some CSS fixes for footnotes and standard. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32096 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-19 21:17:44 +00:00
Richard Heck
194254082e Tags for lots of things are going to have to be div, because we can't do 
things like <p><div>...</div></p>. Why not, I have no idea. Seems pretty
sensible to me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32095 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-19 21:13:19 +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
858dae36e9 Fix up some of the HTML tags now that we have default CSS. 
There's more to be done here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31767 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-10-27 13:39:39 +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
23e01eb866 avoid a doubled \footnote command in latex output (fixes #6130) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30965 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-08-10 09:32:59 +00:00
Jean-Marc Lasgouttes
ace4f7d3b8 move the the latex and validate methods from InsetCollapsable to InsetText; small cleanups 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30582 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-07-14 18:27:54 +00:00
Richard Heck
9fcd1a6c6a XHTML for InsetWrap. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30080 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-12 17:26:48 +00:00
Richard Heck
082ec01eef CSS for InsetInfo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30077 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-12 15:27:29 +00:00
Richard Heck
1ad1c51c22 CSS for marginal notes, which makes them work. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30076 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-12 15:16:08 +00:00
Richard Heck
0a06e2a131 Fix footnote CSS. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30055 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-11 22:31:41 +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
eda7b787b9 XHTML for InsetNote. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29970 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-05 19:58:23 +00:00
Richard Heck
6bbe691b92 InsetFootnote XHTML output. Of course the CSS can be modified, but 
this is pretty cool, I think.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29965 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-05 19:25:49 +00:00
Richard Heck
aa2b14afce Forgot to update the layout format when transferring from branch. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29964 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-05 19:05:48 +00:00
Richard Heck
062db8b679 Initial HTML information for layouts. Much of this is prelimiary, 
some of it is really only for testing purposes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29953 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-06-05 17:51:03 +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
ac4e461898 Move a couple routines from InsetFlex to InsetCollapsable so the CustomPars 
and ForcePlain tags will work not just with InsetFlex but all InsetCollapsables.
Thanks to Jurgen and JMarc for reminding me I'd meant to do this.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28340 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-03 21:12:59 +00:00
Jürgen Spitzmüller
b6f67e1d0b some InsetPhantom fixes. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28336 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-03 10:38:13 +00:00
Uwe Stöhr
2179de28f3 stdinsets.inc: the paragraph dialog must be deactivated inside Phantom insets 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28313 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-01 21:24:30 +00:00
Uwe Stöhr
b742ff6406 support for the LaTeX commands \*phantom, fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28292 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-01-30 00:56:37 +00:00
Jürgen Spitzmüller
5784ce29fd Let InsetWrap find its InsetLayout. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27895 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-12-16 15:34:32 +00:00
Jean-Marc Lasgouttes
0e2ded8161 Fix bug 5407 
http://bugzilla.lyx.org/show_bug.cgi?id=5407

This patch makes insetfloat search its styles using "Float:<floatname>" (or
"Float" if this fails). This allows to define a default behaviour for new
floats that makes sense.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27266 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-11-05 15:35:02 +00:00
Jean-Marc Lasgouttes
e4dea6c076 oops! r27229 was wrong 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27230 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-11-03 09:03:01 +00:00
Jean-Marc Lasgouttes
24ac7258c5 revert r27209 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27229 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-11-03 08:59:03 +00:00
Richard Heck
a2f4949d38 Update format 10 layouts to format 11. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27042 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-23 00:28:36 +00:00
Uwe Stöhr
54faadd049 stdinsets.inc: fix output of InsetInfo, part of http://bugzilla.lyx.org/show_bug.cgi?id=5339 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26840 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-11 11:33:11 +00:00
Richard Heck
0b95498ef4 Update non-counter layouts to format 10. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26781 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-06 14:45:21 +00:00
Richard Heck
be34425828 Update format number for layouts not using counters. The reason 
is that the counter info will be updated later, without changing
the format number again.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26765 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-06 03:00:26 +00:00
Richard Heck
ee4db4a133 Adapt stdinsets.inc and linguistics.module to the new InsetLayout framework. 
There may be some other changes to be made here still, but they should be
fairly painless. What will need checking are InsetFlex's. Those that set 
MultiPar to true will now default to ForcePlain false and CustomPars true;
those that set MultiPar to false (or don't set it, since that's the default)
will have CustomPars false and ForcePlain true. If that's wrong, the right
tag can be added, but it must be AFTER the MultiPar tag, since MultiPar will
reset CustomPars and ForcePlain, as described in stdinsets.inc.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26759 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-10-05 19:46:19 +00:00
Jean-Marc Lasgouttes
ede2dbfade Cleanup and layoutification of the InsetInfo class. 
* InsetInfo.cpp (InsetInfo): derive from InsetCollapsable instead of 
	InsetText, so that we can use InsetLayout. Should be reverted when the 
	layout stuff is migrated to InsetText or some lower level.
	(initTranslator, nameTranslator): moved outside of the class.
	(name, neverIndent): added.
	(draw, setMouseHover): removed.
	(updateInfo): cleanup and use layout
	(read, setInfo): make sure to reset layout.

	* lib/layouts/stdinsets.inc: add layouts for the various Info insets.
	These are used for both display and output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26646 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-09-30 14:11:40 +00:00
Uwe Stöhr
19c8baa1e1 specify a background color for listings and allow the user to change it, patch by Vincent 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26340 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-09-08 21:38:01 +00:00
Richard Heck
23a824599a Whitespace. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26075 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-08-05 21:35:40 +00:00
Richard Heck
2bb93b6c54 Update layout format. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25881 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-25 16:33:04 +00:00
Jürgen Spitzmüller
180121ed53 * stdinsets.inc: 
- Force latex_language in listings inset (fixes bug 5051).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25676 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-16 20:40:05 +00:00
Richard Heck
d252730dff New AddToPreamble tag for layout files. This tag will ADD some information to the document premable rather than completely over-write it, as the Preamble tag does. 
Increment layout format to 7.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23916 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-24 13:11:16 +00:00
Uwe Stöhr
7108582cbf stdinsets.inc: use foreground color also for index insets. Using the latex color would imply that you have to enter there LaTeX code, but since Lyx 1.6this is no longer the case 
ColorCode.h: correct a comment

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23467 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-05 00:06:34 +00:00
Uwe Stöhr
f35ff8f60d Color.cpp, ColorCode.h: define new colors for inset labels and insets text 
stdinsets: use the new colors to allow the users to customize them

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23029 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 23:38:16 +00:00
Richard Heck
e7c8aa0977 Define algorithm. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23026 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-15 17:03:07 +00:00
Uwe Stöhr
f647ae9e8a stdinsets.inc: use minimalistic style for listings as intended by Richard (I changed this unwanted in 22923) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23010 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-14 22:44:42 +00:00
Uwe Stöhr
d9669be4ec stdinsets.inc: use labels for certain inset types as we do currently in LyX 1.5 (fixes bug 4401). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22923 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-10 17:20:59 +00:00
Richard Heck
8fec5f512d Partially fix bug 4532: http://bugzilla.lyx.org/show_bug.cgi?id=4532. 
See in particular comment 6.

We forcibly load stdinsets.inc unless the TextClass declares:
  Provides stdinsets 1
There isn't really any such package, of course. We're just using this
(per a suggestion by JMarc) to say we've loaded relevant info about the
standard insets.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22802 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-05 22:57:33 +00:00
Jürgen Spitzmüller
a5d5a633d9 some more uses of Requires. 
The package ifthen needs to be added to LaTeXConfig.lyx. I'll do this when that file can be opened again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22419 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-01-07 17:32:47 +00:00
Jürgen Spitzmüller
9e5eebc14c *** Requires tag for classes, layouts and custom insets *** 
* src/TextClass{cpp,h}:
	- implement Requires tag for class and InsetLayout.
* src/Layout.{cpp,h}:
	- implement Requires tag for layouts.
	- increase layouts format to 6.
* src/Paragraph.cpp:
	- request required features for paragraph layouts.
* src/LaTeXFeatures.cpp:
	- add some packages needed by modules.
	- remove Preamble method for InsetLayout. This is now done
	  in InsetFlex::validate.
* src/BufferParams.cpp (validate):
	- request required features for the class.
* src/insets/InsetLayout.h:
	- new member "requires".
* src/insets/InsetFlex.{cpp,h}:
	- implement validate method and request required features and preamble snippets.

* lib/layouts/*.{layout,module,inc}:
	- increase layouts format to 6.
	- use Requires tags in some modules (more can be done later).

* lib/doc/Customization.lyx:
	- document Requires tag.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22414 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-01-07 16:59:10 +00:00
Abdelrazak Younes
770c4d41fd stdinset.inc: Some more documentation from Martin. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21986 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-12-06 07:56:39 +00:00
Jürgen Spitzmüller
3582be1441 framed.sty goes InsetBox: 
* src/insets/InsetBox.{cpp,h}:
* src/frontends/qt4/GuiBox.{cpp,h}:
* src/frontends/qt4/ui/BoxUi.ui:
	- add and handle Framed and Shaded boxes
	- use more descriptive label names
	- implement name() function for Box:Shaded's sake

* src/insets/InsetNote.{cpp,h}:
* src/frontends/qt4/GuiNote.cpp:
* src/frontends/qt4/ui/NoteUi.ui:
	- remove Framed and Shaded.

* lib/layouts/stdinsets.inc:
	- remove Note:Framed and Note:Shaded
	- add Box:Shaded

* Buffer.cpp:
	- bump format to 304.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- add conversion/reversion of framed/shaded notes to boxes.

* development/FORMAT:
	- document file format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21945 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-12-04 09:25:50 +00:00
Abdelrazak Younes
44ab27cb98 Add some documentation. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21937 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-12-03 15:24:53 +00:00
Abdelrazak Younes
bba8891efb Add InsetOptArg to standard insets. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21627 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-15 15:40:01 +00:00
Richard Heck
39386042f1 Fix URL output. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21615 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-14 18:06:11 +00:00
Martin Vermeer
979239a248 Make URL a standard inset 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21576 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-13 10:03:16 +00:00
Abdelrazak Younes
074dee47c3 add Figure and Table. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21399 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-03 01:55:16 +00:00
Abdelrazak Younes
fc0f77044d fix layout of InsetBox and remove unused InsetCollapsable methods. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21393 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-02 22:10:59 +00:00
Martin Vermeer
7819fc91b5 NeedProtect inside Index inset 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21316 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-01 07:09:58 +00:00
Martin Vermeer
1d894fd5e3 Fix inset font inheritance mechanism; smaller clean-ups 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21315 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-01 06:25:47 +00:00
Martin Vermeer
3d443b4c9d Implement ForceLtR; cleanup of collapsable insets 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21285 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-30 12:30:46 +00:00
Martin Vermeer
1f07a7f929 Introduce inset parameters keepempty, freespacing, needprotect and rename verbatim->passthru 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21197 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 09:19:26 +00:00
Martin Vermeer
5ab6d5bf65 Simplify ERT by using verbatim 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21121 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-22 18:01:21 +00:00
Martin Vermeer
0f4d519108 A saner way to reset paragraphs to default when inserting inset around selection 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20888 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-10 13:25:37 +00:00
Martin Vermeer
d21a3bb445 Index as collapsible, preserving existing feature set 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20699 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-03 13:38:19 +00:00
Martin Vermeer
ed6f900552 Use Minimalistic for branches 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19973 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 11:40:09 +00:00
Martin Vermeer
77b575e562 Move background colour into the layout files -- for all collapsables 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19813 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-26 20:32:58 +00:00
Martin Vermeer
8eb22fd082 Updated versions to 5; added stdinsets.inc where I felt confident 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19804 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-26 09:10:52 +00:00
Martin Vermeer
612af5c5f0 inset configurability: ERT 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19702 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-21 21:29:13 +00:00
Martin Vermeer
e710636ee8 Symbolic colour names work\! 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19664 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-20 18:57:48 +00:00
Martin Vermeer
96336caed7 make these definitions useful for latex 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19656 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-20 14:22:39 +00:00
Jean-Marc Lasgouttes
1c1a1eca82 fix file format 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19592 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-15 19:25:59 +00:00
Martin Vermeer
2bd998c29e Prepare for inset configurability 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19498 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-13 12:13:17 +00:00