From: Timo Heister <timo.heister@gmail.com>
Date: Wed, 8 Nov 2017 14:22:44 +0000 (-0500)
Subject: update
X-Git-Tag: v9.0.0-rc1~781^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a67c747ecd00111c8f8f6c2ba1dc7d760e84f9;p=dealii.git

update
---

diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc
index 46cc334282..16e28de4ea 100644
--- a/source/base/parameter_handler.cc
+++ b/source/base/parameter_handler.cc
@@ -1141,8 +1141,8 @@ ParameterHandler::recursively_print_parameters (const std::vector<std::string> &
                 out << "\\item {\\it Parameter name:} {\\tt "
                     << escape(demangle(p->first)) << "}\n"
                     << "\\phantomsection";
-                // labels are not to be escaped but mangled:
                 {
+                  // create label: labels are not to be escaped but mangled
                   std::string label = "parameters:";
                   for (unsigned int i=0; i<target_subsection_path.size(); ++i)
                     {
@@ -1150,11 +1150,11 @@ ParameterHandler::recursively_print_parameters (const std::vector<std::string> &
                       label.append("/");
                     }
                   label.append(p->first);
-                  out << "\\label{" << label << "}\n";
-                  // Backwards-compatibility. Also output label without
+                  // Backwards-compatibility. Output the label with and without
                   // escaping whitespace:
                   if (label.find("_20")!=std::string::npos)
                     out << "\\label{" << Utilities::replace_in_string(label,"_20", " ") << "}\n";
+                  out << "\\label{" << label << "}\n";
                 }
                 out << "\n\n";
 
@@ -1197,13 +1197,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:";
-                // do not escape but mangle labels:
-                for (unsigned int i=0; i<target_subsection_path.size(); ++i)
-                  out << mangle(target_subsection_path[i]) << "/";
-                out << p->first;
-                out << "}\n\n"
-                    << '\n';
+                    << "\\phantomsection";
+                {
+                  // create label: labels are not to be escaped but mangled
+                  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);
+                  // Backwards-compatibility. Output the label with and without
+                  // escaping whitespace:
+                  if (label.find("_20")!=std::string::npos)
+                    out << "\\label{" << Utilities::replace_in_string(label,"_20", " ") << "}\n";
+                  out << "\\label{" << label << "}\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 a435c9bce5..0da52b1697 100644
--- a/tests/parameter_handler/parameter_acceptor_06.output
+++ b/tests/parameter_handler/parameter_acceptor_06.output
@@ -18,8 +18,8 @@ DEAL::\label{parameters:First_20Class}
 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::\phantomsection\label{parameters:First Class/First bool}
+DEAL::\label{parameters:First_20Class/First_20bool}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First bool}
@@ -32,8 +32,8 @@ DEAL::
 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::\phantomsection\label{parameters:First Class/First double}
+DEAL::\label{parameters:First_20Class/First_20double}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First double}
@@ -46,8 +46,8 @@ DEAL::
 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::\phantomsection\label{parameters:First Class/First int}
+DEAL::\label{parameters:First_20Class/First_20int}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First int}
@@ -60,8 +60,8 @@ DEAL::
 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::\phantomsection\label{parameters:First Class/First string}
+DEAL::\label{parameters:First_20Class/First_20string}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{First string}
@@ -80,8 +80,8 @@ DEAL::\label{parameters:Second_20Class}
 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::\phantomsection\label{parameters:Second Class/Second bool}
+DEAL::\label{parameters:Second_20Class/Second_20bool}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second bool}
@@ -94,8 +94,8 @@ DEAL::
 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::\phantomsection\label{parameters:Second Class/Second double}
+DEAL::\label{parameters:Second_20Class/Second_20double}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second double}
@@ -108,8 +108,8 @@ DEAL::
 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::\phantomsection\label{parameters:Second Class/Second int}
+DEAL::\label{parameters:Second_20Class/Second_20int}
 DEAL::
 DEAL::
 DEAL::\index[prmindex]{Second int}
@@ -122,8 +122,8 @@ DEAL::
 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::\phantomsection\label{parameters:Second Class/Second string}
