From a14c6822a0ef2177c9cd3d0fd3820220d3064067 Mon Sep 17 00:00:00 2001
From: Meisam Bahadori <meisambahadori@gmail.com>
Date: Sat, 18 Jul 2026 17:38:34 +0200
Subject: [PATCH] Add missing files to pyplot

---
 src/frontend/com_pyplot.c | 98 +++++++++++++++++++++++++++++++++++++++
 src/frontend/com_pyplot.h |  5 ++
 2 files changed, 103 insertions(+)
 create mode 100644 src/frontend/com_pyplot.c
 create mode 100644 src/frontend/com_pyplot.h

diff --git a/src/frontend/com_pyplot.c b/src/frontend/com_pyplot.c
new file mode 100644
index 000000000..82213cbec
--- /dev/null
+++ b/src/frontend/com_pyplot.c
@@ -0,0 +1,98 @@
+/* Enhancement-94: the 'pyplot' command -- plot vectors via matplotlib.
+   Like com_gnuplot(), but the output file base name is OPTIONAL (E-95): the
+   first word is treated as a file name only when it is not itself a plot
+   expression (it contains no '(' and does not name a vector); otherwise the
+   base name defaults to "pyplot" and every word is a plot argument. */
+
+#include <stddef.h>
+#include <string.h>
+
+#include "ngspice/ngspice.h"
+#include "ngspice/bool.h"
+#include "ngspice/wordlist.h"
+#include "ngspice/fteext.h"
+
+#include "plotting/plotit.h"
+#include "../misc/mktemp.h"
+#include "../misc/util.h" /* ngdirname() */
+
+#include "com_pyplot.h"
+
+
+/* matplotlib [file] plotargs */
+void
+com_pyplot(wordlist *wl)
+{
+    char *fname = NULL;
+    char *fullname = NULL;
+    char defname[64] = "pyplot";
+    bool tempf = FALSE;
+    /* Enhancement-183: successive default-named plots must get DISTINCT base
+       names. In window (interactive) mode pyplot launches the Python viewer in
+       the BACKGROUND, so two plots that share the "pyplot" base race on the
+       same pyplot.py/pyplot.data: the second call overwrites the files before
+       the first viewer has read them, and both windows end up showing the
+       second plot (its title, its data). A per-session counter keeps the first
+       default plot named "pyplot" (unchanged) and names later ones
+       "pyplot-2", "pyplot-3", ... so each viewer reads its own files. */
+    static unsigned int autoseq = 0;
+
+    if (!wl)
+        return;
+
+#ifdef HAS_PROGREP
+    SetAnalyse("pyplot", 0);
+#endif
+
+    /* The first word is an output file name only if it is not itself a plot
+       expression -- i.e. it has no '(' (as in v(out), db(...)) and does not
+       name an existing vector (as a bare node name would). Otherwise the base
+       name defaults to "pyplot" and all words are plot arguments. */
+    {
+        const char *w = wl->wl_word;
+        bool is_expr = (strchr(w, '(') != NULL) || (vec_get(w) != NULL);
+        if (!is_expr) {
+            fname = wl->wl_word;
+            wl = wl->wl_next;
+        }
+    }
+
+    if (!fname) {
+        if (autoseq > 0)
+            (void) snprintf(defname, sizeof defname, "pyplot-%u", autoseq + 1);
+        autoseq++;
+        fname = defname;
+    }
+
+    if (cieq(fname, "temp") || cieq(fname, "tmp")) {
+        fname = smktemp("py");
+        tempf = TRUE;
+    }
+
+    /* Enhancement-183: write the .py/.data (and the .png) next to the CIRCUIT
+       FILE, not in whatever directory ngspice happens to have been started
+       from -- so a self-contained deck folder collects its own plot artifacts.
+       Only when the user gave a bare base name (their own path, if any, is
+       respected) and we know where the deck came from; a bare relative deck
+       name (ci_filename dir == ".") is left in the cwd, exactly as before. */
+    if (!tempf && ft_curckt && ft_curckt->ci_filename &&
+            strchr(fname, DIR_TERM) == NULL && strchr(fname, '/') == NULL) {
+        char *dir = ngdirname(ft_curckt->ci_filename);
+        if (dir && dir[0] && !(dir[0] == '.' && dir[1] == '\0')) {
+            fullname = tprintf("%s%s%s", dir, DIR_PATHSEP, fname);
+            fname = fullname;
+        }
+        tfree(dir);
+    }
+
+    if (!wl) /* no plot arguments left */
+        goto done;
+
+    (void) plotit(wl, fname, "pyplot");
+
+done:
+    if (tempf)
+        tfree(fname);
+    if (fullname)
+        tfree(fullname);
+}
diff --git a/src/frontend/com_pyplot.h b/src/frontend/com_pyplot.h
new file mode 100644
index 000000000..8a17dfeae
--- /dev/null
+++ b/src/frontend/com_pyplot.h
@@ -0,0 +1,5 @@
+#ifndef ngspice_COM_PYPLOT_H
+#define ngspice_COM_PYPLOT_H
+
+void com_pyplot(wordlist *wl);
+#endif