fixed: in winix function 'mv':

a recurrence loop - incorrect function was called (typo)
updated: to the new EZC api:
         templates from plugin menu
         templates from 'man' winix function


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@809 e52654a7-88a9-db11-a3e9-0013d4bc506e

templates/man.cpp

@@ -18,6 +18,7 @@ namespace TemplatesFunctions
 
 static Functions::Iterator winixfun_iter;
 static size_t winixfun_curreq = 0;
+static Ezc::Stack * winixstack = &empty_stack;
 
 
 
@@ -36,6 +37,7 @@ return winixfun_iter != functions->End();
 void man_winixfun_tab(Info & i)
 {
 	man_winixfun_tabcheck();
+	winixstack = i.stack;
 
 	if( i.iter == 0 )
 		winixfun_iter = functions->Begin();
@@ -49,7 +51,7 @@ void man_winixfun_tab(Info & i)
 
 void man_winixfun_tab_index(Info & i)
 {
-	i.out << (i.last_iter+1);
+	i.out << (winixstack->iter + 1);
 }
 
 
@@ -65,6 +67,7 @@ void man_winixfun_tab_name(Info & i)
 
 static EzcFun::Iterator ezcfun_iter;
 static size_t ezcfun_curreq = 0;
+static Ezc::Stack * ezcstack = &empty_stack;
 
 
 bool man_ezcfun_tabcheck()
@@ -82,6 +85,7 @@ return ezcfun_iter != ezc_functions.End();
 void man_ezcfun_tab(Info & i)
 {
 	man_ezcfun_tabcheck();
+	ezcstack = i.stack;
 
 	if( i.iter == 0 )
 		ezcfun_iter = ezc_functions.Begin();
@@ -95,7 +99,7 @@ void man_ezcfun_tab(Info & i)
 
 void man_ezcfun_tab_index(Info & i)
 {
-	i.out << (i.last_iter+1);
+	i.out << (ezcstack->iter + 1);
 }
 
 

templates/templates.cpp

@@ -42,6 +42,8 @@ std::vector<std::wstring> empty_pars;
 const std::wstring        empty_string;
 const HtmlTextStream      empty_stream;
 
+// en empty stack item for templates functions
+Ezc::Stack empty_stack;
 
 Db      * db;
 Cur     * cur;

templates/templates.h

@@ -50,6 +50,7 @@ namespace TemplatesFunctions
 	extern EzcFun            ezc_functions;
 	extern LocaleFilter      locale_filter;
 	extern HTMLFilter        html_filter;
+	extern Ezc::Stack        empty_stack;
 
 	extern Db      * db;
 	extern Cur     * cur;