provide alternative labels to be backwards compatible

diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc
index 8799e3593907429e0206b5d6656b099bc45161cf..46cc3342821d655272a8a05f510aa5d5423930e9 100644 (file)
--- a/source/base/parameter_handler.cc
+++ b/source/base/parameter_handler.cc
@@ -1140,13 +1140,23 @@ ParameterHandler::recursively_print_parameters (const std::vector<std::string> &
                 // print name
                 out << "\\item {\\it Parameter name:} {\\tt "
                     << escape(demangle(p->first)) << "}\n"
-                    << "\\phantomsection\\label{parameters:";
+                    << "\\phantomsection";
                 // labels are not to be escaped but mangled:
-                for (unsigned int i=0; i<target_subsection_path.size(); ++i)
-                  out << mangle(target_subsection_path[i]) << "/";
-                out << p->first;
-                out << "}\n\n"
-                    << '\n';
+                {
+                  std::string label = "parameters:";
+                  for (unsigned int i=0; i<target_subsection_path.size(); ++i)
+                    {
+                      label.append(mangle(target_subsection_path[i]));
+                      label.append("/");
+                    }
+                  label.append(p->first);
+                  out << "\\label{" << label << "}\n";
+                  // Backwards-compatibility. Also output label without
+                  // escaping whitespace:
+                  if (label.find("_20")!=std::string::npos)
+                    out << "\\label{" << Utilities::replace_in_string(label,"_20", " ") << "}\n";
+                }
+                out << "\n\n";
 
                 out << "\\index[prmindex]{"
                     << escape(demangle(p->first))

diff --git a/tests/parameter_handler/parameter_acceptor_06.output b/tests/parameter_handler/parameter_acceptor_06.output
index 097c5d7dbfa14575f9d939a38b3857da51dc6f15..a435c9bce55391b8099584d8c1f455af2b0535b2 100644 (file)
--- a/tests/parameter_handler/parameter_acceptor_06.output
+++ b/tests/parameter_handler/parameter_acceptor_06.output
@@ -19,6 +19,7 @@ DEAL::
 DEAL::\begin{itemize}
 DEAL::\item {\it Parameter name:} {\tt First bool}
 DEAL::\phantomsection\label{parameters:First_20Class/First_20bool}
+DEAL::\label{parameters:First Class/First bool}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First bool}
@@ -32,6 +33,7 @@ DEAL::
 DEAL::{\it Possible values:} A boolean value (true or false)
 DEAL::\item {\it Parameter name:} {\tt First double}
 DEAL::\phantomsection\label{parameters:First_20Class/First_20double}
+DEAL::\label{parameters:First Class/First double}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First double}
@@ -45,6 +47,7 @@ DEAL::
 DEAL::{\it Possible values:} A floating point number $v$ such that $-\text{MAX\_DOUBLE} \leq v \leq \text{MAX\_DOUBLE}$
 DEAL::\item {\it Parameter name:} {\tt First int}
 DEAL::\phantomsection\label{parameters:First_20Class/First_20int}
+DEAL::\label{parameters:First Class/First int}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First int}
@@ -58,6 +61,7 @@ DEAL::
 DEAL::{\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 DEAL::\item {\it Parameter name:} {\tt First string}
 DEAL::\phantomsection\label{parameters:First_20Class/First_20string}
+DEAL::\label{parameters:First Class/First string}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First string}
@@ -77,6 +81,7 @@ DEAL::
 DEAL::\begin{itemize}
 DEAL::\item {\it Parameter name:} {\tt Second bool}
 DEAL::\phantomsection\label{parameters:Second_20Class/Second_20bool}
+DEAL::\label{parameters:Second Class/Second bool}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second bool}
@@ -90,6 +95,7 @@ DEAL::
 DEAL::{\it Possible values:} A boolean value (true or false)
 DEAL::\item {\it Parameter name:} {\tt Second double}
 DEAL::\phantomsection\label{parameters:Second_20Class/Second_20double}
+DEAL::\label{parameters:Second Class/Second double}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second double}
@@ -103,6 +109,7 @@ DEAL::
 DEAL::{\it Possible values:} A floating point number $v$ such that $-\text{MAX\_DOUBLE} \leq v \leq \text{MAX\_DOUBLE}$
 DEAL::\item {\it Parameter name:} {\tt Second int}
 DEAL::\phantomsection\label{parameters:Second_20Class/Second_20int}
+DEAL::\label{parameters:Second Class/Second int}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second int}
@@ -116,6 +123,7 @@ DEAL::
 DEAL::{\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 DEAL::\item {\it Parameter name:} {\tt Second string}
 DEAL::\phantomsection\label{parameters:Second_20Class/Second_20string}
+DEAL::\label{parameters:Second Class/Second string}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second string}

