commit c51dda478a96bfdc232ba131f7abf85638b778f9
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Apr 29 14:50:34 2025 +0200
Do not use \cnameref
This is a completely different thing to \nameref
---
lib/lyx2lyx/lyx_2_5.py | 15 ---------------
src/frontends/qt/GuiRef.cpp | 8 +++-----
src/insets/InsetRef.cpp | 17 +++--------------
src/tex2lyx/text.cpp | 12 ++++++------
4 files changed, 12 insertions(+), 40 deletions(-)
diff --git a/lib/lyx2lyx/lyx_2_5.py b/lib/lyx2lyx/lyx_2_5.py
index f5b64e9761..3a738d5db3 100644
--- a/lib/lyx2lyx/lyx_2_5.py
+++ b/lib/lyx2lyx/lyx_2_5.py
@@ -2547,26 +2547,11 @@ def revert_cleveref(document):
i += 1
continue
- nameref = False
- k = find_token(document.body, "LatexCommand formatted", i, j)
- if k == -1:
- k = find_token(document.body, "LatexCommand nameref", i, j)
- if k == -1:
- i += 1
- continue
- nolink = get_bool_value(document.body, "nolink", i, j, False)
- if not nolink:
- i += 1
- continue
- nameref = True
-
plural = get_bool_value(document.body, "plural", i, j, False)
caps = get_bool_value(document.body, "caps", i, j, False)
label = get_quoted_value(document.body, "reference", i, j)
cmd = "\\"
- if nameref:
- cmd += "name"
if caps:
cmd += "C"
else:
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 9fbe5caf2f..06138693e8 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -176,16 +176,14 @@ void GuiRef::enableBoxes()
bool const isFormatted = (reftype == "formatted");
bool const isLabelOnly = (reftype == "labelonly");
bool const hyper_on = buffer().params().pdfoptions().use_hyperref;
- bool const cleveref_nameref = use_cleveref && reftype == "nameref"
- && (!hyper_on || nolinkCB->isChecked());
bool const zref_clever = use_zref && (reftype == "vref" || reftype ==
"vpageref");
- bool const allow_plural = use_refstyle || cleveref_nameref;
+ bool const allow_plural = use_refstyle;
bool const allow_caps = use_refstyle || use_cleveref || use_zref;
bool const allow_nohyper = !isLabelOnly && (!isFormatted ||
use_cleveref || use_zref)
&& (reftype != "cpageref" || use_zref);
bool const intext = bufferview()->cursor().inTexted();
- pluralCB->setEnabled(intext && (isFormatted || cleveref_nameref) &&
allow_plural);
- capsCB->setEnabled(intext && (isFormatted || cleveref_nameref ||
zref_clever || reftype == "cpageref")
+ pluralCB->setEnabled(intext && isFormatted && allow_plural);
+ capsCB->setEnabled(intext && (isFormatted || zref_clever || reftype ==
"cpageref")
&& allow_caps);
noprefixCB->setEnabled(intext && isLabelOnly);
// disabling of hyperlinks not supported by formatted references
diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 5657ba31c3..a05522b3b9 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -408,12 +408,6 @@ void InsetRef::latex(otexstream & os, OutputParams const &
rp) const
first = false;
}
os << "}";
- } else if (cmd == "nameref" && use_cleveref && (use_nolink ||
!hyper_on)) {
- docstring const crefcmd = use_caps ? from_ascii("Cref") :
from_ascii("cref");
- os << "\\name" << crefcmd;
- if (use_plural)
- os << "s";
- os << '{' << data << '}';
} else if (cmd == "labelonly") {
docstring const & ref = getParam("reference");
if (getParam("noprefix") != "true")
@@ -916,14 +910,9 @@ void InsetRef::validate(LaTeXFeatures & features) const
} else if (cmd == "eqref" && buffer().params().xref_package !=
"refstyle")
// with refstyle, we simply output "(\ref{label})"
features.require("amsmath");
- else if (cmd == "nameref") {
- bool const nr_clever =
!buffer().masterParams().pdfoptions().use_hyperref
- || getParam("nolink") == "true";
- if (buffer().masterParams().xref_package == "cleveref" &&
nr_clever)
- features.require("cleveref");
- else
- features.require("nameref");
- } else if (cmd == "cpageref") {
+ else if (cmd == "nameref")
+ features.require("nameref");
+ else if (cmd == "cpageref") {
if (buffer().masterParams().xref_package == "cleveref")
features.require("cleveref");
else if (buffer().masterParams().xref_package == "zref")
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 7e18b42382..56cf527847 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -150,14 +150,14 @@ char const * const known_babel_shorthands[] = { "\"",
"|", "-", "~", "=", "/",
"~", "*", ":", "_", "x", "'", "`", "<", ">", 0 };
char const * const known_ref_commands[] = { "ref", "pageref", "vref",
- "vpageref", "prettyref", "nameref", "eqref", "cref", "Cref", "namecref",
- "nameCref", "namecrefs", "nameCrefs", "cpageref", "labelcref",
- "labelcpageref", "vrefrange", "vpagerefrange", "crefrange", "Crefrange", 0 };
+ "vpageref", "prettyref", "nameref", "eqref", "cref", "Cref",
+ "cpageref", "labelcref", "labelcpageref",
+ "vrefrange", "vpagerefrange", "crefrange", "Crefrange", 0 };
char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
- "vpageref", "formatted", "nameref", "eqref", "formatted", "formatted",
"nameref",
- "nameref", "nameref", "nameref", "cpageref", "ref", "pageref",
- "vref", "vpageref", "formatted", "formatted", 0 };
+ "vpageref", "formatted", "nameref", "eqref", "formatted", "formatted",
+ "cpageref", "ref", "pageref",
+ "vref", "vpageref", "formatted", "formatted", 0 };
char const * const known_starref_commands[] = { "ref", "pageref", "vref",
"vpageref", "nameref", "eqref", "cref", "Cref", "cpageref", 0 };
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
