anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 14:32:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,979 Commits 31 Branches 172 Tags 616 MiB
c52bd08442
Commit Graph

40 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
5e860f2344 Prevent empty warning. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27976 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-01-01 16:35:14 +00:00
Georg Baum
030e249d91 fix potential problems detected by gcc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27956 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-12-22 18:18:47 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-30 08:26:40 +00:00
André Pönitz
c621ec9843 move GuiCommand into hedar of its own. InsetCommandParams.h is expensive 
nowadays ;-|


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24375 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-20 08:19:26 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts' 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-10 21:49:34 +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
e9293e28ac remove unused code; also code cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24097 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-04-02 19:12:47 +00:00
Pavel Sanda
826d0fc879 Change strings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23819 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-18 23:35:57 +00:00
Uwe Stöhr
b1e077a7d2 compilation fixes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23797 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-17 21:11:17 +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
André Pönitz
0cb39e6f8b earder cleanup; cosmetics; 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23744 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-03-15 00:02:41 +00:00
Abdelrazak Younes
1f18764d97 Fix warning. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23242 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-26 08:31:00 +00:00
Richard Heck
b0de1dca99 Code rules. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23241 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-26 01:37:05 +00:00
Richard Heck
2fb02d20f1 Per Abdel's suggestion that we focus on bug-fixing at this point, this will be the last patch in this series for a bit. But I wanted to get this done before I forget what it is I was doing, so here it is. 
The idea behind this patch is to make real key-value support for InsetCommand parameters possible. This should be particularly useful for the listings version of InsetInclude, though we would need some kind of UI for it before it would really be helpful. (See below for some thoughts.) This doesn't substantially change anything else, though some things do get re-arranged a bit.

Basically, the idea is this. First, we introduce a whole range of parameter types: Normal LaTeX optional and required parameters; ones for LyX's internal use (like embed); and finally, in connection with keyval, ones that represent keys and ones that represent optional and required arguments where the keyval stuff will appear. (I'm assuming here that there will always be exactly one of those, and that it will accept only keyval-type material.) The parameters themselves are stored in a map, so it's really only the output routines that need to care about the different types of parameters.

Regarding the frontend, it seems to me that something like the following would work:
(i) scan the parameter list for LATEX_KEY type parameters
(ii) the dialog will have a series of lines, each of which has a combo box listing the acceptable keys and a QLineEdit for entering its value, as well as a "delete" button of some sort for removing this key and its value
(iii) there should be an "add line" button to add a new line, activated only when all other lines are filled with values
Probably not even too hard.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23235 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-25 22:13:45 +00:00
Richard Heck
8e9410b3d0 After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of all of this being to make things more flexible, with the ultimate goal being biblatex support and a kind of InsetCommandFlex that will allow user-definable such things. The next step, really, is to fix up CiteEngine so that we can have different sets of parameters for InsetCitation depending upon what engine is in use. (Something like this also needs doing with InsetInclude.) 
This patch reworks the machinery that holds information about what parameters there are and what their values are. There's enough flexibility here that true keyval support ought to be fairly easy at this point. I'll have a peek at that shortly.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23168 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-23 22:01:02 +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
Richard Heck
969a998f8b Tranlatable strings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22965 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-12 16:41:49 +00:00
Richard Heck
feae27d3ce Better error messages. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22948 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-02-11 19:42:36 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-12-12 19:28:07 +00:00
Abdelrazak Younes
b89cc942eb 'using namespace lyx::support' instead of 'using support::xxx' 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22103 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-12-12 18:57:56 +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
Richard Heck
4ca3a3d59c InsetIndex is no longer an InsetCommand. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21210 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 22:29:45 +00:00
Richard Heck
8f2a8c7267 Revert inadvertent commit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21200 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 13:38:42 +00:00
Richard Heck
07b6198f4c Move the findInfo() and defaultCommand() routines out of InsetCommand and into its subclasses, so that the subclasses know what parameters they want, etc. Also, introduce an "isCompatibleCommand()" routine, so the subclasses can tell us which commands they are prepared to accept. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21194 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 04:13:56 +00:00
Richard Heck
2f4d0ae27e Remove methods marked for removal from InsetCommandParams. Yeah, we can do that now. ;-) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21154 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-23 18:51:04 +00:00
Richard Heck
a46d7ee857 My bad. Sorry Helge! 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21073 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-19 17:49:45 +00:00
Richard Heck
e158e07c29 InsetCommandParams() now takes an InsetCode rather than a string. 
These changes are just adaptations to the new signature.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21072 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-19 17:22:55 +00:00
Richard Heck
3070a548e6 Fix bug due to empty default commands. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20997 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-16 19:21:00 +00:00
Uwe Stöhr
7075eaadef The huge URL patch: 
- rename the lfun to href-insert.png
- rename the files to Hyperlink...
- the former URLUi produces now \href commands (hyperref)

