X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finseturl.C;h=ae2c16a9fe1028ce8dfef62db6b4a6dfe2470875;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=efffb87f998729ab7d1561fd16c41fa0b34c92f4;hpb=132fe5e1322fbc86a32692df51eba78d6b4e479c;p=lyx.git

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index efffb87f99..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,6 +110,12 @@ extern "C" void C_InsetUrl_CloseUrlCB(FL_OBJECT * ob, long data)
 }
 
 
+char const * InsetUrl::EditMessage() const 
+{
+	return _("Opened Url");
+}
+
+
 void InsetUrl::Edit(BufferView * bv, int, int, unsigned int)
 {
 	static int ow = -1, oh;
@@ -166,58 +173,27 @@ string InsetUrl::getScreenLabel() const
 }
 
 
-int InsetUrl::Latex(ostream & os, signed char fragile, bool free_spc) const
+int InsetUrl::Latex(ostream & os,
+		    bool fragile, bool /*free_spc*/) const
 {
-#ifdef USE_OSTREAM_ONLY
 	if (!getOptions().empty())
 		os << getOptions() + ' ';
 	if (fragile)
 		os << "\\protect";
 	os << "\\url{" << getContents() << '}';
 	return 0;
-#else
-	string latex_output;
-	int res = Latex(latex_output, fragile, free_spc);
-	os << latex_output;
-
-	return res;
-#endif
-}
-
-
-#ifndef USE_OSTREAM_ONLY
-int InsetUrl::Latex(string & file, signed char fragile, bool /*free_spc*/) const
-{
-	if (!getOptions().empty())
-		file += getOptions() + ' ';
-	if (fragile)
-		file += "\\protect";
-
-	file += "\\url{" + getContents() + '}';
-
-	return 0;
-}
-
-
-int InsetUrl::Linuxdoc(string & file) const
-{
-	file +=  "<"+ getCmdName() +
-		 " url=\""  + getContents()+"\"" +
-		 " name=\"" + getOptions() +"\">";
-
-	return 0;
 }
 
 
-int InsetUrl::DocBook(string & file) const
+int InsetUrl::Ascii(ostream & os) const
 {
-	file +=  "<ulink url=\""  + getContents() + "\">" +
-		 getOptions() +"</ulink>";
-
+	if (getOptions().empty())
+		os << "[" << getContents() << "]";
+	else
+		os << "[" << getContents() << "||" <<  getOptions() << "]";
 	return 0;
 }
 
-#else
 
 int InsetUrl::Linuxdoc(ostream & os) const
 {
@@ -235,7 +211,6 @@ int InsetUrl::DocBook(ostream & os) const
 	   << getOptions() << "</ulink>";
 	return 0;
 }
-#endif
 
 
 void InsetUrl::Validate(LaTeXFeatures & features) const