diff --git a/tests/parameter_handler/parameter_handler_4.output b/tests/parameter_handler/parameter_handler_4.output
index b2a3573aba7fdc25c24e512d42be78970201b02a..deae5f1a2ada7018ac7b0cf99e2860d2ad38843f 100644 (file)
--- a/tests/parameter_handler/parameter_handler_4.output
+++ b/tests/parameter_handler/parameter_handler_4.output
@@ -39,6 +39,7 @@
 {\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 \item {\it Parameter name:} {\tt string list}
 \phantomsection\label{parameters:Testing/string_20list}
+\label{parameters:Testing/string list}
 
 
 \index[prmindex]{string list}

diff --git a/tests/parameter_handler/parameter_handler_4a.output b/tests/parameter_handler/parameter_handler_4a.output
index 9d2e4fd3d2a807e557522dc0e8eaa0967ac4c210..1b93de23d1699553f4b0c243f235f14c2335407a 100644 (file)
--- a/tests/parameter_handler/parameter_handler_4a.output
+++ b/tests/parameter_handler/parameter_handler_4a.output
@@ -39,6 +39,7 @@
 {\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 \item {\it Parameter name:} {\tt string list}
 \phantomsection\label{parameters:Testing/string_20list}
+\label{parameters:Testing/string list}
 
 
 \index[prmindex]{string list}
@@ -63,6 +64,7 @@
 \begin{itemize}
 \item {\it Parameter name:} {\tt double 2}
 \phantomsection\label{parameters:Testing/Testing_202/double_202}
+\label{parameters:Testing/Testing 2/double 2}
 
 
 \index[prmindex]{double 2}
@@ -79,6 +81,7 @@
 {\it Possible values:} A floating point number $v$ such that $-\text{MAX\_DOUBLE} \leq v \leq \text{MAX\_DOUBLE}$
 \item {\it Parameter name:} {\tt int 2}
 \phantomsection\label{parameters:Testing/Testing_202/int_202}
+\label{parameters:Testing/Testing 2/int 2}
 
 
 \index[prmindex]{int 2}
@@ -92,6 +95,7 @@
 {\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 \item {\it Parameter name:} {\tt string list 2}
 \phantomsection\label{parameters:Testing/Testing_202/string_20list_202}
+\label{parameters:Testing/Testing 2/string list 2}
 
 
 \index[prmindex]{string list 2}

diff --git a/tests/parameter_handler/parameter_handler_4a_with_alias.output b/tests/parameter_handler/parameter_handler_4a_with_alias.output
index 9cfd0d7d6e80bab0020075d7d1c74fac5a5b850b..8e4ddc2e82a95d4347881dfe454669dc88521ef2 100644 (file)
--- a/tests/parameter_handler/parameter_handler_4a_with_alias.output
+++ b/tests/parameter_handler/parameter_handler_4a_with_alias.output
@@ -57,6 +57,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 
 \item {\it Parameter name:} {\tt string list}
 \phantomsection\label{parameters:Testing/string_20list}
+\label{parameters:Testing/string list}
 
 
 \index[prmindex]{string list}
@@ -81,6 +82,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 \begin{itemize}
 \item {\it Parameter name:} {\tt double 2}
 \phantomsection\label{parameters:Testing/Testing_202/double_202}
+\label{parameters:Testing/Testing 2/double 2}
 
 
 \index[prmindex]{double 2}
@@ -97,6 +99,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 {\it Possible values:} A floating point number $v$ such that $-\text{MAX\_DOUBLE} \leq v \leq \text{MAX\_DOUBLE}$
 \item {\it Parameter name:} {\tt int 2}
 \phantomsection\label{parameters:Testing/Testing_202/int_202}
+\label{parameters:Testing/Testing 2/int 2}
 
 
 \index[prmindex]{int 2}
@@ -110,6 +113,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 {\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 \item {\it Parameter name:} {\tt string list 2}
 \phantomsection\label{parameters:Testing/Testing_202/string_20list_202}
+\label{parameters:Testing/Testing 2/string list 2}
 
 
 \index[prmindex]{string list 2}

diff --git a/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output b/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output
index 10ac3bbea42747ff7a418bd5cefacf15a3bae9d9..047b7e1205d94c209cd26b152cfa317d2c579d69 100644 (file)
--- a/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output
+++ b/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output
@@ -57,6 +57,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 
 \item {\it Parameter name:} {\tt string list}
 \phantomsection\label{parameters:Testing/string_20list}
+\label{parameters:Testing/string list}
 
 
 \index[prmindex]{string list}
@@ -81,6 +82,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 \begin{itemize}
 \item {\it Parameter name:} {\tt double 2}
 \phantomsection\label{parameters:Testing/Testing_202/double_202}
+\label{parameters:Testing/Testing 2/double 2}
 
 
 \index[prmindex]{double 2}
@@ -97,6 +99,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 {\it Possible values:} A floating point number $v$ such that $-\text{MAX\_DOUBLE} \leq v \leq \text{MAX\_DOUBLE}$
 \item {\it Parameter name:} {\tt int 2}
 \phantomsection\label{parameters:Testing/Testing_202/int_202}
+\label{parameters:Testing/Testing 2/int 2}
 
 
 \index[prmindex]{int 2}
@@ -110,6 +113,7 @@ This parameter is an alias for the parameter ``\texttt{int}''.
 {\it Possible values:} An integer $n$ such that $-2147483648\leq n \leq 2147483647$
 \item {\it Parameter name:} {\tt string list 2}
 \phantomsection\label{parameters:Testing/Testing_202/string_20list_202}
+\label{parameters:Testing/Testing 2/string list 2}
 
 
 \index[prmindex]{string list 2}

diff --git a/tests/parameter_handler/write_latex_01.output b/tests/parameter_handler/write_latex_01.output
index 8c192f5d6c461bf74e5e9e9cc0893d00bb8814fe..3e44a474fd35ea1a0cab77f0e6bd2de80674e830 100644 (file)
--- a/tests/parameter_handler/write_latex_01.output
+++ b/tests/parameter_handler/write_latex_01.output
@@ -18,6 +18,7 @@
 \begin{itemize}
 \item {\it Parameter name:} {\tt some other entry with \{\%\}}
 \phantomsection\label{parameters:section_5f1/some_20other_20entry_20with_20_7b_25_7d}
+\label{parameters:section_5f1/some other entry with _7b_25_7d}
 
 
 \index[prmindex]{some other entry with \{\%\}}