X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finseturl.C;h=ae2c16a9fe1028ce8dfef62db6b4a6dfe2470875;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=9367c6f0c64d39c46098ab4a76ec300d3fc3c6b4;hpb=b92c96554385bcbc91262cd9a83766f422552564;p=lyx.git
diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index 9367c6f0c6..ae2c16a9fe 100644
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -14,6 +14,7 @@
#include "LaTeXFeatures.h"
#include "lyx_gui_misc.h" // CancelCloseBoxCB
+using std::ostream;
InsetUrl::InsetUrl(string const & cmd)
: fd_form_url(0)
@@ -109,7 +110,13 @@ extern "C" void C_InsetUrl_CloseUrlCB(FL_OBJECT * ob, long data)
}
-void InsetUrl::Edit(BufferView * bv, int, int)
+char const * InsetUrl::EditMessage() const
+{
+ return _("Opened Url");
+}
+
+
+void InsetUrl::Edit(BufferView * bv, int, int, unsigned int)
{
static int ow = -1, oh;
@@ -166,44 +173,42 @@ string InsetUrl::getScreenLabel() const
}
-int InsetUrl::Latex(ostream & os, signed char fragile) const
-{
- string latex_output;
- int res = Latex(latex_output, fragile);
- os << latex_output;
-
- return res;
-}
-
-
-int InsetUrl::Latex(string & file, signed char fragile) const
+int InsetUrl::Latex(ostream & os,
+ bool fragile, bool /*free_spc*/) const
{
if (!getOptions().empty())
- file += getOptions() + ' ';
+ os << getOptions() + ' ';
if (fragile)
- file += "\\protect";
+ os << "\\protect";
+ os << "\\url{" << getContents() << '}';
+ return 0;
+}
- file += "\\url{" + getContents() + '}';
+int InsetUrl::Ascii(ostream & os) const
+{
+ if (getOptions().empty())
+ os << "[" << getContents() << "]";
+ else
+ os << "[" << getContents() << "||" << getOptions() << "]";
return 0;
}
-int InsetUrl::Linuxdoc(string & file) const
+int InsetUrl::Linuxdoc(ostream & os) const
{
- file += "<"+ getCmdName() +
- " url=\"" + getContents()+"\"" +
- " name=\"" + getOptions() +"\">";
+ os << "<" << getCmdName()
+ << " url=\"" << getContents() << "\""
+ << " name=\"" << getOptions() << "\">";
return 0;
}
-int InsetUrl::DocBook(string & file) const
+int InsetUrl::DocBook(ostream & os) const
{
- file += "" +
- getOptions() +"";
-
+ os << ""
+ << getOptions() << "";
return 0;
}