Patch 1 for troffcvt 1.02. Apply with: patch -p < thisfile *** req.c~ Mon Jan 25 10:17:12 1993 --- req.c Thu Jan 21 16:15:54 1993 *************** *** 1277,1283 **** UChar *p = argv[0]; while (*p != '\0'); ! TextChOut (*p); return (1); } --- 1277,1283 ---- UChar *p = argv[0]; while (*p != '\0'); ! TextChOut (*p++); return (1); } *** rtf-spec-mac~ Mon Jan 25 10:17:19 1993 --- rtf-spec-mac Sat Nov 28 14:07:59 1992 *************** *** 42,48 **** hard-space \\~ # backspace em-dash "\\'d1" ! minus - # don't really know what to do with these yet... begin-field "" --- 42,48 ---- hard-space \\~ # backspace em-dash "\\'d1" ! minus "\\'d0" # don't really know what to do with these yet... begin-field "" *** tc2rtf.c~ Mon Jan 25 10:17:14 1993 --- tc2rtf.c Mon Jan 25 10:02:34 1993 *************** *** 91,97 **** static long offset = 1 * twips; static long indent = 0; /*static long tempIndent = 0;*/ ! static long lineLen = 6.5 * twips; static long spacing = 12 * 2; /* half-points */ static long lineSpacing = 1; static long spaceSize = 12; /* 12/36 em */ --- 91,97 ---- static long offset = 1 * twips; static long indent = 0; /*static long tempIndent = 0;*/ ! static long lineLen = 9360; /* 6.5 * twips */ static long spacing = 12 * 2; /* half-points */ static long lineSpacing = 1; static long spaceSize = 12; /* 12/36 em */ *************** *** 101,107 **** static long margl = 0; /* left/right margins fixed in Prolog() */ static long margr = 0; static long pageLen = 11 * twips; ! static long pageWid = 8.5 * twips; /* character format properties */ /*static long fontNum = 1;*/ --- 101,107 ---- static long margl = 0; /* left/right margins fixed in Prolog() */ static long margr = 0; static long pageLen = 11 * twips; ! static long pageWid = 12240; /* 8.5 * twips */ /* character format properties */ /*static long fontNum = 1;*/ *************** *** 188,209 **** inc = 2; if (strcmp (argv[1], "ansi") == 0) { ! charSetName = &argv[1][1]; charSet = ansiCharSet; } else if (strcmp (argv[1], "mac") == 0) { ! charSetName = &argv[1][1]; charSet = macCharSet; } else if (strcmp (argv[1], "pc") == 0) { ! charSetName = &argv[1][1]; charSet = pcCharSet; } else if (strcmp (argv[1], "pca") == 0) { ! charSetName = &argv[1][1]; charSet = pcaCharSet; } else --- 188,209 ---- inc = 2; if (strcmp (argv[1], "ansi") == 0) { ! charSetName = argv[1]; charSet = ansiCharSet; } else if (strcmp (argv[1], "mac") == 0) { ! charSetName = argv[1]; charSet = macCharSet; } else if (strcmp (argv[1], "pc") == 0) { ! charSetName = argv[1]; charSet = pcCharSet; } else if (strcmp (argv[1], "pca") == 0) { ! charSetName = argv[1]; charSet = pcaCharSet; } else *** troff2rtf.sh~ Mon Jan 25 10:17:17 1993 --- troff2rtf.sh Mon Jan 25 10:11:20 1993 *************** *** 23,29 **** echo "Missing charset after -cs" 1>&2 exit 1 fi ! rargs="$rargs $2" shift; shift ;; -*) --- 23,29 ---- echo "Missing charset after -cs" 1>&2 exit 1 fi ! rargs="$rargs -cs $2" shift; shift ;; -*) *************** *** 42,45 **** files="$@" fi ! troffcvt -r1440 $args $files | tc2rtf $rargs --- 42,45 ---- files="$@" fi ! troffcvt -troff -r1440 $args $files | tc2rtf $rargs *** troffcvt.c~ Mon Jan 25 10:17:16 1993 --- troffcvt.c Fri Dec 4 03:19:23 1992 *************** *** 5,10 **** --- 5,12 ---- -afile Read action file -dN Turn on debugging flag N (N missing = all flags) -mXX Read macro package file XX + -troff Act like troff + -nroff Act like nroff troffcvt - troff-to-XXX converter *************** *** 248,254 **** if (argc == 0) /* stdin */ { - ETMMsg ("Reading from standard input..."); CommentOut ("processing input (stdin)"); if (!PushFile ((char *) NULL)) ETMPanic ("Cannot read stdin"); --- 250,255 ---- *** unroff.sh~ Mon Jan 25 10:17:17 1993 --- unroff.sh Fri Dec 4 03:19:54 1992 *************** *** 50,53 **** files="$@" fi ! troffcvt $args $files | tc2text $pargs --- 50,53 ---- files="$@" fi ! troffcvt -nroff $args $files | tc2text $pargs *** config/ProjectGroup.ptmpl~ Mon Jan 25 10:17:04 1993 --- config/ProjectGroup.ptmpl Tue Oct 13 15:08:08 1992 *************** *** 7,13 **** # endif # ifndef ProjectMinorRelease ! # define ProjectMinorRelease 02 # endif --- 7,13 ---- # endif # ifndef ProjectMinorRelease ! # define ProjectMinorRelease 02pl1 # endif