Commit Graph

54 Commits

Author SHA1 Message Date
Juergen Spitzmueller
5801ee2f9a validate encodable characters in href inset (#8357) 2012-09-28 09:27:39 +02:00
Vincent van Ravesteijn
7287a259c5 Change the type of the context menu name to string
There is no need for GUI-elements to use docstring.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40058 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-29 14:48:55 +00:00
Richard Heck
20487d93a6 Hyperlinks have to be escaped for XHTML output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38215 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-02 23:35:57 +00:00
Enrico Forestieri
d866717ef7 Integrate texrow with otexstream in order to perform automatic line
counting when exporting to latex. This is done for the code comprised
between \begin{document} and \end{document}, while the preamble code
still needs manual calls to TexRow::newline() for registering new lines.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37584 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 20:02:48 +00:00
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
Richard Heck
9e9c96035c Finish disentangling tocString(). We introduce a new method, forToc(),
that also makes sure it doesn't do more work than it needs to do, by
limiting the size to 40 characters. Previously, InsetBranch::addToToc()
would have added a string representing the entire contents of the
branch! It's hard to imagine that having to recalculate that sort of
thing doesn't cause some problems with speed, especially in documents
with lots of notes and branches and such.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36974 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-20 21:55:09 +00:00
Richard Heck
832d6cd7e1 Begin undoing the tocString() mess by renaming that routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36889 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-15 01:34:04 +00:00
Richard Heck
c0bb9707cb Remove support for viewing URLs from hyperlinks. This is a security
risk, due to our lack of control over the links and the program used to
view them.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36789 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-09 17:55:11 +00:00
Vincent van Ravesteijn
e7f2bbe1ee Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn't need all the parameters and we split the functionality of choosing which context menu to return, from the functionality of supplying the name for the Inset itself. Now, the InsetText context menu is returned for InsetCollapsables when the button is not hit by the mouse. There is no (intended) change in functionality for insets without a button, collapsed insets. This fixes partly bug #6642. A fix for InsetTabular and for insets with no button will follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 21:27:25 +00:00
Richard Heck
455ac11cfc Bit of cleanup around the Format view and edit code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35914 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 17:14:00 +00:00
Vincent van Ravesteijn
2bbf8e5f2d Remove InsetCommand::mailer_name_.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35893 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 00:46:21 +00:00
Pavel Sanda
b1d6406ac4 Learn URL viewing for hyperlink insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35232 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-29 23:04:36 +00:00
Jürgen Spitzmüller
435067c0f1 * InsetHyperlink.{cpp,h}:
* stdcontext.inc:
	- basic implementation of inset-edit (only for file: now) (part of bug #6864)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35230 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-29 17:23:35 +00:00
Jürgen Spitzmüller
d427010975 * InsetHyperlink.{cpp,h}:
* stdcontext.inc:
	- basic context menu and tooltip (part of bug #6864)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35229 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-29 16:40:52 +00:00
Uwe Stöhr
7d68833dc9 remove unused include of FuncRequest
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35189 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-24 03:07:09 +00:00
Richard Heck
3e654186d2 Move the StartTag, EndTag, and CompTag classes into the html namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33099 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 22:08:04 +00:00
Richard Heck
c1b4b30ab5 Output target if name is not defined.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32225 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-28 21:32:46 +00:00
Richard Heck
b389ce6b1d Restore XHTML output for InsetHyperlink.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32209 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-25 22:19:59 +00:00
Abdelrazak Younes
882e2eeb7b InsetCommand ctor: Pass 'Buffer *'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31902 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-08 16:10:34 +00:00
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
Uwe Stöhr
f6b85a17de InsetHyperlink.cpp:
- fix #5908
 - break too long code lines

OK for branch too?  

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29366 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 00:55:55 +00:00
Uwe Stöhr
2a41c48394 InsetHyperlink.cpp: the "#" character must not be escaped in the URL field, only in the name field
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28195 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 05:24:05 +00:00
Uwe Stöhr
06e961047e InsetHyperlink.cpp: - fix my rash r28141
- bugfix allow the usage of "%" in the URL field

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28169 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-15 02:53:08 +00:00
Uwe Stöhr
03264aab68 InsetHyperlink.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5686
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28141 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-14 01:27:01 +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
Uwe Stöhr
ed5fcd95ac InsetHyperlink.cpp: coding style change according to André's advice
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26269 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-30 14:52:56 +00:00
Uwe Stöhr
ac3f391b46 InsetHyperlink.cpp: fix a bug I introduced in r26218
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26262 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-29 22:44:48 +00:00
Uwe Stöhr
a258a932d9 InsetHyperlink.cpp: add "http://" when the hyperlink type is web and no protocol is specified (as requested on the lyx-devel list)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26218 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-19 22:06:10 +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
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
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
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
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
09df753df4 pimpl not needed here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21395 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 23:42:27 +00:00
Abdelrazak Younes
37af3d5a3d revert accidental commit (r21380)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21381 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 17:13:39 +00:00
Abdelrazak Younes
12a3c703d1 Remove redundant code and introduce InsetCollapsable::setLabelColor().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21380 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 16:46:48 +00:00
Abdelrazak Younes
16441a6914 Fix concatenation bug introduced in rev 21363 and simplify the code a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21370 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 13:56:46 +00:00
Abdelrazak Younes
668ed52302 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21367 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 08:50:16 +00:00
Abdelrazak Younes
52d0e13809 add some const and move things closer to implementation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21366 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 08:32:20 +00:00
Abdelrazak Younes
e49c7ac747 remove FIXMEs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21365 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 08:18:02 +00:00
Abdelrazak Younes
bd820e1168 use docstring wherever it makes sense.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21363 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 08:09:43 +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
Uwe Stöhr
80c4d82e97 InsetHyperlink.cpp: add FIXME for the docstring issue
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21352 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-01 17:54:17 +00:00
Uwe Stöhr
0a7567ce3b - add entry to FORMATS file for Stefan's format change (Richards to 296 change is still not correctly listed)
- add support for hyerlink targets - fileformat changed
  (For Hyperlink.cpp I still need help to get rid of the strings and chars and use docstrings and char_type instead!)

Can anyone please open the changed Hyperlink.ui with a Qt 4.2 designer or below, save it and commit? Thanks. (Otherwise you cannot compile it.)

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