anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetListings: Rewrite C-ism in C++ and fix terminator bug.

Browse Source 
The rewriting is completely done by JMarc. The terminator bug fix has been added to that by me.

Fixes: #8985
Conflicts:
	src/insets/InsetListings.cpp
This commit is contained in:
Juergen Spitzmueller 2014-03-22 12:02:21 +01:00
parent c56fc4c5f4
commit e6af49a9f5
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/insets/InsetListings.cpp
View File

@ -50,9 +50,6 @@ using namespace lyx::support;
namespace lyx { namespace lyx {
char const lstinline_delimiters[] =
"!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par) InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par)
: InsetCollapsable(buf) : InsetCollapsable(buf)
{ {
@ -202,17 +199,18 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
code += "\n"; code += "\n";
} }
if (isInline) { if (isInline) {
char const * delimiter = lstinline_delimiters; static const docstring delimiters =
for (; delimiter != '\0'; ++delimiter) from_utf8("!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm");
if (!contains(code, *delimiter))
break; size_t pos = delimiters.find_first_not_of(code);
// This code piece contains all possible special character? !!! // This code piece contains all possible special character? !!!
// Replace ! with a warning message and use ! as delimiter. // Replace ! with a warning message and use ! as delimiter.
if (*delimiter == '\0') { if (pos == string::npos) {
docstring delim_error = "<" + _("LyX Warning: ") docstring delim_error = "<" + _("LyX Warning: ")
+ _("no more lstline delimiters available") + ">"; + _("no more lstline delimiters available") + ">";
code = subst(code, from_ascii("!"), delim_error); code = subst(code, from_ascii("!"), delim_error);
delimiter = lstinline_delimiters; pos = 0;
if (!runparams.dryrun) { if (!runparams.dryrun) {
// FIXME: warning should be passed to the error dialog // FIXME: warning should be passed to the error dialog
frontend::Alert::warning(_("Running out of delimiters"), frontend::Alert::warning(_("Running out of delimiters"),
@ -223,12 +221,14 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
"must investigate!")); "must investigate!"));
} }
} }
if (param_string.empty()) docstring const delim(1, delimiters[pos]);
os << "\\lstinline" << *delimiter; os << "\\lstinline";
else if (!param_string.empty())
os << "\\lstinline[" << from_utf8(param_string) << "]" << *delimiter; os << "[" << from_utf8(param_string) << "]";
os << code else if (pos >= delimiters.find('Q'))
<< *delimiter; // We need to terminate the command before the delimiter
os << " ";
os << delim << code << delim;
} else { } else {
OutputParams rp = runparams; OutputParams rp = runparams;
rp.moving_arg = true; rp.moving_arg = true;

6
status.20x
View File

@ -70,6 +70,9 @@ What's new
- Fix problem with export of LyX archive when bibtotoc is used (bug 9044). - Fix problem with export of LyX archive when bibtotoc is used (bug 9044).
- Fix LaTeX error with alphabetic delimiters in inline Listings (part of bug
8985).
* USER INTERFACE * USER INTERFACE
@ -144,4 +147,7 @@ What's new
- Improve detection of Qt via pkg-config, especially on Mac OS. - Improve detection of Qt via pkg-config, especially on Mac OS.
- Fix bad compare of pointer vs. character (part of bug 8985).
- Fix a couple of compilation warnings. - Fix a couple of compilation warnings.