diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-04-28 11:06:56 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-04-28 11:06:56 +0000 |
commit | 0875919fa1fe841b7469292aeb8da5b0c4d59a87 (patch) | |
tree | 54446cbd475bdc4f99f3b87c87b55b14fdbd6c21 | |
parent | c6cf72aaa921cecedad2d47346d45e78afb34d72 (diff) |
Now Linux Libertine font works in TeX
svn path=/nixpkgs/trunk/; revision=11740
-rw-r--r-- | pkgs/data/fonts/libertine/2.7.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/builder-defs.nix | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/data/fonts/libertine/2.7.nix b/pkgs/data/fonts/libertine/2.7.nix index 3210f20d50184..271e128b1298a 100644 --- a/pkgs/data/fonts/libertine/2.7.nix +++ b/pkgs/data/fonts/libertine/2.7.nix @@ -12,6 +12,9 @@ rec { phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"]; createTTF=false; + extraFontForgeCommands = '' + ScaleToEm(1000); + ''; name = "linux-libertine-" + version; meta = { diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index 8d839c3ba09ea..ee7aafbdd25af 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -410,8 +410,9 @@ args: with args; with stringsWithDeps; with lib; generateFontsFromSFD = noDepEntry('' for i in *.sfd; do ${args.fontforge}/bin/fontforge -c \ - 'Open($1); - Reencode("unicode"); + 'Open($1); + ${optionalString (args ? extraFontForgeCommands) args.extraFontForgeCommands + }Reencode("unicode"); ${optionalString (getAttr ["createTTF"] true args) ''Generate($1:r + ".ttf");''} ${optionalString (getAttr ["createOTF"] true args) ''Generate($1:r + ".otf");''} Reencode("TeX-Base-Encoding"); |