Lout 3.37.

svn path=/nixpkgs/trunk/; revision=12886

2 files changed, 38 insertions, 10 deletions

diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh
index 28788fc52277..a46d886ffa2a 100755
--- a/pkgs/tools/typesetting/lout/builder.sh
+++ b/pkgs/tools/typesetting/lout/builder.sh
@@ -22,7 +22,8 @@ installDoc ()
       || return 1
     fi
     cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" &&		\
-    ps2pdf "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf"
+    ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4		\
+           "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf"
   done
 
   return 0
diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix
index e36cc9ad303c..f1d6295a6175 100644
--- a/pkgs/tools/typesetting/lout/default.nix
+++ b/pkgs/tools/typesetting/lout/default.nix
@@ -1,20 +1,47 @@
 {stdenv, fetchurl, ghostscript}:
 
-stdenv.mkDerivation {
-  name = "lout-3.36";
+stdenv.mkDerivation rec {
+  name = "lout-3.37";
+
   src = fetchurl {
-    url = ftp://ftp.cs.usyd.edu.au/jeff/lout/lout-3.36.tar.gz;
-    sha256 = "b689cbe12074be8817c90070b162593fc9cc51f2f8868701833ff599b24fd4ad";
+    urls = [
+      "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz"
+      "mirror://sourceforge/lout/${name}.tar.gz"
+      # XXX: We could add the CTAN mirrors
+      # (see http://www.ctan.org/tex-archive/support/lout/).
+    ];
+    sha256 = "1a388q7rpv27bvily7ii8sv2brns30g1hh77gq50qc7w0wsli0cc";
   };
 
   buildInputs = [ ghostscript ];
   builder = ./builder.sh;
 
   meta = {
-    description = ''Lout is a document layout system, similar in functionality
-    		    to TeX/LaTeX, but based on a purely functional programming
-		    language.  It can produce PostScript output.'';
-    homepage = http://www.cs.usyd.edu.au/~jeff/;
-    license = "GPL";
+    description = "Lout, a document layout system similar in style to LaTeX";
+
+    longDescription = ''
+      The Lout document formatting system is now reads a high-level
+      description of a document similar in style to LaTeX and produces
+      a PostScript or plain text output file.
+
+      Lout offers an unprecedented range of advanced features,
+      including optimal paragraph and page breaking, automatic
+      hyphenation, PostScript EPS file inclusion and generation,
+      equation formatting, tables, diagrams, rotation and scaling,
+      sorted indexes, bibliographic databases, running headers and
+      odd-even pages, automatic cross referencing, multilingual
+      documents including hyphenation (most European languages are
+      supported), formatting of computer programs, and much more, all
+      ready to use.  Furthermore, Lout is easily extended with
+      definitions which are very much easier to write than troff of
+      TeX macros because Lout is a high-level, purely functional
+      language, the outcome of an eight-year research project that
+      went back to the beginning.
+    '';
+
+    # Author's page: http://www.cs.usyd.edu.au/~jeff/ .
+    homepage = http://lout.wiki.sourceforge.net/;
+
+    license = "GPLv3+";
   };
 }