Menu
▾
▴
[Maxima-commits] [git] Maxima CAS branch master updated. branch-5_48-base-291-ga4546c909
|
From: l_butler <l_b...@us...> - 2025-11-27 18:34:27
|
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 CAS".
The branch, master has been updated
via a4546c9094c8d35c9d59e5374285652aec63293d (commit)
via 81712b7ec36931da2fdfc1c663fb3bffee1f2fc3 (commit)
from c380557ab485e0d5fc5b4c775216081f686214df (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 a4546c9094c8d35c9d59e5374285652aec63293d
Author: Atri Bhattacharya <bad...@op...>
Date: Thu Nov 27 12:27:25 2025 -0600
Draw: add support for standalone cairolatex pdf terminal.
Part 2 of 2.
Patch supplied by Atri Bhattacharya <bad...@op...>.
Includes update to documentation.
Ref: https://sourceforge.net/p/maxima/mailman/message/59265356
diff --git a/doc/info/draw.texi b/doc/info/draw.texi
index bdd888d17..0929c79dd 100644
--- a/doc/info/draw.texi
+++ b/doc/info/draw.texi
@@ -1129,6 +1129,7 @@ points in each direction. If they are not integers, they are rounded.
With terminals @code{eps}, @code{epslatex}, @code{epslatex_standalone},
@code{eps_color}, @code{multipage_eps}, @code{multipage_eps_color},
+@code{cairolatex_pdf}, @code{cairolatex_pdf_standalone},
@code{pdf}, @code{multipage_pdf}, @code{pdfcairo},
@code{multipage_pdfcairo}, @code{tikz}, and @code{tikz_standalone}, both
numbers represent hundredths of cm, which means that, by default,
@@ -2726,6 +2727,7 @@ Default value: @code{screen}
Selects the terminal to be used by Gnuplot; possible values are:
@code{screen} (default), @code{png}, @code{pngcairo}, @code{jpg}, @code{gif},
+@code{cairolatex_pdf}, @code{cairolatex_pdf_standalone},
@code{eps}, @code{eps_color}, @code{epslatex}, @code{epslatex_standalone},
@code{svg}, @code{canvas}, @code{dumb}, @code{dumb_file}, @code{pdf}, @code{pdfcairo},
@code{wxt}, @code{animated_gif}, @code{multipage_pdfcairo}, @code{multipage_pdf},
diff --git a/share/draw/gnuplot.lisp b/share/draw/gnuplot.lisp
index 831b5715c..f35129912 100644
--- a/share/draw/gnuplot.lisp
+++ b/share/draw/gnuplot.lisp
@@ -1,7 +1,7 @@
;;; COPYRIGHT NOTICE
;;;
;;; Copyright (C) 2007-2016 Mario Rodriguez Riotorto
-;;; Time-stamp: "2025-11-27 12:22:21 Leo Butler"
+;;; Time-stamp: "2025-11-27 12:27:02 Leo Butler"
;;;
;;; This program is free software; you can redistribute
;;; it and/or modify it under the terms of the
@@ -2857,7 +2857,7 @@
(setf plotcmd
(concatenate 'string
(unless (or *multiplot-is-active*
- (member (get-option '$terminal) '($eps $epslatex $epslatex_standalone $cairolatex_pdf)))
+ (member (get-option '$terminal) '($eps $epslatex $epslatex_standalone $cairolatex_pdf $cairolatex_pdf_standalone)))
(format nil "set obj 1 fc rgb '~a' fs solid 1.0 noborder ~%"
(get-option '$background_color)) )
(if (equal (get-option '$proportional_axes) '$none)
@@ -3344,6 +3344,11 @@
(/ (first (get-option '$dimensions)) 100.0)
(/ (second (get-option '$dimensions)) 100.0)
(get-option '$file_name)))
+ ($cairolatex_pdf_standalone (format cmdstorage "set terminal cairolatex pdf standalone ~a color size ~acm, ~acm~%set out '~a.tex'"
+ (write-font-type)
+ (/ (first (get-option '$dimensions)) 100.0)
+ (/ (second (get-option '$dimensions)) 100.0)
+ (get-option '$file_name)))
(($pdf $multipage_pdf) (format cmdstorage "set terminal pdf dashed enhanced ~a color size ~acm, ~acm~%set out '~a.pdf'"
(write-font-type)
(/ (first (get-option '$dimensions)) 100.0)
@@ -3488,7 +3493,7 @@
(format cmdstorage "~%set size ~a, ~a~%" size1 size2)
(format cmdstorage "set origin ~a, ~a~%" origin1 origin2)
(unless (or *multiplot-is-active*
- (member (get-option '$terminal) '($epslatex $epslatex_standalone $cairolatex_pdf)))
+ (member (get-option '$terminal) '($epslatex $epslatex_standalone $cairolatex_pdf $cairolatex_pdf_standalone)))
(format cmdstorage "set obj 1 rectangle behind from screen ~a,~a to screen ~a,~a~%"
origin1 origin2 (+ origin1 size1 ) (+ origin2 size2))) ))
(setf is1stobj t
@@ -3686,7 +3691,12 @@
(/ (first (get-option '$dimensions)) 100.0)
(/ (second (get-option '$dimensions)) 100.0)
(get-option '$file_name))))
- ($cairolatex_pdf (format str "set terminal cairolatex pdf ~a color colortext size ~acm, ~acm~%set out '~a.tex'"
+ ($cairolatex_pdf (format str "set terminal cairolatex pdf ~a color size ~acm, ~acm~%set out '~a.tex'"
+ (write-font-type)
+ (/ (first (get-option '$dimensions)) 100.0)
+ (/ (second (get-option '$dimensions)) 100.0)
+ (get-option '$file_name)))
+ ($cairolatex_pdf_standalone (format str "set terminal cairolatex pdf standalone ~a color size ~acm, ~acm~%set out '~a.tex'"
(write-font-type)
(/ (first (get-option '$dimensions)) 100.0)
(/ (second (get-option '$dimensions)) 100.0)
diff --git a/share/draw/grcommon.lisp b/share/draw/grcommon.lisp
index 85f6f7d43..934d4c6d6 100644
--- a/share/draw/grcommon.lisp
+++ b/share/draw/grcommon.lisp
@@ -984,7 +984,7 @@
$dumb $dumb_file $pdf $pdfcairo $wxt $animated_gif $windows
$multipage_pdfcairo $multipage_pdf $multipage_eps
$multipage_eps_color $aquaterm $tiff $vrml $obj $stl $pnm $ply
- $cairolatex_pdf)))
+ $cairolatex_pdf $cairolatex_pdf_standalone)))
(cond
((member val terms)
(when (and (eq val '$png) $draw_use_pngcairo)
commit 81712b7ec36931da2fdfc1c663fb3bffee1f2fc3
Author: Atri Bhattacharya <bad...@op...>
Date: Thu Nov 27 12:24:29 2025 -0600
Draw: Add support for cairolatex pdf terminal
Part 1 of 2.
Patch supplied via the mailing list by Atri Bhattacharya
<bad...@op...>.
Ref: https://sourceforge.net/p/maxima/mailman/message/59265356
diff --git a/share/draw/gnuplot.lisp b/share/draw/gnuplot.lisp
index de004eb6e..831b5715c 100644
--- a/share/draw/gnuplot.lisp
+++ b/share/draw/gnuplot.lisp
@@ -1,7 +1,7 @@
;;; COPYRIGHT NOTICE
;;;
;;; Copyright (C) 2007-2016 Mario Rodriguez Riotorto
-;;; Time-stamp: "2024-11-28 17:39:24 Leo Butler"
+;;; Time-stamp: "2025-11-27 12:22:21 Leo Butler"
;;;
;;; This program is free software; you can redistribute
;;; it and/or modify it under the terms of the
@@ -2857,7 +2857,7 @@
(setf plotcmd
(concatenate 'string
(unless (or *multiplot-is-active*
- (member (get-option '$terminal) '($eps $epslatex $epslatex_standalone)))
+ (member (get-option '$terminal) '($eps $epslatex $epslatex_standalone $cairolatex_pdf)))
(format nil "set obj 1 fc rgb '~a' fs solid 1.0 noborder ~%"
(get-option '$background_color)) )
(if (equal (get-option '$proportional_axes) '$none)
@@ -3339,6 +3339,11 @@
(/ (first (get-option '$dimensions)) 100.0)
(/ (second (get-option '$dimensions)) 100.0)
(get-option '$file_name)))
+ ($cairolatex_pdf (format cmdstorage "set terminal cairolatex pdf ~a color size ~acm, ~acm~%set out '~a.tex'"
+ (write-font-type)
+ (/ (first (get-option '$dimensions)) 100.0)
+ (/ (second (get-option '$dimensions)) 100.0)
+ (get-option '$file_name)))
(($pdf $multipage_pdf) (format cmdstorage "set terminal pdf dashed enhanced ~a color size ~acm, ~acm~%set out '~a.pdf'"
(write-font-type)
(/ (first (get-option '$dimensions)) 100.0)
@@ -3483,7 +3488,7 @@
(format cmdstorage "~%set size ~a, ~a~%" size1 size2)
(format cmdstorage "set origin ~a, ~a~%" origin1 origin2)
(unless (or *multiplot-is-active*
- (member (get-option '$terminal) '($epslatex $epslatex_standalone)))
+ (member (get-option '$terminal) '($epslatex $epslatex_standalone $cairolatex_pdf)))
(format cmdstorage "set obj 1 rectangle behind from screen ~a,~a to screen ~a,~a~%"
origin1 origin2 (+ origin1 size1 ) (+ origin2 size2))) ))
(setf is1stobj t
@@ -3681,6 +3686,11 @@
(/ (first (get-option '$dimensions)) 100.0)
(/ (second (get-option '$dimensions)) 100.0)
(get-option '$file_name))))
+ ($cairolatex_pdf (format str "set terminal cairolatex pdf ~a color colortext size ~acm, ~acm~%set out '~a.tex'"
+ (write-font-type)
+ (/ (first (get-option '$dimensions)) 100.0)
+ (/ (second (get-option '$dimensions)) 100.0)
+ (get-option '$file_name)))
($pdf (setf str (format nil "set terminal pdf dashed enhanced ~a color size ~acm, ~acm~%set out '~a.pdf'"
(write-font-type)
(/ (first (get-option '$dimensions)) 100.0)
diff --git a/share/draw/grcommon.lisp b/share/draw/grcommon.lisp
index 513a06074..85f6f7d43 100644
--- a/share/draw/grcommon.lisp
+++ b/share/draw/grcommon.lisp
@@ -983,7 +983,8 @@
$epslatex $epslatex_standalone $svg $tikz $tikz_standalone $x11 $qt
$dumb $dumb_file $pdf $pdfcairo $wxt $animated_gif $windows
$multipage_pdfcairo $multipage_pdf $multipage_eps
- $multipage_eps_color $aquaterm $tiff $vrml $obj $stl $pnm $ply)))
+ $multipage_eps_color $aquaterm $tiff $vrml $obj $stl $pnm $ply
+ $cairolatex_pdf)))
(cond
((member val terms)
(when (and (eq val '$png) $draw_use_pngcairo)
-----------------------------------------------------------------------
Summary of changes:
doc/info/draw.texi | 2 ++
share/draw/gnuplot.lisp | 26 +++++++++++++++++++++++---
share/draw/grcommon.lisp | 3 ++-
3 files changed, 27 insertions(+), 4 deletions(-)
hooks/post-receive
--
Maxima CAS
|
