From 268ae66e3c7df04effc329373dc887715d9c6f06 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Wed, 7 Jun 2017 01:25:35 +0200 Subject: [PATCH] Rename the minted 'lang' external template option as 'language' This is for consistency with the newly introduced support in the listings inset, where the option name is dictated by the listings package and cannot be changed. --- lib/examples/minted.lyx | 4 ++-- lib/xtemplates/minted.xtemplate | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/examples/minted.lyx b/lib/examples/minted.lyx index 1cc11d4c98..dab838fc15 100644 --- a/lib/examples/minted.lyx +++ b/lib/examples/minted.lyx @@ -191,8 +191,8 @@ This is the title of the listing appearing in the headers. template MintedSource filename ../scripts/lyxpak.py display false - extra LaTeX "fontsize=\tiny,baselinestretch=1.05,frame=leftline,framesep=10pt,breaklines,breakanywhere,lang=python" - extra PDFLaTeX "fontsize=\tiny,baselinestretch=1.05,frame=leftline,framesep=10pt,breaklines,breakanywhere,lang=python" + extra LaTeX "fontsize=\tiny,baselinestretch=1.05,frame=leftline,framesep=10pt,breaklines,breakanywhere,language=python" + extra PDFLaTeX "fontsize=\tiny,baselinestretch=1.05,frame=leftline,framesep=10pt,breaklines,breakanywhere,language=python" \end_inset diff --git a/lib/xtemplates/minted.xtemplate b/lib/xtemplates/minted.xtemplate index 7cc6535a96..3216c079b4 100644 --- a/lib/xtemplates/minted.xtemplate +++ b/lib/xtemplates/minted.xtemplate @@ -15,16 +15,16 @@ # # In order to use the external templates machinery, the options of the # minted package are extended to be able to construct a proper \inputminted -# command. This template defines an additional 'lang' option for minted, which -# is then extracted from the options and passed as the second non-optional +# command. This template defines an additional 'language' option for minted, +# which is then extracted from the options and passed as the second non-optional # parameter of \inputminted. This template works for minted version 2.1 or # higher. As it relies on the internals of minted, an update might break it. PreambleDef minted \usepackage{minted} \@namedef{minted@opt@cmd@lang}{latex} - \define@key{minted@opt@cmd}{lang}{\@namedef{minted@opt@cmd@lang}{#1} - \minted@configlang{#1}} + \define@key{minted@opt@cmd}{language}{\@namedef{minted@opt@cmd@lang}{#1} + \minted@configlang{#1}} \DeclareRobustCommand\inputsource{\@ifnextchar[\@inputsrc{\@inputsrc[]}} \def\@inputsrc[#1]#2{\inputminted[#1]{\minted@opt@cmd@lang}{#2}} PreambleDefEnd @@ -34,16 +34,16 @@ Template MintedSource HelpText Format source code using the 'minted' package. This template works with minted version 2.1 or higher. - The source language is specified by the 'lang' option, + The source language is specified by the 'language' option, which must be inserted into the 'Option' field in the 'LaTeX and LyX options' tab. Example options: - * linenos,fontsize=\footnotesize,lang=fortran - * bgcolor=yellow,baselinestretch=1.2,lang=c - * frame=lines,framesep=2\fboxsep,lang=python + * linenos,fontsize=\footnotesize,language=fortran + * bgcolor=yellow,baselinestretch=1.2,language=c + * frame=lines,framesep=2\fboxsep,language=python - If 'lang=xxx' is not given, 'lang=latex' is assumed by default. + If 'language=xxx' is not given, 'language=latex' is assumed by default. Make sure to use the '-shell-escape' option for the latex backend. Read the documentation of the minted package for further options and details. -- 2.39.2