Merge branch 'disp_aux_4' of git.dynare.org:JohannesPfeifer/dynare

Ref. !2117

matlab/disp_dr.m

@@ -79,7 +79,7 @@ value_format_zero  = sprintf('%%%dd',header_label_length);
 if ~isempty(M_.aux_vars)
     aux_vars_type = [M_.aux_vars.type];
     if any(aux_vars_type==4)
-        aux_var_additional_characters=14;
+        aux_var_additional_characters=17;
     else
         aux_var_additional_characters=3;
     end

matlab/subst_auxvar.m

@@ -50,7 +50,7 @@ if ~isempty(aux_index)
             orig_name = M_.exo_names{M_.aux_vars(aux_index).orig_index};
         case 4
             % Expectation operator
-            str = sprintf('EXPECTATION(%d)(...)', aux_lead_lag);
+            str = sprintf('%s', M_.aux_vars(aux_index).orig_expr);
             return
         case 6
             % Ramsey's multipliers