Index: tools/pcb2ncap/catlayer.cc
===================================================================
--- tools/pcb2ncap/catlayer.cc	(revision 1332)
+++ tools/pcb2ncap/catlayer.cc	(revision 1333)
@@ -28,33 +28,29 @@
 
 using namespace std;
 
-void
-main (int argc, char **argv)
+void main(int argc, char **argv)
 {
-  if (argc != 4)
-    {
-      cout << "usage: " << argv[0] << " layernum file.pcb file.lpcb" << endl;
-      exit (0);
-    };
+	if (argc != 4) {
+		cout << "usage: " << argv[0] << " layernum file.pcb file.lpcb" << endl;
+		exit(0);
+	};
 
-  ifstream fin1 (argv[2]);
-  ifstream fin2 (argv[3]);
+	ifstream fin1(argv[2]);
+	ifstream fin2(argv[3]);
 
-  string s;
-  string layer = "Layer(";
-  layer += argv[1];
-  int test;
-  while (getline (fin1, s))
-    {
-      cout << s << endl;
-      test = s.find (layer);
-      if (test >= 0)
-	{
-	  getline (fin1, s);
-	  cout << s << endl;
-	  while (getline (fin2, s))
-	    cout << s << endl;
+	string s;
+	string layer = "Layer(";
+	layer += argv[1];
+	int test;
+	while (getline(fin1, s)) {
+		cout << s << endl;
+		test = s.find(layer);
+		if (test >= 0) {
+			getline(fin1, s);
+			cout << s << endl;
+			while (getline(fin2, s))
+				cout << s << endl;
+		};
+
 	};
-
-    };
 };
Index: tools/pcb2ncap/pcb2ncap.cc
===================================================================
--- tools/pcb2ncap/pcb2ncap.cc	(revision 1332)
+++ tools/pcb2ncap/pcb2ncap.cc	(revision 1333)
@@ -33,35 +33,33 @@
 using namespace std;
 
 
-class signal
-{
+class signal {
 public:
-  string des, xpos, ypos;
+	string des, xpos, ypos;
 };
 
 
-class module
-{
+class module {
 private:
 public:
-  int number;
-  int type;
-  int npins;
-  int variant;
-  string description;
-  int position;
-  string xposition;
-  string yposition;
-  string orientation;
+	int number;
+	int type;
+	int npins;
+	int variant;
+	string description;
+	int position;
+	string xposition;
+	string yposition;
+	string orientation;
 
-  string des;
-  string ref;
+	string des;
+	string ref;
 
-  signal signals[100];
+	signal signals[100];
 
-    module (string);
-  void print (void);
-  void make (void);
+	  module(string);
+	void print(void);
+	void make(void);
 };
 
 
@@ -73,135 +71,124 @@
 string xsize, ysize;
 
 void
-module::print (void)
+  module::print(void)
 {
-  arq2 << number << endl << type << endl << npins << endl << variant << endl
-    << description << endl << position << endl << xposition << endl <<
-    yposition << endl << orientation << endl;
-  for (int i = 1; i <= npins; i++)
-    arq2 << signals[i].des << endl;
+	arq2 << number << endl << type << endl << npins << endl << variant << endl
+		<< description << endl << position << endl << xposition << endl << yposition << endl << orientation << endl;
+	for (int i = 1; i <= npins; i++)
+		arq2 << signals[i].des << endl;
 };
 
-void
-module::make (void)
+void module::make(void)
 {
-  char fname[100];
-  char fname2[100];
-  mkdir ("outlines", S_IRWXU | S_IRWXG);
-  sprintf (fname, "outlines/dev%i.%i.0", type, npins);
-  ofstream out (fname);
-  out << "paddef:\ntracking circle 60\npower annulus 80\nend\npins\n";
+	char fname[100];
+	char fname2[100];
+	mkdir("outlines", S_IRWXU | S_IRWXG);
+	sprintf(fname, "outlines/dev%i.%i.0", type, npins);
+	ofstream out(fname);
+	out << "paddef:\ntracking circle 60\npower annulus 80\nend\npins\n";
 
-  int x1 = 0, y1 = 0, x2 = 0, y2 = 0, x3, y3, x4, y4, x5, y5, x6, y6, x7, y7;
-  int xpos, ypos;
-  for (int i = 0; i < npins; i++)
-    {
-      xpos = atoi (signals[i].xpos.c_str ()) - atoi (xposition.c_str ());
-      ypos = atoi (signals[i].ypos.c_str ()) - atoi (yposition.c_str ());
-  //    ypos = atoi (yposition.c_str ()) - atoi (signals[i].ypos.c_str ());
+	int x1 = 0, y1 = 0, x2 = 0, y2 = 0, x3, y3, x4, y4, x5, y5, x6, y6, x7, y7;
+	int xpos, ypos;
+	for (int i = 0; i < npins; i++) {
+		xpos = atoi(signals[i].xpos.c_str()) - atoi(xposition.c_str());
+		ypos = atoi(signals[i].ypos.c_str()) - atoi(yposition.c_str());
+		//    ypos = atoi (yposition.c_str ()) - atoi (signals[i].ypos.c_str ());
 
-      out << xpos << ',' << ypos << endl;
+		out << xpos << ',' << ypos << endl;
 
-      if (xpos < x1)
-	x1 = xpos;
-      if (xpos > x2)
-	x2 = xpos;
-      if (ypos < y1)
-	y1 = ypos;
-      if (ypos > y2)
-	y2 = ypos;
-    };
-  out << "end\n";
-  x1 -= 30;
-  x2 += 30;
-  y1 -= 30;
-  y2 += 30;
+		if (xpos < x1)
+			x1 = xpos;
+		if (xpos > x2)
+			x2 = xpos;
+		if (ypos < y1)
+			y1 = ypos;
+		if (ypos > y2)
+			y2 = ypos;
+	};
+	out << "end\n";
+	x1 -= 30;
+	x2 += 30;
+	y1 -= 30;
+	y2 += 30;
 
-  out << x1 << ',' << y1 << ',' << x2 << ',' << y1 << endl;
-  out << x2 << ',' << y1 << ',' << x2 << ',' << y2 << endl;
-  out << x2 << ',' << y2 << ',' << x1 << ',' << y2 << endl;
-  out << x1 << ',' << y2 << ',' << x1 << ',' << y1 << endl;
+	out << x1 << ',' << y1 << ',' << x2 << ',' << y1 << endl;
+	out << x2 << ',' << y1 << ',' << x2 << ',' << y2 << endl;
+	out << x2 << ',' << y2 << ',' << x1 << ',' << y2 << endl;
+	out << x1 << ',' << y2 << ',' << x1 << ',' << y1 << endl;
 
-  out.close ();
-  sprintf (fname2, "outlines/tab.%i", type);
-  out.open (fname2);
-  out << "description\n!\n" << npins << ".0";
+	out.close();
+	sprintf(fname2, "outlines/tab.%i", type);
+	out.open(fname2);
+	out << "description\n!\n" << npins << ".0";
 };
 
 
-void
-strip (string s)
+void strip(string s)
 {
-  while (s[pos] != '(')
-    pos++;
+	while (s[pos] != '(')
+		pos++;
 };
 
-string
-parse_quotes (string s)
+string parse_quotes(string s)
 {
-  string out = "";
-  while (s[pos] != '\"')
-    pos++;
-  pos++;
-  while (s[pos] != '\"')
-    out += s[pos++];
-  pos++;
-  return out;
+	string out = "";
+	while (s[pos] != '\"')
+		pos++;
+	pos++;
+	while (s[pos] != '\"')
+		out += s[pos++];
+	pos++;
+	return out;
 };
 
-string
-parse_space (string s)
+string parse_space(string s)
 {
-  string out = "";
-  while ((pos < s.size ()) && (s[pos] != '\t') && (s[pos] != ' ')
-	 && (s[pos] != '('))
-    pos++;
-  pos++;
-  while ((pos < s.size ()) && (s[pos] != '\t') && (s[pos] != ' ')
-	 && (s[pos] != ')'))
-    out += s[pos++];
-  return out;
+	string out = "";
+	while ((pos < s.size()) && (s[pos] != '\t') && (s[pos] != ' ')
+				 && (s[pos] != '('))
+		pos++;
+	pos++;
+	while ((pos < s.size()) && (s[pos] != '\t') && (s[pos] != ' ')
+				 && (s[pos] != ')'))
+		out += s[pos++];
+	return out;
 };
 
-void
-parse_element (string s)
+void parse_element(string s)
 {
-  pos = s.find ("PCB");
-  if (pos >= 0)
-    {
-      pos = 0;
-      parse_quotes (s);		//description
-      xsize = parse_space (s);
-      ysize = parse_space (s);
-    };
+	pos = s.find("PCB");
+	if (pos >= 0) {
+		pos = 0;
+		parse_quotes(s);						//description
+		xsize = parse_space(s);
+		ysize = parse_space(s);
+	};
 
-  pos = s.find ("Element(");
-  if (pos >= 0)
-    {
-      devices[ndevices] = new module (s);
-      pin = 0;
-    };
+	pos = s.find("Element(");
+	if (pos >= 0) {
+		devices[ndevices] = new module(s);
+		pin = 0;
+	};
 
-  pos = s.find ("Pin");
-  if (pos >= 0)
-    {
-      pos = 0;
-      strip (s);
-      devices[ndevices - 1]->signals[pin].xpos = parse_space (s);
-      devices[ndevices - 1]->signals[pin].ypos = parse_space (s);
-      pin++;
-      devices[ndevices - 1]->npins = pin;
-    }
-  pos = s.find ("Pad");
-  if (pos >= 0)
-    {
-      pos = 0;
-      strip (s);
-      devices[ndevices - 1]->signals[pin].xpos = parse_space (s);
-      devices[ndevices - 1]->signals[pin].ypos = parse_space (s);
-      pin++;
-      devices[ndevices - 1]->npins = pin;
-    }
+	pos = s.find("Pin");
+	if (pos >= 0) {
+		pos = 0;
+		strip(s);
+		devices[ndevices - 1]->signals[pin].xpos = parse_space(s);
+		devices[ndevices - 1]->signals[pin].ypos = parse_space(s);
+		pin++;
+		devices[ndevices - 1]->npins = pin;
+	}
+	pos = s.find("Pad");
+	if (pos >= 0) {
+		pos = 0;
+		strip(s);
+		devices[ndevices - 1]->signals[pin].xpos = parse_space(s);
+		devices[ndevices - 1]->signals[pin].ypos = parse_space(s);
+		pin++;
+		devices[ndevices - 1]->npins = pin;
+	}
 /*  
   pos=s.find("ElementLine");	
   if(pos >= 0)
@@ -211,115 +198,103 @@
   if(pos >= 0)
     cout<<"ElementArc: "<<s<<endl;
 */
-  pos = s.find ("Mark");
-  if (pos >= 0)
-    {
-      pos = 0;
-      strip (s);
-      devices[ndevices - 1]->xposition = parse_space (s);
-      devices[ndevices - 1]->yposition = parse_space (s);
-    };
+	pos = s.find("Mark");
+	if (pos >= 0) {
+		pos = 0;
+		strip(s);
+		devices[ndevices - 1]->xposition = parse_space(s);
+		devices[ndevices - 1]->yposition = parse_space(s);
+	};
 };
 
-void
-parse_signal (string s)
+void parse_signal(string s)
 {
-  int pos2 = 0;
-  string signal = "", sig = "", uname, upin;
-  pos = 0;
-  while ((s[pos] != ' ') && (s[pos] != '\t'))
-    {
-      signal += s[pos];
-      pos++;
-    };
-  while (s[pos] != '\0')
-    {
-      sig = "";
-      sig = parse_space (s);
-      if (sig.size () > 0)
-	{
-	  pos2 = 0;
-	  uname = "";
-	  while (sig[pos2] != '-')
-	    {
-	      uname += sig[pos2];
-	      pos2++;
-	    };
-	  pos2++;
-	  upin = "";
-	  while (pos2 < sig.size ())
-	    {
-	      upin += sig[pos2];
-	      pos2++;
-	    };
+	int pos2 = 0;
+	string signal = "", sig = "", uname, upin;
+	pos = 0;
+	while ((s[pos] != ' ') && (s[pos] != '\t')) {
+		signal += s[pos];
+		pos++;
+	};
+	while (s[pos] != '\0') {
+		sig = "";
+		sig = parse_space(s);
+		if (sig.size() > 0) {
+			pos2 = 0;
+			uname = "";
+			while (sig[pos2] != '-') {
+				uname += sig[pos2];
+				pos2++;
+			};
+			pos2++;
+			upin = "";
+			while (pos2 < sig.size()) {
+				upin += sig[pos2];
+				pos2++;
+			};
 
-	  for (int o = 0; o < ndevices; o++)
-	    for (int p = 0; p < devices[o]->npins; p++)
-	      if (devices[o]->description == uname)
-		devices[o]->signals[atoi (upin.c_str ())].des = signal;
+			for (int o = 0; o < ndevices; o++)
+				for (int p = 0; p < devices[o]->npins; p++)
+					if (devices[o]->description == uname)
+						devices[o]->signals[atoi(upin.c_str())].des = signal;
+		};
 	};
-    };
 
 };
 
 
-module::module (string s)
+module::module(string s)
 {
-  pos = 0;
+	pos = 0;
 
-  des = parse_quotes (s);
-  description = parse_quotes (s);
-  ref = parse_quotes (s);
-  orientation = "0";
-  number = ndevices++;
-  type = number;
-  npins = 0;
-  variant = 0;
-  position = 1;
-  for (int i = 0; i < 100; i++)
-    signals[i].des = "NC";
+	des = parse_quotes(s);
+	description = parse_quotes(s);
+	ref = parse_quotes(s);
+	orientation = "0";
+	number = ndevices++;
+	type = number;
+	npins = 0;
+	variant = 0;
+	position = 1;
+	for (int i = 0; i < 100; i++)
+		signals[i].des = "NC";
 };
 
 
-void
-main (int argc, char **argv)
+void main(int argc, char **argv)
 {
-  int elm, bytes = 0;
-  string s;
-  int pins = 0;
+	int elm, bytes = 0;
+	string s;
+	int pins = 0;
 
-  if (argc < 2)
-    {
-      cout << "usage: " << argv[0] << " pcbfile <netfile>" << endl;
-      exit (0);
-    };
+	if (argc < 2) {
+		cout << "usage: " << argv[0] << " pcbfile <netfile>" << endl;
+		exit(0);
+	};
 
-  string fname = argv[1];
-  arq.open (fname.c_str ());
-  fname.replace(fname.find(".pcb"),5,".ncap");
-  arq2.open (fname.c_str ());
+	string fname = argv[1];
+	arq.open(fname.c_str());
+	fname.replace(fname.find(".pcb"), 5, ".ncap");
+	arq2.open(fname.c_str());
 
-  while (getline (arq, s))
-    {
-      parse_element (s);
-    };
-  arq.close ();
+	while (getline(arq, s)) {
+		parse_element(s);
+	};
+	arq.close();
 
-  arq.open (argv[2]);
+	arq.open(argv[2]);
 
-  while (getline (arq, s))
-    {
-      parse_signal (s);
-    };
+	while (getline(arq, s)) {
+		parse_signal(s);
+	};
 
 
-  arq2 << "ncapture" << endl << 0 << endl << 0 << endl << layers << endl <<
-    xsize << endl << ysize << endl << xstart << endl << ystart << endl;
+	arq2 << "ncapture" << endl << 0 << endl << 0 << endl << layers << endl <<
+		xsize << endl << ysize << endl << xstart << endl << ystart << endl;
 
-  for (int i = 0; i < ndevices; i++)
-    {
-      devices[i]->print ();
-      devices[i]->make ();
-    };
+	for (int i = 0; i < ndevices; i++) {
+		devices[i]->print();
+		devices[i]->make();
+	};
 
 };
Index: tools/pcb2ncap/up2pcb.cc
===================================================================
--- tools/pcb2ncap/up2pcb.cc	(revision 1332)
+++ tools/pcb2ncap/up2pcb.cc	(revision 1333)
@@ -32,90 +32,85 @@
 
 using namespace std;
 
-float SCALE= 3.0;
-	
-int
-main (int argc, char **argv)
+float SCALE = 3.0;
+
+int main(int argc, char **argv)
 {
-  int x1, y1, x2, y2, r;
-  string s;
-  string fname,fname2;
+	int x1, y1, x2, y2, r;
+	string s;
+	string fname, fname2;
 
-  for (int d = 1; d < argc; d++)
-    {
-      fname = argv[d];
-      FILE *fi, *fo, *fov;
-      float sx,sy;
+	for (int d = 1; d < argc; d++) {
+		fname = argv[d];
+		FILE *fi, *fo, *fov;
+		float sx, sy;
 
-      fi = fopen (fname.c_str (), "r");
-      fname2 =fname+ ".lpcb";
-      fo = fopen (fname2.c_str (), "w");
-      fname2 =fname+ ".vpcb";
-      fov = fopen (fname2.c_str (), "w");
-  
-       while (!feof (fi))
-	{
-	  switch (getc (fi))
-	    {
-	    case 's':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      x2 = getc (fi) + (getc (fi) * 256);
-	      y2 = getc (fi) + (getc (fi) * 256);
+		fi = fopen(fname.c_str(), "r");
+		fname2 = fname + ".lpcb";
+		fo = fopen(fname2.c_str(), "w");
+		fname2 = fname + ".vpcb";
+		fov = fopen(fname2.c_str(), "w");
 
-	      sx= x2/600.0;
-	      sy= y2/800.0;
-	      if(sx<sy)
-	        SCALE=sy;
-	      else
-		SCALE=sx;      
-//	      printf ("s--%i %i %i %i ???\n", x1, y1, x2, y2);
-	      break;
-	    case 'l':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      x2 = getc (fi) + (getc (fi) * 256);
-	      y2 = getc (fi) + (getc (fi) * 256);
-	      fprintf (fo, "Line(%i %i %i %i 20 0x00000000)\n",x1,y1,x2,y2);
-	      break;
-	    case 'c':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      r = getc (fi) + (getc (fi) * 256);
-	      fprintf (fov,"Via(%i %i 60 25 \"\" 0x00000002)\n",x1, y1);
-	      break;
-	    case 'n':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      fprintf (fo, "Line(%i %i %i %i 20 0x00000000)\n",x1,y1,x2,y2);
-	      x2=x1;
-	      y2=y1;
-	      break;
-	    case 'm':
-	      x1 = (getc (fi) * 256) + getc (fi);
-	      y1 = (getc (fi) * 256) + getc (fi);
-	      printf ("m--%0.4f %0.4f moveto\n", x1 / SCALE, y1 / SCALE);
-	      break;
-	    case 'a':
-	      x1 = (getc (fi) * 256) + getc (fi);
-	      y1 = (getc (fi) * 256) + getc (fi);
-	      x2 = (getc (fi) * 256) + getc (fi);
-	      y2 = (getc (fi) * 256) + getc (fi);
-	      r = (getc (fi) * 256) + getc (fi);
-	      printf
-		("a--stroke newpath\n%0.4f %0.4f %0.4f %0.4f %0.4f arc\n",
-		 x1 / SCALE, y1 / SCALE, x2 / SCALE, y2 / SCALE, r / SCALE);
-	      break;
-	    case 'e':
-	      break;
-	    case 't':
-	      while (r != '\0')
-		r = getc (fi);
-	      break;
-	    };
+		while (!feof(fi)) {
+			switch (getc(fi)) {
+			case 's':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				x2 = getc(fi) + (getc(fi) * 256);
+				y2 = getc(fi) + (getc(fi) * 256);
+
+				sx = x2 / 600.0;
+				sy = y2 / 800.0;
+				if (sx < sy)
+					SCALE = sy;
+				else
+					SCALE = sx;
+//        printf ("s--%i %i %i %i ???\n", x1, y1, x2, y2);
+				break;
+			case 'l':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				x2 = getc(fi) + (getc(fi) * 256);
+				y2 = getc(fi) + (getc(fi) * 256);
+				fprintf(fo, "Line(%i %i %i %i 20 0x00000000)\n", x1, y1, x2, y2);
+				break;
+			case 'c':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				r = getc(fi) + (getc(fi) * 256);
+				fprintf(fov, "Via(%i %i 60 25 \"\" 0x00000002)\n", x1, y1);
+				break;
+			case 'n':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				fprintf(fo, "Line(%i %i %i %i 20 0x00000000)\n", x1, y1, x2, y2);
+				x2 = x1;
+				y2 = y1;
+				break;
+			case 'm':
+				x1 = (getc(fi) * 256) + getc(fi);
+				y1 = (getc(fi) * 256) + getc(fi);
+				printf("m--%0.4f %0.4f moveto\n", x1 / SCALE, y1 / SCALE);
+				break;
+			case 'a':
+				x1 = (getc(fi) * 256) + getc(fi);
+				y1 = (getc(fi) * 256) + getc(fi);
+				x2 = (getc(fi) * 256) + getc(fi);
+				y2 = (getc(fi) * 256) + getc(fi);
+				r = (getc(fi) * 256) + getc(fi);
+				printf
+					("a--stroke newpath\n%0.4f %0.4f %0.4f %0.4f %0.4f arc\n", x1 / SCALE, y1 / SCALE, x2 / SCALE, y2 / SCALE, r / SCALE);
+				break;
+			case 'e':
+				break;
+			case 't':
+				while (r != '\0')
+					r = getc(fi);
+				break;
+			};
+		};
+		fclose(fi);
+		fclose(fo);
+		fclose(fov);
 	};
-      fclose (fi);
-      fclose (fo);
-      fclose (fov);
-    };
 };
Index: tools/pcb2ncap/up2ps.cc
===================================================================
--- tools/pcb2ncap/up2ps.cc	(revision 1332)
+++ tools/pcb2ncap/up2ps.cc	(revision 1333)
@@ -32,89 +32,84 @@
 
 using namespace std;
 
-float SCALE= 3.0;
-	
-int
-main (int argc, char **argv)
+float SCALE = 3.0;
+
+int main(int argc, char **argv)
 {
-  int x1, y1, x2, y2, r;
-  string s;
-  string fname;
+	int x1, y1, x2, y2, r;
+	string s;
+	string fname;
 
-  for (int d = 1; d < argc; d++)
-    {
-      fname = argv[d];
-      FILE *fi, *fo;
-      float sx,sy;
+	for (int d = 1; d < argc; d++) {
+		fname = argv[d];
+		FILE *fi, *fo;
+		float sx, sy;
 
-      fi = fopen (fname.c_str (), "r");
-      fname += ".ps";
-      fo = fopen (fname.c_str (), "w");
-      fprintf (fo,
-	       "%!\n\%\%BoundingBox: 18 25 572 579\n/Courier findfont 12 scalefont setfont\n0 0 0 setrgbcolor\n0.1 setlinewidth newpath\n");
-      while (!feof (fi))
-	{
-	  switch (getc (fi))
-	    {
-	    case 's':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      x2 = getc (fi) + (getc (fi) * 256);
-	      y2 = getc (fi) + (getc (fi) * 256);
+		fi = fopen(fname.c_str(), "r");
+		fname += ".ps";
+		fo = fopen(fname.c_str(), "w");
+		fprintf(fo,
+						"%!\n\%\%BoundingBox: 18 25 572 579\n/Courier findfont 12 scalefont setfont\n0 0 0 setrgbcolor\n0.1 setlinewidth newpath\n");
+		while (!feof(fi)) {
+			switch (getc(fi)) {
+			case 's':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				x2 = getc(fi) + (getc(fi) * 256);
+				y2 = getc(fi) + (getc(fi) * 256);
 
-	      sx= x2/600.0;
-	      sy= y2/800.0;
-	      if(sx<sy)
-	        SCALE=sy;
-	      else
-		SCALE=sx;      
-//	      printf ("s--%i %i %i %i ???\n", x1, y1, x2, y2);
-	      break;
-	    case 'l':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      x2 = getc (fi) + (getc (fi) * 256);
-	      y2 = getc (fi) + (getc (fi) * 256);
-	      fprintf (fo, "%0.4f %0.4f moveto %0.4f %0.4f lineto\n",
-		       x1 / SCALE, y1 / SCALE, x2 / SCALE, y2 / SCALE);
-	      break;
-	    case 'c':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      r = getc (fi) + (getc (fi) * 256);
-	      fprintf (fo, "stroke newpath\n%0.4f %0.4f %0.4f 0 360 arc\n",x1 / SCALE, y1 / SCALE, r / SCALE);
-	      break;
-	    case 'n':
-	      x1 = getc (fi) + (getc (fi) * 256);
-	      y1 = getc (fi) + (getc (fi) * 256);
-	      fprintf (fo, "%0.4f %0.4f lineto\n", x1 / SCALE, y1 / SCALE);
-	      break;
-	    case 'm':
-	      x1 = (getc (fi) * 256) + getc (fi);
-	      y1 = (getc (fi) * 256) + getc (fi);
-	      fprintf (fo,"%0.4f %0.4f moveto\n", x1 / SCALE, y1 / SCALE);
-	      break;
-	    case 'a':
-	      x1 = (getc (fi) * 256) + getc (fi);
-	      y1 = (getc (fi) * 256) + getc (fi);
-	      x2 = (getc (fi) * 256) + getc (fi);
-	      y2 = (getc (fi) * 256) + getc (fi);
-	      r = (getc (fi) * 256) + getc (fi);
+				sx = x2 / 600.0;
+				sy = y2 / 800.0;
+				if (sx < sy)
+					SCALE = sy;
+				else
+					SCALE = sx;
+//        printf ("s--%i %i %i %i ???\n", x1, y1, x2, y2);
+				break;
+			case 'l':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				x2 = getc(fi) + (getc(fi) * 256);
+				y2 = getc(fi) + (getc(fi) * 256);
+				fprintf(fo, "%0.4f %0.4f moveto %0.4f %0.4f lineto\n", x1 / SCALE, y1 / SCALE, x2 / SCALE, y2 / SCALE);
+				break;
+			case 'c':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				r = getc(fi) + (getc(fi) * 256);
+				fprintf(fo, "stroke newpath\n%0.4f %0.4f %0.4f 0 360 arc\n", x1 / SCALE, y1 / SCALE, r / SCALE);
+				break;
+			case 'n':
+				x1 = getc(fi) + (getc(fi) * 256);
+				y1 = getc(fi) + (getc(fi) * 256);
+				fprintf(fo, "%0.4f %0.4f lineto\n", x1 / SCALE, y1 / SCALE);
+				break;
+			case 'm':
+				x1 = (getc(fi) * 256) + getc(fi);
+				y1 = (getc(fi) * 256) + getc(fi);
+				fprintf(fo, "%0.4f %0.4f moveto\n", x1 / SCALE, y1 / SCALE);
+				break;
+			case 'a':
+				x1 = (getc(fi) * 256) + getc(fi);
+				y1 = (getc(fi) * 256) + getc(fi);
+				x2 = (getc(fi) * 256) + getc(fi);
+				y2 = (getc(fi) * 256) + getc(fi);
+				r = (getc(fi) * 256) + getc(fi);
 /*	      printf
 		("a--stroke newpath\n%0.4f %0.4f %0.4f %0.4f %0.4f arc\n",
 		x1 / SCALE, y1 / SCALE, x2 / SCALE, y2 / SCALE, r / SCALE);
 */
-        	break;
-	    case 'e':
-	      break;
-	    case 't':
-	      while (r != '\n')
-		r = getc (fi);
-	      break;
-	    };
+				break;
+			case 'e':
+				break;
+			case 't':
+				while (r != '\n')
+					r = getc(fi);
+				break;
+			};
+		};
+		fprintf(fo, "stroke showpage");
+		fclose(fi);
+		fclose(fo);
 	};
-      fprintf (fo, "stroke showpage");
-      fclose (fi);
-      fclose (fo);
-    };
 };