# HG changeset patch
# User Rik <rik@octave.org>
# Date 1452991803 28800
# Node ID 83ce7b8fb91cc865a53c7ac9adec1d8c6b3bcf3b
# Parent  8c9755d29d2a7ed882e0d9f51258abcaa04e7c4e
maint: rename glps_renderer class to gl2ps_renderer to match filename.

* gl2ps-renderer.cc, gl2ps-renderer.h, __osmesa_print__.cc:
Replace all "glps_renderer" with "gl2ps_renderer".
In error messages, use name of class "gl2ps_renderer" rather than
filename "gl2ps-renderer".

diff -r 8c9755d29d2a -r 83ce7b8fb91c libinterp/corefcn/gl2ps-renderer.cc
--- a/libinterp/corefcn/gl2ps-renderer.cc	Sun Jan 03 10:01:31 2016 +0100
+++ b/libinterp/corefcn/gl2ps-renderer.cc	Sat Jan 16 16:50:03 2016 -0800
@@ -41,7 +41,7 @@
 #include "unistd.h"
 
 void
-glps_renderer::draw (const graphics_object& go, const std::string& print_cmd)
+gl2ps_renderer::draw (const graphics_object& go, const std::string& print_cmd)
 {
   static bool in_draw = false;
   static std::string old_print_cmd;
@@ -68,7 +68,7 @@
       else if (term.find ("tex") != std::string::npos)
         gl2ps_term = GL2PS_TEX;
       else
-        error ("gl2ps-renderer::draw: Unknown terminal %s", term.c_str ());
+        error ("gl2ps_renderer::draw: Unknown terminal %s", term.c_str ());
 
       GLint gl2ps_text = 0;
       if (term.find ("notxt") != std::string::npos)
@@ -85,7 +85,7 @@
       FILE* tmpf = gnulib::tmpfile ();
 
       if (! tmpf)
-        error ("glps_renderer::draw: couldn't open temporary file for printing");
+        error ("gl2ps_renderer::draw: couldn't open temporary file for printing");
 
       GLint buffsize = 2*1024*1024;
       buffer_overflow = true;
@@ -124,7 +124,7 @@
             include_graph = "foobar-inc";
 
           // GL2PS_SILENT was removed to allow gl2ps printing errors on stderr
-          GLint ret = gl2psBeginPage ("glps_renderer figure", "Octave", 0,
+          GLint ret = gl2psBeginPage ("gl2ps_renderer figure", "Octave", 0,
                                       gl2ps_term, gl2ps_sort,
                                       (GL2PS_NO_BLENDING
                                        | GL2PS_OCCLUSION_CULL
@@ -137,7 +137,7 @@
           if (ret == GL2PS_ERROR)
             {
               old_print_cmd.clear ();
-              error ("gl2ps-renderer::draw: gl2psBeginPage returned GL2PS_ERROR");
+              error ("gl2ps_renderer::draw: gl2psBeginPage returned GL2PS_ERROR");
             }
 
           opengl_renderer::draw (go);
@@ -147,7 +147,7 @@
 
           // Don't check return value of gl2psEndPage, it is not meaningful.
           // Errors and warnings are checked after gl2psEndViewport in 
-          // glps_renderer::draw_axes instead.
+          // gl2ps_renderer::draw_axes instead.
           gl2psEndPage ();
         }
 
@@ -167,7 +167,7 @@
 }
 
 int
-glps_renderer::alignment_to_mode (int ha, int va) const
+gl2ps_renderer::alignment_to_mode (int ha, int va) const
 {
   int gl2psa = GL2PS_TEXT_BL;
 
@@ -203,7 +203,7 @@
 }
 
 void
-glps_renderer::fix_strlist_position (double x, double y, double z,
+gl2ps_renderer::fix_strlist_position (double x, double y, double z,
                                      Matrix box, double rotation,
                                      std::list<ft_render::ft_string>& lst)
 {
@@ -442,7 +442,7 @@
 }
 
 Matrix
-glps_renderer::render_text (const std::string& txt,
+gl2ps_renderer::render_text (const std::string& txt,
                             double x, double y, double z,
                             int ha, int va, double rotation)
 {
@@ -539,7 +539,7 @@
 }
 
 void
-glps_renderer::set_font (const base_properties& props)
+gl2ps_renderer::set_font (const base_properties& props)
 {
   opengl_renderer::set_font (props);
 
@@ -572,7 +572,7 @@
 }
 
 void
-glps_renderer::draw_pixels (GLsizei w, GLsizei h, GLenum format,
+gl2ps_renderer::draw_pixels (GLsizei w, GLsizei h, GLenum format,
                             GLenum type, const GLvoid *data)
 {
   // gl2psDrawPixels only supports the GL_FLOAT type.
@@ -586,7 +586,7 @@
 }
 
 void
-glps_renderer::draw_text (const text::properties& props)
+gl2ps_renderer::draw_text (const text::properties& props)
 {
   if (props.get_string ().is_empty ())
     return;
@@ -649,7 +649,7 @@
 
   frame.add_fcn (safe_pclose, fp);
 
-  glps_renderer rend (fp, term);
+  gl2ps_renderer rend (fp, term);
 
   rend.draw (fig, cmd);
 
diff -r 8c9755d29d2a -r 83ce7b8fb91c libinterp/corefcn/gl2ps-renderer.h
--- a/libinterp/corefcn/gl2ps-renderer.h	Sun Jan 03 10:01:31 2016 +0100
+++ b/libinterp/corefcn/gl2ps-renderer.h	Sat Jan 16 16:50:03 2016 -0800
@@ -32,14 +32,14 @@
 
 class
 OCTINTERP_API
-glps_renderer : public opengl_renderer
+gl2ps_renderer : public opengl_renderer
 {
 public:
-  glps_renderer (FILE *_fp, const std::string& _term)
+  gl2ps_renderer (FILE *_fp, const std::string& _term)
     : opengl_renderer () , fp (_fp), term (_term), fontsize (),
     fontname (), buffer_overflow (false) { }
 
-  ~glps_renderer (void) { }
+  ~gl2ps_renderer (void) { }
 
   void draw (const graphics_object& go, const std::string& print_cmd);
 
@@ -66,9 +66,9 @@
     // Finalize viewport
     GLint state = gl2psEndViewport ();
     if (state == GL2PS_NO_FEEDBACK)
-      warning ("glps_renderer::draw_axes: empty feedback buffer and/or nothing else to print");
+      warning ("gl2ps_renderer::draw_axes: empty feedback buffer and/or nothing else to print");
     else if (state == GL2PS_ERROR)
-      error ("glps_renderer::draw_axes: gl2psEndPage returned GL2PS_ERROR");
+      error ("gl2ps_renderer::draw_axes: gl2psEndPage returned GL2PS_ERROR");
     
     buffer_overflow |= (state == GL2PS_OVERFLOW);
   }
diff -r 8c9755d29d2a -r 83ce7b8fb91c libinterp/dldfcn/__osmesa_print__.cc
--- a/libinterp/dldfcn/__osmesa_print__.cc	Sun Jan 03 10:01:31 2016 +0100
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Sat Jan 16 16:50:03 2016 -0800
@@ -190,7 +190,7 @@
 
           frame.add_fcn (close_fcn, filep);
 
-          glps_renderer rend (filep, term);
+          gl2ps_renderer rend (filep, term);
           rend.draw (fobj, "");
 
           // Make sure buffered commands are finished!!!