Only missing thing is the lyx2lyx conversion routine - this will be done by Richard

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20950 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-13 19:06:09 +00:00
Abdelrazak Younes
f7b1c86393 Move Inset::Code to InsetCode.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20936 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-13 09:04:52 +00:00
Richard Heck
0787ade6c0 This is the first part of a cleanup of how we handle the InsetCommand hierarchy. This part starts to disentangle the type of the inset from the command that a single instance of the inset represents. This involves two sorts of changes: 
(i) The file format is changed, so that command insets are represented as:
    \begin_inset CommandInset insetype
    LatexCommand command
    ...
    \end_inset
This involves some lyx2lyx and changes to the readInset() routine in factory.cpp
(ii) The InsetCommand and InsetCommandParams classes also have to be changed, as the command name was used in these classes for various purposes for which the inset type ought really to be used.
Further clean-up to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20544 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-27 18:24:18 +00:00
André Pönitz
9b8e429a64 remove unnecessary includes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20228 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-11 21:43:55 +00:00
Lars Gullik Bjønnes
897436efbb Whitespace cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18550 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-28 22:27:45 +00:00
Bo Peng
4ce743a0a7 Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog. 
* src/LyXAction.cpp: listing-insert action
	* src/insets/Inset.h,cpp: LISTINGS_CODE
	* src/insets/InsetInclude.cpp: handle \lstinputlisting
	* src/insets/InsetListings.h,cpp: new listings inset
	* src/insets/InsetListingsParams.h,cpp: parameters from listings package
	* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
	* src/Bidi.cpp: handle LISTINGS_CODE
	* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
	* src/frontends/qt4/ui/ListingsUi.ui: new dialog
	* src/frontends/qt4/ui/IncludeUi.ui: update UI
	* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
	* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
	* src/frontends/qt4/QListings.h,cpp: new listings inset
	* src/frontends/qt4/Dialogs.cpp: new listings dialog
	* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
	* src/frontends/controllers/ControlListings.h,cpp: new listings inset
	* src/LyXFunc.cpp: handle LISTING_CODE
	* src/Paragraph.cpp: handle LISTING_CODE
	* src/factory.cpp: new listings inset
	* src/CutAndPaste.cpp: handle LISTINGS_CODE
	* src/LaTeXFeatures.cpp: require listings
	* src/Text3.cpp: Handle LISTINGS_CODE
	* src/lfuns.h: add LFUN_LISTING_INSERT
	* src/Buffer.cpp: change lyx file format to 269
	* src/BufferParams.h,cpp: add listings_params to preamble
	* lib/lyx2lyx/LyX.py: lyx2lyx 
	* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
	* lib/ui/stdmenus.inc: new menu item (no shortcut!)
	* src/insets/Makefile.am: update autotools
	* src/frontends/controllers/Makefile.am
	* src/frontends/qt4/Makefile.dialogs
	* src/frontends/qt4/Makefile.am
	* po/POTFILES.in: a few more translatable files.
	* development/scons/scons_manifest.py: scons build system
	* development/FORMAT: document format changes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-09 19:11:42 +00:00
André Pönitz
39e79d8602 rename LyXLex into Lexer 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18033 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-26 11:30:54 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-26 04:41:58 +00:00
Bo Peng
65d89a8af3 merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_helpers to frontend_helpers, step 1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17996 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-25 17:15:56 +00:00
Bo Peng
c8d00ed127 Rename insets/insetxxx to insets/InsetXxx, part 2 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17965 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-25 01:25:51 +00:00