From c6b757646e98bc20617173b690cef0e6f8adc0a5 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Thu, 21 Nov 2019 10:10:49 +0100 Subject: [PATCH] Move remaining LaTeX-files to subfolder Closes https://git.dynare.org/Dynare/dynare/issues/1655 --- matlab/collect_latex_files.m | 9 --------- matlab/write_latex_definitions.m | 7 +++++-- matlab/write_latex_parameter_table.m | 8 ++++++-- matlab/write_latex_prior_table.m | 7 +++++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/matlab/collect_latex_files.m b/matlab/collect_latex_files.m index 77f98b975..0b9f28407 100644 --- a/matlab/collect_latex_files.m +++ b/matlab/collect_latex_files.m @@ -40,15 +40,6 @@ fprintf(fid,'%s \n','\usepackage{breqn}'); fprintf(fid,'%s \n','\usepackage{float,morefloats,caption}'); fprintf(fid,'%s \n','\begin{document}'); -%% Include LaTeX files from root directory -TeX_Files=dir([M_.fname,'*.tex']); -for ii=1:length(TeX_Files) - [pathstr,f_name,ext] = fileparts(TeX_Files(ii).name); - if ~strcmp(TeX_Files(ii).name,f_name_binder) - fprintf(fid,'%s \n',['\include{',f_name,'}']); - end -end - %% Include LaTeX files from /latex/ directory, except the standalone ones TeX_Files=dir([M_.dname filesep 'latex' filesep '*.tex']); for ii=1:length(TeX_Files) diff --git a/matlab/write_latex_definitions.m b/matlab/write_latex_definitions.m index 30e96506f..531e799cf 100644 --- a/matlab/write_latex_definitions.m +++ b/matlab/write_latex_definitions.m @@ -12,7 +12,7 @@ function write_latex_definitions % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013-2018 Dynare Team +% Copyright (C) 2013-2019 Dynare Team % % This file is part of Dynare. % @@ -39,7 +39,10 @@ else M_var_root = {'M_.endo', 'M_.exo', 'M_.exo_det', 'M_.param'}; end -fid = fopen([M_.fname '_latex_definitions.tex'], 'w'); +if ~exist([M_.fname '/latex'],'dir') + mkdir(M_.fname,'latex'); +end +fid = fopen([M_.fname, '/latex/' M_.fname '_latex_definitions.tex'], 'w'); for i=1:length(tables) fprintf(fid, '\\begin{center}\n'); fprintf(fid, '\\begin{longtable}{ccc}\n'); diff --git a/matlab/write_latex_parameter_table.m b/matlab/write_latex_parameter_table.m index 7d76880ff..8b1b1b98b 100644 --- a/matlab/write_latex_parameter_table.m +++ b/matlab/write_latex_parameter_table.m @@ -12,7 +12,7 @@ function write_latex_parameter_table % SPECIAL REQUIREMENTS % none -% Copyright (C) 2015-2018 Dynare Team +% Copyright (C) 2015-2019 Dynare Team % % This file is part of Dynare. % @@ -37,7 +37,11 @@ if ~isequal(M_.param_names, M_.param_names_long) Long_names_present = true; end -fid = fopen([M_.fname '_latex_parameters.tex'], 'w'); +if ~exist([M_.fname '/latex'],'dir') + mkdir(M_.fname,'latex'); +end + +fid = fopen([M_.fname, '/latex/' M_.fname '_latex_parameters.tex'], 'w'); fprintf(fid, '\\begin{center}\n'); if Long_names_present==1 fprintf(fid, '\\begin{longtable}{ccc}\n'); diff --git a/matlab/write_latex_prior_table.m b/matlab/write_latex_prior_table.m index 2fb738bd7..3bae6d8c5 100644 --- a/matlab/write_latex_prior_table.m +++ b/matlab/write_latex_prior_table.m @@ -11,7 +11,7 @@ function write_latex_prior_table % SPECIAL REQUIREMENTS % none -% Copyright (C) 2015-2017 Dynare Team +% Copyright (C) 2015-2019 Dynare Team % % This file is part of Dynare. % @@ -54,7 +54,10 @@ ub=bounds.ub; PriorNames = { 'Beta' , 'Gamma' , 'Gaussian' , 'Inv. Gamma' , 'Uniform' , 'Inv. Gamma -- 2', '', 'Weibull' }; -fidTeX = fopen([Model.fname '_priors_table.tex'],'w+'); +if ~exist([M_.fname '/latex'],'dir') + mkdir(M_.fname,'latex'); +end +fidTeX = fopen([M_.fname, '/latex/' Model.fname '_priors_table.tex'],'w+'); fprintf(fidTeX,'%% TeX-table generated by Dynare write_latex_prior_table.m.\n'); fprintf(fidTeX,'%% Prior Information\n'); fprintf(fidTeX,['%% ' datestr(now,0)]);