Changeset cf4d8f in git

Timestamp:

Jul 26, 2005, 6:51:52 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

aaa49cc6aa7665f191223675066ceaf1f337254e

Parents:

457bd5039e1e1fb3f2f0753e4cc37c6ba141af1e

Message:

*hannes: clarified help init.


git-svn-id: file:///usr/local/Singular/svn/trunk@8452 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• LIB/help.cnf (modified) (3 diffs)
• fehelp.cc (modified) (5 diffs)

Singular/LIB/help.cnf

@@ -1 @@
-# Singular help browser file $Id: help.cnf,v 1.7 2005-04-18 08:45:40 bricken Exp $
+# Singular help browser file $Id: help.cnf,v 1.8 2005-07-26 16:51:52 Singular Exp $
 # each line which start with an # is a comment
 # each other line defines a (possible) help browser
@@ -9 +9 @@
 #  h- requires html dir
 #  D- requires the enviroment variable DISPLAY
+#  C- requires Windows-help: Manual.chm
 #  E:executable:- requires the named exectable
 #----------------------------------------------------
@@ -20 +21 @@
 #----------------------------------------------------
 # the default help browsers builtin, dummy and emacs are always 
-# available and should NOT be mentioned here
-# ix86_Win: has 2 additional default browsers: html and winhlp
+#   available and should NOT be mentioned here
+# ix86_Win: has additional default browsers: htmlhelp, html and winhlp
+#   also not mentioned here
 #----------------------------------------------------
 htmlview!xDhE:htmlview:!htmlview %h &

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.46 2005-07-25 09:05:08 wienand Exp $
+* versin $Id: fehelp.cc,v 1.47 2005-07-26 16:51:39 Singular Exp $
 */
 
@@ -145 +145 @@
     assume(heCurrentHelpBrowser != NULL);
 #ifdef ix86_Win
-    if (strcmp(heCurrentHelpBrowser->browser,"htmlhelp")==0) {
+    if (strcmp(heCurrentHelpBrowser->browser,"htmlhelp")==0)
+    {
       // In Windows always let htmlhelp handle request, if standard
       strcpy(hentry.key, str);
@@ -221 +222 @@
     fseek(f,0,SEEK_SET);
 #ifdef ix86_Win
-    // for the 6(!) default browsers and make htmlhelp the default default
-    heHelpBrowsers=(heBrowser_s*)omAlloc0((br+9)*sizeof(heBrowser_s));
-    br = 0;
-    heHelpBrowsers[br].browser="htmlhelp";
-    heHelpBrowsers[br].init_proc=heGenInit;
-    heHelpBrowsers[br].help_proc=heWinHtmlHelp;
-    heHelpBrowsers[br].required="C";
-    // heHelpBrowsers[br].action=NULL;
-    br++;
+    // for the 7(!) default browsers and make htmlhelp the default default
+    heHelpBrowsers=(heBrowser_s*)omAlloc0((br+7)*sizeof(heBrowser_s));
 #else
     // for the 4(!) default browsers
     heHelpBrowsers=(heBrowser_s*)omAlloc0((br+4)*sizeof(heBrowser_s));
+#endif
     br = 0;
-#endif
     while (fgets( buf, sizeof(buf), f))
     {
@@ -266 +260 @@
   }
 #ifdef ix86_Win
+  heHelpBrowsers[br].browser="htmlhelp";
+  heHelpBrowsers[br].init_proc=heGenInit;
+  heHelpBrowsers[br].help_proc=heWinHtmlHelp;
+  heHelpBrowsers[br].required="C";
+  // heHelpBrowsers[br].action=NULL;
+  br++;
   heHelpBrowsers[br].browser="winhlp";
   heHelpBrowsers[br].init_proc=heGenInit;
@@ -719 +719 @@
       h=ggetid(s);
       if (h!=NULL)
-      {      
+      {
         Print("help for %s from package %\n",ss,s);
         char s_help[200];