2 files changed, 62 insertions, 15 deletions

diff --git a/vietnamese/vnelvis/files/patch-vnelvis.1V b/vietnamese/vnelvis/files/patch-vnelvis.1V
index bb08ba8409e5..0064c94589ed 100644
--- a/vietnamese/vnelvis/files/patch-vnelvis.1V
+++ b/vietnamese/vnelvis/files/patch-vnelvis.1V
@@ -1,6 +1,8 @@
 --- vnelvis.1V.orig	Mon Apr 12 14:48:10 1993
-+++ vnelvis.1V	Wed Aug 22 11:53:06 2001
-@@ -12,12 +12,12 @@
++++ vnelvis.1V	Tue Nov 27 17:08:43 2001
+@@ -10,32 +10,32 @@
+ .SH DESCRIPTION
+ .NXR "vnelvis command"
  .PP
 -.PN Vnelvis
 +.B Vnelvis
@@ -18,7 +20,9 @@
 -.PN vi
 +.B vi
  implementations allow only 7-bit text editing
-@@ -27,13 +27,13 @@
+ which is inappropriate for the  8-bit
+ Vietnamese character set.
+ This manual page describes only
  those features specific to
 -.PN vnelvis ;
 +.B vnelvis ;
@@ -37,7 +41,11 @@
 -.PN Vnelvis
 +.B Vnelvis
  allows user to edit 
-@@ -48,8 +48,8 @@
+ Vietnamese text with the keyboard input
+ style according the 7-bit VIQR standard,
+@@ -46,19 +46,19 @@
+ text (according to the VISCII standard).
+ .PP
  In order to use
 -.PN vnelvis,
 +.B vnelvis,
@@ -49,7 +57,7 @@
 -.MS vietterm 1V
 +.B vietterm 1V
  .PP
-@@ -57,6 +57,6 @@
+ There is one user-definable setting
  with
 -.PN vnelvis:
 +.B vnelvis:
@@ -58,7 +66,11 @@
 -.PN vi
 +.B vi
  variables and can be set with your .exrc or
-@@ -80,7 +80,7 @@
+ your EXINIT environment variable, e.g.,:
+ .EX
+@@ -78,11 +78,11 @@
+ .I vnkeys
+ specifies whether Vietnamese input processing is to
  be performed; when it is off,
 -.PN vnelvis
 +.B vnelvis
@@ -69,7 +81,11 @@
 -.PN vi ,
 +.B vi ,
  except that 8-bit data is supported.
-@@ -94,7 +94,7 @@
+ Note that keyboard filtering is only done in input
+ mode and not in vi-command mode, which is most
+@@ -92,11 +92,11 @@
+ .I vnkeys
+ off.  The reason for this is because users will typically
  start
 -.PN vnelvis
 +.B vnelvis
@@ -80,7 +96,11 @@
 -.PN vietterm
 +.B vietterm
  window, which is already doing its Vietnamese keyboard filtering.
-@@ -115,10 +115,10 @@
+ .SH STATUS DISPLAY
+ When the vi-variable
+@@ -113,59 +113,68 @@
+ .SH USAGE NOTES
+ .IP o
  When using
 -.PN vnelvis
 +.B vnelvis
@@ -95,12 +115,15 @@
 -.PN vnterm ,
 +.B vnterm ,
  otherwise the results of your keypresses going
-@@ -127,3 +127,3 @@
+ through two Vietnamese filters may be somewhat
+ confusing.
  .IP o
 -.PN vnelvis
 +.B vnelvis
  is currently the only alternative that
-@@ -133,10 +133,10 @@
+ would correctly handle the six Vietnamese characters
+ "A(? A(~ A^~ Y? Y~ Y." as they are coded in
+ the C0 control area.  For best results when
  using
 -.PN vnelvis
 +.B vnelvis
@@ -115,7 +138,10 @@
 -.PN vnterm 's
 +.B vnterm 's
  keyboard filtering.  This will ensure that
-@@ -147,7 +147,7 @@
+ Vietnamese characters are generated only in
+ input mode when you typically really want them.
+ .IP o
+ On the other hand,
  if you prefer leaving
 -.PN vnterm 's
 +.B vnterm 's
@@ -126,13 +152,34 @@
 -.PN vnelvis 's
 +.B vnelvis 's
  keyboard filter, you may find commands such as
-@@ -156,3 +156,3 @@
+ "dd" (delete line) awkward, because
+ the "dd" is converted first to the Vietnamese
  character "d-bar" before it is sent to
 -.PN vnelvis.
 +.B vnelvis.
  Therefore you must either type "d\\d"
-@@ -161,3 +161,3 @@
+ to prevent the composition action, or
+ use the "qq" sequence which has been
  implemented in
 -.PN vnelvis
 +.B vnelvis
  as a substitute for "dd".
+ .SH AUTHOR
+ Adapted from Steve Kirkendall's elvis.1.4
+ by Cuong T. Nguyen, the TriChlor Group, TriChlor@haydn.Stanford.EDU
+ .SH "SEE ALSO"
+-The Viet-Std Standardization Specification (Viet-Std@Haydn.Stanford.EDU)
+-.br
+ viqr(3V), vntype(3V),
+ vi(1), elvis(1l)
++.SH STANDARDS
++Viet-Std Standardization Specification (Viet-Std@Haydn.Stanford.EDU)
++.PP
++RFC 1456 Vietnamese Standardization Working Group,
++"Conventions for Encoding the Vietnamese Language
++.br
++VISCII: VIetnamese Standard Code for Information Interchange
++.br
++VIQR: VIetnamese Quoted-Readable Specification Revision 1.1",
++.br
++May 1993.
diff --git a/vietnamese/vnelvis/pkg-descr b/vietnamese/vnelvis/pkg-descr
index 5999c3a73f16..af5b0e58b83a 100644
--- a/vietnamese/vnelvis/pkg-descr
+++ b/vietnamese/vnelvis/pkg-descr
@@ -2,8 +2,8 @@ Tha^n cha`o ca'c ba.n,
 
 VNElvis is a clone of vi/ex (the standard UNIX editor) that allows the
 displaying and editing of documents in the Vietnamese 8-bit VISCII (VIetnamese
-Standard Code for Information Interchange) data format using the 7-bit VIQR
-(VIetnamese Quoted Readable) input method.
+Standard Code for Information Interchange) (RFC 1456) data format using the
+7-bit VIQR (VIetnamese Quoted Readable) input method.
 
 It is expected that you will run vnelvis w/in a vnterm.  Because of the way
 vi utilizes various key strokes, it may be better to turn off vnterm's VIQR