8 files changed, 24 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 55a4374a..62409a44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-29  Waldek Hebisch  <hebisch@math.uni.wroc.pl>
+
+    * hyper/htinp.c: Use strcpy instead of strcat.
+    * hyper/presea: Misc.
+    * hyper/pages/man0.ht: Fix htsearch path.
+    * hyper/pages/MSET.ht: Fix link name.
+    * hyper/pages/util.ht: Fix paths.
+    * hyper/pages/xmpexp.ht: Fix link name.
+    * hyper/pages/ug01.ht: Likewise.
+
 2008-08-29  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* algebra/aggcat.spad.pamphlet: Import used domains.
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index 6151b0f8..49520641 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -273,7 +273,7 @@ strCopy(char *s)
 {
     char *b = halloc(strlen(s) + 1,"String");
 
-    strcat(b, s);
+    strcpy(b, s);
     return b;
 }
 
diff --git a/src/hyper/pages/MSET.ht b/src/hyper/pages/MSET.ht
index 706f7515..a9340e9b 100644
--- a/src/hyper/pages/MSET.ht
+++ b/src/hyper/pages/MSET.ht
@@ -4,7 +4,7 @@
 \newcommand{\MultisetXmpNumber}{9.53}
 %
 % =====================================================================
-\begin{page}{MultisetXmpPage}{9.53 MultiSet}
+\begin{page}{MultisetXmpPage}{9.53 Multiset}
 % =====================================================================
 \beginscroll
 The domain \spadtype{Multiset(R)} is similar to \spadtype{Set(R)}
diff --git a/src/hyper/pages/man0.ht b/src/hyper/pages/man0.ht
index 8583f4ea..70756edd 100644
--- a/src/hyper/pages/man0.ht
+++ b/src/hyper/pages/man0.ht
@@ -9,7 +9,7 @@ Enter search string :
 \newline
 \beginmenu
 \menuunixlink{Search}
-  {htsearch "\stringvalue{pattern}"}
+  {\$AXIOM/lib/htsearch "\stringvalue{pattern}"}
   \tab{15} Reference documentation ({\em *} wild card is not accepted).
 \endmenu
 \endscroll
@@ -45,7 +45,7 @@ Enter search string (use {\em *} for wild card unless counter-indicated):
   \tab{15} Detailed search with selectable options.
 \horizontalline
 \menuunixlink{Reference}
-  {htsearch "\stringvalue{pattern}"}
+  {\$AXIOM/lib/htsearch "\stringvalue{pattern}"}
   \tab{15} Search Reference documentation ({\em *} wild card is not accepted).
 \menumemolink{Commands}{ugSysCmdPage}
 \tab{15} View system command documentation.
diff --git a/src/hyper/pages/ug01.ht b/src/hyper/pages/ug01.ht
index b193daeb..60c92bf8 100644
--- a/src/hyper/pages/ug01.ht
+++ b/src/hyper/pages/ug01.ht
@@ -1370,7 +1370,7 @@ structure like streams for infinite collections.
 
 A \spadgloss{multiset}
 is a set that keeps track of the number
