[Groff-commit] groff ChangeLog src/preproc/soelim/soelim.man s...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/08/25 20:00:57

Modified files:
        .              : ChangeLog 
        src/preproc/soelim: soelim.man 
        src/roff/troff : env.cpp 

Log message:
        * src/preproc/soelim/soelim.man: Document how to insert `\' and ` '
        in file names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.985&r2=1.986
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/soelim/soelim.man?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/env.cpp?cvsroot=groff&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -b -r1.985 -r1.986
--- ChangeLog   19 Aug 2006 11:28:24 -0000      1.985
+++ ChangeLog   25 Aug 2006 20:00:57 -0000      1.986
@@ -1,3 +1,8 @@
+2006-08-25  Werner LEMBERG  <address@hidden>
+
+       * src/preproc/soelim/soelim.man: Document how to insert `\' and ` '
+       in file names.
+
 2006-08-19  Werner LEMBERG  <address@hidden>
 
        * configure: Regenerated.

Index: src/preproc/soelim/soelim.man
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/soelim/soelim.man,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/preproc/soelim/soelim.man       7 Aug 2004 04:52:54 -0000       1.7
+++ src/preproc/soelim/soelim.man       25 Aug 2006 20:00:57 -0000      1.8
@@ -1,6 +1,7 @@
 '\" p
 .ig
-Copyright (C) 1989-2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2003, 2004, 2006
+Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -22,10 +23,14 @@
 .
 .TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .
+.
 .SH NAME
+.
 @address@hidden \- interpret .so requests in groff input
 .
+.
 .SH SYNOPSIS
+.
 .B @address@hidden
 [
 .B \-Crtv
@@ -42,7 +47,9 @@
 .B \-I
 command line option and its parameter.
 .
+.
 .SH DESCRIPTION
+.
 .B @address@hidden
 reads
 .I files
@@ -63,6 +70,15 @@
 .BR groff .
 .
 .PP
+To embed `\[rs]' in the file name, write `\[rs]\[rs]' or `\[rs]e'.
+To embed a space, write `\[rs]\ '.
+Any other escape sequence in
+.I file
+makes
+.B soelim
+ignore the whole line.
+.
+.PP
 Note that there must be no whitespace between the leading dot and
 the two characters `s' and `o'.  Otherwise, only
 .B groff
@@ -72,7 +88,9 @@
 .B soelim
 ignores it).
 .
+.
 .SH OPTIONS
+.
 .TP
 .B \-C
 Recognize
@@ -83,27 +101,29 @@
 .BI \-I dir
 This option may be used to specify a directory to search for
 files (both those on the command line and those named in
-.B \&.so
+.B .so
 requests).
 The current directory is always searched first.
 This option may be specified more than once,
-the directories will be searched in the order specified.
+the directories are searched in the order specified.
 No directory search is performed for files specified using an absolute path.
 .
 .TP
 .B \-r
-Do not add .lf requests (for general use, with non-groff files).
+Do not add \&.lf requests (for general use, with non-groff files).
 .
 .TP
 .B \-t
-Don't emit .lf requests but TeX comment lines (starting with `%') giving
+Don't emit \&.lf requests but TeX comment lines (starting with `%') giving
 the current file and line number.
 .
 .TP
 .B \-v
 Print the version number.
 .
+.
 .SH USAGE
+.
 The normal processing sequence of groff is this:
 .
 .PP
@@ -208,7 +228,9 @@
 .fi
 .\}
 .
+.
 .SH "SEE ALSO"
+.
 .BR groff (@MAN1EXT@)
 .
 .\" Local Variables:

Index: src/roff/troff/env.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/env.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/roff/troff/env.cpp      12 Jul 2006 19:31:09 -0000      1.17
+++ src/roff/troff/env.cpp      25 Aug 2006 20:00:57 -0000      1.18
@@ -3816,7 +3816,7 @@
     while (h && h->hyphenation_code == 0)
       h = h->next;
     int len = 0;
-    char hbuf[WORD_MAX+2];
+    char hbuf[WORD_MAX + 2];
     char *buf = hbuf + 1;
     hyphen_list *tem;
     for (tem = h; tem && len < WORD_MAX; tem = tem->next) {
@@ -3840,14 +3840,14 @@
          }
       }
       else {
-       hbuf[0] = hbuf[len+1] = '.';
-       int num[WORD_MAX+3];
-       current_language->patterns.hyphenate(hbuf, len+2, num);
+       hbuf[0] = hbuf[len + 1] = '.';
+       int num[WORD_MAX + 3];
+       current_language->patterns.hyphenate(hbuf, len + 2, num);
        int i;
        num[2] = 0;
-       if (flags & 8)
+       if (flags & HYPHEN_FIRST_CHARS)
          num[3] = 0;
-       if (flags & 4)
+       if (flags & HYPHEN_LAST_CHARS)
          --len;
        for (i = 2, tem = h; i < len && tem; tem = tem->next, i++)
          if (num[i] & 1)