+DEAL::\label{parameters:Second_20Class/Second_20string}
 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 deae5f1a2a..f590e9d387 100644
--- a/tests/parameter_handler/parameter_handler_4.output
+++ b/tests/parameter_handler/parameter_handler_4.output
@@ -38,8 +38,8 @@
 
 {\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}
+\phantomsection\label{parameters:Testing/string list}
+\label{parameters:Testing/string_20list}
 
 
 \index[prmindex]{string list}
diff --git a/tests/parameter_handler/parameter_handler_4a.output b/tests/parameter_handler/parameter_handler_4a.output
index 1b93de23d1..042e196dff 100644
--- a/tests/parameter_handler/parameter_handler_4a.output
+++ b/tests/parameter_handler/parameter_handler_4a.output
@@ -38,8 +38,8 @@
 
 {\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}
+\phantomsection\label{parameters:Testing/string list}
+\label{parameters:Testing/string_20list}
 
 
 \index[prmindex]{string list}
@@ -63,8 +63,8 @@
 
 \begin{itemize}
 \item {\it Parameter name:} {\tt double 2}
-\phantomsection\label{parameters:Testing/Testing_202/double_202}
-\label{parameters:Testing/Testing 2/double 2}
+\phantomsection\label{parameters:Testing/Testing 2/double 2}
+\label{parameters:Testing/Testing_202/double_202}
 
 
 \index[prmindex]{double 2}
@@ -80,8 +80,8 @@
 
 {\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}
+\phantomsection\label{parameters:Testing/Testing 2/int 2}
+\label{parameters:Testing/Testing_202/int_202}
 
 
 \index[prmindex]{int 2}
@@ -94,8 +94,8 @@
 
 {\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}
+\phantomsection\label{parameters:Testing/Testing 2/string list 2}
+\label{parameters:Testing/Testing_202/string_20list_202}
 
 
 \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 8e4ddc2e82..27e2321416 100644
--- a/tests/parameter_handler/parameter_handler_4a_with_alias.output
+++ b/tests/parameter_handler/parameter_handler_4a_with_alias.output
@@ -56,8 +56,8 @@ 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}
+\phantomsection\label{parameters:Testing/string list}
+\label{parameters:Testing/string_20list}
 
 
 \index[prmindex]{string list}
@@ -81,8 +81,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/double 2}
+\label{parameters:Testing/Testing_202/double_202}
 
 
 \index[prmindex]{double 2}
@@ -98,8 +98,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/int 2}
+\label{parameters:Testing/Testing_202/int_202}
 
 
 \index[prmindex]{int 2}
@@ -112,8 +112,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/string list 2}
+\label{parameters:Testing/Testing_202/string_20list_202}
 
 
 \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 047b7e1205..4b2750dda7 100644
--- a/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output
+++ b/tests/parameter_handler/parameter_handler_4a_with_alias_deprecated.output
@@ -56,8 +56,8 @@ 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}
+\phantomsection\label{parameters:Testing/string list}
+\label{parameters:Testing/string_20list}
 
 
 \index[prmindex]{string list}
@@ -81,8 +81,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/double 2}
+\label{parameters:Testing/Testing_202/double_202}
 
 
 \index[prmindex]{double 2}
@@ -98,8 +98,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/int 2}
+\label{parameters:Testing/Testing_202/int_202}
 
 
 \index[prmindex]{int 2}
@@ -112,8 +112,8 @@ 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}
+\phantomsection\label{parameters:Testing/Testing 2/string list 2}
+\label{parameters:Testing/Testing_202/string_20list_202}
 
 
 \index[prmindex]{string list 2}
diff --git a/tests/parameter_handler/write_latex_01.output b/tests/parameter_handler/write_latex_01.output
index 3e44a474fd..7513fbf555 100644
--- a/tests/parameter_handler/write_latex_01.output
+++ b/tests/parameter_handler/write_latex_01.output
@@ -17,8 +17,8 @@
 
 \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}
+\phantomsection\label{parameters:section_5f1/some other entry with _7b_25_7d}
+\label{parameters:section_5f1/some_20other_20entry_20with_20_7b_25_7d}
 
 
 \index[prmindex]{some other entry with \{\%\}}