-of duplicate values.\footnote{See \downlink{`MultiSet'}{MultiSetXmpPage}\ignore{MultiSet} for details.}
+of duplicate values.\footnote{See \downlink{`Multiset'}{MultisetXmpPage}\ignore{Multiset} for details.}
 \xtc{
 For all the primes \axiom{p} between 2 and 1000, find the
 distribution of \texht{$p \bmod 5$}{p mod 5}.
diff --git a/src/hyper/pages/util.ht b/src/hyper/pages/util.ht
index 99eb123d..b2594d84 100644
--- a/src/hyper/pages/util.ht
+++ b/src/hyper/pages/util.ht
@@ -80,8 +80,8 @@ The page you requested was not found in the \HyperName{} database.
 % All unix commands should be done as macros defined here so we don't
 % have to go hunting when moving between Unix versions.
 
-\newcommand{\newspadclient}[1]{xterm -n "#1" -e \$SPAD/bin/clef \$SPAD/bin/server/spadclient}
-\newcommand{\searchwindow}[2]{\unixwindow{#1}{\$SPAD/lib/htsearch "#2"}}
+\newcommand{\newspadclient}[1]{xterm -n "#1" -e \$AXIOM/bin/clef \$AXIOM/bin/server/spadclient}
+\newcommand{\searchwindow}[2]{\unixwindow{#1}{\$AXIOM/lib/htsearch "#2"}}
 \newcommand{\unixwindow}[2]{\unixlink{#1}{#2}}
 \newcommand{\menuunixlink}[2]{\item\unixlink{\menuitemstyle{#1}}{#2}}
 \newcommand{\menuunixcommand}[2]{\item\unixcommand{\menuitemstyle{#1}}{#2}}
@@ -199,14 +199,14 @@ The page you requested was not found in the \HyperName{} database.
 
 % Creating a real live viewport:
 
-\newcommand{\viewportbutton}[2]{\unixcommand{#1}{viewAlone #2}}
-\newcommand{\axiomViewportbutton}[2]{\unixcommand{#1}{viewAlone \$AXIOM/share/viewports/{#2}}}
+\newcommand{\viewportbutton}[2]{\unixcommand{#1}{\$AXIOM/bin/viewAlone #2}}
+\newcommand{\axiomViewportbutton}[2]{\unixcommand{#1}{\$AXIOM/bin/viewAlone \$AXIOM/share/viewports/{#2}}}
 \newcommand{\spadviewportbutton}[2]{\axiomViewportbutton{#1}{#2}}
 
 % Making active viewport buttons:
 
-\newcommand{\viewportasbutton}[1]{\unixcommand{\inputimage{{#1}.VIEW/image}}{viewAlone {#1}}}
-\newcommand{\axiomViewportasbutton}[1]{\unixcommand{\inputimage{\env{AXIOM}/share/viewports/{#1}.VIEW/image}}{viewAlone \$AXIOM/share/viewports/{#1}}}
+\newcommand{\viewportasbutton}[1]{\unixcommand{\inputimage{{#1}.VIEW/image}}{\$AXIOM/bin/viewAlone {#1}}}
+\newcommand{\axiomViewportasbutton}[1]{\unixcommand{\inputimage{\env{AXIOM}/share/viewports/{#1}.VIEW/image}}{\$AXIOM/bin/viewAlone \$AXIOM/share/viewports/{#1}}}
 \newcommand{\spadviewportasbutton}[1]{\axiomViewportasbutton{#1}}
 
 % ----------------------------------------------------------------------
diff --git a/src/hyper/pages/xmpexp.ht b/src/hyper/pages/xmpexp.ht
index 401206a8..c829d372 100644
--- a/src/hyper/pages/xmpexp.ht
+++ b/src/hyper/pages/xmpexp.ht
@@ -61,7 +61,7 @@ Click on any item below to see that section.
 { \downlink{MakeFunction}{MakeFunctionXmpPage} }
 { \downlink{MappingPackage1}{MappingPackageOneXmpPage} }
 { \downlink{Matrix}{MatrixXmpPage} }
-{ \downlink{MultiSet}{MultiSetXmpPage} }
+{ \downlink{Multiset}{MultisetXmpPage} }
 { \downlink{MultivariatePolynomial}{MultivariatePolynomialXmpPage} }
 { \downlink{None}{NoneXmpPage} }
 { \downlink{Octonion}{OctonionXmpPage} }
diff --git a/src/hyper/presea b/src/hyper/presea
index b3b9485c..fb9af4db 100755
--- a/src/hyper/presea
+++ b/src/hyper/presea
@@ -6,7 +6,8 @@ BEGIN {n=0;m=0
         a[n] = $0;
         n=n+1;
         j=split($0,b,"{");
-        m=m+substr(b[j],1,length(b[j])-1);
+        if ( j>= 2)
+          m=m+substr(b[j],1,length(b[j])-1);
 }
 
 END {