tex2lyx: complete minted support (inputminted)

Also fix some whitespace issues in minted inset import.

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 0fe7d44e717988fe4816078055f7c740bc00abb1..be5d7700217508f327b2d8a9153226bee82ab30a 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -58,12 +58,6 @@ Format LaTeX feature                        LyX feature
       \begin{btUnit}...\end{btUnit}        \multibib {none|part|chapter|section|subsection}
         (if a part, chapter, section etc.
          follows the \begin...)
-544   Minted support
-      \usepackage{minted}                  \use_minted
-      \begin{minted}{lang}                 \begin_inset listings
-      \end{minted}
-      \lyxmintcaption[]{caption\label{}}   add to include inset
-      \inputminted{tex}{Intro.fls}         \begin_inset include ...
 
 
 

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 3049b87f2e5d92521d03a89a69fc305909c932c6..6a89ac02dafb2d0232922be0a3b47adc98201965 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1118,7 +1118,7 @@ Inline:
 \begin_inset listings
 lstparams "language={C++},keywordstyle={\color{green}}"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 int a=5;
@@ -1138,7 +1138,7 @@ int a=5;
 \begin_inset listings
 lstparams "caption={Example Listing float},label={lst:Example-Listing},language=Python"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 # Example listing float
@@ -1222,7 +1222,7 @@ symbol
 \begin_inset listings
 lstparams "extendedchars=true,firstline=3,language=Python,lastline=8,numbers=left,showspaces=true,stepnumber=3"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def func(param):
@@ -1270,7 +1270,7 @@ Special cases:
 \begin_inset listings
 lstparams "abovecaptionskip=2em,basicstyle={\large\ttfamily},breaklines=true,extendedchars=true,firstline=2,float=h,language={[R/3 3.1]ABAP},lastline=5,numbers=left,numberstyle={\scriptsize},showspaces=true,showstringspaces=false,stepnumber=3,tabsize=4"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 hello
@@ -1286,7 +1286,7 @@ hello
 \begin_inset listings
 lstparams "language=TeX"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index b340878d369d1de15aaf53608ea5fbae8bedb2ec..f0446a1abd4d4defec2df33490f44a9cf0c22c99 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1178,7 +1178,7 @@ Inline:
 \begin_inset listings
 lstparams "language={C++},keywordstyle={\color{green}}"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 int a=5;
@@ -1198,7 +1198,7 @@ int a=5;
 \begin_inset listings
 lstparams "caption={Example Listing float},label={lst:Example-Listing},language=Python"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 # Example listing float
@@ -1282,7 +1282,7 @@ symbol
 \begin_inset listings
 lstparams "extendedchars=true,firstline=3,language=Python,lastline=8,numbers=left,showspaces=true,stepnumber=3"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def func(param):
@@ -1330,7 +1330,7 @@ Special cases:
 \begin_inset listings
 lstparams "abovecaptionskip=2em,basicstyle={\large\ttfamily},breaklines=true,extendedchars=true,firstline=2,float=h,language={[R/3 3.1]ABAP},lastline=5,numbers=left,numberstyle={\scriptsize},showspaces=true,showstringspaces=false,stepnumber=3,tabsize=4"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 hello
@@ -1346,7 +1346,7 @@ hello
 \begin_inset listings
 lstparams "language=TeX"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 

diff --git a/src/tex2lyx/test/test-minted.lyx.lyx b/src/tex2lyx/test/test-minted.lyx.lyx
index b043e36d4b3d590b623d166b0a1ea1745345b75e..6ae92dc36c501fa9acab49c1bbfe5a07ac9ca21b 100644 (file)
--- a/src/tex2lyx/test/test-minted.lyx.lyx
+++ b/src/tex2lyx/test/test-minted.lyx.lyx
@@ -102,7 +102,7 @@ Inline:
 \begin_inset listings
 lstparams "style=bw,language=C++"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 int a=5;
@@ -137,7 +137,7 @@ noprefix "false"
 \begin_inset listings
 lstparams "language=Python,float=h"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 # Example listing float
@@ -216,7 +216,7 @@ symbol
 \begin_inset listings
 lstparams "firstline=4,numbers=left,showspaces=true,language=Python"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def func(param):
@@ -252,7 +252,7 @@ A floating one-liner with [h] placement and without caption:
 \begin_inset listings
 lstparams "fontfamily=tt,fontsize={\large},bgcolor=lightgray,language=ABAP,float=h"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 hello
