From 4d26c7626b3bdf581909b4f291d379aa04cc424b Mon Sep 17 00:00:00 2001
From: arno <arno>
Date: Sat, 13 May 2000 10:29:25 +0000
Subject: [PATCH] 	* src/frontend/agraf.c src/frontend/agraf.h 
 src/frontend/grid.c src/frontend/grid.h src/frontend/clip.c 
 src/frontend/clip.h: Moved these files...

	* src/frontend/plotting/agraf.c src/frontend/plotting/agraf.h
	src/frontend/plotting/clip.c src/frontend/plotting/clip.h
	src/frontend/plotting/grid.c src/frontend/plotting/grid.h:
	... here

	* src/frontend/Makefile.am src/frontend/plotting/Makefile.am:
	Updates for new locations.
---
 src/frontend/Makefile.am            |  9 +--------
 src/frontend/agraf.h                | 13 -------------
 src/frontend/plotting/Makefile.am   |  8 ++++++++
 src/frontend/{ => plotting}/agraf.c |  8 ++++----
 src/frontend/plotting/agraf.h       | 18 ++++++++++++++++++
 src/frontend/{ => plotting}/clip.c  |  0
 src/frontend/{ => plotting}/clip.h  |  2 --
 src/frontend/{ => plotting}/grid.c  |  0
 src/frontend/{ => plotting}/grid.h  |  0
 9 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 src/frontend/agraf.h
 rename src/frontend/{ => plotting}/agraf.c (98%)
 create mode 100644 src/frontend/plotting/agraf.h
 rename src/frontend/{ => plotting}/clip.c (100%)
 rename src/frontend/{ => plotting}/clip.h (99%)
 rename src/frontend/{ => plotting}/grid.c (100%)
 rename src/frontend/{ => plotting}/grid.h (100%)

diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 5363c2f0d..07d4b3cdb 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -15,9 +15,8 @@ libfte_a_SOURCES = \
 	com_let.h	\
 	com_setscale.c	\
 	com_setscale.h	\
+	completion.h	\
 	\
-	agraf.c		\
-	agraf.h		\
 	arg.c		\
 	arg.h		\
 	aspice.c	\
@@ -28,8 +27,6 @@ libfte_a_SOURCES = \
 	breakp2.h	\
 	circuits.c	\
 	circuits.h	\
-	clip.c		\
-	clip.h		\
 	cpitf.c		\
 	cpitf.h		\
 	debugcom.c	\
@@ -56,12 +53,8 @@ libfte_a_SOURCES = \
 	fourier.h	\
 	gens.c		\
 	gens.h		\
-	graf.c		\
-	graf.h		\
 	graphdb.c	\
 	graphdb.h	\
-	grid.c		\
-	grid.h		\
 	inp.c		\
 	inp.h		\
 	inpcom.c	\
diff --git a/src/frontend/agraf.h b/src/frontend/agraf.h
deleted file mode 100644
index eb54ee764..000000000
--- a/src/frontend/agraf.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*************
- * Header file for agraf.c
- * 1999 E. Rouat
- ************/
-
-#ifndef AGRAF_H_INCLUDED
-#define AGRAF_H_INCLUDED
-
-void ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, 
-	      struct dvec *vecs, double xdel, double ydel, bool xlog, bool ylog, 
-	      bool nointerp);
-
-#endif
diff --git a/src/frontend/plotting/Makefile.am b/src/frontend/plotting/Makefile.am
index f7585b8af..a0e5bd3e2 100644
--- a/src/frontend/plotting/Makefile.am
+++ b/src/frontend/plotting/Makefile.am
@@ -3,6 +3,14 @@ noinst_LIBRARIES = libplotting.a
 libplotting_a_SOURCES = \
 	plotting.c	\
 	plotting.h	\
+	agraf.c		\
+	agraf.h		\
+	clip.c		\
+	clip.h		\
+	graf.c		\
+	graf.h		\
+	grid.c		\
+	grid.h		\
 	pvec.c		\
 	pvec.h		\
 	plot5.c		\
diff --git a/src/frontend/agraf.c b/src/frontend/plotting/agraf.c
similarity index 98%
rename from src/frontend/agraf.c
rename to src/frontend/plotting/agraf.c
index 53a50c3aa..f6532dd1f 100644
--- a/src/frontend/agraf.c
+++ b/src/frontend/plotting/agraf.c
@@ -36,18 +36,19 @@ ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, s
     char *line1, *line2, c, cb;
     double xrange[2], yrange[2], x1, x2, yy1, y2, x, y;
     int mag, hmt, lmt, dst, spacing, nsp, ypt, upper, lower, curline;
-    double tenpowmag, diff, *values;
+    double tenpowmag, diff;
+    double *values = NULL;
     struct dvec *v;
     int margin = MARGIN_BASE;
     int omargin;
-    register int i, j, k;
+    int i, j, k;
     int shift;
 
 
     /* ANSI C does not specify how many digits are in an exponent for %c
      * We assumed it was 2.  If it's more, shift starting position over.
      */
-    (void) sprintf(buf, "%1.1e", 0.0);		/* expect 0.0e+00 */
+    sprintf(buf, "%1.1e", 0.0);		/* expect 0.0e+00 */
     shift = strlen(buf) - 7;
     margin += shift;
 
@@ -331,4 +332,3 @@ ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, s
         tfree(values);
     return;
 }
-
diff --git a/src/frontend/plotting/agraf.h b/src/frontend/plotting/agraf.h
new file mode 100644
index 000000000..c92b074de
--- /dev/null
+++ b/src/frontend/plotting/agraf.h
@@ -0,0 +1,18 @@
+/*************
+ * Header file for agraf.c
+ * 1999 E. Rouat
+ ************/
+
+#ifndef _AGRAF_H
+#define _AGRAF_H
+
+#include <dvec.h>
+#include <bool.h>
+#include <plot.h>
+
+void ft_agraf(double *xlims, double *ylims, struct dvec *xscale,
+	      struct plot *plot, struct dvec *vecs,
+	      double xdel, double ydel, bool xlog, bool ylog, 
+	      bool nointerp);
+
+#endif
diff --git a/src/frontend/clip.c b/src/frontend/plotting/clip.c
similarity index 100%
rename from src/frontend/clip.c
rename to src/frontend/plotting/clip.c
diff --git a/src/frontend/clip.h b/src/frontend/plotting/clip.h
similarity index 99%
rename from src/frontend/clip.h
rename to src/frontend/plotting/clip.h
index d5eee1f39..24fb3abbe 100644
--- a/src/frontend/clip.h
+++ b/src/frontend/plotting/clip.h
@@ -10,6 +10,4 @@
 bool clip_line(int *pX1, int *pY1, int *pX2, int *pY2, int l, int b, int r, int t);
 bool clip_to_circle(int *x1, int *y1, int *x2, int *y2, int cx, int cy, int rad);
 
-
-
 #endif
diff --git a/src/frontend/grid.c b/src/frontend/plotting/grid.c
similarity index 100%
rename from src/frontend/grid.c
rename to src/frontend/plotting/grid.c
diff --git a/src/frontend/grid.h b/src/frontend/plotting/grid.h
similarity index 100%
rename from src/frontend/grid.h
rename to src/frontend/plotting/grid.h