From: Mario R. R. <rio...@us...> - 2012-11-03 10:36:24
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima, A Computer Algebra System". The branch, master has been updated via cc7bbf75141da55ba9e147158fecead8668f79ef (commit) from bb3baf1817573bcaae8b40b92ca26e78a862005b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cc7bbf75141da55ba9e147158fecead8668f79ef Author: Mario Rodriguez <rio...@us...> Date: Sat Nov 3 11:34:55 2012 +0100 Let x11 terminal be set by the user diff --git a/share/draw/draw.lisp b/share/draw/draw.lisp index 3141079..f5af411 100644 --- a/share/draw/draw.lisp +++ b/share/draw/draw.lisp @@ -3130,6 +3130,11 @@ (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))))) + ($x11 (format cmdstorage "set terminal x11 enhanced ~a ~a size ~a, ~a~%" + *draw-terminal-number* + (write-font-type) + (round (first (get-option '$dimensions))) + (round (second (get-option '$dimensions))))) (otherwise ; default screen output (cond (*windows-OS* ; running on windows operating system @@ -3294,7 +3299,7 @@ (cond ; connect to gnuplot via pipes ((and (not *windows-OS*) - (member (get-option '$terminal) '($screen $aquaterm $wxt)) + (member (get-option '$terminal) '($screen $aquaterm $wxt $x11)) (equal $draw_renderer '$gnuplot_pipes)) (check-gnuplot-process) (when (not *multiplot-is-active*) ; not in a one window multiplot @@ -3304,7 +3309,7 @@ (format nil "load '~a'" gfn))) ; call gnuplot via system command (t - ($system (if (member (get-option '$terminal) '($screen $aquaterm $wxt)) + ($system (if (member (get-option '$terminal) '($screen $aquaterm $wxt $x11)) (format nil "~a ~a" $gnuplot_command (format nil $gnuplot_view_args gfn)) diff --git a/share/draw/grcommon.lisp b/share/draw/grcommon.lisp index eb810e0..ecd09f4 100644 --- a/share/draw/grcommon.lisp +++ b/share/draw/grcommon.lisp @@ -339,7 +339,7 @@ (defun update-terminal (val) (let ((terms '($screen $png $pngcairo $jpg $gif $eps $eps_color - $epslatex $epslatex_standalone $svg + $epslatex $epslatex_standalone $svg $x11 $dumb $dumb_file $pdf $pdfcairo $wxt $animated_gif $multipage_pdfcairo $multipage_pdf $multipage_eps $multipage_eps_color $aquaterm $tiff $vrml $obj $pnm))) ----------------------------------------------------------------------- Summary of changes: share/draw/draw.lisp | 9 +++++++-- share/draw/grcommon.lisp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- Maxima, A Computer Algebra System |