The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 30cbe535c3b7df8cb0db185e4d70fdbd97230f32
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Tue Feb 19 13:48:48 2013 +0100
Make annoying debug message optional
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index d87f590..ca80409 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -240,7 +240,7 @@ string const parsecmd(string const & incmd, string &
infile, string & outfile,
int Systemcall::startscript(Starttype how, string const & what,
string const & path, bool process_events)
{
- lyxerr << "\nRunning: " << what << endl;
+ LYXERR(Debug::INFO,"Running: " << what);
string infile;
string outfile;
commit efe06103f3335f24c754bfb78d5fcf1072c3624f
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Tue Feb 19 12:36:06 2013 +0100
Add test case for bug #5312
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx
b/src/tex2lyx/test/test-insets.lyx.lyx
index b9deacb..d0d2da9 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 462
+\lyxformat 463
\begin_document
\begin_header
\textclass article
@@ -13,7 +13,7 @@
\maintain_unincluded_children false
\language english
\language_package none
-\inputencoding latin9
+\inputencoding iso8859-15
\fontencoding T1
\font_roman default
\font_sans default
@@ -874,6 +874,20 @@ description "uniform resource locator"
\end_layout
\begin_layout Standard
+An URL with strange characters:
+\begin_inset Flex Flex:URL
+status collapsed
+
+\begin_layout Plain Layout
+http://www.lyx.org/percent%dollar$
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
link:
\begin_inset CommandInset href
LatexCommand href
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index 11385dd..28d4301 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -174,6 +174,8 @@ between~\verbatiminput{foo} or~\verbatiminput*{foo}.
An URL: \url{http://www.lyx.org} \nomenclature{URL2}{uniform resource locator}
+An URL with strange characters: \url{http://www.lyx.org/percent%dollar$}
+
link:\href{http://www.test.test}{www.test.test}
link2:\href{http://www.test.test}{http://www.test.test}
-----------------------------------------------------------------------
Summary of changes:
src/support/Systemcall.cpp | 2 +-
src/tex2lyx/test/test-insets.lyx.lyx | 18 ++++++++++++++++--
src/tex2lyx/test/test-insets.tex | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
