groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub gr...


From: Bernd Warken
Subject: [Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub gr...
Date: Thu, 05 Oct 2006 16:33:40 +0000

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  06/10/05 16:33:40

Modified files:
        contrib/groffer: ChangeLog Makefile.sub groffer.man groffer2.sh 
                         version.sh 

Log message:
        Update of groffer 0.9.31

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/ChangeLog?cvsroot=groff&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/Makefile.sub?cvsroot=groff&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/groffer.man?cvsroot=groff&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/groffer2.sh?cvsroot=groff&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/version.sh?cvsroot=groff&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- ChangeLog   3 Oct 2006 15:48:24 -0000       1.44
+++ ChangeLog   5 Oct 2006 16:33:39 -0000       1.45
@@ -1,3 +1,26 @@
+2006-10-05  Bernd Warken
+       ________________________________________________________________
+       * release of groffer 0.9.31
+
+       * groffer2.sh:
+       - _make_pdf(): Fix argument of `obj'.
+       - to_tmp(): Add option -r to soelim to omit the .lf request.  The
+       new global variable $_SOELIM_R stores the option if it is
+       available.  Use numbers for the names of the `file' and `so'
+       temporary files, such that the information for each filespec
+       argument is kept for debug.  New global variable $_FILE_NR.
+       - main_set_resources(): Remove `man' temporary files except for
+       debug.
+       - man_get(): Change name in $_TMP_MANSPEC.
+       - man_is_man(): Change name in $_TMP_MANSPEC.  Remove file in
+       $_TMP_MANPEC if empty.
+       - _do_display() of main_display(): Add check on empty mode file.
+
+       * groffer.man: Filespec: Add information on the argument
+       handling of apropos.
+
+       Remove the space characters at the end of line in all files.
+
 2006-10-03  Bernd Warken
        ________________________________________________________________
        * release of groffer 0.9.30

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/Makefile.sub,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Makefile.sub        26 Sep 2006 21:10:24 -0000      1.18
+++ Makefile.sub        5 Oct 2006 16:33:40 -0000       1.19
@@ -5,7 +5,7 @@
 # Copyright (C) 2001,2002,2005,2006 Free Software Foundation, Inc.
 # Written by Werner Lemberg <address@hidden> and Bernd Warken.
 
-# Last update: 17 Sep 2006
+# Last update: 5 Oct 2006
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -27,7 +27,7 @@
 ########################################################################
 
 MAN1=groffer.n
-CLEANADD=groffer
+CLEANADD=groffer groffer.n
 
 # not all make programs have $(RM) predefined.
 RM=rm -f

Index: groffer.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/groffer.man,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- groffer.man 3 Oct 2006 15:48:24 -0000       1.34
+++ groffer.man 5 Oct 2006 16:33:40 -0000       1.35
@@ -15,7 +15,7 @@
 Source file position:  <groff_source_top>/contrib/groffer/groffer.man
 Installed position:    $prefix/share/man/man1/groffer.1
 
-Last update: 3 Oct 2006
+Last update: 5 Oct 2006
 
 Source file position: <groff-source>/contrib/groffer/groffer.man
 ..
@@ -2331,7 +2331,46 @@
 .
 .
 .P
-For the following, it is necessary to know that on each system the
+The options
+.Long_opt apropos*
+have a special handling of
+.I filespec
+arguments.
+.
+Each argument is taken as a search scheme of its own.
+.
+Also a regexp (regular expression) can be used in the filespec.
+.
+For example,
+.B groffer --apropos '^gro.f$'
+searches
+.B groff
+in the
+.I man\~page
+name, while
+.B groffer --apropos groff
+searches
+.B groff
+somewhere in the name or description of the
+.IR man\~pages .
+.
+.
+.P
+All other parts of
+.IR groffer ,
+such as the normal display or the output with
+.Long_opt whatis
+have a different scheme for
+.IR filespecs .
+No regular expressions are used for the arguments.
+.
+The
+.I filespec
+arguments are handled by the following scheme.
+.
+.
+.P
+It is necessary to know that on each system the
 .I \%man\~pages
 are sorted according to their content into several sections.
 .

Index: groffer2.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/groffer2.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- groffer2.sh 3 Oct 2006 15:48:24 -0000       1.12
+++ groffer2.sh 5 Oct 2006 16:33:40 -0000       1.13
@@ -12,7 +12,7 @@
 # Free Software Foundation, Inc.
 # Written by Bernd Warken
 
-# Last update: 3 Oct 2006
+# Last update: 5 Oct 2006
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -603,6 +603,7 @@
 export _DISPLAY_MODE;          # Display mode.
 export _DISPLAY_PROG;          # Viewer program to be used for display.
 export _DISPLAY_ARGS;          # X resources for the viewer program.
+export _FILE_NR;               # number for temporary `,file,*'
 export _FILEARGS;              # Stores filespec parameters.
 export _FILESPEC_ARG;          # Stores the actual filespec parameter.
 export _FILESPEC_IS_MAN;       # filespec is for searching a man page
@@ -610,9 +611,12 @@
 export _MACRO_PACKAGES;                # groff's macro packages.
 export _MACRO_PKG;             # Macro package for each found file.
 export _NO_FILESPECS;          # Yes, if there are no filespec arguments.
+export _OUTPUT_FILE_NAME;      # output generated, see main_set_res..()
 export _REG_TITLE_LIST;                # Processed file names.
+export _SOELIM_R;              # option -r for soelim
 export _SPECIAL_FILESPEC;      # Filespec ran for apropos or whatis.
 export _SPECIAL_SETUP;         # Test on setup for apropos or whatis.
+export _VIEWER_BACKGROUND;     # viewer shall be run in the background or not
 # _MAN_* finally used configuration of man searching
 export _MAN_ALL;               # search all man pages per filespec
 export _MAN_ENABLE;            # enable search for man pages
@@ -673,8 +677,6 @@
 export _OPT_WHATIS;            # print the man description
 export _OPT_XRM;               # specify X resource
 export _OPT_Z;                 # groff option -Z
-export _OUTPUT_FILE_NAME;      # output generated, see main_set_res..()
-export _VIEWER_BACKGROUND;     # viewer shall be run in the background or not
 # _TMP_* temporary directory and files
 export _TMP_DIR;               # groffer directory for temporary files
 export _TMP_CAT;               # stores concatenation of everything
@@ -691,6 +693,7 @@
 
 # For variables that can be reset by option `--default', see reset().
 
+_FILE_NR=0;
 _FILEARGS='';
 _MACRO_PACKAGES="'-man' '-mdoc' '-me' '-mm' '-mom' '-ms'";
 _SPECIAL_FILESPEC='no';
@@ -708,6 +711,14 @@
 _PDF_HAS_GS='no';
 _PDF_HAS_PS2PDF='no';
 
+# option -r for soelim
+if echo -n '' | soelim -r 2>${_NULL_DEV} >${_NULL_DEV}
+then
+  _SOELIM_R='-r';
+else
+  _SOELIM_R='';
+fi;
+
 ########################################################################
 # reset ()
 #
@@ -3060,7 +3071,7 @@
   then
     mg_ext="${_MAN_EXT}";
   fi;
-  if obj _TMP_MANSPEC is_not_equal "${_TMP_DIR}/,man.${mg_sec}${mg_ext}:$1"
+  if obj _TMP_MANSPEC is_not_equal "${_TMP_DIR}/,man:$1:${mg_sec}${mg_ext}"
   then
     error 'man_get(): $_TMP_MANSPEC does not suit to the arguments '"$*".;
   fi;
@@ -3304,7 +3315,7 @@
   else
     mim_ext="$3";
   fi;
-  _TMP_MANSPEC="${_TMP_DIR}/,man.${mim_sec}${mim_ext}:$1";
+  _TMP_MANSPEC="${_TMP_DIR}/,man:$1:${mim_sec}${mim_ext}";
 ### man_is_man()
   if obj _TMP_MANSPEC is_not_file
   then
@@ -3322,6 +3333,7 @@
   eval ${_UNSET} mim_sec;
   if obj _TMP_MANSPEC is_empty_file
   then
+    rm_file_with_debug "${_TMP_MANSPEC}";
     eval "${return_no}";
   else
     eval "${return_yes}";
@@ -4334,6 +4346,7 @@
     error 'to_tmp(): $_TMP_CAT is not yet set';
   fi;
   tt_1="$1";
+  tt_so_nr=0;                  # number for temporary `,so,*,*'
   if is_file "${tt_1}"
   then
     tt_dir="$(dir_name "${tt_1}")";
@@ -4341,7 +4354,8 @@
     then
       whatis_filename "${tt_1}" >>"${_TMP_CAT}";
     else
-      tt_file="${_TMP_DIR}/,file";
+      _FILE_NR="$(expr ${_FILE_NR} + 1)";
+      tt_file="${_TMP_DIR}/,file${_FILE_NR}";
       if obj _FILESPEC_IS_MAN is_yes
       then
         if obj _DEBUG_PRINT_FILENAMES is_yes
@@ -4350,7 +4364,6 @@
         fi;
         tt_tmp="${_TMP_DIR}/,tmp";
         cat_z "${tt_1}" >"${tt_file}";
-        tt_sofile="${_TMP_DIR}/,so:";
         grep '^\.[     ]*so[   ]' "${tt_file}" |
          sed -e 's/^\.[        ]*so[   ]*//' >"${tt_tmp}";
         list_from_file tt_list "${tt_tmp}";
@@ -4359,15 +4372,21 @@
         for i in "$@"
         do
           tt_i="$i";
-          tt_sofile="${tt_sofile}"'x';
+          tt_so_nr="$(expr ${tt_so_nr} + 1)";
+          tt_sofile="${_TMP_DIR}/,so${_FILE_NR}_${tt_so_nr}";
+          tt_sofiles="${tt_sofiles} ${tt_sofile}";
           _do_man_so "${tt_i}";
         done;
         rm_file "${tt_tmp}";
         mv "${tt_file}" "${tt_tmp}";
-        cat "${tt_tmp}" | soelim -I "${tt_dir}" >"${tt_file}";
+        cat "${tt_tmp}" | soelim -I "${tt_dir}" ${_SOELIM_R} >"${tt_file}";
+        for f in ${tt_sofiles}
+        do
+          rm_file_with_debug $f;
+        done;
         rm_file "${tt_tmp}";
       else                     # $_FILESPEC_IS_MAN ist not yes
-        cat_z "${tt_1}" | soelim -I "${tt_dir}" >"${tt_file}";
+        cat_z "${tt_1}" | soelim -I "${tt_dir}" ${_SOELIM_R} >"${tt_file}";
       fi;
 ### to_tmp()
       obj_from_output tt_grog grog "${tt_file}";
@@ -4403,6 +4422,9 @@
                 eval ${_UNSET} tt_file;
                 eval ${_UNSET} tt_grog;
                 eval ${_UNSET} tt_i;
+                eval ${_UNSET} tt_so_nr;
+                eval ${_UNSET} tt_sofile;
+                eval ${_UNSET} tt_sofiles;
                 eval ${_UNSET} tt_sofound;
                 eval ${_UNSET} tt_list;
                 eval ${_UNSET} tt_tmp;
@@ -4431,6 +4453,9 @@
   eval ${_UNSET} tt_file;
   eval ${_UNSET} tt_grog;
   eval ${_UNSET} tt_i;
+  eval ${_UNSET} tt_so_nr;
+  eval ${_UNSET} tt_sofile;
+  eval ${_UNSET} tt_sofiles;
   eval ${_UNSET} tt_sofound;
   eval ${_UNSET} tt_list;
   eval ${_UNSET} tt_tmp;
@@ -6549,6 +6574,10 @@
   func_check main_set_resources = 0 "$@";
   # $msr_prog   viewer program
   # $msr_rl     resource list
+  for f in ${_TMP_DIR}/,man*
+  do
+    rm_file_with_debug $f;
+  done;
   obj_from_output msr_title \
     get_first_essential "${_OPT_TITLE}" "${_REG_TITLE_LIST}";
   _OUTPUT_FILE_NAME='';
@@ -7075,15 +7104,23 @@
     obj md_modefile rm_file;
     cat "${_TMP_CAT}" | \
       eval "${md_groggy}" "${_ADDOPTS_GROFF}" > "${md_modefile}";
+    if obj md_modefile is_empty_file
+    then
+      echo2 '_do_display(): empty output.';
+      clean_up;
+      exit;
+    fi;
     if is_not_empty "$1"
     then
       eval "$1";
     fi;
+### _do_display() of main_display()
     obj _TMP_CAT rm_file_with_debug;
     if obj _OPT_STDOUT is_yes
     then
       cat "${md_modefile}";
-      eval "${return_ok}";
+      clean_up;
+      exit;
     fi;
     if obj _VIEWER_BACKGROUND is_not_yes # for programs that run on tty
     then
@@ -7150,7 +7187,7 @@
   if obj _PDF_HAS_PS2PDF is_yes && ps2pdf "${_mp_psfile}" "${md_modefile}";
   then
     :;
-  elif obj _PDF_HAS_GS && gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite \
+  elif obj _PDF_HAS_GS is_yes && gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite \
        -sOutputFile="${md_modefile}" -c save pop -f "${_mp_psfile}";
   then
     :;

Index: version.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/version.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- version.sh  3 Oct 2006 11:40:22 -0000       1.7
+++ version.sh  5 Oct 2006 16:33:40 -0000       1.8
@@ -32,8 +32,8 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='0.9.30';
-_LAST_UPDATE='3 Oct 2006';
+_PROGRAM_VERSION='0.9.31';
+_LAST_UPDATE='5 Oct 2006';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]