svn commit: r222855 - in stable/8: contrib/groff/src/devices/grohtml
contrib/groff/src/libs/libdriver contrib/groff/src/roff/troff
contrib/groff/src/utils/hpftodit contrib/groff/tmac
gnu/usr.bin/gr...
Ruslan Ermilov
ru at FreeBSD.org
Wed Jun 8 08:22:55 UTC 2011
Author: ru
Date: Wed Jun 8 08:22:54 2011
New Revision: 222855
URL: http://svn.freebsd.org/changeset/base/222855
Log:
Sync Groff with what's in HEAD except for not re-enabling ANSI SGR support.
Modified:
stable/8/contrib/groff/src/devices/grohtml/post-html.cpp
stable/8/contrib/groff/src/libs/libdriver/input.cpp
stable/8/contrib/groff/src/roff/troff/mtsm.cpp
stable/8/contrib/groff/src/roff/troff/node.cpp
stable/8/contrib/groff/src/utils/hpftodit/hpftodit.cpp
stable/8/contrib/groff/tmac/doc-common
stable/8/contrib/groff/tmac/doc-syms
stable/8/contrib/groff/tmac/doc.tmac
stable/8/gnu/usr.bin/groff/tmac/mdoc.local
Directory Properties:
stable/8/contrib/groff/ (props changed)
stable/8/gnu/usr.bin/groff/ (props changed)
Modified: stable/8/contrib/groff/src/devices/grohtml/post-html.cpp
==============================================================================
--- stable/8/contrib/groff/src/devices/grohtml/post-html.cpp Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/src/devices/grohtml/post-html.cpp Wed Jun 8 08:22:54 2011 (r222855)
@@ -1587,7 +1587,7 @@ void header_desc::write_headings (FILE *
buffer += as_string(h);
buffer += '\0';
- fprintf(f, buffer.contents());
+ fputs(buffer.contents(), f);
} else
fputs(g->text_string, f);
h++;
Modified: stable/8/contrib/groff/src/libs/libdriver/input.cpp
==============================================================================
--- stable/8/contrib/groff/src/libs/libdriver/input.cpp Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/src/libs/libdriver/input.cpp Wed Jun 8 08:22:54 2011 (r222855)
@@ -995,7 +995,7 @@ next_command(void)
inline bool
odd(const int n)
{
- return (n & 1 == 1) ? true : false;
+ return ((n & 1) == 1) ? true : false;
}
//////////////////////////////////////////////////////////////////////
Modified: stable/8/contrib/groff/src/roff/troff/mtsm.cpp
==============================================================================
--- stable/8/contrib/groff/src/roff/troff/mtsm.cpp Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/src/roff/troff/mtsm.cpp Wed Jun 8 08:22:54 2011 (r222855)
@@ -611,14 +611,16 @@ int state_set::is_in(int_value_state i)
return (intset & (1 << (int)i)) != 0;
}
+// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11)
int state_set::is_in(units_value_state u)
{
- return (unitsset & (1 << (int)u) != 0);
+ return (unitsset & (1 << (int)u)) != 0;
}
+// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11)
int state_set::is_in(string_value_state s)
{
- return (stringset & (1 << (int)s) != 0);
+ return (stringset & (1 << (int)s)) != 0;
}
void state_set::add(units_value_state, int n)
Modified: stable/8/contrib/groff/src/roff/troff/node.cpp
==============================================================================
--- stable/8/contrib/groff/src/roff/troff/node.cpp Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/src/roff/troff/node.cpp Wed Jun 8 08:22:54 2011 (r222855)
@@ -2157,7 +2157,7 @@ void glyph_node::debug_node()
if (c)
fprintf(stderr, "%c", c);
else
- fprintf(stderr, ci->nm.contents());
+ fputs(ci->nm.contents(), stderr);
if (push_state)
fprintf(stderr, " <push_state>");
if (state)
Modified: stable/8/contrib/groff/src/utils/hpftodit/hpftodit.cpp
==============================================================================
--- stable/8/contrib/groff/src/utils/hpftodit/hpftodit.cpp Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/src/utils/hpftodit/hpftodit.cpp Wed Jun 8 08:22:54 2011 (r222855)
@@ -870,9 +870,9 @@ output_charset(const int tfm_type)
else if (!all_flag)
continue;
else if (tfm_type == MSL)
- printf(hp_msl_to_ucode_name(charcode));
+ fputs(hp_msl_to_ucode_name(charcode), stdout);
else
- printf(unicode_to_ucode_name(charcode));
+ fputs(unicode_to_ucode_name(charcode), stdout);
printf("\t%d,%d",
scale(char_table[i].width), scale(char_table[i].ascent));
Modified: stable/8/contrib/groff/tmac/doc-common
==============================================================================
--- stable/8/contrib/groff/tmac/doc-common Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/tmac/doc-common Wed Jun 8 08:22:54 2011 (r222855)
@@ -543,6 +543,7 @@
.ds doc-operating-system-FreeBSD-7.3 7.3
.ds doc-operating-system-FreeBSD-8.0 8.0
.ds doc-operating-system-FreeBSD-8.1 8.1
+.ds doc-operating-system-FreeBSD-8.2 8.2
.
.ds doc-operating-system-Darwin-8.0.0 8.0.0
.ds doc-operating-system-Darwin-8.1.0 8.1.0
@@ -563,6 +564,17 @@
.ds doc-operating-system-Darwin-9.4.0 9.4.0
.ds doc-operating-system-Darwin-9.5.0 9.5.0
.ds doc-operating-system-Darwin-9.6.0 9.6.0
+.ds doc-operating-system-Darwin-9.7.0 9.7.0
+.ds doc-operating-system-Darwin-9.8.0 9.8.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.1.0 10.1.0
+.ds doc-operating-system-Darwin-10.2.0 10.2.0
+.ds doc-operating-system-Darwin-10.3.0 10.3.0
+.ds doc-operating-system-Darwin-10.4.0 10.4.0
+.ds doc-operating-system-Darwin-10.5.0 10.5.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.7.0 10.7.0
+.ds doc-operating-system-Darwin-11.0.0 11.0.0
.
.ds doc-operating-system-DragonFly-1.0 1.0
.ds doc-operating-system-DragonFly-1.1 1.1
Modified: stable/8/contrib/groff/tmac/doc-syms
==============================================================================
--- stable/8/contrib/groff/tmac/doc-syms Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/tmac/doc-syms Wed Jun 8 08:22:54 2011 (r222855)
@@ -617,6 +617,8 @@
.\" POSIX Part 1: System API
.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
.as doc-str-St--p1003.1 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1b \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b
+.as doc-str-St--p1003.1b " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
.ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988
.as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
.ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990
@@ -754,6 +756,7 @@
.
.ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm)
.ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32)
+.ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm)
.ds doc-str-Lb-libc Standard C\~Library (libc, \-lc)
.ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk)
.ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat)
@@ -779,6 +782,7 @@
.ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread)
.ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv)
.ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt)
+.ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem)
.ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap)
.ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid)
.ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil)
Modified: stable/8/contrib/groff/tmac/doc.tmac
==============================================================================
--- stable/8/contrib/groff/tmac/doc.tmac Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/contrib/groff/tmac/doc.tmac Wed Jun 8 08:22:54 2011 (r222855)
@@ -1197,8 +1197,14 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Aq
.
-. ds doc-quote-left <
-. ds doc-quote-right >
+. ie "\*[doc-macro-name]"An" \{\
+. ds doc-quote-left <
+. ds doc-quote-right >
+. \}
+. el \{\
+. ds doc-quote-left \[la]
+. ds doc-quote-right \[ra]
+. \}
.
. doc-enclose-string \$@
..
@@ -1527,7 +1533,10 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Ao
.
-. ds doc-quote-left \[la]
+. ie "\*[doc-macro-name]"An" \
+. ds doc-quote-left <
+. el \
+. ds doc-quote-left \[la]
.
. doc-enclose-open \$@
..
@@ -1546,7 +1555,10 @@
. if !\n[doc-arg-limit] \
. ds doc-macro-name Ac
.
-. ds doc-quote-right \[ra]
+. ie "\*[doc-macro-name]"An" \
+. ds doc-quote-right >
+. el \
+. ds doc-quote-right \[ra]
.
. doc-enclose-close \$@
..
Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Jun 8 08:16:32 2011 (r222854)
+++ stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Jun 8 08:22:54 2011 (r222855)
@@ -34,7 +34,6 @@
.\" FreeBSD .Lb values
.ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive)
.ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth)
-.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm)
.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r)
.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam)
@@ -43,6 +42,7 @@
.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat)
.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
.ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit)
+.ds doc-str-Lb-libefi EFI Runtime Services Library (libefi, \-lefi)
.ds doc-str-Lb-libelf ELF Parsing Library (libelf, \-lelf)
.ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch)
.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
@@ -55,12 +55,15 @@
.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat)
.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
.ds doc-str-Lb-libpmc Performance Monitoring Counters Interface Library (libpmc, \-lpmc)
+.ds doc-str-Lb-libproc Processor Monitoring and Analysis Library (libproc, \-lproc)
.ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss)
.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc)
+.ds doc-str-Lb-librtld_db Run-time Linker Debugging Library (librtld_db, \-lrtld_db)
.ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp)
.ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr)
.ds doc-str-Lb-libufs UFS File System Access Library (libufs, \-lufs)
.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw)
+.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog)
.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl)
.
.\" FreeBSD architectures not found in doc-common
@@ -71,7 +74,6 @@
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
-.ds doc-operating-system-FreeBSD-8.2 8.2
.ds doc-operating-system-FreeBSD-8.3 8.3
.ds doc-operating-system-FreeBSD-9.0 9.0
.
More information about the svn-src-stable-8
mailing list