diff --git a/Makefile b/Makefile index f05df311fb42837b84e456aa78285c3410573fe1..0c567cb188cbd5dad999da26ad13657dc0ffe2a8 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ distrib: mkdir gl2ps-${RELEASE} cd doc && ${MAKE} cp TODO COPYING.GL2PS COPYING.LGPL gl2ps.c gl2ps.h gl2psTest.c\ - doc/gl2ps.pdf gl2ps-${RELEASE} + gl2psTestSimple.c doc/gl2ps.pdf gl2ps-${RELEASE} tar zcvf gl2ps-${RELEASE}.tgz gl2ps-${RELEASE} @echo "********************************************************************" @echo "Did you remember to untabify both gl2ps.c and gl2ps.h?" @@ -49,6 +49,6 @@ distrib-nightly: mkdir gl2ps-${DATE} cd doc && ${MAKE} gl2ps.pdf cp TODO COPYING.GL2PS COPYING.LGPL gl2ps.c gl2ps.h gl2psTest.c\ - doc/gl2ps.pdf gl2ps-${DATE} + gl2psTestSimple.c doc/gl2ps.pdf gl2ps-${DATE} tar zcvf gl2ps-nightly.tgz gl2ps-${DATE} rm -rf gl2ps-${DATE} diff --git a/doc/gl2ps.tex b/doc/gl2ps.tex index ffe25e420091a7ff84748b5de7e1577032ab04dc..582ab0d7987721ed98fd705dc092c19cf3b7ea29 100644 --- a/doc/gl2ps.tex +++ b/doc/gl2ps.tex @@ -1,4 +1,4 @@ -% $Id: gl2ps.tex,v 1.198 2005-06-19 18:30:10 geuzaine Exp $ +% $Id: gl2ps.tex,v 1.199 2005-06-19 19:18:35 geuzaine Exp $ % % GL2PS, an OpenGL to PostScript Printing Library % Copyright (C) 1999-2005 Christophe Geuzaine <geuz@geuz.org> @@ -621,7 +621,8 @@ fclose(fp); gl2psText("MyText", "Courier", 12); \end{verbatim} -A complete example (\dd{gl2psTest.c}) is included in the distribution. +Complete example programs (\dd{gl2psTestSimple.c} and \dd{gl2psTest.c}) +are included in the distribution. %\begin{figure} %\scalebox{0.85}{\input{outLatex.tex}} diff --git a/gl2psTest.c b/gl2psTest.c index c467196746db3aabb356ec60e006b85bd6315f4b..ee601fea8d912f2084deb1b9f3b831cbbba33a2e 100644 --- a/gl2psTest.c +++ b/gl2psTest.c @@ -1,4 +1,4 @@ -/* $Id: gl2psTest.c,v 1.68 2005-06-18 18:06:20 geuzaine Exp $ */ +/* $Id: gl2psTest.c,v 1.69 2005-06-19 19:18:35 geuzaine Exp $ */ /* * GL2PS, an OpenGL to PostScript Printing Library * Copyright (C) 1999-2005 Christophe Geuzaine <geuz@geuz.org> @@ -496,7 +496,7 @@ void writefile(int format, int sort, int options, int nbcol, while(state == GL2PS_OVERFLOW){ buffsize += 1024*1024; - gl2psBeginPage(file, "test", viewport, format, sort, options, + gl2psBeginPage(file, "gl2psTest", viewport, format, sort, options, GL_RGBA, 0, NULL, nbcol, nbcol, nbcol, buffsize, fp, file); display(); diff --git a/gl2psTestSimple.c b/gl2psTestSimple.c index eb0835427451f5f3b9fcc3efded2de380afd8576..ab2acce9d95206b0b0fca858d54d5832c6853d71 100644 --- a/gl2psTestSimple.c +++ b/gl2psTestSimple.c @@ -1,4 +1,4 @@ -/* $Id: gl2psTestSimple.c,v 1.7 2005-06-19 18:56:47 geuzaine Exp $ */ +/* $Id: gl2psTestSimple.c,v 1.8 2005-06-19 19:18:35 geuzaine Exp $ */ /* * GL2PS, an OpenGL to PostScript Printing Library * Copyright (C) 1999-2005 Christophe Geuzaine <geuz@geuz.org> @@ -78,12 +78,12 @@ void keyboard(unsigned char key, int x, int y){ exit(0); break; case 's': - fp = fopen("test.eps", "wb"); + fp = fopen("out.eps", "wb"); while(state == GL2PS_OVERFLOW){ buffsize += 1024*1024; - gl2psBeginPage("test", "test", NULL, GL2PS_EPS, GL2PS_BSP_SORT, + gl2psBeginPage("test", "gl2psTestSimple", NULL, GL2PS_EPS, GL2PS_BSP_SORT, GL2PS_DRAW_BACKGROUND | GL2PS_USE_CURRENT_VIEWPORT, - GL_RGBA, 0, NULL, 0, 0, 0, buffsize, fp, "test.eps"); + GL_RGBA, 0, NULL, 0, 0, 0, buffsize, fp, "out.eps"); display(); state = gl2psEndPage(); }