gbranden pushed a commit to branch master
in repository groff.
commit 6fd27d5d0b69985ae5f8a68b8fa058d82ad9d233
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Aug 13 05:45:57 2024 -0500
[troff]: Drop GROFF_ENABLE_TRANSPARENCY_WARNINGS.
* src/roff/troff/div.cpp (top_level_diversion::transparent_output):
* src/roff/troff/input.cpp (transparent_translate): Drop
`GROFF_ENABLE_TRANSPARENCY_WARNINGS` environment variable kludge. The
underlying problems are better understood now and giving the user
tools to fix them is on the horizon.
See <https://savannah.gnu.org/bugs/?63074>.
---
ChangeLog | 9 +++++++++
src/roff/troff/div.cpp | 7 +++----
src/roff/troff/input.cpp | 12 ++++++------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 810c547d4..d9a813d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-13 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/div.cpp
+ (top_level_diversion::transparent_output):
+ * src/roff/troff/input.cpp (transparent_translate): Drop
+ `GROFF_ENABLE_TRANSPARENCY_WARNINGS` environment variable
+ kludge. The underlying problems are better understood now and
+ giving the user tools to fix them is on the horizon.
+
2024-08-13 G. Branden Robinson <[email protected]>
* src/roff/troff/node.cpp: Drop Autoconf-guarded inclusion of
diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp
index dc029be0b..d3ff8a488 100644
--- a/src/roff/troff/div.cpp
+++ b/src/roff/troff/div.cpp
@@ -460,10 +460,9 @@ void top_level_diversion::transparent_output(unsigned char
c)
void top_level_diversion::transparent_output(node * /*n*/)
{
- // TODO: Restore this diagnostic when Savannah #65371 is fixed;
- // perhaps suggest use of \[uXXXX] notation.
- if (getenv("GROFF_ENABLE_TRANSPARENCY_WARNINGS") != 0 /* nullptr */)
- error("can't transparently output node at top level");
+ // TODO: When Savannah #63074 is fixed, the user will have a way to
+ // avoid this error.
+ error("can't transparently output node at top level");
}
// Implement the internals of `.cf`.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 42244b07e..bc7df3340 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -2891,12 +2891,12 @@ static int transparent_translate(int cc)
int c = ci->get_ascii_code();
if (c != '\0')
return c;
- if (getenv("GROFF_ENABLE_TRANSPARENCY_WARNINGS")
- != 0 /* nullptr */)
- error("can't translate %1 to special character '%2'"
- " in transparent throughput",
- input_char_description(cc),
- ci->nm.contents());
+ // TODO: When Savannah #63074 is fixed, the user will have a way
+ // to avoid this error.
+ error("can't translate %1 to special character '%2'"
+ " in transparent throughput",
+ input_char_description(cc),
+ ci->nm.contents());
}
}
return cc;
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
