diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-17 19:08:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-17 19:08:53 -0400 |
| commit | ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b (patch) | |
| tree | bd73bf8f8dabc046c12c53295b18daad49379887 /gnu/packages/engineering.scm | |
| parent | 5fba12ecd3146e17d826167b6b9ffdfcbe2a49c9 (diff) | |
| parent | 9e2592a3466c72dbfb64494e1316ce8af1554647 (diff) | |
| download | guix-ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b.tar guix-ccb522324bd99cc379ada4a1da5b8bcfd7d12c5b.tar.gz | |
Merge branch 'master' into dbus-update
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 54e43ef0f8..1c378f63a7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -237,6 +237,9 @@ optimizer; and it can produce photorealistic and design review images.") (sha256 (base32 "0x37vfp6k0d2z3gnig0hbicvi0jp8v267xjnn3z8jdllpiaa6p3k")) + (snippet + ;; Remove a non-free file. + '(delete-file "doc/psfig.sty")) (modules '((guix build utils) (guix build download) (guix ftp-client))) @@ -265,8 +268,18 @@ optimizer; and it can produce photorealistic and design review images.") (("\\\\special\\{psfile=([^,]*),.*scale=([#0-9.]*).*\\}" all file scale) (string-append "\\includegraphics[scale=" scale "]{" - file "}"))) - (substitute* '("doc/mtt.tex" "doc/tcad.tex") + file "}")) + (("\\\\psfig\\{figure=([^,]*),.*width=([#0-9.]*in).*\\}" + all file width) + (string-append "\\includegraphics[width=" width "]{" + file "}")) + (("\\\\psfig\\{figure=([^,]*),.*height=([#0-9.]*in).*\\}" + all file height) + (string-append "\\includegraphics[height=" height "]{" + file "}")) + (("\\\\psfig\\{figure=([^,]*)\\}" all file) + (string-append "\\includegraphics{" file "}"))) + (substitute* '("doc/mtt.tex" "doc/tcad.tex" "doc/ug.tex") (("^\\\\documentstyle\\[(.*)\\]\\{(.*)\\}" all options class) (string-append "\\documentclass[" options "]{" |