From 42070839c7a63651d0a67c7e75cae63f0b2828fa Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 24 Oct 2002 13:32:30 +0000 Subject: [PATCH] * man2hlp.c (handle_link): Treat link name after & as regular text. Suggested by David Martin --- src/ChangeLog | 6 ++++++ src/man2hlp.c | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 428f2d9d1..255d04812 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-10-24 Andrew V. Samoilov + + * man2hlp.c (handle_link): Treat link name after \& as regular + text. + Suggested by David Martin + 2002-10-23 Andrew V. Samoilov * poptconfig.c (configLine): Cast the argument to functions for diff --git a/src/man2hlp.c b/src/man2hlp.c index 99ea61af3..76e645971 100644 --- a/src/man2hlp.c +++ b/src/man2hlp.c @@ -593,6 +593,7 @@ handle_link (char *buffer) { static char old[80]; int len; + char *amp; switch (link_flag) { case 1: @@ -618,8 +619,18 @@ handle_link (char *buffer) if (len && buffer[len - 1] == '"') { buffer[--len] = 0; } - printf_string ("%c%s%c%s%c\n", CHAR_LINK_START, old, - CHAR_LINK_POINTER, buffer, CHAR_LINK_END); + + /* "Layout\&)," -- "Layout" should be highlighted, but not ")," */ + amp = strstr (old, "\\&"); + if (amp) { + *amp = 0; + amp += 2; + } else { + amp = ""; + } + + printf_string ("%c%s%c%s%c%s\n", CHAR_LINK_START, old, + CHAR_LINK_POINTER, buffer, CHAR_LINK_END, amp); link_flag = 0; /* Add to the linked list */ if (current_link) {