diff --git a/matlab/reports/@graph/createGraph.m b/matlab/reports/@graph/createGraph.m index 8b9c6ca8c0454fd2ed5bd0fa828c7ebf7fee3d1e..d1d3b95603d47db78cd935bcd6f56694bf280754 100644 --- a/matlab/reports/@graph/createGraph.m +++ b/matlab/reports/@graph/createGraph.m @@ -11,7 +11,7 @@ function o = createGraph(o) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -142,7 +142,7 @@ if isempty(o.figname) end o.figname = [o.figDirName '/' tn '.tex']; end -disp(' converting to tex....'); + if isoctave && isempty(regexpi(computer, '.*apple.*', 'once')) print(o.figname, '-dtikz'); else @@ -157,4 +157,5 @@ box off; hold off; close(h); clear h; +fprintf(1, '.'); end diff --git a/matlab/reports/@pages/addPage.m b/matlab/reports/@pages/addPage.m index 00d154a1f164af70adad5792ccd1c451444d8685..799a92cfbde556f2172e46f137ba5ac45e3b2b0b 100644 --- a/matlab/reports/@pages/addPage.m +++ b/matlab/reports/@pages/addPage.m @@ -12,7 +12,7 @@ function o = addPage(o, varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -29,6 +29,6 @@ function o = addPage(o, varargin) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -disp(['Processing Page: ' num2str(numPages(o)+1)]); +fprintf(1, '\nAdding Page: %d', numPages(o)+1); o.objArray = o.objArray.addObj(page(varargin{:})); end \ No newline at end of file diff --git a/matlab/reports/@pages/write.m b/matlab/reports/@pages/write.m index 203060495ed5d8dc00135f13398344af89b700fb..7d211e642cca0f751220e00fd3c1381f1670d78c 100644 --- a/matlab/reports/@pages/write.m +++ b/matlab/reports/@pages/write.m @@ -12,7 +12,7 @@ function o = write(o, fid) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -33,7 +33,7 @@ assert(fid ~= -1); fprintf(fid, '\n%% Pages Object\n'); nps = numPages(o); for i=1:nps - disp(['Writing Page: ' num2str(i)]); + fprintf(1, '\nWriting Page: %d', i); o.objArray(i).write(fid); end fprintf(fid, '%% End Pages Object\n\n'); diff --git a/matlab/reports/@report_table/write.m b/matlab/reports/@report_table/write.m index d16288d62e7f90ec444836df67b2ac1002ea3cd1..4d74bb462b6f37f773fb7a02f90e1666706074a2 100644 --- a/matlab/reports/@report_table/write.m +++ b/matlab/reports/@report_table/write.m @@ -158,4 +158,5 @@ end fprintf(fid, '\\bottomrule\n'); fprintf(fid, '\\end{tabular} \\par \\medskip\n\n'); fprintf(fid, '%% End Report_Table Object\n'); +fprintf(1, '.'); end diff --git a/matlab/reports/@section/addGraph.m b/matlab/reports/@section/addGraph.m index b8e3c03f2aac2a41cc2399b11f3bb8450a3679ed..46e2bdc4a803d32bd32561352d67278fdf1ec440 100644 --- a/matlab/reports/@section/addGraph.m +++ b/matlab/reports/@section/addGraph.m @@ -13,7 +13,7 @@ function o = addGraph(o, varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -30,6 +30,6 @@ function o = addGraph(o, varargin) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -disp(['Processing Section Element: ' num2str(numElements(o)+1)]); +fprintf(1, '.'); o.elements = o.elements.addGraph(varargin{:}); end diff --git a/matlab/reports/@section/addTable.m b/matlab/reports/@section/addTable.m index 831ff70032872dcfafd962fa8784b3b4cc28c1bc..f3098e627c86d6e00ee27c7f45b5a0410e403fa6 100644 --- a/matlab/reports/@section/addTable.m +++ b/matlab/reports/@section/addTable.m @@ -13,7 +13,7 @@ function o = addTable(o, varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -30,6 +30,6 @@ function o = addTable(o, varargin) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -disp(['Processing Section Element: ' num2str(numElements(o)+1)]); +fprintf(1, '.'); o.elements = o.elements.addTable(varargin{:}); end diff --git a/matlab/reports/@section/addVspace.m b/matlab/reports/@section/addVspace.m index 43ca6ac671aa0057b5b20e6a46f1b555467a8dae..8b9ae0863038454aeed5b0144ccf9ca5811ce35f 100644 --- a/matlab/reports/@section/addVspace.m +++ b/matlab/reports/@section/addVspace.m @@ -12,7 +12,7 @@ function o = addVspace(o, varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -29,6 +29,6 @@ function o = addVspace(o, varargin) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -disp(['Processing Section Element: ' num2str(numElements(o)+1)]); +fprintf(1, '.'); o.elements = o.elements.addVspace(varargin{:}); end diff --git a/matlab/reports/@section/write.m b/matlab/reports/@section/write.m index b80a5fd0cb6754391fcf4f5cd2955e18364cf16b..3478371d4679cc1a55970feaded84b396f510a71 100644 --- a/matlab/reports/@section/write.m +++ b/matlab/reports/@section/write.m @@ -12,7 +12,7 @@ function o = write(o, fid) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -30,7 +30,7 @@ function o = write(o, fid) % along with Dynare. If not, see <http://www.gnu.org/licenses/>. assert(fid ~= -1); - +fprintf(1, '/'); fprintf(fid, '%% Section Object\n'); if ~isempty(o.height) fprintf(fid, '\\setlength\\sectionheight{%s}%%\n', o.height); @@ -51,7 +51,6 @@ ne = numElements(o); nvspace = numVspace(o); nlcounter = 0; for i=1:ne - disp(['Writing Section Element: ' num2str(i)]); if isa(o.elements(i), 'vspace') assert(rem(nlcounter, o.cols) == 0, ['@section.write: must place ' ... 'vspace command after a linebreak in the table ' ... diff --git a/matlab/reports/@sections/addSection.m b/matlab/reports/@sections/addSection.m index d2190ae84845d83203999ab8741e2d514d677668..bdf1c1e0d8b074eb25b81bf3db9e2f2f11798196 100644 --- a/matlab/reports/@sections/addSection.m +++ b/matlab/reports/@sections/addSection.m @@ -1,7 +1,7 @@ function o = addSection(o, varargin) % function o = addSection(o, varargin) -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -18,6 +18,6 @@ function o = addSection(o, varargin) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -disp(['Processing Section: ' num2str(numSections(o)+1)]); +fprintf(1, '/'); o.objArray = o.objArray.addObj(section(varargin{:})); end \ No newline at end of file diff --git a/matlab/reports/@sections/write.m b/matlab/reports/@sections/write.m index d354d331f983092eb187e54a8480326206d998fc..6c87a43eaa41f8c1805b80047594d820ea90c027 100644 --- a/matlab/reports/@sections/write.m +++ b/matlab/reports/@sections/write.m @@ -12,7 +12,7 @@ function o = write(o, fid) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -33,7 +33,6 @@ assert(fid ~= -1); fprintf(fid, '\n%% Sections Object\n'); nps = numSections(o); for i=1:nps - disp(['Writing Section: ' num2str(i)]); o.objArray(i).write(fid); end fprintf(fid, '%% End Sections Object\n\n'); diff --git a/matlab/reports/@vspace/write.m b/matlab/reports/@vspace/write.m index b3d2fb2bb13fc9a990271d3bd30d5432c4c7f915..1808f88dff15c0aeb047e65d6014c39f79ece4c9 100644 --- a/matlab/reports/@vspace/write.m +++ b/matlab/reports/@vspace/write.m @@ -12,7 +12,7 @@ function o = write(o, fid) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % % This file is part of Dynare. % @@ -41,4 +41,5 @@ if o.hline > 0 fprintf(fid, '\\midrule'); end end +fprintf(1, '.'); end \ No newline at end of file