From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Tue, 13 Nov 2007 10:03:16 +0000 (+0000)
Subject: Make URL a standard inset
X-Git-Tag: 1.6.10~7379
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=979239a248c2e39589cfba410ab212accb1d5770;p=features.git

Make URL a standard inset

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21576 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index bfeac92d4e..779876927f 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -202,3 +202,24 @@ InsetLayout table
 	MultiPar              true
 End
 
+InsetLayout URL
+	LyXType               standard
+	LatexName             url
+	Decoration            minimalistic
+	LabelString           URL
+	PassThru              true
+	ForceLTR              true
+	Font
+	  Family              Typewriter
+	  Color               Blue
+	EndFont
+	LabelFont
+	  Family              Typewriter
+	  Color               Blue
+	  Size                Small
+	EndFont
+	Preamble
+	  \usepackage{url}
+	EndPreamble
+End
+
diff --git a/lib/layouts/url.module b/lib/layouts/url.module
deleted file mode 100644
index 12176695cc..0000000000
--- a/lib/layouts/url.module
+++ /dev/null
@@ -1,25 +0,0 @@
-#\DeclareLyXModule[url.sty]{Adds a character style for the \url command.}{URL}
-
-Format 4
-
-InsetLayout URL
-  LyXType charstyle
-  LatexType command
-  LatexName url
-  Decoration minimalistic
-  LabelString URL
-  PassThru true
-  ForceLTR true
-  Font
-    Family Typewriter
-    Color Blue
-  EndFont
-  LabelFont
-    Family Typewriter
-    Color Blue
-    Size Small
-  EndFont
-  Preamble
-    \usepackage{url}
-  EndPreamble
-End
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index c14f7ea8e9..309b3da976 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -328,6 +328,7 @@ Menuset
 		Separator
 		Item "Table...|T" "tabular-insert"
 		Item "Graphics...|G" "dialog-show-new-inset graphics"
+		Item "URL" "flex-insert URL"
 		Item "Hyperlink|k" "href-insert"
 		Item "Footnote|F" "footnote-insert"
 		Item "Marginal Note|M" "marginalnote-insert"
diff --git a/src/Text3.cpp b/src/Text3.cpp
index 026d51e839..8a1456b232 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1907,7 +1907,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		InsetLayout il =  cur.buffer().params().getTextClass().insetlayout(from_utf8(s));
 		if (il.lyxtype != "charstyle" &&
 		    il.lyxtype != "custom" &&
-		    il.lyxtype != "element")
+		    il.lyxtype != "element" &&
+		    il.lyxtype != "standard")
 			enable = false;
 		break;
 		}