[Groff-commit] groff ./ChangeLog src/roff/troff/input.cpp src/...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/04/26 07:41:33

Modified files:
        .              : ChangeLog 
        src/roff/troff : input.cpp node.cpp node.h 

Log message:
        Surround the (pseudo) file name for the .pso request with `<' and
        `>'.
        
        * src/roff/troff/node.cpp (real_output_file, troff_output_file): Add
        second parameter to `really_put_filename' and `put_filename'.
        (troff_output_file::really_put_filename): Emit `<' and `>' around
        filename if second argument is set.
        * src/roff/troff/node.h: Updated.
        
        * src/roff/troff/input.cpp (file_iterator::file_iterator,
        file_iterator::set_location): Update to changes in node.cpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.950&tr2=1.951&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/input.cpp.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/node.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/node.h.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.950 groff/ChangeLog:1.951
--- groff/ChangeLog:1.950       Wed Apr 26 07:16:36 2006
+++ groff/ChangeLog     Wed Apr 26 07:41:33 2006
@@ -3,6 +3,19 @@
        * src/devices/grohtml/post-html.cpp (html_printer::~html_printer):
        Handle current_paragraph only if it is non-NULL.
 
+
+       Surround the (pseudo) file name for the .pso request with `<' and
+       `>'.
+
+       * src/roff/troff/node.cpp (real_output_file, troff_output_file): Add
+       second parameter to `really_put_filename' and `put_filename'.
+       (troff_output_file::really_put_filename): Emit `<' and `>' around
+       filename if second argument is set.
+       * src/roff/troff/node.h: Updated.
+
+       * src/roff/troff/input.cpp (file_iterator::file_iterator,
+       file_iterator::set_location): Update to changes in node.cpp.
+
 2006-04-25  Tetsurou Okazaki  <address@hidden>
 
        * src/preproc/preconv/preconv.cpp (do_file): Fix conditional
Index: groff/src/roff/troff/input.cpp
diff -u groff/src/roff/troff/input.cpp:1.36 groff/src/roff/troff/input.cpp:1.37
--- groff/src/roff/troff/input.cpp:1.36 Tue Apr  4 20:20:04 2006
+++ groff/src/roff/troff/input.cpp      Wed Apr 26 07:41:33 2006
@@ -294,7 +294,7 @@
   if ((font::use_charnames_in_special) && (fn != 0)) {
     if (!the_output)
       init_output();
-    the_output->put_filename(fn);
+    the_output->put_filename(fn, po);
   }
 }
 
@@ -403,7 +403,7 @@
     filename = f;
     if (!the_output)
       init_output();
-    the_output->put_filename(f);
+    the_output->put_filename(f, 0);
   }
   lineno = ln;
   return 1;
Index: groff/src/roff/troff/node.cpp
diff -u groff/src/roff/troff/node.cpp:1.22 groff/src/roff/troff/node.cpp:1.23
--- groff/src/roff/troff/node.cpp:1.22  Sun Mar  5 17:03:40 2006
+++ groff/src/roff/troff/node.cpp       Wed Apr 26 07:41:33 2006
@@ -694,7 +694,7 @@
                                 vunits before, vunits after, hunits width) = 0;
   virtual void really_begin_page(int pageno, vunits page_length) = 0;
   virtual void really_copy_file(hunits x, vunits y, const char *filename);
-  virtual void really_put_filename(const char *filename);
+  virtual void really_put_filename(const char *, int);
   virtual void really_on();
   virtual void really_off();
 public:
@@ -705,7 +705,7 @@
   void transparent_char(unsigned char);
   void print_line(hunits x, vunits y, node *n, vunits before, vunits after, 
hunits width);
   void begin_page(int pageno, vunits page_length);
-  void put_filename(const char *filename);
+  void put_filename(const char *, int);
   void on();
   void off();
   int is_on();
@@ -794,7 +794,7 @@
   void really_print_line(hunits x, vunits y, node *n, vunits before, vunits 
after, hunits width);
   void really_begin_page(int pageno, vunits page_length);
   void really_copy_file(hunits x, vunits y, const char *filename);
-  void really_put_filename(const char *filename);
+  void really_put_filename(const char *, int);
   void really_on();
   void really_off();
   void draw(char, hvpair *, int, font_size, color *, color *);
@@ -1470,11 +1470,15 @@
   flush_tbuf();
 }
 
-void troff_output_file::really_put_filename(const char *filename)
+void troff_output_file::really_put_filename(const char *filename, int po)
 {
   flush_tbuf();
   put("F ");
+  if (po)
+    put("<");
   put(filename);
+  if (po)
+    put(">");
   put('\n');
 }
 
@@ -1588,7 +1592,7 @@
 {
 }
 
-void output_file::put_filename(const char *)
+void output_file::put_filename(const char *, int)
 {
 }
 
@@ -1694,12 +1698,12 @@
   // do nothing
 }
 
-void real_output_file::put_filename(const char *filename)
+void real_output_file::put_filename(const char *filename, int po)
 {
-  really_put_filename(filename);
+  really_put_filename(filename, po);
 }
 
-void real_output_file::really_put_filename(const char *)
+void real_output_file::really_put_filename(const char *, int)
 {
 }
 
Index: groff/src/roff/troff/node.h
diff -u groff/src/roff/troff/node.h:1.30 groff/src/roff/troff/node.h:1.31
--- groff/src/roff/troff/node.h:1.30    Thu May 26 21:02:01 2005
+++ groff/src/roff/troff/node.h Wed Apr 26 07:41:33 2006
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -642,7 +642,7 @@
   virtual void begin_page(int pageno, vunits page_length) = 0;
   virtual void copy_file(hunits x, vunits y, const char *filename) = 0;
   virtual int is_printing() = 0;
-  virtual void put_filename(const char *);
+  virtual void put_filename(const char *, int);
   virtual void on();
   virtual void off();
 #ifdef COLUMN