X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListings.cpp;h=0c6b472da86d171f4f73db9d0686dc52fcaa8fb2;hb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;hp=bd338d46612ae2a74f9d7f5adc8f75a0e0ce1c74;hpb=5cb3e1920018457e9257d18819a37ebcbcd45650;p=lyx.git

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index bd338d4661..0c6b472da8 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -14,6 +14,9 @@
 #include "InsetListings.h"
 #include "InsetCaption.h"
 
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
 #include "Language.h"
 #include "gettext.h"
 #include "DispatchResult.h"
@@ -28,13 +31,16 @@
 namespace lyx {
 
 using support::token;
+using support::contains;
+using support::subst;
 
-using std::auto_ptr;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
 using std::string;
 
+char const lstinline_delimiters[] =
+	"!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
 
 void InsetListings::init()
 {
@@ -44,8 +50,9 @@ void InsetListings::init()
 	font.decSize();
 	font.setColor(Color::none);
 	setLabelFont(font);
-	text_.current_font.setLanguage(latex_language);
-	text_.real_current_font.setLanguage(latex_language);
+	// FIXME: what to do with those?
+	//text_.current_font.setLanguage(latex_language);
+	//text_.real_current_font.setLanguage(latex_language);
 }
 
 
@@ -63,9 +70,9 @@ InsetListings::InsetListings(InsetListings const & in)
 }
 
 
-auto_ptr<Inset> InsetListings::doClone() const
+Inset * InsetListings::clone() const
 {
-	return auto_ptr<Inset>(new InsetListings(*this));
+	return new InsetListings(*this);
 }
 
 
@@ -81,6 +88,21 @@ Inset::DisplayType InsetListings::display() const
 }
 
 
+void InsetListings::updateLabels(Buffer const & buf, ParIterator const & it)
+{
+	Counters & cnts = buf.params().getTextClass().counters();
+	string const saveflt = cnts.current_float();
+
+	// Tell to captions what the current float is
+	cnts.current_float("listing");
+
+	InsetCollapsable::updateLabels(buf, it);
+
+	//reset afterwards
+	cnts.current_float(saveflt);
+}
+
+
 void InsetListings::write(Buffer const & buf, ostream & os) const
 {
 	os << "listings" << "\n";
@@ -121,38 +143,21 @@ void InsetListings::read(Buffer const & buf, Lexer & lex)
 
 docstring const InsetListings::editMessage() const
 {
-	return _("Opened Listings Inset");
+	return _("Opened Listing Inset");
 }
 
 
 int InsetListings::latex(Buffer const & buf, odocstream & os,
 		    OutputParams const & runparams) const
 {
-	string param_string = params().encodedString();
+	string param_string = params().params();
 	// NOTE: I use {} to quote text, which is an experimental feature
 	// of the listings package (see page 25 of the manual)
 	int lines = 0;
-	bool lstinline = params().isInline();
-	if (lstinline) {
-		if (param_string.empty())
-			os << "\\lstinline{";
-		else
-			os << "\\lstinline[" << from_ascii(param_string) << "]{";
-	} else {
-		docstring const caption = getCaption(buf, runparams);
-		if (param_string.empty() && caption.empty())
-			os << "\n\\begingroup\n\\inputencoding{latin1}\n\\begin{lstlisting}\n";
-		else {
-			os << "\n\\begingroup\n\\inputencoding{latin1}\n\\begin{lstlisting}[";
-			if (!caption.empty()) {
-				os << "caption={" << caption << '}';
-				if (!param_string.empty())
-					os << ',';
-			}
-			os << from_ascii(param_string) << "]\n";
-		}
-		lines += 4;
-	}
+	bool isInline = params().isInline();
+	// get the paragraphs. We can not output them directly to given odocstream
+	// because we can not yet determine the delimiter character of \lstinline
+	docstring code;
 	ParagraphList::const_iterator par = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
 
@@ -165,20 +170,49 @@ int InsetListings::latex(Buffer const & buf, odocstream & os,
 			// ignore all struck out text and (caption) insets
 			if (par->isDeleted(i) || par->isInset(i))
 				continue;
-			os.put(par->getChar(i));
+			code += par->getChar(i);
 		}
 		++par;
 		// for the inline case, if there are multiple paragraphs
 		// they are simply joined. Otherwise, expect latex errors.
-		if (par != end && !lstinline && !captionline) {
-			os << "\n";
+		if (par != end && !isInline && !captionline) {
+			code += "\n";
 			++lines;
 		}
 	}
-	if (lstinline)
-		os << "}";		
-	else {
-		os << "\n\\end{lstlisting}\n\\endgroup\n";
+	if (isInline) {
+                char const * delimiter = lstinline_delimiters;
+		for (; delimiter != '\0'; ++delimiter)
+			if (!contains(code, *delimiter))
+				break;
+		// This code piece contains all possible special character? !!!
+		// Replace ! with a warning message and use ! as delimiter.
+		if (*delimiter == '\0') {
+			code = subst(code, from_ascii("!"), from_ascii(" WARNING: no lstline delimiter can be used "));
+			delimiter = lstinline_delimiters;
+		}
+		if (param_string.empty())
+			os << "\\lstinline" << *delimiter;
+		else
+			os << "\\lstinline[" << from_ascii(param_string) << "]" << *delimiter;
+                os << code
+                   << *delimiter;
+	} else {
+		docstring const caption = getCaption(buf, runparams);
+		if (param_string.empty() && caption.empty())
+			os << "\n\\begingroup\n\\inputencoding{latin1}\n\\begin{lstlisting}\n";
+		else {
+			os << "\n\\begingroup\n\\inputencoding{latin1}\n\\begin{lstlisting}[";
+			if (!caption.empty()) {
+				os << "caption={" << caption << '}';
+				if (!param_string.empty())
+					os << ',';
+			}
+			os << from_utf8(param_string) << "]\n";
+		}
+		lines += 4;
+                os << code
+                   << "\n\\end{lstlisting}\n\\endgroup\n";
 		lines += 3;
 	}
 
@@ -196,7 +230,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
 	}
 	case LFUN_INSET_DIALOG_UPDATE:
 		InsetListingsMailer(*this).updateDialog(&cur.bv());
-		break;	
+		break;
 	case LFUN_MOUSE_RELEASE: {
 		if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
 			InsetListingsMailer(*this).showDialog(&cur.bv());
@@ -231,20 +265,17 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
 void InsetListings::setButtonLabel()
 {
 	// FIXME UNICODE
-	setLabel(isOpen() ?  _("Listings") : getNewLabel(_("Listings")));
+	setLabel(isOpen() ?  _("Listing") : getNewLabel(_("Listing")));
 }
 
 
-bool InsetListings::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetListings::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	Font tmpfont = mi.base.font;
 	getDrawFont(mi.base.font);
 	mi.base.font.realize(tmpfont);
 	InsetCollapsable::metrics(mi, dim);
 	mi.base.font = tmpfont;
-	bool const changed = dim_ != dim;
-	dim_ = dim;
-	return changed;
 }