From 6122e6ce73532724e1fb2f1c599a258d12c08d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 18 Nov 2010 10:47:39 +0100
Subject: [PATCH 1/4] Fixed typo in copyright notice of Dynare Emacs mode

---
 dynare.el   | 2 +-
 license.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dynare.el b/dynare.el
index 887c62ba9..839b89eb2 100644
--- a/dynare.el
+++ b/dynare.el
@@ -15,7 +15,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, see
+;; along with this program.  If not, see
 ;; <http://www.gnu.org/licenses/>.
 
 ;; Keywords: dynare
diff --git a/license.txt b/license.txt
index 4a229e49c..ecfa3d2bd 100644
--- a/license.txt
+++ b/license.txt
@@ -320,5 +320,5 @@ License: GPL-3+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with GNU Emacs; see the file COPYING.  If not, see
+ along with this program.  If not, see
  <http://www.gnu.org/licenses/>.

From 4e45c5ce234344a2446d97c7f346f0a2e43cf730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 18 Nov 2010 10:48:12 +0100
Subject: [PATCH 2/4] Added entry for slicot in license file

---
 license.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/license.txt b/license.txt
index ecfa3d2bd..1b088a27d 100644
--- a/license.txt
+++ b/license.txt
@@ -322,3 +322,20 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
+
+Files: mex/sources/libslicot/*
+Copyright: 2002-2009, NICONET e.V.
+License: GPL-2+
+ This program is free software: you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 2 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see
+ <http://www.gnu.org/licenses/>.

From 479b2be6026c77d64270e9467fdbb5aa90219a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 18 Nov 2010 11:10:49 +0100
Subject: [PATCH 3/4] Build system: added missing PIC flag for Fortran code in
 Octave DLLs

---
 mex/build/octave/mex.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mex/build/octave/mex.am b/mex/build/octave/mex.am
index 9f450f524..f2eab8ad8 100644
--- a/mex/build/octave/mex.am
+++ b/mex/build/octave/mex.am
@@ -5,7 +5,7 @@ CPPFLAGS += -I$(top_srcdir)/../../sources
 DEFS += -DOCTAVE_MEX_FILE
 
 CFLAGS += $(shell $(MKOCTFILE) -p CPICFLAG)
-
+FFLAGS += $(shell $(MKOCTFILE) -p FPICFLAG)
 CXXFLAGS += $(shell $(MKOCTFILE) -p CXXPICFLAG)
 
 LDFLAGS += $(shell $(MKOCTFILE) -p DL_LDFLAGS)

From 3459e1ffc427fc29df32e212921ff6d4e7d6a12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 18 Nov 2010 11:21:20 +0100
Subject: [PATCH 4/4] Preprocessor: max lead/lags in the model are no longer
 affected by lead/lags on parameters (closes #153)

---
 preprocessor/DynamicModel.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc
index 1ac138e16..19150e4ac 100644
--- a/preprocessor/DynamicModel.cc
+++ b/preprocessor/DynamicModel.cc
@@ -3111,10 +3111,14 @@ DynamicModel::computeDerivIDs()
       int lag = it->second;
       SymbolType type = symbol_table.getType(it->first);
 
-      // Setting maximum and minimum lags
-      if (max_lead < lag)
+      /* Setting maximum and minimum lags.
+
+         We don't want these to be affected by lead/lags on parameters: they
+         are accepted for facilitating variable flipping, but are simply
+         ignored. */
+      if (max_lead < lag && type != eParameter)
         max_lead = lag;
-      else if (-max_lag > lag)
+      else if (-max_lag > lag && type != eParameter)
         max_lag = -lag;
 
       switch (type)