[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog doc/groff.texinfo src/devices...
From: |
Werner LEMBERG |
Subject: |
[Groff-commit] groff ./ChangeLog doc/groff.texinfo src/devices... |
Date: |
Mon, 27 Mar 2006 17:31:06 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 06/03/27 17:31:06
Modified files:
. : ChangeLog
doc : groff.texinfo
src/devices/grohtml: post-html.cpp
src/roff/troff : input.cpp
tmac : Makefile.sub
Log message:
* src/roff/troff/input.cpp (encode_char): Emit special characters
for -Thtml as `\[...]'.
* src/devices/grohtml/post-html.cpp (page::add_and_encode): Updated.
* doc/groff.texinfo (\X): Updated.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.943&tr2=1.944&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/doc/groff.texinfo.diff?tr1=1.234&tr2=1.235&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/roff/troff/input.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/tmac/Makefile.sub.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.943 groff/ChangeLog:1.944
--- groff/ChangeLog:1.943 Mon Mar 27 13:50:37 2006
+++ groff/ChangeLog Mon Mar 27 17:31:06 2006
@@ -1,3 +1,11 @@
+2006-03-27 Gaius Mulley <address@hidden>
+
+ * src/roff/troff/input.cpp (encode_char): Emit special characters
+ for -Thtml as `\[...]'.
+ * src/devices/grohtml/post-html.cpp (page::add_and_encode): Updated.
+
+ * doc/groff.texinfo (\X): Updated.
+
2006-03-27 Werner LEMBERG <address@hidden>
* tmac/Makefile.sub (NORMALFILES, SPECIALFILES): Add various missing
Index: groff/doc/groff.texinfo
diff -u groff/doc/groff.texinfo:1.234 groff/doc/groff.texinfo:1.235
--- groff/doc/groff.texinfo:1.234 Sun Mar 26 08:55:38 2006
+++ groff/doc/groff.texinfo Mon Mar 27 17:31:06 2006
@@ -13110,9 +13110,8 @@
@pindex address@hidden, and @code{use_charnames_in_special}}
@cindex @code{\X}, and special characters
If the @samp{use_charnames_in_special} keyword is set in the @file{DESC}
-file, special characters no longer cause an error; the name @var{xx} is
-represented as @samp{\(@var{xx}\)} in the @address@hidden X}} output command.
-Additionally, the backslash is represented as @code{\\}.
+file, special characters no longer cause an error; they are simply output
+verbatim. Additionally, the backslash is represented as @code{\\}.
@samp{use_charnames_in_special} is currently used by @code{grohtml} only.
@endDefesc
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.35
groff/src/devices/grohtml/post-html.cpp:1.36
--- groff/src/devices/grohtml/post-html.cpp:1.35 Fri Feb 24 08:08:42 2006
+++ groff/src/devices/grohtml/post-html.cpp Mon Mar 27 17:31:06 2006
@@ -1379,9 +1379,9 @@
* add_and_encode - adds a special string to the page, it translates the
string
* into html glyphs. The special string will have come from
x X html:
* and can contain troff character encodings which appear as
- * \(char\). A sequence of \\ represents \.
+ * \[char]. A sequence of \\ represents \.
* So for example we can write:
- * "cost = \(Po\)3.00 file = \\foo\\bar"
+ * "cost = \[Po]3.00 file = \\foo\\bar"
* which is translated into:
* "cost = £3.00 file = \foo\bar"
*/
@@ -1399,15 +1399,15 @@
if (s->f == NULL)
return;
while (i < str.length()) {
- if ((i+1<str.length()) && (str.substring(i, 2) == string("\\("))) {
+ if ((i+1<str.length()) && (str.substring(i, 2) == string("\\["))) {
// start of escape
- i += 2; // move over \(
+ i += 2; // move over \[
int a = i;
- while ((i+1<str.length()) && (str.substring(i, 2) != string("\\)"))) {
+ while ((i<str.length()) && (str.substring(i, 1) != string("]"))) {
i++;
}
int n = i;
- if ((i+1<str.length()) && (str.substring(i, 2) == string("\\)")))
+ if ((i<str.length()) && (str.substring(i, 1) == string("]")))
i++;
else
n = -1;
Index: groff/src/roff/troff/input.cpp
diff -u groff/src/roff/troff/input.cpp:1.33 groff/src/roff/troff/input.cpp:1.34
--- groff/src/roff/troff/input.cpp:1.33 Thu Feb 23 20:00:47 2006
+++ groff/src/roff/troff/input.cpp Mon Mar 27 17:31:06 2006
@@ -5185,14 +5185,13 @@
const char *s = ci->get_symbol()->contents();
if (s[0] != (char)0) {
mac->append('\\');
- mac->append('(');
+ mac->append('[');
int i = 0;
while (s[i] != (char)0) {
mac->append(s[i]);
i++;
}
- mac->append('\\');
- mac->append(')');
+ mac->append(']');
}
}
else if (tok.stretchable_space()
Index: groff/tmac/Makefile.sub
diff -u groff/tmac/Makefile.sub:1.38 groff/tmac/Makefile.sub:1.39
--- groff/tmac/Makefile.sub:1.38 Mon Mar 27 13:50:37 2006
+++ groff/tmac/Makefile.sub Mon Mar 27 17:31:06 2006
@@ -32,7 +32,7 @@
trans.tmac \
hyphen.us hyphenex.us \
fr.tmac hyphen.fr \
- sv.tmac hyphen.sv \
+ sv.tmac hyphen.sv
SPECIALFILES=an.tmac man.tmac s.tmac ms.tmac www.tmac
STRIPFILES=e.tmac doc.tmac doc-old.tmac
MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ./ChangeLog doc/groff.texinfo src/devices...,
Werner LEMBERG <=