Changeset 21b87cf in git

Timestamp:

Apr 9, 2024, 11:59:15 AM (4 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

1714178c00bc7b3f6fd54c1a12b6d6e41f33745e

Parents:

f200c3e647195924288296761c367a53da2ab9b8

Message:

help-url at Manual/%v, %H: 4-4

File:

• Singular/fehelp.cc (modified) (5 diffs)

Singular/fehelp.cc

@@ -898 +898 @@
                    {
                      if (*p=='H')
-                     #ifdef SINGULAR_4_2
+                     // starting with 4.4.0
                        snprintf(temp,256,"%s/%d-%d/%s", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                     #else
-                       snprintf(temp,256,"%s/%d-%d-%d/%s", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                                 (SINGULAR_VERSION % 100)/10,
-                     #endif
+                                  SINGULAR_VERSION/10000,
+                                 (SINGULAR_VERSION % 10000)/1000,
                        hentry->url);
                      else
@@ -915 +909 @@
                    {
                      if (*p=='H')
-                     #ifdef SINGULAR_4_2
+                     // starting with 4-4-0
                        snprintf(temp,256,"%s/%d-%d/index.htm", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100
+                                  SINGULAR_VERSION/10000,
+                                 (SINGULAR_VERSION % 10000)/1000
                        );
-                     #else
-                       snprintf(temp,256,"%s/%d-%d-%d/index.htm", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                                 (SINGULAR_VERSION % 100)/10
-                       );
-                     #endif
                      else
                        snprintf(temp,256,"%s/index.htm", htmldir);
@@ -933 +920 @@
                    {
                      if (*p=='H')
-                     #ifdef SINGULAR_4_2
+                     // starting with 4-4-0
                        snprintf(temp,256,"%s/%d-%d/%s", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
+                                  SINGULAR_VERSION/10000,
+                                 (SINGULAR_VERSION % 10000)/1000,
                        hentry->url);
                      else
                        snprintf(temp,256,"%s/%s", htmldir, hentry->url);
-                     #else
-                       snprintf(temp,256,"%s/%d-%d-%d/%s", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                                 (SINGULAR_VERSION % 100)/10,
-                       hentry->url);
-                     else
-                       snprintf(temp,256,"%s/%s", htmldir, hentry->url);
-                     #endif
                    }
                    else
                      if (*p=='H')
-                     #ifdef SINGULAR_4_2
+                     // starting with 4-4-0
                        snprintf(temp,256,"%s/%d-%d/index.htm", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100
+                                  SINGULAR_VERSION/10000,
+                                 (SINGULAR_VERSION % 10000)/1000
                        );
-                     #else
-                       snprintf(temp,256,"%s/%d-%d-%d/index.htm", htmldir,
-                                  SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                                 (SINGULAR_VERSION % 100)/10
-                       );
-                     #endif
                      else
                        snprintf(temp,256,"%s/index.htm", htmldir);
@@ -1010 +981 @@
                  {
                    char temp[256];
-                   snprintf(temp,256,"%d-%d-%d",SINGULAR_VERSION/1000,
-                                 (SINGULAR_VERSION % 1000)/100,
-                                 (SINGULAR_VERSION % 100)/10);
+                   snprintf(temp,256,"%d-%d",SINGULAR_VERSION/10000,
+                                 (SINGULAR_VERSION % 10000)/1000);
                    strcat(sys,temp);
                    i=strlen(sys);
@@ -1164 +1134 @@
    #ifdef HAVE_VSNPRINTF
    {
-     #ifdef SINGULAR_4_2
      snprintf(temp,256,"%s/%d-%d/%s", htmldir,
-       SINGULAR_VERSION/1000,
-       (SINGULAR_VERSION % 1000)/100,
-     #else
-     snprintf(temp,256,"%s/%d-%d-%d/%s", htmldir,
-       SINGULAR_VERSION/1000,
-       (SINGULAR_VERSION % 1000)/100,
-       (SINGULAR_VERSION % 100)/10,
-     #endif
+       SINGULAR_VERSION/10000,
+       (SINGULAR_VERSION % 10000)/1000,
        hentry->url);
    }
    #else
    {
-     #ifdef SINGULAR_4_2
      snprintf(temp,256,"%s/%d-%d/%s", htmldir,
-     SINGULAR_VERSION/1000,
-     (SINGULAR_VERSION % 1000)/100,
-     #else
-     snprintf(temp,256,"%s/%d-%d-%d/%s", htmldir,
-     SINGULAR_VERSION/1000,
-     (SINGULAR_VERSION % 1000)/100,
-     (SINGULAR_VERSION % 100)/10,
-     #endif
+     SINGULAR_VERSION/10000,
+     (SINGULAR_VERSION % 10000)/1000,
      hentry->url);
    }