diff --git a/Common/Context.h b/Common/Context.h index 503f14b8f9df15e352685a5a5e0ce674fcac25ca..cf8c78e234e7bcb13f9af4e4830972e4199f0c01 100644 --- a/Common/Context.h +++ b/Common/Context.h @@ -186,8 +186,8 @@ public : // print options struct{ - int format, compress; - int eps_quality, eps_background, eps_font_size; + int format; + int eps_quality, eps_background, eps_font_size, eps_compress; int eps_occlusion_culling, eps_best_root; char *eps_font; double eps_line_width_factor, eps_point_size_factor; diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h index 0c4ca632c8b0127e86f0ede91869307ba14f5853..4c987dcd7c83cdbcffa39b9c513eea3a9cc24e0f 100644 --- a/Common/DefaultOptions.h +++ b/Common/DefaultOptions.h @@ -989,22 +989,22 @@ StringXNumber ViewOptions_Number[] = { } ; StringXNumber PrintOptions_Number[] = { - { F|O, "Compress" , opt_print_compress , 0 , - "Compress PostScript/PDF output using zlib" }, { F|O, "EpsBackground" , opt_print_eps_background , 1 , "Save image background in PostScript/PDF output" }, + { F|O, "EpsBestRoot" , opt_print_eps_best_root , 1 , + "Try to minimize primitive splitting in BSP tree sorted PostScript/PDF output" }, + { F|O, "EpsCompress" , opt_print_eps_compress , 0 , + "Compress PostScript/PDF output using zlib" }, { F|O, "EpsFontSize" , opt_print_eps_font_size , 12. , "Font size used in PostScript/PDF output" }, { F|O, "EpsLineWidthFactor" , opt_print_eps_line_width_factor , 0.2 , "Width factor for lines in PostScript/PDF output" }, + { F|O, "EpsOcclusionCulling" , opt_print_eps_occlusion_culling , 1 , + "Cull occluded primitives (to reduce PostScript/PDF file size)" }, { F|O, "EpsPointSizeFactor" , opt_print_eps_point_size_factor , 1. , "Size factor for points in PostScript/PDF output" }, { F|O, "EpsQuality" , opt_print_eps_quality , 1 , "PostScript/PDF quality (1=simple sort, 2=BSP tree sort)" }, - { F|O, "EpsOcclusionCulling" , opt_print_eps_occlusion_culling , 1 , - "Cull occluded primitives (to reduce PostScript/PDF file size)" }, - { F|O, "EpsBestRoot" , opt_print_eps_best_root , 1 , - "Try to minimize primitive splitting in BSP tree sorted PostScript/PDF output" }, { F|O, "Format" , opt_print_format , FORMAT_AUTO , "File format (10=automatic)" }, diff --git a/Common/Options.cpp b/Common/Options.cpp index 3c9047963d3ea24532569cfe1fd18856f707618c..d948b2621dae50f152a1f9dbc1e0b59c240e2947 100644 --- a/Common/Options.cpp +++ b/Common/Options.cpp @@ -1,4 +1,4 @@ -// $Id: Options.cpp,v 1.116 2003-10-26 16:53:12 geuzaine Exp $ +// $Id: Options.cpp,v 1.117 2003-11-08 04:08:20 geuzaine Exp $ // // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // @@ -4514,11 +4514,11 @@ double opt_print_format(OPT_ARGS_NUM) return CTX.print.format; } -double opt_print_compress(OPT_ARGS_NUM) +double opt_print_eps_compress(OPT_ARGS_NUM) { if(action & GMSH_SET) - CTX.print.compress = (int)val; - return CTX.print.compress; + CTX.print.eps_compress = (int)val; + return CTX.print.eps_compress; } double opt_print_eps_quality(OPT_ARGS_NUM) diff --git a/Common/Options.h b/Common/Options.h index 5420ac4e6e770509214bffe0d6a094a31c0d40a6..4a13a3dbc734229bd739b22804d68aaf99093d88 100644 --- a/Common/Options.h +++ b/Common/Options.h @@ -462,7 +462,7 @@ double opt_view_line_width(OPT_ARGS_NUM); double opt_view_point_type(OPT_ARGS_NUM); double opt_view_line_type(OPT_ARGS_NUM); double opt_print_format(OPT_ARGS_NUM); -double opt_print_compress(OPT_ARGS_NUM); +double opt_print_eps_compress(OPT_ARGS_NUM); double opt_print_eps_quality(OPT_ARGS_NUM); double opt_print_eps_occlusion_culling(OPT_ARGS_NUM); double opt_print_eps_best_root(OPT_ARGS_NUM); diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp index 9c8e9a5a4a2b43070f790bca18e6c1c88e4f41e4..9ed226f1cb2f668479e8a7e3dc3d206dd03e40e6 100644 --- a/Graphics/CreateFile.cpp +++ b/Graphics/CreateFile.cpp @@ -1,4 +1,4 @@ -// $Id: CreateFile.cpp,v 1.49 2003-11-05 17:11:36 geuzaine Exp $ +// $Id: CreateFile.cpp,v 1.50 2003-11-08 04:08:20 geuzaine Exp $ // // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // @@ -216,7 +216,7 @@ void CreateOutputFile(char *name, int format) (CTX.print.eps_occlusion_culling ? GL2PS_OCCLUSION_CULL : 0) | (CTX.print.eps_best_root ? GL2PS_BEST_ROOT : 0) | (CTX.print.eps_background ? GL2PS_DRAW_BACKGROUND : 0) | - (CTX.print.compress ? GL2PS_COMPRESS : 0) | + (CTX.print.eps_compress ? GL2PS_COMPRESS : 0) | (format == FORMAT_PSTEX ? GL2PS_NO_TEXT : 0) | (format == FORMAT_EPSTEX ? GL2PS_NO_TEXT : 0) | (format == FORMAT_PDFTEX ? GL2PS_NO_TEXT : 0);