1151497Sru.ig \"-*- nroff -*- 2151497SruCopyright (C) 2004, 2005 Free Software Foundation, Inc. 3151497Sru 4151497SruThis file is part of the gdiffmk utility, which is part of groff. 5151497SruWritten by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>> 6151497Sru 7151497SruPermission is granted to make and distribute verbatim copies of 8151497Sruthis manual provided the copyright notice and this permission notice 9151497Sruare preserved on all copies. 10151497Sru 11151497SruPermission is granted to copy and distribute modified versions of this 12151497Srumanual under the conditions for verbatim copying, provided that the 13151497Sruentire resulting derived work is distributed under the terms of a 14151497Srupermission notice identical to this one. 15151497Sru 16151497SruPermission is granted to copy and distribute translations of this 17151497Srumanual into another language, under the above conditions for modified 18151497Sruversions, except that this permission notice may be included in 19151497Srutranslations approved by the Free Software Foundation instead of in 20151497Sruthe original English. 21151497Sru.. 22151497Sru. 23151497Sru.do mso www.tmac 24151497Sru. 25151497Sru.TH GDIFFMK @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" 26151497Sru. 27151497Sru. 28151497Sru.SH NAME 29151497Srugdiffmk \- mark differences between groff/nroff/troff files 30151497Sru. 31151497Sru. 32151497Sru.SH SYNOPSIS 33151497Sru.nr a \n(.j 34151497Sru.ad l 35151497Sru.nr i \n(.i 36151497Sru.in +\w'\fBgdiffmk 'u 37151497Sru.ti \niu 38151497Sru.B gdiffmk 39151497Sru.de OP 40151497Sru. ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]" 41151497Sru. el .RB "[\ " "\\$1" "\ ]" 42151497Sru.. 43151497Sru.OP \-a \%addmark 44151497Sru.OP \-c \%changemark 45151497Sru.OP \-d \%deletemark 46151497Sru[\ \c 47151497Sru.B \-D 48151497Sru.OP \-B 49151497Sru.OP \-M "mark1 mark2" 50151497Sru] 51151497Sru.OP \-x \%diffcmd 52151497Sru.OP \-\- 53151497Sru.OP \-\-help 54151497Sru.OP \%\-\-version 55151497Sru.I \%file1 56151497Sru.I \%file2 57151497Sru[\ \c 58151497Sru.IR \%output \ \c 59151497Sru] 60151497Sru.br 61151497Sru.ad \na 62151497Sru. 63151497Sru. 64151497Sru.SH DESCRIPTION 65151497Sru.B gdiffmk 66151497Srucompares two 67151497Sru.BR groff (1), 68151497Sru.BR nroff (1), 69151497Sruor 70151497Sru.BR troff (1) 71151497Srudocuments, 72151497Sru.I file1 73151497Sruand 74151497Sru.IR file2 , 75151497Sruand creates an output which is 76151497Sru.I file2 77151497Sruwith added `margin character' (.mc) commands that indicate the differences. 78151497Sru. 79151497Sru.LP 80151497SruIf the 81151497Sru.I output 82151497Srufilename is present, 83151497Sruthe output is written there. 84151497SruIf it is 85151497Sru.B \- 86151497Sruor absent the output is written to the standard output. 87151497Sru. 88151497Sru.LP 89151497SruIf the 90151497Sru.I file1 91151497Sruor 92151497Sru.I file2 93151497Sruargument is 94151497Sru.B \- 95151497Sruthe standard input is read for that input. 96151497SruClearly both cannot be 97151497Sru.BR \- . 98151497Sru. 99151497Sru.LP 100151497SruNote that the output is not necessarily compatible with all macro packages 101151497Sruand all preprocessors. 102151497SruSee the 103151497Sru.B BUGS 104151497Srusection below. 105151497Sru. 106151497Sru. 107151497Sru.SH OPTIONS 108151497Sru.TP 109151497Sru.BI \-a addmark 110151497SruUse the 111151497Sru.I addmark 112151497Srufor source lines not in 113151497Sru.I file1 114151497Srubut present in 115151497Sru.IR file2 . 116151497SruDefault: 117151497Sru.BR + . 118151497Sru. 119151497Sru.TP 120151497Sru.B \-B 121151497SruBy default, the deleted texts marked by the 122151497Sru.B \-D 123151497Sruoption end 124151497Sruwith an added troff break command, 125151497Sru.BR .br , 126151497Sruto ensure that the deletions are marked properly. 127151497SruThis is the only way to guarantee that deletions and small 128151497Sruchanges get flagged. 129151497SruThis option directs the program not to insert these breaks; it makes no 130151497Srusense to use it without 131151497Sru.BR \-D . 132151497Sru. 133151497Sru.TP 134151497Sru.BI \-c changemark 135151497SruUse the 136151497Sru.I changemark 137151497Srufor changed source lines. 138151497SruDefault: 139151497Sru.BR | . 140151497Sru. 141151497Sru.TP 142151497Sru.BI \-d deletemark 143151497SruUse the 144151497Sru.I deletemark 145151497Srufor deleted source lines. 146151497SruDefault: 147151497Sru.BR * . 148151497Sru. 149151497Sru.TP 150151497Sru.B \-D 151151497SruShow the deleted portions from changed and deleted text. 152151497SruDefault delimiting marks: 153151497Sru.BR "[[" " .\&.\&.\&. " "]]" . 154151497Sru. 155151497Sru.TP 156151497Sru.BI \-M "mark1 mark2" 157151497SruChange the delimiting marks for the 158151497Sru.B \-D 159151497Sruoption. 160151497SruIt makes no sense to use this option without 161151497Sru.BR \-D . 162151497Sru. 163151497Sru.TP 164151497Sru.BI \-x diffcmd 165151497SruUse the 166151497Sru.I diffcmd 167151497Srucommand to perform the comparison of 168151497Sru.I file1 169151497Sruand 170151497Sru.IR file2 . 171151497SruIn particular, 172151497Sru.I diffcmd 173151497Srushould accept the GNU 174151497Sru.B diff 175151497Sru.BI \-D name 176151497Sruoption. 177151497SruDefault: 178151497Sru.BR diff (1). 179151497Sru. 180151497Sru.TP 181151497Sru.B \-\- 182151497SruAll the following arguments are treated as file names, 183151497Srueven if they begin with 184151497Sru.BR \- . 185151497Sru. 186151497Sru.TP 187151497Sru.B \-\-help 188151497SruPrint a usage message on standard error output and exit. 189151497Sru. 190151497Sru.TP 191151497Sru.B \-\-version 192151497SruPrint version information on the standard output and exit. 193151497Sru. 194151497Sru. 195151497Sru.SH BUGS 196151497SruThe output is not necessarily compatible with all macro packages 197151497Sruand all preprocessors. 198151497SruA workaround that is often successful against preprocessor problems 199151497Sruis to run 200151497Sru.B gdiffmk 201151497Sruon the output of all the preprocessors instead of the input source. 202151497Sru. 203151497Sru.LP 204151497Sru.B gdiffmk 205151497Srurelies on the 206151497Sru.BI \-D name 207151497Sruoption of GNU 208151497Sru.BR diff (1) 209151497Sruto make a merged `#ifdef' output format. 210151497SruIt hasn't been tested whether other versions of 211151497Sru.BR diff (1) 212151497Srudo support this option. 213151497SruSee also the 214151497Sru.BI \-x diffcmd 215151497Sruoption. 216151497Sru. 217151497Sru.LP 218151497SruReport bugs to bug-groff@gnu.org. 219151497SruInclude a complete, self-contained example that will allow the bug to 220151497Srube reproduced, and say which version of 221151497Sru.B gdiffmk 222151497Sruyou are using. 223151497Sru. 224151497Sru. 225151497Sru.SH AUTHORS 226151497SruThis document was written and is maintained by 227151497Sru.MTO MBianchi@Foveal.com "Mike Bianchi" . 228151497Sru. 229151497Sru.LP 230151497SruThis document is distributed under the terms of the FDL (GNU Free 231151497SruDocumentation License) version 1.1 or later. 232151497SruYou should have received a copy of the FDL on your system, it is also 233151497Sruavailable on-line at the 234151497Sru.URL http://\:www.gnu.org/\:copyleft/\:fdl.html "GNU copyleft site" . 235151497Sru. 236151497Sru.LP 237151497Sru.B gdiffmk 238151497Sruis part of the 239151497Sru.I groff 240151497SruGNU free software project. 241151497SruAll parts of the 242151497Sru.I groff package 243151497Sruare protected by GNU copyleft licenses. 244151497SruThe software files are distributed under the terms of the GNU General 245151497SruPublic License (GPL), while the documentation files mostly use the GNU 246151497SruFree Documentation License (FDL). 247151497Sru. 248151497Sru. 249151497Sru.SH COPYRIGHT 250151497SruCopyright \(co 2004, 2005 Free Software Foundation, Inc. 251151497Sru. 252151497Sru.LP 253151497Sru.B gdiffmk 254151497Sruis free software; you can redistribute it and/or modify it under 255151497Sruthe terms of the GNU General Public License as published by the Free 256151497SruSoftware Foundation; either version 2, or (at your option) any later 257151497Sruversion. 258151497Sru. 259151497Sru.LP 260151497Sru.B gdiffmk 261151497Sruis distributed in the hope that it will be useful, but WITHOUT ANY 262151497SruWARRANTY; without even the implied warranty of MERCHANTABILITY or 263151497SruFITNESS FOR A PARTICULAR PURPOSE. 264151497SruSee the GNU General Public License for more details. 265151497Sru. 266151497Sru.LP 267151497SruYou should have received a copy of the GNU General Public License along 268151497Sruwith groff; see the file COPYING. 269151497SruIf not, write to the Free Software 270151497SruFoundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. 271151497Sru. 272151497Sru. 273151497Sru.SH "SEE ALSO" 274151497Sru.BR groff (@MAN1EXT@), 275151497Sru.BR nroff (@MAN1EXT@), 276151497Sru.BR gtroff (@MAN1EXT@), 277151497Sru.BR diff (@MAN1EXT@) 278151497Sru. 279151497Sru.\" Local Variables: 280151497Sru.\" mode: nroff 281151497Sru.\" End: 282