diff --git a/Setup.lhs b/Setup.lhs --- a/Setup.lhs +++ b/Setup.lhs diff --git a/doc/macros.tex b/doc/macros.tex --- a/doc/macros.tex +++ b/doc/macros.tex @@ -1,6 +1,6 @@ % Custom macros. -\newcommand{\vtyuiversion}{1.3} +\newcommand{\vtyuiversion}{1.3.1} \newcommand{\fw}[1]{\texttt{#1}} \newcommand{\vtyui}{\fw{vty-ui}} diff --git a/doc/minted.sty b/doc/minted.sty deleted file mode 100644 --- a/doc/minted.sty +++ /dev/null @@ -1,227 +0,0 @@ -%% -%% This is file `minted.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% minted.dtx (with options: `package') -%% Copyright 2010 Konrad Rudolph -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% Additionally, the project may be distributed under the terms of the new BSD -%% license. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Konrad Rudolph. -%% -%% This work consists of the files mints.dtx and mints.ins -%% and the derived file mints.sty. -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{minted}[2010/01/27 v1.6 Yet another Pygments shim for LaTeX] -\RequirePackage{keyval} -\RequirePackage{fancyvrb} -\RequirePackage{color} -\RequirePackage{float} -\RequirePackage{ifthen} -\RequirePackage{calc} -\RequirePackage{ifplatform} -\ifwindows - \providecommand\DeleteFile[1]{\immediate\write18{del #1}} -\else - \providecommand\DeleteFile[1]{\immediate\write18{rm #1}} -\fi -\newboolean{AppExists} -\providecommand\TestAppExists[1]{ - \ifwindows - \DeleteFile{\jobname.aex} - \immediate\write18{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd) - do set >\jobname.aex >\jobname.aex} %$ - \newread\@appexistsfile - \immediate\openin\@appexistsfile\jobname.aex - \expandafter\def\expandafter\@tmp@cr\expandafter{\the\endlinechar} - \endlinechar=-1\relax - \readline\@appexistsfile to \@apppathifexists - \endlinechar=\@tmp@cr - \ifthenelse{\equal{\@apppathifexists}{}} - {\AppExistsfalse} - {\AppExiststrue} - \immediate\closein\@appexistsfile - \DeleteFile{\jobname.aex} -\immediate\typeout{file deleted} - \else - \immediate\write18{which #1 && touch \jobname.aex} - \IfFileExists{\jobname.aex} - {\AppExiststrue - \DeleteFile{\jobname.aex}} - {\AppExistsfalse} - \fi} -\newcommand\minted@resetoptions{} -\newcommand\minted@defopt[1]{ - \expandafter\def\expandafter\minted@resetoptions\expandafter{% - \minted@resetoptions - \@namedef{minted@opt@#1}{}}} -\newcommand\minted@opt[1]{ - \expandafter\detokenize% - \expandafter\expandafter\expandafter{\csname minted@opt@#1\endcsname}} -\newcommand\minted@define@opt[3][]{ - \minted@defopt{#2} - \ifthenelse{\equal{#1}{}}{ - \define@key{minted@opt}{#2}{\@namedef{minted@opt@#2}{#3}}} - {\define@key{minted@opt}{#2}[#1]{\@namedef{minted@opt@#2}{#3}}}} -\newcommand\minted@define@switch[2]{ - \minted@defopt{#1} - \define@booleankey{minted@opt}{#1}{ - \@namedef{minted@opt@#1}{#2}} - {\@namedef{minted@opt@#1}{}}} -\minted@defopt{extra} -\newcommand\minted@define@extra[1]{ - \define@key{minted@opt}{#1}{ - \expandafter\def\expandafter\minted@opt@extra\expandafter{% - \minted@opt@extra,#1=##1}}} -\newcommand\minted@define@extra@switch[1]{ - \define@booleankey{minted@opt}{#1} - {\expandafter\def\expandafter\minted@opt@extra\expandafter{% - \minted@opt@extra,#1}} - {\expandafter\def\expandafter\minted@opt@extra\expandafter{% - \minted@opt@extra,#1=false}}} -\minted@define@switch{texcl}{-P texcomments} -\minted@define@switch{mathescape}{-P mathescape} -\minted@define@switch{linenos}{-P linenos} -\minted@define@opt{gobble}{-F gobble:n=#1} -\minted@define@opt{bgcolor}{#1} -\minted@define@extra{frame} -\minted@define@extra{framesep} -\minted@define@extra{framerule} -\minted@define@extra{rulecolor} -\minted@define@extra{numbersep} -\minted@define@extra{firstnumber} -\minted@define@extra{stepnumber} -\minted@define@extra{firstline} -\minted@define@extra{lastline} -\minted@define@extra{baselinestretch} -\minted@define@extra{xleftmargin} -\minted@define@extra{xrightmargin} -\minted@define@extra{fillcolor} -\minted@define@extra{tabsize} -\minted@define@extra{fontfamily} -\minted@define@extra{fontsize} -\minted@define@extra{fontshape} -\minted@define@extra{fontseries} -\minted@define@extra{formatcom} -\minted@define@extra@switch{numberblanklines} -\minted@define@extra@switch{showspaces} -\minted@define@extra@switch{resetmargins} -\minted@define@extra@switch{samepage} -\minted@define@extra@switch{showtabs} -\minted@define@extra@switch{obeytabs} -\newsavebox{\minted@bgbox} -\newenvironment{minted@colorbg}[1]{ - \def\minted@bgcol{#1} - \noindent - \begin{lrbox}{\minted@bgbox} - \begin{minipage}{\linewidth-2\fboxsep}} - {\end{minipage} - \end{lrbox}% - \colorbox{\minted@bgcol}{\usebox{\minted@bgbox}}} -\newwrite\minted@code -\newcommand\minted@savecode[1]{ - \immediate\openout\minted@code\jobname.pyg - \immediate\write\minted@code{#1} - \immediate\closeout\minted@code} -\newcommand\minted@pygmentize[2][\jobname.pyg]{ - \def\minted@cmd{pygmentize -l #2 -f latex -F tokenmerge - \minted@opt{gobble} \minted@opt{texcl} \minted@opt{mathescape} - \minted@opt{linenos} -P "verboptions=\minted@opt{extra}" - -o \jobname.out.pyg #1} - \immediate\write18{\minted@cmd} - \ifthenelse{\equal{\minted@opt@bgcolor}{}} - {} - {\begin{minted@colorbg}{\minted@opt@bgcolor}} - \input{\jobname.out.pyg} - \ifthenelse{\equal{\minted@opt@bgcolor}{}} - {} - {\end{minted@colorbg}} - \DeleteFile{\jobname.out.pyg}} -\newcommand\minted@usedefaultstyle{\usemintedstyle{default}} -\newcommand\usemintedstyle[1]{ - \renewcommand\minted@usedefaultstyle{} - \immediate\write18{pygmentize -S #1 -f latex > \jobname.pyg} - \input{\jobname.pyg}} -\newcommand\mint[3][]{ - \DefineShortVerb{#3} - \minted@resetoptions - \setkeys{minted@opt}{#1} - \SaveVerb[aftersave={ - \UndefineShortVerb{#3} - \minted@savecode{\FV@SV@minted@verb} - \minted@pygmentize{#2} - \DeleteFile{\jobname.pyg}}]{minted@verb}#3} -\newcommand\minted@proglang[1]{} -\newenvironment{minted}[2][] - {\VerbatimEnvironment - \renewcommand{\minted@proglang}[1]{#2} - \minted@resetoptions - \setkeys{minted@opt}{#1} - \begin{VerbatimOut}{\jobname.pyg}}% - {\end{VerbatimOut} - \minted@pygmentize{\minted@proglang{}} - \DeleteFile{\jobname.pyg}} -\newcommand\inputminted[3][]{ - \minted@resetoptions - \setkeys{minted@opt}{#1} - \minted@pygmentize[#3]{#2}} -\newcommand\newminted[3][]{ - \ifthenelse{\equal{#1}{}} - {\def\minted@envname{#2code}} - {\def\minted@envname{#1}} - \newenvironment{\minted@envname} - {\VerbatimEnvironment\begin{minted}[#3]{#2}} - {\end{minted}} - \newenvironment{\minted@envname *}[1] - {\VerbatimEnvironment\begin{minted}[#3,##1]{#2}} - {\end{minted}}} -\newcommand\newmint[3][]{ - \ifthenelse{\equal{#1}{}} - {\def\minted@shortname{#2}} - {\def\minted@shortname{#1}} - \expandafter\newcommand\csname\minted@shortname\endcsname[2][]{ - \mint[#3,##1]{#2}##2}} -\newcommand\newmintedfile[3][]{ - \ifthenelse{\equal{#1}{}} - {\def\minted@shortname{#2file}} - {\def\minted@shortname{#1}} - \expandafter\newcommand\csname\minted@shortname\endcsname[2][]{ - \inputminted[#3,##1]{#2}{##2}}} -\newfloat{listing}{h}{lol} -\newcommand\listingscaption{Listing} -\floatname{listing}{\listingscaption} -\newcommand\listoflistingscaption{List of listings} -\providecommand\listoflistings{\listof{listing}{\listoflistingscaption}} -\AtBeginDocument{ - \minted@usedefaultstyle} -\AtEndOfPackage{ - \ifeof18 - \PackageError{minted} - {You must invoke LaTeX with the - -shell-escape flag} - {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty - documentation for more information.}\fi} - \TestAppExists{pygmentize} - \ifAppExists\else - \PackageError{minted} - {You must have `pygmentize' installed - to use this package} - {Refer to the installation instructions in the minted - documentation for more information.} - \fi -\endinput -%% -%% End of file `minted.sty'. diff --git a/src/Graphics/Vty/Widgets/Core.hs b/src/Graphics/Vty/Widgets/Core.hs --- a/src/Graphics/Vty/Widgets/Core.hs +++ b/src/Graphics/Vty/Widgets/Core.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ExistentialQuantification, DeriveDataTypeable, TypeSynonymInstances #-} +{-# LANGUAGE ExistentialQuantification, DeriveDataTypeable, TypeSynonymInstances, FlexibleInstances #-} -- |This module is the core of this library; it provides -- infrastructure for creating new types of widgets and extending -- their functionality. This module provides various bits of diff --git a/src/Graphics/Vty/Widgets/DirBrowser.hs b/src/Graphics/Vty/Widgets/DirBrowser.hs --- a/src/Graphics/Vty/Widgets/DirBrowser.hs +++ b/src/Graphics/Vty/Widgets/DirBrowser.hs @@ -19,6 +19,7 @@ import Data.IORef import qualified Data.Map as Map +import qualified Control.Exception as E import Control.Monad import Graphics.Vty import Graphics.Vty.Widgets.Core @@ -260,7 +261,7 @@ (res, entries) <- (do entries <- getDirectoryContents cPath return (True, entries)) - `catch` \e -> do + `E.catch` \e -> do reportBrowserError b (ioeGetErrorString e) return (False, []) diff --git a/test/src/Tests/Instances.hs b/test/src/Tests/Instances.hs --- a/test/src/Tests/Instances.hs +++ b/test/src/Tests/Instances.hs @@ -6,7 +6,7 @@ import Graphics.Vty -instance (Arbitrary a, Eq a) => Arbitrary (MaybeDefault a) where +instance (Show a, Arbitrary a, Eq a) => Arbitrary (MaybeDefault a) where arbitrary = oneof [ pure Default , pure KeepCurrent , SetTo <$> arbitrary diff --git a/vty-ui.cabal b/vty-ui.cabal --- a/vty-ui.cabal +++ b/vty-ui.cabal @@ -1,5 +1,5 @@ Name: vty-ui -Version: 1.3 +Version: 1.3.1 Synopsis: An interactive terminal user interface library for Vty Description: An extensible library of user interface widgets @@ -63,7 +63,6 @@ doc/vty-ui-users-manual.tex doc/title_page.tex doc/toc.tex - doc/minted.sty Source-Repository head type: git