Changeset 71f6706 in git for Singular/LIB/standard.lib

Timestamp:

Apr 22, 1999, 10:35:12 AM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

25ea20d6d662e7545fe93d42f9d3e76d73f44beb

Parents:

8dd3ac7f1579c1f59cd86191b12b185a2ab8dab0

Message:

* changes in examples of sprintf


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

File:

• Singular/LIB/standard.lib (modified) (7 diffs)

Singular/LIB/standard.lib

@@ -1 @@
-// $Id: standard.lib,v 1.28 1999-04-19 13:20:02 obachman Exp $
+// $Id: standard.lib,v 1.29 1999-04-22 08:35:12 obachman Exp $
 //////////////////////////////////////////////////////////////////////////////
 
-version="$Id: standard.lib,v 1.28 1999-04-19 13:20:02 obachman Exp $";
+version="$Id: standard.lib,v 1.29 1999-04-22 08:35:12 obachman Exp $";
 info="
 LIBRARY: standard.lib   PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP
@@ -735 +735 @@
           except that the string may contain conversion specifications. Do
           'help print:' for a listing of valid conversion specifications.
+          As an addition to the conversions of 'print', the '%n' and '%2' 
+          conversion specification does not consume an additional argument,
+          but simply generates a newline character.
 NOTE:     If one of the additional arguments is a list, then it should be 
           enclosed once more into a list() command, since passing a list
@@ -748 +751 @@
   int next, l, nnext;
   string ret;
-  list formats = "%l", "%s", "%2l", "%2s", "%t", "%;", "%p", "%b";
+  list formats = "%l", "%s", "%2l", "%2s", "%t", "%;", "%p", "%b", "%n", "%2";
   while (1)
   {
@@ -777 +780 @@
       return (ret + fmt);
     }
-    ret = ret + fmt[1, next - 1] + print(#[1], formats[l]);
+    if (formats[l] != "%2" && formats[l] != "%n")
+    {
+      ret = ret + fmt[1, next - 1] + print(#[1], formats[l]);
+      # = delete(#, 1);
+    }
+    else
+    {
+      ret = ret + fmt[1, next - 1] + print("", "%2s");
+    }
     if (size(fmt) <= (next + size(formats[l]) - 1))
     {
       return (ret);
     }
-    # = delete(#, 1);
     fmt = fmt[next + size(formats[l]), size(fmt)-next-size(formats[l]) + 1];
   }
@@ -792 +802 @@
   intmat M=betti(mres(m,0));
   list l = r, m, M;
-  string s = sprintf("s:%s, l:%l", 1, 2); s;
-  s = sprintf("s:%s", l); s;
-  s = sprintf("s:%s", list(l)); s;
-  s = sprintf("2l:%2l", list(l)); s;
+  string s = sprintf("s:%s,%n l:%l", 1, 2); s;
+  s = sprintf("s:%n%s", l); s;
+  s = sprintf("s:%2%s", list(l)); s;
+  s = sprintf("2l:%n%2l", list(l)); s;
   s = sprintf("%p", list(l)); s;
   s = sprintf("%;", list(l)); s;
@@ -812 +822 @@
           string may contain conversion specifications. 
           Do 'help print:' for a listing of valid conversion specifications.
+          As an addition to the conversions of 'print', the '%n' and '%2' 
+          conversion specification does not consume an additional argument,
+          but simply generates a newline character.
 
 NOTE:     If one of the additional arguments is a list, then it should be 
@@ -849 +862 @@
           string may contain conversion specifications. 
           Do 'help print:' for a listing of valid conversion specifications.
+          As an addition to the conversions of 'print', the '%n' and '%2' 
+          conversion specification does not consume an additional argument,
+          but simply generates a newline character.
 
 NOTE:     If one of the additional arguments is a list, then it should be