X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finseturl.C;h=848584044fbc0508b1678230eac65aaeacd97637;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=cb3fe5f22ebf5cdd9bc918baab110a94920f801e;hpb=e59e72d1d10e6184fafa1bd4daedaf5512a1e23b;p=lyx.git

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index cb3fe5f22e..848584044f 100644
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -10,26 +10,33 @@
 #include "LyXView.h"
 #include "debug.h"
 #include "frontends/Dialogs.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 
 using std::ostream;
 
 
-InsetUrl::InsetUrl(InsetCommandParams const & p)
+InsetUrl::InsetUrl(InsetCommandParams const & p, bool)
 		: InsetCommand(p)
 {}
 
 
-void InsetUrl::Edit(BufferView * bv, int, int, unsigned int)
+void InsetUrl::edit(BufferView * bv, int, int, unsigned int)
 {
-	bv->owner()->getDialogs()->showUrl( this );
+	bv->owner()->getDialogs()->showUrl(this);
 }
 
 
-string const InsetUrl::getScreenLabel() const
+void InsetUrl::edit(BufferView * bv, bool)
+{
+	edit(bv, 0, 0, 0);
+}
+
+
+string const InsetUrl::getScreenLabel(Buffer const *) const
 {
 	string temp;
-	if (getCmdName() == "url" )
+	if (getCmdName() == "url")
 		temp = _("Url: ");
 	else 
 		temp = _("HtmlUrl: ");
@@ -43,7 +50,7 @@ string const InsetUrl::getScreenLabel() const
 }
 
 
-int InsetUrl::Latex(Buffer const *, ostream & os,
+int InsetUrl::latex(Buffer const *, ostream & os,
 		    bool fragile, bool /*free_spc*/) const
 {
 	if (!getOptions().empty())
@@ -55,7 +62,7 @@ int InsetUrl::Latex(Buffer const *, ostream & os,
 }
 
 
-int InsetUrl::Ascii(Buffer const *, ostream & os, int) const
+int InsetUrl::ascii(Buffer const *, ostream & os, int) const
 {
 	if (getOptions().empty())
 		os << "[" << getContents() << "]";
@@ -65,7 +72,7 @@ int InsetUrl::Ascii(Buffer const *, ostream & os, int) const
 }
 
 
-int InsetUrl::Linuxdoc(Buffer const *, ostream & os) const
+int InsetUrl::linuxdoc(Buffer const *, ostream & os) const
 {
 	os << "<" << getCmdName()
 	   << " url=\""  << getContents() << "\""
@@ -75,15 +82,15 @@ int InsetUrl::Linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetUrl::DocBook(Buffer const *, ostream & os) const
+int InsetUrl::docbook(Buffer const *, ostream & os) const
 {
-	os << "<ulink url=\"" << getContents() << "\">"
-	   << getOptions() << "</ulink>";
+	os << "<ulink url=\"" << subst(getContents(),"&","&amp;")
+	   << "\">" << getOptions() << "</ulink>";
 	return 0;
 }
 
 
-void InsetUrl::Validate(LaTeXFeatures & features) const
+void InsetUrl::validate(LaTeXFeatures & features) const
 {
-	features.url = true;
+	features.require("url");
 }