Commit Graph

60 Commits

Author SHA1 Message Date
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
12f57a57bd The return value for xhtml() is not going to be needed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30078 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-12 16:11:33 +00:00
Richard Heck
f61bebd7fb HTML output code for a handful of easy insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29951 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 17:48:14 +00:00
Vincent van Ravesteijn
4c9fe33c83 * Move handling of LFUN_INSET_SETTINGS to Inset,
* Remove the EDITABLE enum,
* add functions hasSettings() for all insets.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29375 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 20:55:13 +00:00
Vincent van Ravesteijn
80228965b1 Move handling of LFUN_MOUSE_RELEASE up to Inset and remove the edit() functions for insets that do not derive from InsetCollapsable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29184 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 12:38:32 +00:00
Vincent van Ravesteijn
cc11c6803c Make the insets accept LFUN_INSET_SETTINGS. These insets did not yet respond to LFUN_INSET_SETTINGS. One had to use LFUN_INSET_TOGGLE to show the settings dialog. Now, this dependency on LFUN_INSET_TOGGLE can be removed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29176 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 00:20:12 +00:00
Jürgen Spitzmüller
6525a79188 * InsetSpace.cpp: typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28071 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-10 17:07:52 +00:00
Georg Baum
ac1fd9b37f fix bug 2558: hspace support in math
The basic idea was to reuse the corresponding text space inset in the same
fashion as is already done for references. The dialog displays a different
selection for math than for text. If wanted, the additional spaces could
also be enabled for text, but that would be a file format change.
Constructs like \hspace{\mylengthvariable} that are not supported are
treated by the math parser as ERT as before.

For reasons I don't know the context menu does not work, but this is not so
important IMHO (since a left click opens the dialog).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27954 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-22 18:12:32 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
Richard Heck
b83564d82c Inset::textString --> Inset::tocString
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27378 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-10 22:45:14 +00:00
Jean-Marc Lasgouttes
3387e437a8 Length::inBP returns big postscript points, not pixel width
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26373 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-12 14:38:03 +00:00
Abdelrazak Younes
f3f99c354c add const
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25590 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 05:33:14 +00:00
Abdelrazak Younes
e93fd11d41 Fix MSVC warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25589 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-14 05:19:39 +00:00
Jürgen Spitzmüller
47e6b74e74 * src/insets/InsetSpace.cpp:
- proper visualization for negative hspaces, in analogy to negative vspaces.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25557 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 08:46:05 +00:00
Uwe Stöhr
3ceba1f8e4 InsetSpace.cpp:
- use another color for negative spaces to be able to distinguish it from "normal" positive one
 - don't swap the inset drawing as this inconsistent to the other negative spaces and the ones in math mode

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25544 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 22:01:57 +00:00
Jürgen Spitzmüller
f10b67b09f * src/insets/InsetSpace.cpp:
- comment

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25531 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 07:45:33 +00:00
Jürgen Spitzmüller
21f3fadbc1 * src/insets/InsetSpace.cpp:
- (simple) visual indication for negative hspaces.
	- minimal metrics width for hspaces.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25530 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 07:43:21 +00:00
Jürgen Spitzmüller
0160b75b4d * src/insets/InsetSpace.cpp:
- use abs().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25516 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-09 10:31:16 +00:00
Jürgen Spitzmüller
01fb1898ad * src/insets/InsetSpace.cpp:
- correct metrics for negative hspaces (bug 5009).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25512 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-09 08:12:38 +00:00
Richard Heck
2a47858dda Fix remaining issues with InsetSpace. The identifier "Space" used in the .lyx
file has been changed to "space" to match the identifier used for the inset in
Inset.cpp and for the dialog in GuiView.cpp.

In future, we will want to get a similar uniformity elsewhere: The identifier
used in the LyX file should match the one used as inset identifier. The easy
way to do this, in the code, is to have insets write themselves this way:
	os << insetName(lyxCode()) << " ";
rather than at present:
	os << "space ";
Similar things could then happen elsewhere. E.g., if the dialog names are in
sync with the inset names, then we could do something like:
	hideDialogs(insetName(lyxCode()), this);
rather than
	hideDialogs("space", this);
and perhaps even put that into the Inset destructor rather than have specific
versions in each inset---with a test for whether there is such a dialog, of
course.

But this is all for later.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25016 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-30 15:38:43 +00:00
Richard Heck
afbc6bd2b9 Fix some of the InsetSpace problems.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25014 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-30 15:18:13 +00:00
Jürgen Spitzmüller
48e6184e84 * InsetSpace.cpp:
- brace/arrowfill drawing cosmetics, by Helge.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25002 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-30 09:31:06 +00:00
Richard Heck
77ed747114 FuncStatus::enabled(bool) --> FuncStatus::setEnabled(bool)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24999 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-29 15:14:00 +00:00
Jean-Marc Lasgouttes
050ec93722 remove some useless workarounds in getStatus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24942 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-26 10:23:07 +00:00
Jürgen Spitzmüller
2e60364941 * InsetSpace drawing cosmetics, from Helge.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24621 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-05 17:58:16 +00:00
Jürgen Spitzmüller
95767b840b support for rightarrowfill, leftarrowfill, upbracefill, downbracefill, by Helge Hafting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24567 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 20:11:57 +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
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
André Pönitz
0e09045e08 small simplification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24023 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-28 23:46:47 +00:00
André Pönitz
444dc60b23 one more mistake...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24020 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-28 20:05:33 +00:00
André Pönitz
f9b81e51e9 remove remaining MailInsets.
please check your favourite insets, I am sure I broke _something_...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24006 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-27 22:26:24 +00:00
Abdelrazak Younes
fb25ff1819 Cleanup mouse/selection/context-menu interactions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23944 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-25 10:54:38 +00:00
Jürgen Spitzmüller
e1ac6d4118 Some context menu work:
* src/BufferView.cpp:
* src/FuncCode.h:
* src/LyXAction.cpp:
	- new LFUN_NEXT_INSET_MODIFY

