[LyX/master] tex2lyx support for starred refs
Juergen Spitzmueller
spitz at lyx.org
Mon Dec 5 05:57:32 UTC 2022
commit dedcee9117547fc0fba1f3b159a239b3d2725143
Author: Juergen Spitzmueller <spitz at lyx.org>
Date: Mon Dec 5 07:52:41 2022 +0100
tex2lyx support for starred refs
---
src/tex2lyx/TODO.txt | 1 -
src/tex2lyx/text.cpp | 17 +++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 001d6cf..7efd943 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -34,7 +34,6 @@ Format LaTeX feature LyX feature
443 unicode-math.sty InsetMath*
453 automatic stmaryrd loading \use_package stmaryrd
457 automatic stackrel loading \use_package stackrel
-612 starred reference commands
General
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2ee2ada..b4afeee 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -151,6 +151,9 @@ char const * const known_ref_commands[] = { "ref", "pageref", "vref",
char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
"vpageref", "formatted", "nameref", "eqref", 0 };
+char const * const known_starref_commands[] = { "ref", "pageref", "vref",
+ "vpageref", "nameref", "eqref", 0 };
+
char const * const known_refstyle_commands[] = { "algref", "chapref", "corref",
"eqref", "enuref", "figref", "fnref", "lemref", "parref", "partref", "propref",
"secref", "subsecref", "tabref", "thmref", 0 };
@@ -4548,8 +4551,14 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
// if refstyle is used, we must not convert \prettyref to a
// formatted reference, since that would result in a refstyle command.
- if ((where = is_known(t.cs(), known_ref_commands)) &&
- (t.cs() != "prettyref" || !preamble.refstyle())) {
+ if ((where = is_known(t.cs(), known_ref_commands))
+ && (t.cs() != "prettyref" || !preamble.refstyle())
+ && (p.next_token().asInput() != "*" || is_known(t.cs(), known_starref_commands))) {
+ bool starred = false;
+ if (p.next_token().asInput() == "*") {
+ starred = true;
+ p.get_token();
+ }
string const opt = p.getOpt();
if (opt.empty()) {
context.check_layout(os);
@@ -4561,6 +4570,10 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
os << "plural \"false\"\n";
os << "caps \"false\"\n";
os << "noprefix \"false\"\n";
+ if (starred)
+ os << "nolink \"true\"\n";
+ else
+ os << "nolink \"false\"\n";
end_inset(os);
if (t.cs() == "vref" || t.cs() == "vpageref")
preamble.registerAutomaticallyLoadedPackage("varioref");
More information about the lyx-cvs
mailing list