@@ -269,7 +269,7 @@ Another inline listing:
 \begin_inset listings
 lstparams "language=TeX"
 inline true
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -298,11 +298,11 @@ noprefix "false"
 
 \end_inset
 
-):  
+): 
 \begin_inset listings
 lstparams "numbers=left,frame=lines,language=C"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 
@@ -372,7 +372,7 @@ noprefix "false"
 \begin_inset listings
 lstparams "numbers=left,frame=lines,language=Fortran"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 subroutine incr(i)
@@ -417,10 +417,6 @@ A Fortran subroutine
 
 \end_inset
 
-
-\end_layout
-
-\begin_layout Standard
 A framed floating listing with a caption and a label (Listing
 \begin_inset space ~
 
@@ -440,7 +436,7 @@ noprefix "false"
 \begin_inset listings
 lstparams "frame=single,language=Python,float=h"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def boring(args = None):
@@ -495,7 +491,7 @@ noprefix "false"
 ): \begin_inset listings
 lstparams "frame=single,language=Python,float=h"
 inline false
-status collapsed
+status open
 
 \begin_layout Plain Layout
 def boring(args = None):

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 6c29d4bc72666a82cb4b1b9ab4d34ba5c06d5da3..3916fd3880faae1d9165e5859bce50a3615f693d 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1483,7 +1483,7 @@ void parse_listings(Parser & p, ostream & os, Context & parent_context,
                os << "inline true\n";
        else
                os << "inline false\n";
-       os << "status collapsed\n";
+       os << "status open\n";
        Context context(true, parent_context.textclass);
        context.layout = &parent_context.textclass.plainLayout();
        if (use_minted && prefixIs(minted_nonfloat_caption, "[t]")) {
@@ -2001,6 +2001,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                                                parse_text_snippet(p, FLAG_ITEM,
                                                        false, parent_context);
                                        minted_nonfloat_caption = "[b]" + caption;
+                                       eat_whitespace(p, os, parent_context, true);
                                }
                        }
                        p.popPosition();
@@ -4450,6 +4451,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                // so simply skip it.
                                parse_text_snippet(p, FLAG_ITEM, false, context);
                        }
+                       eat_whitespace(p, os, context, true);
                        continue;
                }
 
@@ -4784,7 +4786,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
                if (t.cs() == "input" || t.cs() == "include"
                    || t.cs() == "verbatiminput"
-                   || t.cs() == "lstinputlisting") {
+                   || t.cs() == "lstinputlisting"
+                   || t.cs() == "inputminted") {
                        string name = t.cs();
                        if (name == "verbatiminput"
                            && p.next_token().asInput() == "*")
@@ -4798,6 +4801,39 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                literal = !oa.first;
                                if (literal)
                                        lstparams = subst(lstparams, "\n", " ");
+                       } else if (name == "inputminted") {
+                               name = "lstinputlisting";
+                               string const lang = p.getArg('{', '}');
+                               if (lang != "tex") {
+                                       string cmd = "\\inputminted{" + lang + "}{";
+                                       cmd += p.getArg('{', '}') + "}";
+                                       output_ert_inset(os, cmd, context);
+                                       continue;
+                               }
+                               if (prefixIs(minted_nonfloat_caption, "[t]")) {
+                                       minted_nonfloat_caption.erase(0,3);
+                                       // extract label and caption from the already produced LyX code
+                                       vector<string> nfc = getVectorFromString(minted_nonfloat_caption, "\n");
+                                       string const caption = nfc.front();
+                                       string label;
+                                       vector<string>::iterator it =
+                                               find(nfc.begin(), nfc.end(), "LatexCommand label");
+                                       if (it != nfc.end()) {
+                                               ++it;
+                                               if (it != nfc.end())
+                                                       label = *it;
+                                               label = support::split(label, '"');
+                                               label.pop_back();
+                                       }
+                                       minted_nonfloat_caption.clear();
+                                       lstparams = "caption=" + caption;
+                                       if (!label.empty())
+                                               lstparams += ",label=" + label;
+                                       pair<bool, string> oa = convert_latexed_command_inset_arg(lstparams);
+                                       literal = !oa.first;
+                                       if (literal)
+                                               lstparams = subst(lstparams, "\n", " ");
+                               }
                        }
                        string lit = literal ? "\"true\"" : "\"false\"";
                        string filename(normalize_filename(p.getArg('{', '}')));