Merge branch 'master' of http://iffwww.iff.kfa-juelich.de/~wuttke/frida2

TODO

@@ -3,8 +3,6 @@
 - coord name algebra
 - convolutand must not be defined over full energy range
 - we need kww with double precision, period.
-- check error bars in PS log graph; keep them inside frame
-- \i history does not work, not even for simplest examples
 
 == TO CHECK ==
 
@@ -16,10 +14,8 @@
 == WISHLIST: TODO ==
 
 - user interface
-  - 'hf' add explanation (formulae)
   - 'gp!' <filename> ?
   - 'dp' output for #spec>1 is obfuscated
-  - expressions should have access to file-wide parameters
 
 - docu lines and num pars
   - 'mfj' remove redundant doc lines
@@ -55,6 +51,7 @@
 - pipes to avoid unnecessary files
 
 - avg, int, sum in oi
+  oy y/[].mr{abs(x)>7}.oy{y^2}.avg[j]
 
 - 2d plots using pm3d # was ist das ?
 

pub/CHANGELOG

@@ -34,6 +34,7 @@ Release 2.1.1a of 01oct10:
 - bugfixes:
   - repaired 'ry' after 100511 introduction of shared_ptr
   - file and spectrum references containing i were calculated incorrectly
+  - restore basic \i functionality
 
 Release 2.1.0c of 21may10:
 

pub/src/commands.cpp

@@ -58,7 +58,7 @@ bool fridaCommand( string cmd )
             "  r    raw data read in (currently only for SPHERES)\n"
             "  _    special / temporary commands\n"
             "More help:\n"
-            "  \\?   help on meta commands and macros\n"
+            "  \\h   help on meta commands and macros\n"
             "  hf   math operators and functions\n"
             ;
 

pub/src/mystd.cpp

@@ -495,7 +495,7 @@ void mystd::glob_file_list(
         string fmain, fext;
         fname_divide( words[i], 0, &fmain, &fext );
         extended_pattern += words[i];
-        if ( fext=="" )
+        if ( fext=="" && extension!="" )
             extended_pattern += "." + extension;
         if ( ++i>=words.size() )
             break;