anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 22:41:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add automatic color package loading for listings

Browse Source 
The listings inset does automatically load the color package if any parameter
contains \color. As mentioned in bug #8066 tex2lyx needs to be aware of this,
so the \usepckage{color} is automatically skipped in these cases.
This commit is contained in:
Georg Baum 2012-10-18 20:41:23 +02:00
parent 75e809c023
commit 75ba5d3db5
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/test/test-insets.lyx.lyx
View File

@ -1037,7 +1037,7 @@ Listings
Inline: Inline:
\begin_inset listings \begin_inset listings
lstparams "language={C++}" lstparams "language={C++},keywordstyle={\color{green}}"
inline true inline true
status collapsed status collapsed

2
src/tex2lyx/test/test-insets.tex
View File

@ -181,7 +181,7 @@ parser test (escaped):\href{http://www.test.test}{a brace \} and another one \{
\section{Listings} \section{Listings}
Inline: \lstinline[language={C++}]!int a=5;!\\ Inline: \lstinline[language={C++},keywordstyle={\color{green}}]!int a=5;!\\
Float: Float:
\begin{lstlisting}[caption={Example Listing float},label={lst:Example-Listing},language=Python] \begin{lstlisting}[caption={Example Listing float},label={lst:Example-Listing},language=Python]

2
src/tex2lyx/text.cpp
View File

@ -1154,6 +1154,8 @@ void parse_listings(Parser & p, ostream & os, Context & parent_context, bool in_
if (p.hasOpt()) { if (p.hasOpt()) {
string arg = p.verbatimOption(); string arg = p.verbatimOption();
os << "lstparams " << '"' << arg << '"' << '\n'; os << "lstparams " << '"' << arg << '"' << '\n';
if (arg.find("\\color") != string::npos)
preamble.registerAutomaticallyLoadedPackage("color");
} }
if (in_line) if (in_line)
os << "inline true\n"; os << "inline true\n";