From fe165c2430d2becbe7530d896216f2db4c31ac05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 11 Jul 2019 17:35:30 +0200
Subject: [PATCH] LaTeX files generated by the preprocessor are now under
<basename>/latex/
---
matlab/collect_latex_files.m | 23 +++++++++++++++--------
preprocessor | 2 +-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/matlab/collect_latex_files.m b/matlab/collect_latex_files.m
index 53886f3901..77f98b975e 100644
--- a/matlab/collect_latex_files.m
+++ b/matlab/collect_latex_files.m
@@ -8,7 +8,7 @@ function collect_latex_files
% - The packages loaded enable pdflatex to run
% - The _dynamic and _static TeX-model files are not included as they are standalone TeX-files
-% Copyright (C) 2015-2017 Dynare Team
+% Copyright (C) 2015-2019 Dynare Team
%
% This file is part of Dynare.
%
@@ -40,20 +40,27 @@ fprintf(fid,'%s \n','\usepackage{breqn}');
fprintf(fid,'%s \n','\usepackage{float,morefloats,caption}');
fprintf(fid,'%s \n','\begin{document}');
-%% Root directory
+%% 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) && ...
- ~strcmp(TeX_Files(ii).name,[M_.fname,'_dynamic.tex']) && ...
- ~strcmp(TeX_Files(ii).name,[M_.fname,'_static.tex']) && ...
- ~strcmp(TeX_Files(ii).name,[M_.fname,'_original.tex']) && ...
- ~strcmp(TeX_Files(ii).name,[M_.fname,'_steady_state.tex']) && ...
- ~strcmp(TeX_Files(ii).name,[M_.fname,'_TeX_binder.tex'])
+ if ~strcmp(TeX_Files(ii).name,f_name_binder)
fprintf(fid,'%s \n',['\include{',f_name,'}']);
end
end
+%% Include LaTeX files from <fname>/latex/ directory, except the standalone ones
+TeX_Files=dir([M_.dname filesep 'latex' filesep '*.tex']);
+for ii=1:length(TeX_Files)
+ [pathstr,f_name,ext] = fileparts(TeX_Files(ii).name);
+ if ~strcmp(f_name, 'dynamic') && ...
+ ~strcmp(f_name, 'static') && ...
+ ~strcmp(f_name, 'original') && ...
+ ~strcmp(f_name, 'steady_state')
+ fprintf(fid,'%s \n',['\include{' M_.dname '/latex/' f_name '}']);
+ end
+end
+
%% Output directory
TeX_Files=dir([M_.dname filesep 'Output' filesep M_.fname '*.tex']);
for ii=1:length(TeX_Files)
diff --git a/preprocessor b/preprocessor
index 24d4b2dc77..0988a1f755 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 24d4b2dc77a461047ee24f2c73388d5a09edf053
+Subproject commit 0988a1f755be01b00aab7a458c89d9b63800875d
--
GitLab