diff -urN mined-2000.13.2.orig/CHANGES mined-2000.13.2/CHANGES
--- mined-2000.13.2.orig/CHANGES Fri Dec 1 01:22:38 2006
+++ mined-2000.13.2/CHANGES Fri Dec 1 00:00:00 2006
@@ -437,6 +437,9 @@
* Tweaked uterm to add some X resource preferences for xterm when
invoked with an application (-e). (See uterm manual page for details.)
+Printing:
+* Tweaked printing script uprint to cooperate with newer version of paps.
+
Building mined / makefiles:
* Tweaked some makefiles to work also on systems with the termcap API
installed only in /lib (not in /usr/lib).
@@ -462,6 +465,9 @@
Fixed display error after deleting a combining character that was
combined with a TAB character (since 2000.6).
+Fixed printing script uprint to properly report if neither the paps
+nor the uniprint utility can be found (since 2000.11).
+
Fixed screen size change handling to work also with ncurses.
The curses version (minced) could not detect some screen properties
@@ -477,6 +483,8 @@
character mnemonic" to "Invalid character" (when a valid mnemonic was
not found on first attempt of the new mnemonic lookup algorithm but
the character found later cannot be inserted in the current encoding).
+
+Fixed a crash condition in cygwin version when using the print command.
diff -urN mined-2000.13.2.orig/doc/changes.html mined-2000.13.2/doc/changes.html
--- mined-2000.13.2.orig/doc/changes.html Fri Dec 1 01:22:38 2006
+++ mined-2000.13.2/doc/changes.html Fri Dec 1 00:00:00 2006
@@ -437,6 +437,9 @@
* Tweaked uterm to add some X resource preferences for xterm when
invoked with an application (-e). (See uterm manual page for details.)
+Printing:
+* Tweaked printing script uprint to cooperate with newer version of paps.
+
Building mined / makefiles:
* Tweaked some makefiles to work also on systems with the termcap API
installed only in /lib (not in /usr/lib).
@@ -462,6 +465,9 @@
Fixed display error after deleting a combining character that was
combined with a TAB character (since 2000.6).
+Fixed printing script uprint to properly report if neither the paps
+nor the uniprint utility can be found (since 2000.11).
+
Fixed screen size change handling to work also with ncurses.
The curses version (minced) could not detect some screen properties
@@ -477,6 +483,8 @@
character mnemonic" to "Invalid character" (when a valid mnemonic was
not found on first attempt of the new mnemonic lookup algorithm but
the character found later cannot be inserted in the current encoding).
+
+Fixed a crash condition in cygwin version when using the print command.
diff -urN mined-2000.13.2.orig/doc/download.html mined-2000.13.2/doc/download.html
--- mined-2000.13.2.orig/doc/download.html Fri Dec 1 01:23:11 2006
+++ mined-2000.13.2/doc/download.html Fri Dec 1 00:00:00 2006
@@ -54,21 +54,26 @@
Download PC binaries
(not yet updated to 2000.13.2)
-- MSDOS binary
+
- MSDOS binary
(compiled with djgpp)
- Runs in Windows DOS box (with long filename support) or on plain DOS.
-- Windows binary
+
- Windows binary
(compiled with cygwin)
- Runs in Windows DOS box or Windows xterm.
-
- The archive includes the cygwin1.dll library version 1.5.21 from
- cygwin
- so cygwin mined can be used even without an installed cygwin system.
+
- The archive includes the cygwin1.dll library from
+ cygwin so cygwin
+ mined can be used even without an installed cygwin system.
+
The included version is 1.5.22 patched to fix
+
+ bug # 514 again.
(If you want to obtain the sources, get the
-
- cygwin1.dll source package.)
+
+ cygwin1.dll source package and the
+
+ patch for bug # 514.)
diff -urN mined-2000.13.2.orig/doc/mined.html mined-2000.13.2/doc/mined.html
--- mined-2000.13.2.orig/doc/mined.html Thu Nov 30 00:00:00 2006
+++ mined-2000.13.2/doc/mined.html Fri Dec 1 00:00:00 2006
@@ -5381,24 +5381,24 @@
or a Control-modified punctuation key is entered,
a corresponding key assignment help bar is displayed
(see F1 F1 etc. below).
-
The online help file mined.hlp is installed
- with the Mined runtime support library.
- If this is not installed in one of the standard
+
The online help file mined.hlp is
+ installed with the
+ Mined runtime support library. If
+ this is not installed in one of the standard
locations, the environment variable MINEDDIR should be
set to point to the directory so mined can find its
online help file.
… with HOP:
- View online help with mined (in read-only mode).
- Selection of help topics is offered and prompted.
- (Alternatively, another (shifted) F1 key can be entered,
- see F1 F1 etc. below.)
- Then, the help file is opened (instead of invoking the
- "less" viewer) and positioned to the selected help topic.
-
The text being edited will automatically be saved
- (if it was modified) and any prompting required will
- be performed. The suspended editing session will
- automatically be restored after help viewing is
- finished.
+ If followed by a topic selection (initial letter after
+ prompt), view online help with mined (in read-only
+ mode) by opening the online help file (instead of
+ invoking the "less" viewer) and positioning to the
+ selected help topic.
+
Before opening the help file, the text being
+ edited is automatically saved (if it was modified) and
+ any prompting required will be performed. The
+ suspended editing session will automatically be
+ restored after help viewing is finished.
F1 F1 or Shift-F1 or Control-F1 or Alt-F1 or 
Control-Shift-F1 or Alt-Shift-F1
Display a help bar (in the bottom status line) with short
@@ -5437,7 +5437,8 @@
Control-Alt-Space
Set mark (to remember the current location).
F1 or ESC h
- View online help with mined. (Like HOP F1.)
+ If followed by a topic selection (initial letter after prompt),
+ view online help with mined (like HOP F1).
Screen size change functions
diff -urN mined-2000.13.2.orig/man/mined.1 mined-2000.13.2/man/mined.1
--- mined-2000.13.2.orig/man/mined.1 Thu Nov 30 00:00:00 2006
+++ mined-2000.13.2/man/mined.1 Fri Dec 1 23:34:00 2006
@@ -1,4 +1,4 @@
-.TH mined 1 "November 2006" "mined 2000.13.2" "Unicode text editor"
+.TH mined 1 "December 2006" "mined 2000.13.2" "Unicode text editor"
.SH NAME
mined - powerful text editor with extensive Unicode and CJK support
.PP
@@ -5904,26 +5904,26 @@
a corresponding key assignment help bar is displayed
(see F1 F1 etc. below).
.br
-The online help file mined.hlp is installed
-with the Mined runtime support library.
-If this is not installed in one of the standard
+The online help file mined.hlp is
+installed with the
+Mined runtime support library. If
+this is not installed in one of the standard
locations, the environment variable MINEDDIR should be
set to point to the directory so mined can find its
online help file.
.TP
\fI... with HOP:\fR
-View online help with mined (in read-only mode).
-Selection of help topics is offered and prompted.
-(Alternatively, another (shifted) F1 key can be entered,
-see F1 F1 etc. below.)
-Then, the help file is opened (instead of invoking the
-"less" viewer) and positioned to the selected help topic.
-.br
-The text being edited will automatically be saved
-(if it was modified) and any prompting required will
-be performed. The suspended editing session will
-automatically be restored after help viewing is
-finished.
+If followed by a topic selection (initial letter after
+prompt), view online help with mined (in read-only
+mode) by opening the online help file (instead of
+invoking the "less" viewer) and positioning to the
+selected help topic.
+.br
+Before opening the help file, the text being
+edited is automatically saved (if it was modified) and
+any prompting required will be performed. The
+suspended editing session will automatically be
+restored after help viewing is finished.
.TP
F1 F1 \fIor\fR Shift-F1 \fIor\fR Control-F1 \fIor\fR Alt-F1 \fIor\fR \(->NEW\(-> Control-Shift-F1 \fIor\fR \(->NEW\(-> Alt-Shift-F1
Display a help bar (in the bottom status line) with short
@@ -5966,7 +5966,8 @@
Set mark (to remember the current location).
.TP
F1 \fIor\fR ESC h
-View online help with mined. (Like HOP F1.)
+If followed by a topic selection (initial letter after prompt),
+view online help with mined (like HOP F1).
.TP
\fIScreen size change functions\fR
MSDOS screen size changes depend on a
diff -urN mined-2000.13.2.orig/src/charmaps.cfg mined-2000.13.2/src/charmaps.cfg
--- mined-2000.13.2.orig/src/charmaps.cfg Wed Oct 11 00:00:00 2006
+++ mined-2000.13.2/src/charmaps.cfg Wed Nov 1 00:00:00 2006
@@ -55,7 +55,9 @@
isocyril I5 ISO Cyrillic ISO 8859-5
w-cyrill WC Windows Cyrillic CP1251
koi8-t Tj Tadjik KOI8-T
+# spell?: Tajik
pt154 Kz Kazakh PT154
+# spell?: Qazaq
---- Georgian
georg-ps GP Georgian-PS Georgian-PS g
+-------
diff -urN mined-2000.13.2.orig/src/keyboard.c mined-2000.13.2/src/keyboard.c
--- mined-2000.13.2.orig/src/keyboard.c Tue Nov 28 00:00:00 2006
+++ mined-2000.13.2/src/keyboard.c Fri Dec 1 00:00:00 2006
@@ -72,9 +72,9 @@
|* Handling function key and keyboard mapping tables *|
\*======================================================================*/
-#ifndef msdos
-
#define in_status_line (current_cursor_y == YMAX)
+
+#ifndef msdos
static
void
diff -urN mined-2000.13.2.orig/src/mined.h mined-2000.13.2/src/mined.h
--- mined-2000.13.2.orig/src/mined.h Tue Nov 28 00:00:00 2006
+++ mined-2000.13.2/src/mined.h Fri Dec 1 00:00:00 2006
@@ -209,7 +209,7 @@
/*typedef unsigned int character;*/
/* Screen size and display definitions. Coordinates start at 0, 0 */
-#ifdef pc
+#ifdef pcxx
# define maxYMAX 64
# define maxXMAX 132
#else
diff -urN mined-2000.13.2.orig/src/mined1.c mined-2000.13.2/src/mined1.c
--- mined-2000.13.2.orig/src/mined1.c Tue Nov 28 00:00:00 2006
+++ mined-2000.13.2/src/mined1.c Fri Dec 1 00:00:00 2006
@@ -20,9 +20,13 @@
# ifdef unix
# ifdef sysV
-# define print_command "LC_ALL=en_US.UTF-8 lp %s"
+# ifdef __CYGWIN__
+# define print_command "LC_ALL=en_US.UTF-8 lpr %s"
+# else
+# define print_command "LC_ALL=en_US.UTF-8 lp %s"
+# endif
# else
-# define print_command "LC_ALL=en_US.UTF-8 lpr %s"
+# define print_command "LC_ALL=en_US.UTF-8 lpr %s"
# endif
# endif
@@ -2802,7 +2806,7 @@
void
PRINT ()
{
- char cmd [maxLINE_LEN]; /* Buffer for print command */
+ char cmd [MAX_CHARS]; /* Buffer for print command */
int sysres;
char * msg;
@@ -2931,7 +2935,7 @@
#endif
raw_mode (False);
- system (command);
+ (void) system (command);
sleep (1);
raw_mode (True);
@@ -2987,7 +2991,7 @@
set_cursor (0, YMAX);
raw_mode (False);
- system (getenv ("COMSPEC"));
+ (void) system (getenv ("COMSPEC"));
raw_mode (True);
clear_status ();
@@ -3069,7 +3073,7 @@
set_cursor (0, YMAX);
raw_mode (False);
- system ("SPAWN");
+ (void) system ("SPAWN");
raw_mode (True);
clear_status ();
diff -urN mined-2000.13.2.orig/usrshare/bin/uprint mined-2000.13.2/usrshare/bin/uprint
--- mined-2000.13.2.orig/usrshare/bin/uprint Thu Jul 13 00:00:00 2006
+++ mined-2000.13.2/usrshare/bin/uprint Fri Dec 1 00:00:00 2006
@@ -114,26 +114,66 @@
#############################################################################
-# construct parameters for uniprint / paps
-case "$fontfile" in
-"") fontspec=;;
-*) fontspec="-font $fontfile";;
-esac
-
-case "$size" in
-"") sizespec=
- sizepaps=
- ;;
-*) sizespec="-size $size"
- sizepaps="--font_scale $size"
- ;;
-esac
+# construct parameters for paps / uniprint
+
+if $paps
+then
+ papsopt=
+
+ case "$size" in
+ "") sizepaps=
+ ;;
+ *) sizepaps="--font_scale $size"
+ ;;
+ esac
+
+ # add header option if configurable header available
+ #if paps --help | grep -- --header > /dev/null
+ #then papsopt="$papsopt --header"
+ #fi
+
+ # add font spec in proper syntax for paps version
+ if paps --help | grep -- --family > /dev/null
+ then papsfontpar=--family
+ papsfont="$font"
+ papsopt="$papsopt $sizepaps"
+ elif paps --help | grep -- --font= > /dev/null
+ then papsfontpar=--font
+ papsfont="$font $size"
+ fi
+
+ # add dpi spec for old paps version
+ if paps --help | grep -- --dpi > /dev/null
+ then papsopt="$papsopt --dpi 300"
+ fi
+
+else
+
+ case "$fontfile" in
+ "") fontspec=;;
+ *) fontspec="-font $fontfile";;
+ esac
+
+ case "$size" in
+ "") sizespec=
+ ;;
+ *) sizespec="-size $size"
+ ;;
+ esac
+
+fi
#############################################################################
# print
+
+printed=true
+
if $paps
-then paps --family "$font" $sizepaps "$1" | $LPR
+then if [ -n "$papsfontpar" ]
+ then paps $papsfontpar "$papsfont" $papsopt "$1" | $LPR
+ else paps $papsopt "$1" | $LPR
+ fi
elif type uniprint
then if [ "$LPR" != "" ]
then uniprint $params -wrap $fontspec $sizespec -out - "$1" | $LPR
@@ -141,16 +181,20 @@
#rm -f "$1.ps"
else uniprint $params -wrap $fontspec $sizespec "$1"
fi
-else echo uniprint not found >&2
- false
+else printed=false
fi
-case "$remove" in
--r) case "$1" in
+if $printed
+then
+ case "$remove" in
+ -r) case "$1" in
/tmp/*|/???/tmp/*|${MINEDTMP--}/*|${TMPDIR--}/*|${TMP--}/*|${TEMP--}/*)
rm -f "$1";;
esac;;
-esac
+ esac
+else
+ false
+fi
#############################################################################
diff -urN mined-2000.13.2.orig/usrshare/doc_user/changes.html mined-2000.13.2/usrshare/doc_user/changes.html
--- mined-2000.13.2.orig/usrshare/doc_user/changes.html Fri Dec 1 01:22:38 2006
+++ mined-2000.13.2/usrshare/doc_user/changes.html Fri Dec 1 00:00:00 2006
@@ -437,6 +437,9 @@
* Tweaked uterm to add some X resource preferences for xterm when
invoked with an application (-e). (See uterm manual page for details.)
+Printing:
+* Tweaked printing script uprint to cooperate with newer version of paps.
+
Building mined / makefiles:
* Tweaked some makefiles to work also on systems with the termcap API
installed only in /lib (not in /usr/lib).
@@ -462,6 +465,9 @@
Fixed display error after deleting a combining character that was
combined with a TAB character (since 2000.6).
+Fixed printing script uprint to properly report if neither the paps
+nor the uniprint utility can be found (since 2000.11).
+
Fixed screen size change handling to work also with ncurses.
The curses version (minced) could not detect some screen properties
@@ -477,6 +483,8 @@
character mnemonic" to "Invalid character" (when a valid mnemonic was
not found on first attempt of the new mnemonic lookup algorithm but
the character found later cannot be inserted in the current encoding).
+
+Fixed a crash condition in cygwin version when using the print command.
diff -urN mined-2000.13.2.orig/usrshare/doc_user/download.html mined-2000.13.2/usrshare/doc_user/download.html
--- mined-2000.13.2.orig/usrshare/doc_user/download.html Fri Dec 1 01:23:11 2006
+++ mined-2000.13.2/usrshare/doc_user/download.html Fri Dec 1 00:00:00 2006
@@ -54,21 +54,26 @@
Download PC binaries
(not yet updated to 2000.13.2)
-- MSDOS binary
+
- MSDOS binary
(compiled with djgpp)
- Runs in Windows DOS box (with long filename support) or on plain DOS.
-- Windows binary
+
- Windows binary
(compiled with cygwin)
- Runs in Windows DOS box or Windows xterm.
-
- The archive includes the cygwin1.dll library version 1.5.21 from
- cygwin
- so cygwin mined can be used even without an installed cygwin system.
+
- The archive includes the cygwin1.dll library from
+ cygwin so cygwin
+ mined can be used even without an installed cygwin system.
+
The included version is 1.5.22 patched to fix
+
+ bug # 514 again.
(If you want to obtain the sources, get the
-
- cygwin1.dll source package.)
+
+ cygwin1.dll source package and the
+
+ patch for bug # 514.)
diff -urN mined-2000.13.2.orig/usrshare/doc_user/mined.html mined-2000.13.2/usrshare/doc_user/mined.html
--- mined-2000.13.2.orig/usrshare/doc_user/mined.html Thu Nov 30 00:00:00 2006
+++ mined-2000.13.2/usrshare/doc_user/mined.html Fri Dec 1 00:00:00 2006
@@ -5381,24 +5381,24 @@
or a Control-modified punctuation key is entered,
a corresponding key assignment help bar is displayed
(see F1 F1 etc. below).
-
The online help file mined.hlp is installed
- with the Mined runtime support library.
- If this is not installed in one of the standard
+
The online help file mined.hlp is
+ installed with the
+ Mined runtime support library. If
+ this is not installed in one of the standard
locations, the environment variable MINEDDIR should be
set to point to the directory so mined can find its
online help file.
… with HOP:
- View online help with mined (in read-only mode).
- Selection of help topics is offered and prompted.
- (Alternatively, another (shifted) F1 key can be entered,
- see F1 F1 etc. below.)
- Then, the help file is opened (instead of invoking the
- "less" viewer) and positioned to the selected help topic.
-
The text being edited will automatically be saved
- (if it was modified) and any prompting required will
- be performed. The suspended editing session will
- automatically be restored after help viewing is
- finished.
+ If followed by a topic selection (initial letter after
+ prompt), view online help with mined (in read-only
+ mode) by opening the online help file (instead of
+ invoking the "less" viewer) and positioning to the
+ selected help topic.
+
Before opening the help file, the text being
+ edited is automatically saved (if it was modified) and
+ any prompting required will be performed. The
+ suspended editing session will automatically be
+ restored after help viewing is finished.
F1 F1 or Shift-F1 or Control-F1 or Alt-F1 or Control-Shift-F1 or Alt-Shift-F1
Display a help bar (in the bottom status line) with short
@@ -5437,7 +5437,8 @@
Control-Alt-Space
Set mark (to remember the current location).
F1 or ESC h
- View online help with mined. (Like HOP F1.)
+ If followed by a topic selection (initial letter after prompt),
+ view online help with mined (like HOP F1).
Screen size change functions
diff -urN mined-2000.13.2.orig/usrshare/package_doc/CHANGES mined-2000.13.2/usrshare/package_doc/CHANGES
--- mined-2000.13.2.orig/usrshare/package_doc/CHANGES Fri Dec 1 01:22:38 2006
+++ mined-2000.13.2/usrshare/package_doc/CHANGES Fri Dec 1 00:00:00 2006
@@ -437,6 +437,9 @@
* Tweaked uterm to add some X resource preferences for xterm when
invoked with an application (-e). (See uterm manual page for details.)
+Printing:
+* Tweaked printing script uprint to cooperate with newer version of paps.
+
Building mined / makefiles:
* Tweaked some makefiles to work also on systems with the termcap API
installed only in /lib (not in /usr/lib).
@@ -462,6 +465,9 @@
Fixed display error after deleting a combining character that was
combined with a TAB character (since 2000.6).
+Fixed printing script uprint to properly report if neither the paps
+nor the uniprint utility can be found (since 2000.11).
+
Fixed screen size change handling to work also with ncurses.
The curses version (minced) could not detect some screen properties
@@ -477,6 +483,8 @@
character mnemonic" to "Invalid character" (when a valid mnemonic was
not found on first attempt of the new mnemonic lookup algorithm but
the character found later cannot be inserted in the current encoding).
+
+Fixed a crash condition in cygwin version when using the print command.