From 931ebece9233702434eeadf90e12d2d0f1be0cf4 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 5 Feb 2020 16:16:31 +0100
Subject: [PATCH] Remove options `noemptylinemacro` and `nolinemacro`; add
 option `linemacro`

---
 doc/manual/source/conf.py            |  4 ++--
 doc/manual/source/running-dynare.rst | 17 +++++------------
 preprocessor                         |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/doc/manual/source/conf.py b/doc/manual/source/conf.py
index 8f8a1079f..64d6888bb 100644
--- a/doc/manual/source/conf.py
+++ b/doc/manual/source/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2018-2019 Dynare Team
+# Copyright (C) 2018-2020 Dynare Team
 #
 # This file is part of Dynare.
 #
@@ -36,7 +36,7 @@ mathjax_path = 'mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
 master_doc = 'index'
 
 project = u'Dynare'
-copyright = u'2019, Dynare Team'
+copyright = u'2020, Dynare Team'
 author = u'Dynare Team'
 
 add_function_parentheses = False
diff --git a/doc/manual/source/running-dynare.rst b/doc/manual/source/running-dynare.rst
index 99a81aebd..bb69284af 100644
--- a/doc/manual/source/running-dynare.rst
+++ b/doc/manual/source/running-dynare.rst
@@ -152,19 +152,12 @@ by the ``dynare`` command.
         debugging purposes or for using the macro processor
         independently of the rest of Dynare toolbox.
 
-    .. option:: nolinemacro
+    .. option:: linemacro
 
-        Instructs the macro preprocessor to omit line numbering
-        information in the intermediary ``.mod`` file created after
-        the macro processing step. Useful in conjunction with
-        :opt:`savemacro <savemacro[=FILENAME]>` when one wants that to reuse the intermediary
-        ``.mod`` file, without having it cluttered by line numbering
-        directives.
-
-    .. option:: noemptylinemacro
-
-        Passing this option removes all empty lines from the macro expanded
-        mod file created when the :opt:`savemacro <savemacro[=FILENAME]>` option is used.
+        Instructs the macro preprocessor include ``@#line`` directives
+        specifying the line on which macro directives were encountered and
+        expanded from. Only useful in conjunction with :opt:`savemacro
+        <savemacro[=FILENAME]>`.
 
     .. option:: onlymodel
 
diff --git a/preprocessor b/preprocessor
index c4a9f93d4..1dbbd87d3 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit c4a9f93d40abd4747a1101116729400452dfe9a3
+Subproject commit 1dbbd87d3d4a44b2762e4779ccb4173b6ae9088f