* src/insets/InsetBox.{cpp, h}:
* src/insets/InsetCommand.{cpp,h}:
* src/insets/InsetNote.{cpp,h}:
* src/insets/InsetSpace.{cpp,h}:
* src/insets/InsetVSpace.{cpp,h}:
	- implement context menu and access to some changes

* lib/ui/stdmenus.ui:
	- new context menus for Box, Space, VSpace, Note.
	- extend the context menu for InsetRef.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23920 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 13:33:48 +00:00
Jürgen Spitzmüller
48778460a0 * src/insets/InsetSpace.{cpp, h}:
- this inset is now editable. Mark as such and add an editable method (allows for opening the inset dialog with
	  "next-inset-toggle".
	- implement context menu (no actual menu yet).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23907 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-23 15:19:01 +00:00
Jürgen Spitzmüller
18101eea7b ** add support for protected horizontal fill. FILE FORMAT CHANGE. **
* src/Buffer.cpp:
	- increment file format to 320.

* src/insets(InsetSpace.{cpp, h}:
	- add HFILL_PROTECTED, a protected horizontal fill
	  (LaTeX: \hspace*{\fill})

* src/factory.cpp:
* src/frontends/qt4/GuiHSpace.{cpp, h}:
	- handle the new space type.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- reversion routine for protected hfill.

* development/FORMAT:
	- document file format change

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23805 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-18 12:11:28 +00:00
Jürgen Spitzmüller
f2e8cd3cd9 *** File Format Change: UI and enhancement for InsetSpace ***
* src/insets/InsetSpace.{cpp,h}:
	- merge in HFill inset, add support for dotfill, hrulefill,
	  hspace and hspace*
* src/insets/InsetHFill.{cpp,h}:
	- remove

* src/frontends/qt4/GuiHSpace.{cpp,h}:
* src/frontends/qt4/ui/HSpaceUi.ui:
* src/frontends/qt4/GuiView:
	- new GUI for Space insets.

* src/insets/Inset.{cpp,h}:
* src/insets/InsetCode.h:
* src/insets/InsetCollapsable.cpp:
* src/insets/InsetCommandParams.cpp:
	- remove HFILL_CODE and LFUN_HFILL_INSERT, add SPACE_CODE where necessary,
	  new Inset member isStretchableSpace() to indicate HFill and friends.

* Buffer.cpp: 
	- increase format to 319
* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- conversion/reversion routines
* development/FORMAT:
	- document file format change

* src/Makefile.am:
* src/frontends/qt4/Makefile.am:
* development/scons/scons_manifest.py:
	- deal with UI changes.

* src/LyXAction.cpp:
	- remove LFUN_HFILL_INSERT

* src/LyXFunc.cpp:
	- handle space dialog.

* src/factory.cpp:
* src/Paragraph.cpp (isHFill):
* src/Text.cpp:
* src/Text3.cpp:
* src/TextMetrics.cpp:
	- adapt to changes

* lib/ui/classic.ui:
* lib/ui/stdmenus.ui:
	- add HSpace dialog, remove HFill.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23787 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 09:23:43 +00:00
Richard Heck
1becd75946 These don't seem to be causing crashes at the moment, but as a matter of long-term stability, it seems worth cloning them the "canonical" way.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23360 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-29 20:16:04 +00:00
André Pönitz
db8c16d554 progress on buffer-reference-in-insets. beware of instabilities...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23289 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 20:43:16 +00:00
Abdelrazak Younes
2bf1c09376 header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23049 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-18 07:14:42 +00:00
Jürgen Spitzmüller
63c45ec226 * src/insets/InsetCitation.{cpp,h}:
* src/insets/InsetHyperlink.{cpp,h}:
* src/insets/InsetRef.{cpp,h}:
* src/insets/InsetSpace.{cpp,h}:
* src/insets/InsetSpecialChar.{cpp,h}:
	- fix textString member (bug 4472).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22480 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-10 16:09:01 +00:00
Jürgen Spitzmüller
cfb1d4027b * src/insets/InsetSpace.cpp:
- further improve appearance of protected space.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22307 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-26 10:38:59 +00:00
Abdelrazak Younes
6564f8a52a fix warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22297 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-25 18:49:55 +00:00
Richard Heck
a155d8934e Improve size of spaces.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22236 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-21 19:34:13 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
André Pönitz
150cf11651 hand-crafted LyXErr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21849 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 22:12:03 +00:00
André Pönitz
a8cd9a4b8f cosmetics. mainly replace #include "dostring.h" by #include "strfwd.h"
in header files when possible. Adjust .cpp files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21358 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 22:17:22 +00:00