X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo-listing.tex;h=ccd0d9cf0fb23aaf14f40177959df3a41ed95473;hb=7dfe6fdee9d819258393544917c871f6b85a3eb8;hp=f898aba13ea886be03258fea0bfc61dd1ee72dd9;hpb=fc7cfa7f3d02715cb09eae2e1c6bc501dc2d8d50;p=mjotex.git

diff --git a/mjo-listing.tex b/mjo-listing.tex
index f898aba..ccd0d9c 100644
--- a/mjo-listing.tex
+++ b/mjo-listing.tex
@@ -14,8 +14,13 @@
 \def\havemjolisting{1}
 
 
-\usepackage{listings}
-\usepackage{tcolorbox}
+\ifx\lstset\undefined
+  \usepackage{listings}
+\fi
+
+\ifx\tcbuselibrary\undefined
+  \usepackage{tcolorbox}
+\fi
 
 % Tell tcolorbox to use ``listings'' within the boxes.
 \tcbuselibrary{listings}
@@ -50,12 +55,15 @@
 %
 % The sole argument is the "name" of the listing, which ultimately
 % just identifies a file named "sage_listings/<name>.listing".
-\newcommand*{\sagelisting}[1]{\tcbinputlisting{listing only,%
-               colback=codebg,%
-               coltext=codefg,%
-               left=2em,%
-               listing options={language=sage,style=sage},%
-               listing file=sage_listings/#1.listing}}
-
+\newtcbinputlisting{\sagelisting}[2][]{%
+  colback=codebg,%
+  coltext=codefg,%
+  enlarge bottom finally by=\baselineskip,%
+  enlarge top initially by=\baselineskip,%
+  left=2em,%
+  listing only,%
+  listing options={language=sage,style=sage},%
+  listing file=sage_listings/#2.listing,%
+  #1}
 
 \fi