1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635
|
Index: sgml/docbook-to-man/Instant/Makefile
diff -c sgml/docbook-to-man/Instant/Makefile:1.1.1.1 sgml/docbook-to-man/Instant/Makefile:1.3
*** sgml/docbook-to-man/Instant/Makefile:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/Makefile Tue Feb 23 22:21:26 1999
***************
*** 47,53 ****
#
# J.Bowe, 1993
#
! # $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/Makefile,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
#
# This assumes you have the (tpt)regexp package (includes and library)
# available.
--- 47,53 ----
#
# J.Bowe, 1993
#
! # $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/Makefile,v 1.3 1999/02/23 22:21:26 db3l Exp $
#
# This assumes you have the (tpt)regexp package (includes and library)
# available.
***************
*** 59,71 ****
# BINDIR = /usr/local/bin # where you keep your programs
# (You should set DEF_TPT_LIB to something, or set it in general.h.
# At OSF we use the default in that file.)
!
MAKE = make
SHELL = /bin/sh
ROOT = /usr/local
! TPTLIB = $(ROOT)/lib/tpt
REGEX_INC = -Itptregexp
REGEX_LIB = tptregexp
BINDIR = $(ROOT)/bin
--- 59,73 ----
# BINDIR = /usr/local/bin # where you keep your programs
# (You should set DEF_TPT_LIB to something, or set it in general.h.
# At OSF we use the default in that file.)
! #
! # -DSTRERROR to DEFINES if library does not have strerror() [ANS-db3l]
! #
MAKE = make
SHELL = /bin/sh
ROOT = /usr/local
! TPTLIB = $(ROOT)/share/sgml/transpec
REGEX_INC = -Itptregexp
REGEX_LIB = tptregexp
BINDIR = $(ROOT)/bin
Index: sgml/docbook-to-man/Instant/general.h
diff -c sgml/docbook-to-man/Instant/general.h:1.1.1.1 sgml/docbook-to-man/Instant/general.h:1.2
*** sgml/docbook-to-man/Instant/general.h:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/general.h Mon Nov 16 22:23:50 1998
***************
*** 53,59 ****
#ifdef STORAGE
#ifndef lint
static char *gen_h_RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/general.h,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $";
#endif
#endif
--- 53,59 ----
#ifdef STORAGE
#ifndef lint
static char *gen_h_RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/general.h,v 1.2 1998/11/16 22:23:50 db3l Exp $";
#endif
#endif
***************
*** 281,286 ****
--- 281,287 ----
Relation_t FindRelByName(char *);
char *FindAttValByName(Element_t *, char *);
char *FindContext(Element_t *, int, char *);
+ char *LookupSDATA(char *);
char *AddElemName(char *);
char *AddAttName(char *);
void OutputString(char *, FILE *, int);
Index: sgml/docbook-to-man/Instant/main.c
diff -c sgml/docbook-to-man/Instant/main.c:1.1.1.1 sgml/docbook-to-man/Instant/main.c:1.3
*** sgml/docbook-to-man/Instant/main.c:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Instant/main.c Tue Feb 23 20:31:37 1999
***************
*** 62,72 ****
*
* Takes input from James Clark's "sgmls" program (v. 1.1).
* ________________________________________________________________________
*/
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/main.c,v 1.1.1.1 1998/11/13 21:31:58 db3l Exp $";
#endif
#include <stdio.h>
--- 62,81 ----
*
* Takes input from James Clark's "sgmls" program (v. 1.1).
* ________________________________________________________________________
+ *
+ *
+ * [ANS-db3l]
+ * General modifications for better interaction with DocBook markup.
+ * Significant changes (but not every change) marked in source with
+ * ANS tag as above. Primary for this module is processing of ESIS
+ * data for elements (ESIS quoting/CMAP/SDATA) here rather than holding
+ * off until DoData() or OutputString().
+ *
*/
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/main.c,v 1.3 1999/02/23 20:31:37 db3l Exp $";
#endif
#include <stdio.h>
***************
*** 83,88 ****
--- 92,106 ----
#define STORAGE
#include "general.h"
+ /* [ANS-db3l] Included for character mapping in ReadESIS */
+ #include <tptregexp.h>
+ #include "translate.h"
+
+ /* [ANS-db3l] Don't have "makeVersionFile", so just stamp the overall */
+ /* release here. Starting with 2.0 to isolate from earlier releases, */
+ /* and tagging with ANS to distinguish it a bit further. */
+ #define VERSION "2.0(0)-ANS"
+
static int do_context, do_tree, do_summ, do_stats, do_validate, do_idlist;
static int do_DATAhack = 0;
static char *this_prog;
***************
*** 120,125 ****
--- 138,146 ----
HandleArgs(ac, av);
Initialize2();
+ if (sdatafile) ReadSDATA(sdatafile);
+ if (cmapfile) ReadCharMap(cmapfile);
+
ReadInstance(in_file);
if (interactive) {
***************
*** 139,146 ****
}
}
else e = DocTree;
- if (sdatafile) ReadSDATA(sdatafile);
- if (cmapfile) ReadCharMap(cmapfile);
/* If we're doing validation, make output file pointer null.
* This means that we generate no output, except error messages. */
if (do_validate) outfp = NULL;
--- 160,165 ----
***************
*** 276,282 ****
case 'l': tpt_lib = optarg; break;
case 'i': start_id = optarg; break;
case 'o': out_file = optarg; break;
! case 'd': do_DATAhack = 1; break;
case 'f': BOFTTextThresh = atoi(optarg); break;
case 'b': interactive = 1; break;
case 'W': warnings = 0; break;
--- 295,301 ----
case 'l': tpt_lib = optarg; break;
case 'i': start_id = optarg; break;
case 'o': out_file = optarg; break;
! case 'd': do_DATAhack++; break;
case 'f': BOFTTextThresh = atoi(optarg); break;
case 'b': interactive = 1; break;
case 'W': warnings = 0; break;
***************
*** 334,342 ****
DoHelpMessage()
{
char **s = help_msg;
printf("usage: %s [option ...] [file]", this_prog);
while (*s) puts(*s++);
! printf("\nVersion: %s\n", _HeadVeRsIoN_);
}
/* ______________________________________________________________________ */
--- 353,364 ----
DoHelpMessage()
{
char **s = help_msg;
+ printf("Instant: SGML document processor/translator, Version %s\n",
+ VERSION);
printf("usage: %s [option ...] [file]", this_prog);
while (*s) puts(*s++);
! /* printf("\nVersion: %s\n", _HeadVeRsIoN_); */
!
}
/* ______________________________________________________________________ */
***************
*** 526,532 ****
}
}
fprintf(stderr, "Error: End of AccumElemInfo - should not be here: %s\n",
! e->gi);
/* return e;*/
exit(1);
}
--- 548,554 ----
}
}
fprintf(stderr, "Error: End of AccumElemInfo - should not be here: %s\n",
! (e && e->gi) ? e->gi : "(No element)");
/* return e;*/
exit(1);
}
***************
*** 534,557 ****
/* Read ESIS lines.
* Limitation? Max 5000 children per node. (done for efficiency --
* should do some malloc and bookkeeping games later).
*/
static Element_t *
ReadESIS(
FILE *fp,
! int depth
)
{
! char *buf;
! int i, c, ncont;
! Element_t *e;
Content_t cont[5000];
Malloc( LINESIZE+1, buf, char );
/* Read input stream - the output of "sgmls", called "ESIS". */
e = AccumElemInfo(fp);
e->depth = depth;
ncont = 0;
while (1) {
--- 556,587 ----
/* Read ESIS lines.
* Limitation? Max 5000 children per node. (done for efficiency --
* should do some malloc and bookkeeping games later).
+ *
+ * [ANS-db3l]
+ * Changes to process ESIS input quoting/cmap/sdata at this point. Also
+ * pass in parent element to function so it can look up the hierarchy
+ * for parent attributes if necessary (such as for FORMAT).
*/
static Element_t *
ReadESIS(
FILE *fp,
! int depth,
! Element_t *parent
)
{
! char *buf, *xlatebuf, *dst, *src, *pch, *sdata;
! int i, c, ncont, inspace, nomap;
! Element_t *e, *cur_e;
Content_t cont[5000];
Malloc( LINESIZE+1, buf, char );
+ Malloc( LINESIZE+1, xlatebuf, char );
/* Read input stream - the output of "sgmls", called "ESIS". */
e = AccumElemInfo(fp);
e->depth = depth;
+ e->parent = parent;
ncont = 0;
while (1) {
***************
*** 563,574 ****
case CMD_DATA: /* -data */
fgets(buf, LINESIZE, fp);
stripNL(buf);
! if (do_DATAhack && (buf[0] == '\\') && (buf[1] == 'n')) {
if ( ! buf[2] )
break;
buf[0] = ' ';
memcpy(&buf[1], &buf[2], strlen(buf)-1);
}
cont[ncont].ch.data = strdup(buf);
cont[ncont].type = CMD_DATA;
ncont++;
--- 593,779 ----
case CMD_DATA: /* -data */
fgets(buf, LINESIZE, fp);
stripNL(buf);
!
! /* [ANS-db3l] Process/sanitize element data */
! /* */
! /* The new default behavior (unless "-d" - do_DATAhack is */
! /* given) is to process inbound translation of ESIS data */
! /* elements at the input stage. This handles all quoting */
! /* from [n]sgmls, as well as character mapping. Doing it */
! /* now avoids a lot of headaches later. OutputString will */
! /* still do Transpec mappings but this way character maps */
! /* only apply to input data, thus freeing the SDATA and */
! /* translation spec from knowing what is in the CMAP. */
! /* */
! /* After translating quoting and mapping characters, as */
! /* long as this attribute doesn't have a defined format of */
! /* linespecific (preserve whitespace/line formatting), the */
! /* result is further processed to translate all spans of */
! /* whitespace into a single space. */
! /* */
! /* Using "-d" restores the previous do_DATAhack behavior, */
! /* while "-d -d" restores original non-translating mode. */
!
! if (!do_DATAhack) {
! #ifdef DEBUG
! fprintf(stderr,"Data: Element '%s'\n Input='%s'\n",
! e->gi,buf);
! #endif
! /* Use the secondary buffer to avoid moving things */
! /* around too much. Note that unless no further cmap */
! /* translation should be performed (nomap==1), *dst */
! /* should point to the last character stored and not */
! /* one past (it should be one past for no cmap). */
! src = buf;
! dst = xlatebuf;
! while (*src) {
! nomap = 0;
! if (*src == '\\') {
! src++;
! switch (*src) {
! case '\\':
! /* Quoted backslash */
! *dst = *src++;
! break;
! case 'n':
! /* Newline */
! *dst = '\n'; src++;
! break;
! case '0': case '1': case '2': case '3':
! case '4': case '5': case '6': case '7':
! /* Octal encoding */
! *dst = ((*src-'0') << 6) +
! ((*(src+1)-'0') << 3) +
! ((*(src+2)-'0'));
! src += 3;
! break;
! case '#': case '%':
! /* Decimal internal(#)/document(%) char */
! /* XXX: Handle better */
! *dst++ = '[';
! while (*src != ';') {
! *dst++ = *src++;
! }
! *dst++ = ']';
! src++;
! /* XXX: Whimp out - no translation */
! nomap = 1;
! break;
! case '|':
! /* SDATA reference */
! sdata = ++src;
! while (*src && *src != '\\' &&
! *(src+1) != '|') {
! src++;
! }
! if (!*src) break;
! *src = '\0'; /* Terminate SDATA name */
! src += 2; /* and skip past */
! if (pch = LookupSDATA(sdata)) {
! strcpy(dst,pch);
! dst += strlen(pch);
! } else {
! /* Output in brackets */
! *dst++ = '[';
! strcpy(dst,sdata);
! dst += strlen(sdata);
! *dst++ = ']';
! }
! /* No cmap translation of sdata */
! nomap = 1;
! break;
! default:
! fprintf(stderr,
! "? Warning: Unknown ESIS escape "
! "sequence in stream: ('%c')\n",
! *src);
! *dst++ = *src++;
! nomap = 1;
! }
! } else {
! *dst = *src++;
! }
!
! /* Handle any character mapping of last character */
! if (!nomap) {
! if (nCharMap) {
! for (i=0; i<nCharMap; i++) {
! if (*dst != CharMap[i].name[0]) continue;
! strcpy(dst,CharMap[i].sval);
! dst += strlen(CharMap[i].sval)-1;
! }
! } else if (*dst == '\\') {
! /* If no map, we'll quote \ automatically to */
! /* avoid always requiring a single line cmap */
! *++dst = '\\';
! }
! dst++;
! }
! } /* while *src */
! *dst = '\0';
!
! /* So it still ends up in "buf" (doesn't matter */
! /* if we just keep swapping them over time. */
! pch = xlatebuf;
! xlatebuf = buf;
! buf = pch;
! #ifdef DEBUG
! fprintf(stderr," D: ESIS/Charmap xlate='%s'\n",buf);
! #endif
! /* Attempt to locate a FORMAT attribute for this element */
! /* or any parent elements, to use as the guide for */
! /* whether or not whitespace is kept in this element */
! cur_e = e;
! while (cur_e) {
! if (pch = FindAttValByName(cur_e,"FORMAT")) {
! #ifdef DEBUG
! fprintf(stderr," D: Using FORMAT from %s element\n",
! cur_e->gi);
! #endif
! break;
! }
! cur_e = cur_e->parent;
! }
! if (!(pch && !(strcmp(pch,"LINESPECIFIC")))) {
! #ifdef DEBUG
! fprintf(stderr," D: Compressing whitespace\n");
! #endif
! /* Replace any span of whitespace with a single space */
! dst = src = buf;
! inspace = 0;
! while (*src) {
! i = isspace(*src);
! if (!(inspace && i)) {
! *dst++ = i ? ' ' : *src;
! }
! inspace = i;
! src++;
! }
! *dst = '\0';
! } /* if !linespecific */
! #ifdef DEBUG
! fprintf(stderr," D: Output='%s'\n",buf);
! #endif
! } /* if !do_DATAhack */
!
! /* Remove any empty elements (not sure you can ever */
! /* get this from NSGMLS, but while I'm here...) */
! if (*buf == '\0') {
! /* Nothing left - skip this chunk */
! break;
! }
!
! /* Original "do_DATAhack" support. We check explicitly */
! /* here for a do_DATAhack value of 1, since using -d */
! /* twice on the command line can now restore the older */
! /* default behavior of not doing anything. */
! if (do_DATAhack==1 && (buf[0] == '\\') && (buf[1] == 'n')) {
if ( ! buf[2] )
break;
buf[0] = ' ';
memcpy(&buf[1], &buf[2], strlen(buf)-1);
}
+
cont[ncont].ch.data = strdup(buf);
cont[ncont].type = CMD_DATA;
ncont++;
***************
*** 591,596 ****
--- 796,802 ----
for (i=0; i<ncont; i++) e->cont[i] = cont[i];
}
free(buf);
+ free(xlatebuf);
return e;
break;
***************
*** 607,613 ****
case CMD_PUBID: /* ppubid */
case CMD_FILENAME: /* ffilename */
ungetc(c, fp);
! cont[ncont].ch.elem = ReadESIS(fp, depth+1);
cont[ncont].type = CMD_OPEN;
cont[ncont].ch.elem->parent = e;
ncont++;
--- 813,819 ----
case CMD_PUBID: /* ppubid */
case CMD_FILENAME: /* ffilename */
ungetc(c, fp);
! cont[ncont].ch.elem = ReadESIS(fp, depth+1,e);
cont[ncont].type = CMD_OPEN;
cont[ncont].ch.elem->parent = e;
ncont++;
***************
*** 633,638 ****
--- 839,845 ----
}
fprintf(stderr, "Error: End of ReadESIS - should not be here: %s\n", e->gi);
free(buf);
+ free(xlatebuf);
return NULL;
}
***************
*** 659,665 ****
}
else fp = stdin;
last_file = filename;
! DocTree = ReadESIS(fp, 0);
if (filename) fclose(fp);
/* Traverse tree, filling in econt and figuring out which child
--- 866,872 ----
}
else fp = stdin;
last_file = filename;
! DocTree = ReadESIS(fp, 0, NULL);
if (filename) fclose(fp);
/* Traverse tree, filling in econt and figuring out which child
Index: sgml/docbook-to-man/Instant/tables.c
diff -c sgml/docbook-to-man/Instant/tables.c:1.1.1.1 sgml/docbook-to-man/Instant/tables.c:1.2
*** sgml/docbook-to-man/Instant/tables.c:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Instant/tables.c Mon Nov 16 22:23:51 1998
***************
*** 73,79 ****
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/tables.c,v 1.1.1.1 1998/11/13 21:31:58 db3l Exp $";
#endif
#include <stdio.h>
--- 73,79 ----
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/tables.c,v 1.2 1998/11/16 22:23:51 db3l Exp $";
#endif
#include <stdio.h>
***************
*** 1091,1096 ****
--- 1091,1103 ----
* TO DO:
*
* deallocate colspecs and spanspecs
+ *
+ * [ANS-db3l]
+ * I found that if you ended a table with a spanning entry, tbl got
+ * confused and seemed to use the spanning row definition for the default
+ * row entry in the table. So we output a final row adjustment if the
+ * current (last) row format wasn't the same as the tgroup element. The
+ * code is adapted from from the original code in TblTFoot().
*/
***************
*** 1100,1105 ****
--- 1107,1132 ----
{
register struct tblcolspec * tcsp, * tcsp2;
register struct tblspanspec * tssp, * tssp2;
+ register struct tblformat * ffp, * ffp2;
+ static struct tblformat * tfp, * tfp2;
+
+ tfp = TblBuild1Format(ep, FALSE, TGroup);/* gen format for the row */
+
+ for ( tfp2=formP; tfp2 && tfp2->next; tfp2=tfp2->next )
+ ;
+
+ if (!TblFormatMatch(tfp,tfp2)) {
+
+ for ( ffp=formP; ffp; ffp=ffp2 ) {
+ ffp2 = ffp->next;
+ free(ffp); /* clear entire list */
+ }
+
+ formP = tfp; /* this becomes the prevailing format */
+
+ OutputString("^.T&^", fP, 1);
+ TblPrintFormat(fP, formP);
+ }
for ( tcsp=tblColSpec; tcsp; tcsp=tcsp2 ) {
***************
*** 1198,1203 ****
--- 1225,1237 ----
/* TblBuild1Format() -- build one row's worth of format information
*
+ *
+ * [ANS-db3l]
+ * Added check for spanning columns, and if they exist, move any width
+ * information to the previous non-spanning column (scanning left) since
+ * that seems to be the way that tbl wants it. E.g., tbl works if you
+ * have "lw(6i) s s" but not with "lw(2i) sw(2i) sw(2i)".
+ *
*/
***************
*** 1207,1213 ****
bool addinRowsep, /* insert rowsep into model? */
tblsource source) /* type type of row */
{
! register int i;
register bool allProp;
float totalProp;
register struct tblformat * tfp;
--- 1241,1247 ----
bool addinRowsep, /* insert rowsep into model? */
tblsource source) /* type type of row */
{
! register int i, j;
register bool allProp;
float totalProp;
register struct tblformat * tfp;
***************
*** 1228,1233 ****
--- 1262,1290 ----
allProp = tfp->colpwidth[i][0];
totalProp += atof(tfp->colpwidth[i]);
}
+ if (i>1 && tfp->colformat[i] == 's') {
+ for (j=i; j>=1; j--) {
+ if (tfp->colformat[j] != 's') {
+ if (tfp->colwidth[i][0]) {
+ sprintf(tfp->colwidth[j],"%fi",
+ atof(tfp->colwidth[j])+
+ atof(tfp->colwidth[i]));
+ }
+ if (tfp->colpwidth[i][0]) {
+ sprintf(tfp->colpwidth[j],"%fi",
+ atof(tfp->colpwidth[j])+
+ atof(tfp->colpwidth[i]));
+ }
+ tfp->colwidth[i][0] = '\0';
+ tfp->colpwidth[i][0] = '\0';
+ break;
+ }
+ }
+ if (j<1) {
+ fprintf(stderr, "? Warning: missed earlier column to "
+ "add span width to\n");
+ }
+ }
strcpy(tfp->font[i], TblGetFont(i, ep, source));
tfp->colsep[i] = tblgcolsep || TblGetColSep(i, ep, source);
if ( addinRowsep )
***************
*** 1243,1248 ****
--- 1300,1306 ----
if ( allProp ) {
for ( i=1; i <= tblcols; i++ ) {
+ if (tfp->colpwidth[i][0])
sprintf(tfp->colwidth[i], "%fi",
(atof(tfp->colpwidth[i]) / totalProp) * TEXTWIDTH);
}
***************
*** 1597,1602 ****
--- 1655,1666 ----
*
* nothing..
*
+ * [ANS-db3l]
+ * We need to look and see if the upcoming row is going to be any different
+ * than the current row formatting in place, and if so, output a new
+ * row control line and make it the default format. This is adapted from
+ * the existing code in TblTFoot().
+ *
*/
***************
*** 1605,1612 ****
TblTRowStart(Element_t * ep,
FILE * fP)
{
! /* nothing to do */
tblrow++; /* except note that we're within a new row */
--- 1669,1694 ----
TblTRowStart(Element_t * ep,
FILE * fP)
{
+ register struct tblformat * ffp, * ffp2;
+ static struct tblformat * tfp, * tfp2;
+
+ tfp = TblBuild1Format(ep, FALSE, TGroup);/* gen format for the row */
+
+ for ( tfp2=formP; tfp2 && tfp2->next; tfp2=tfp2->next )
+ ;
+
+ if (!TblFormatMatch(tfp,tfp2)) {
! for ( ffp=formP; ffp; ffp=ffp2 ) {
! ffp2 = ffp->next;
! free(ffp); /* clear entire list */
! }
!
! formP = tfp; /* this becomes the prevailing format */
!
! OutputString("^.T&^", fP, 1);
! TblPrintFormat(fP, formP);
! }
tblrow++; /* except note that we're within a new row */
Index: sgml/docbook-to-man/Instant/traninit.c
diff -c sgml/docbook-to-man/Instant/traninit.c:1.1.1.1 sgml/docbook-to-man/Instant/traninit.c:1.2
*** sgml/docbook-to-man/Instant/traninit.c:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/traninit.c Mon Nov 16 22:38:12 1998
***************
*** 61,67 ****
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/traninit.c,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $";
#endif
#include <stdio.h>
--- 61,67 ----
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/traninit.c,v 1.2 1998/11/16 22:38:12 db3l Exp $";
#endif
#include <stdio.h>
***************
*** 100,108 ****
Trans_t T;
if ((fp=OpenFile(transfile)) == NULL) {
! fprintf(stderr, "Can not open translation spec file '%s'.\n%s\n",
! transfile, strerror(errno));
! return;
}
memset(&T, 0, sizeof T); /* initialize/clear structure */
--- 100,108 ----
Trans_t T;
if ((fp=OpenFile(transfile)) == NULL) {
! sprintf(buf,"Can not open translation spec '%s'", transfile);
! perror(buf);
! return;
}
memset(&T, 0, sizeof T); /* initialize/clear structure */
***************
*** 361,369 ****
int n_alloc=0; /* number of slots allocated so far */
if ((fp=OpenFile(filename)) == NULL) {
! fprintf(stderr, "Can not open character mapping file '%s'.\n%s\n",
! filename, strerror(errno));
! return;
}
/* We allocate slots in blocks of N, so we don't have to call
--- 361,370 ----
int n_alloc=0; /* number of slots allocated so far */
if ((fp=OpenFile(filename)) == NULL) {
! sprintf(buf,"Can not open character mapping file file '%s': ",
! filename);
! perror(buf);
! return;
}
/* We allocate slots in blocks of N, so we don't have to call
***************
*** 419,427 ****
int lineno=0;
if ((fp=OpenFile(filename)) == NULL) {
! fprintf(stderr, "Can not open SDATA file '%s': %s", filename,
! strerror(errno));
! return;
}
if (!SDATAmap) SDATAmap = NewMap(IMS_sdata);
--- 420,428 ----
int lineno=0;
if ((fp=OpenFile(filename)) == NULL) {
! sprintf(buf,"Can not open SDATA file '%s': ", filename);
! perror(buf);
! return;
}
if (!SDATAmap) SDATAmap = NewMap(IMS_sdata);
Index: sgml/docbook-to-man/Instant/translate.c
diff -c sgml/docbook-to-man/Instant/translate.c:1.1.1.1 sgml/docbook-to-man/Instant/translate.c:1.2
*** sgml/docbook-to-man/Instant/translate.c:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/translate.c Mon Nov 16 22:23:51 1998
***************
*** 58,64 ****
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/translate.c,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $";
#endif
#include <stdio.h>
--- 58,64 ----
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/translate.c,v 1.2 1998/11/16 22:23:51 db3l Exp $";
#endif
#include <stdio.h>
***************
*** 610,615 ****
--- 610,620 ----
* Arguments:
* Pointer to data content to process
* FILE pointer to where to write output.
+ *
+ * [ANS-db3l]
+ * No longer perform character mapping here - that's done on the input
+ * side when parsing the ESIS data block for an element.
+ *
*/
void
***************
*** 628,633 ****
--- 633,640 ----
/* CLEANUP: this should really all be done in OutputString(). (I think) */
+ #if 0
+ /* [ANS-db3l] Moved to input processing of ESIS in main.c */
if (nCharMap) {
/* for each character, see if it's mapped to something else */
for (prev=0,cp=data,dp=buf; *cp; cp++) {
***************
*** 650,656 ****
dp = buf;
}
else dp = data;
! OutputString(dp, fp, 1);
}
/* ______________________________________________________________________ */
--- 657,665 ----
dp = buf;
}
else dp = data;
! #endif
!
! OutputString(data, fp, 1);
}
/* ______________________________________________________________________ */
Index: sgml/docbook-to-man/Instant/util.c
diff -c sgml/docbook-to-man/Instant/util.c:1.1.1.1 sgml/docbook-to-man/Instant/util.c:1.4
*** sgml/docbook-to-man/Instant/util.c:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/util.c Tue Feb 23 22:21:27 1999
***************
*** 72,78 ****
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/util.c,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $";
#endif
#include <stdio.h>
--- 72,78 ----
#ifndef lint
static char *RCSid =
! "$Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/util.c,v 1.4 1999/02/23 22:21:27 db3l Exp $";
#endif
#include <stdio.h>
***************
*** 89,96 ****
#include "general.h"
! /* forward references */
! static char *LookupSDATA(char *);
/* ______________________________________________________________________ */
/* "Split" a string into tokens. Given a string that has space-separated
--- 89,100 ----
#include "general.h"
! #ifdef _AIX
!
! /* This should be prototyped in string.h but isn't */
! int strcasecmp (char *String1, char *String2);
!
! #endif
/* ______________________________________________________________________ */
/* "Split" a string into tokens. Given a string that has space-separated
***************
*** 533,538 ****
--- 537,543 ----
* FILE pointer of where to print.
* Flag saying whether or not to keep track of our position in the output
* stream. (We want to when writing to a file, but not for stderr.)
+ *
*/
void
***************
*** 573,578 ****
--- 578,587 ----
break;
case '|': /* SDATA */
+ /* [ANS-db3l] In non-"DATAhack" (-d) operation, this is */
+ /* now normally done while reading the ESIS input, but */
+ /* I've left it here just in case some existing users of */
+ /* OutputString need it (don't think so, but...) */
s++; /* point past \| */
sdata = s;
/* find matching/closing \| */
***************
*** 612,618 ****
}
else if (c == ANCHOR) c = NL;
}
! if (c) putc(c, fp);
}
}
--- 621,632 ----
}
else if (c == ANCHOR) c = NL;
}
! if (c) {
! if (track_pos) {
! char_pos = ((c == '\n') ? 0 : char_pos+1);
! }
! putc(c, fp);
! } /* if c */
}
}
***************
*** 628,634 ****
* Mapped value of the SDATA entity.
*/
! static char *
LookupSDATA(
char *s
)
--- 642,648 ----
* Mapped value of the SDATA entity.
*/
! char *
LookupSDATA(
char *s
)
***************
*** 1009,1021 ****
{
ID_t *id;
for (id=IDList; id; id=id->next)
! if (id->id[0] == idval[0] && !strcmp(id->id, idval)) return id->elem;
return 0;
}
/* ______________________________________________________________________ */
! #ifndef linux
char *
strerror(int number)
--- 1023,1040 ----
{
ID_t *id;
for (id=IDList; id; id=id->next)
! if (toupper(id->id[0]) == toupper(idval[0]) && !strcasecmp(id->id, idval)) return id->elem;
return 0;
}
/* ______________________________________________________________________ */
! /* [ANS-db3l] Change this to a config'd request for a replacement function */
! /* since later Sun systems have this and on other systems not explicitly */
! /* checked here (existing code only excluded Linux) such as FreeBSD/BSDI */
! /* it would crash on perror() calls. */
!
! #ifdef STRERROR
char *
strerror(int number)
Index: sgml/docbook-to-man/Instant/tptregexp/Makefile
diff -c sgml/docbook-to-man/Instant/tptregexp/Makefile:1.1.1.1 sgml/docbook-to-man/Instant/tptregexp/Makefile:1.2
*** sgml/docbook-to-man/Instant/tptregexp/Makefile:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/tptregexp/Makefile Tue Feb 23 22:21:27 1999
***************
*** 18,24 ****
# Dalrymple Consulting
#
#
! # $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/tptregexp/Makefile,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
#
ROOT = /usr/local
--- 18,24 ----
# Dalrymple Consulting
#
#
! # $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/Instant/tptregexp/Makefile,v 1.2 1999/02/23 22:21:27 db3l Exp $
#
ROOT = /usr/local
***************
*** 36,41 ****
--- 36,42 ----
# -DSTRCSPN library does not have strcspn()
# -Dstrchr=index library does not have strchr()
# -DERRAVAIL have utzoo-compatible error() function and friends
+ # -DSTRERROR library does not have strerror() [ANS-db3l]
#ENV=-Dvoid=int -DCHARBITS=0377 -DSTATIC=extern
#LENV=-Dvoid=int -DCHARBITS=0377
Index: sgml/docbook-to-man/Instant/tptregexp/strerror.c
diff -c sgml/docbook-to-man/Instant/tptregexp/strerror.c:1.1.1.1 sgml/docbook-to-man/Instant/tptregexp/strerror.c:1.2
*** sgml/docbook-to-man/Instant/tptregexp/strerror.c:1.1.1.1 Fri Nov 13 21:31:59 1998
--- sgml/docbook-to-man/Instant/tptregexp/strerror.c Tue Feb 23 22:21:28 1999
***************
*** 1,3 ****
--- 1,8 ----
+ /* [ANS-db3l] Change this to a config'd request for a replacement function */
+ /* since later Sun systems have this and on other systems not explicitly */
+ /* checked here such as FreeBSD/BSDI it would crash on perror() calls. */
+
+ #ifdef STRERROR
/* standin for strerror(3) which is missing on some systems
* (eg, SUN)
***************
*** 9,11 ****
--- 14,18 ----
perror(num);
return "";
}
+
+ #endif
Index: sgml/docbook-to-man/Transpec/Makefile
diff -c sgml/docbook-to-man/Transpec/Makefile:1.1.1.1 sgml/docbook-to-man/Transpec/Makefile:1.2
*** sgml/docbook-to-man/Transpec/Makefile:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Transpec/Makefile Mon Nov 16 22:23:53 1998
***************
*** 37,43 ****
#############################################################################
ROOT = /usr/local
! TPTLIB = $(ROOT)/lib/tpt
MAKE = make
SHELL = /bin/sh
--- 37,43 ----
#############################################################################
ROOT = /usr/local
! TPTLIB = $(ROOT)/share/sgml/transpec
MAKE = make
SHELL = /bin/sh
Index: sgml/docbook-to-man/Transpec/docbook-to-man.ts
diff -c sgml/docbook-to-man/Transpec/docbook-to-man.ts:1.1.1.1 sgml/docbook-to-man/Transpec/docbook-to-man.ts:1.2
*** sgml/docbook-to-man/Transpec/docbook-to-man.ts:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Transpec/docbook-to-man.ts Mon Nov 16 22:23:53 1998
***************
*** 36,41 ****
--- 36,45 ----
#
#############################################################################
#
+ # $Id: docbook-to-man.ts,v 1.2 1998/11/16 22:23:53 db3l Exp $
+ #
+ #############################################################################
+ #
# Variables
#
Var: callout 0
***************
*** 53,59 ****
# #### ##### ##### ##### ##### ##### #### #####
#
GI: REFENTRY
! StartText: ^.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
^.TH "${_followrel descendant REFENTRYTITLE 1000}"
"${_followrel descendant MANVOLNUM 1000}"^
EndText: ^.\\" created by instant / docbook-to-man, ${date}^
--- 57,63 ----
# #### ##### ##### ##### ##### ##### #### #####
#
GI: REFENTRY
! StartText: ^'\\" t^${_action 1001}
^.TH "${_followrel descendant REFENTRYTITLE 1000}"
"${_followrel descendant MANVOLNUM 1000}"^
EndText: ^.\\" created by instant / docbook-to-man, ${date}^
***************
*** 133,138 ****
--- 137,147 ----
-
#
GI: TITLE
+ Context: REFSYNOPSISDIV
+ Ignore: all
+ -
+ #
+ GI: TITLE
Context: REFSECT1
Ignore: all
-
***************
*** 297,309 ****
-
#
GI: PROGRAMLISTING
! StartText: ^.PP^.nf^\\f(CW
EndText: \\fR^.fi^.PP^
-
#
GI: LITERALLAYOUT
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
GI: BLOCKQUOTE
--- 306,320 ----
-
#
GI: PROGRAMLISTING
! StartText: ^.PP^.nf^${_action 1001}^\\f(CW
EndText: \\fR^.fi^.PP^
+ Verbatim:
-
#
GI: LITERALLAYOUT
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
+ Verbatim:
-
#
GI: BLOCKQUOTE
***************
*** 376,383 ****
-
#
GI: SCREEN
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
GI: SCREENCO
--- 387,395 ----
-
#
GI: SCREEN
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
+ Verbatim:
-
#
GI: SCREENCO
***************
*** 489,496 ****
# #### ##### ##### ##### ##### ##### #### #####
#
GI: ADDRESS
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
GI: STREET
--- 501,509 ----
# #### ##### ##### ##### ##### ##### #### #####
#
GI: ADDRESS
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
+ Verbatim:
-
#
GI: STREET
***************
*** 1155,1162 ****
# #### ##### ##### ##### ##### ##### #### #####
#
GI: SYNOPSIS
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
GI: CMDSYNOPSIS
--- 1168,1176 ----
# #### ##### ##### ##### ##### ##### #### #####
#
GI: SYNOPSIS
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
+ Verbatim:
-
#
GI: CMDSYNOPSIS
***************
*** 1237,1244 ****
-
#
GI: FUNCSYNOPSIS
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
GI: FUNCSYNOPSISINFO
--- 1251,1259 ----
-
#
GI: FUNCSYNOPSIS
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
+ Verbatim:
-
#
GI: FUNCSYNOPSISINFO
***************
*** 1313,1328 ****
#
GI: XREF
AttValue: ENDTERM
! StartText: \\fI(cross-reference to ``${_followlink ENDTERM 1000}'')\\fR\s
-
#
GI: XREF
! StartText: \\fI(cross-reference to ``${_followlink LINKEND 600})''\\fR\s
-
#
GI: _xref
SpecID: 600
! StartText: ${XREFLABEL}
Ignore: all
-
#
--- 1328,1356 ----
#
GI: XREF
AttValue: ENDTERM
! StartText: \\fI"${_followlink ENDTERM 1000}"\\fR\s
-
#
GI: XREF
! StartText: \\fI"${_followlink LINKEND 600}"\\fR\s
-
#
GI: _xref
SpecID: 600
! StartText: ${_set xreflabel no}${_isset XREFLABEL 601}${_isset xreflabel no 602}
! Ignore: all
! -
! #
! GI: _xref_label
! SpecID: 601
! StartText: ${_set xreflabel yes}${XREFLABEL}
! Ignore: all
! -
! #
! GI: _xref_title
! SpecID: 602
! Set:
! StartText: ${_followrel child TITLE 1000}
Ignore: all
-
#
***************
*** 1757,1762 ****
--- 1785,1794 ----
# no special presentation
-
#
+ GI: PROMPT
+ # no special presentation
+ -
+ #
GI: SHORTCUT
# no special presentation
-
***************
*** 1965,1970 ****
--- 1997,2013 ----
#
GI: _passthrough
SpecID: 1000
+ -
+ #
+ # Used to reset trap positions, either at start of file or when .nf is
+ # restarted, such as for literal output. Assumes caller is responsible
+ # for line starting characters as appropriate. (it helps the calling
+ # definitions read more logically).
+ #
+ GI: _tabset
+ SpecID: 1001
+ StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ Ignore: all
-
#
GI: _doTitle
Index: sgml/docbook-to-man/Transpec/docbook-to-man.ts-PUSHPOP
diff -c sgml/docbook-to-man/Transpec/docbook-to-man.ts-PUSHPOP:1.1.1.1 sgml/docbook-to-man/Transpec/docbook-to-man.ts-PUSHPOP:1.5
*** sgml/docbook-to-man/Transpec/docbook-to-man.ts-PUSHPOP:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Transpec/docbook-to-man.ts-PUSHPOP Tue Feb 23 20:31:38 1999
***************
*** 36,41 ****
--- 36,45 ----
#
#############################################################################
#
+ # $Id: docbook-to-man.ts-PUSHPOP,v 1.5 1999/02/23 20:31:38 db3l Exp $
+ #
+ #############################################################################
+ #
# Variables
#
Var: callout 0
***************
*** 53,62 ****
# #### ##### ##### ##### ##### ##### #### #####
#
GI: REFENTRY
! StartText: ^.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
! ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
! "${_followrel descendant MANVOLNUM 1000}"^
! EndText: ^.\\" created by instant / docbook-to-man, ${date}
-
#
GI: DOCINFO
--- 57,66 ----
# #### ##### ##### ##### ##### ##### #### #####
#
GI: REFENTRY
! StartText: ^'\\" t^.TH "${_followrel descendant REFENTRYTITLE 1000}"
! "${_followrel descendant MANVOLNUM 1000}" "${date}"
! ^${_action 1002}^${_action 1001}^
! EndText: ^.\\" created by instant / docbook-to-man, ${date}^
-
#
GI: DOCINFO
***************
*** 133,138 ****
--- 137,147 ----
-
#
GI: TITLE
+ Context: REFSYNOPSISDIV
+ Ignore: all
+ -
+ #
+ GI: TITLE
Context: REFSECT1
Ignore: all
-
***************
*** 292,303 ****
-
#
GI: PROGRAMLISTING
! StartText: ^.PP^.nf^\\f(CW
EndText: \\fR^.fi^.PP^
-
#
GI: LITERALLAYOUT
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
--- 301,312 ----
-
#
GI: PROGRAMLISTING
! StartText: ^.PP^.nf^${_action 1001}^\\f(CW
EndText: \\fR^.fi^.PP^
-
#
GI: LITERALLAYOUT
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
-
#
***************
*** 371,377 ****
-
#
GI: SCREEN
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
--- 380,386 ----
-
#
GI: SCREEN
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
-
#
***************
*** 484,490 ****
# #### ##### ##### ##### ##### ##### #### #####
#
GI: ADDRESS
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
--- 493,499 ----
# #### ##### ##### ##### ##### ##### #### #####
#
GI: ADDRESS
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
-
#
***************
*** 1230,1236 ****
-
#
GI: FUNCSYNOPSIS
! StartText: ^.PP^.nf^
EndText: ^.fi^
-
#
--- 1239,1245 ----
-
#
GI: FUNCSYNOPSIS
! StartText: ^.PP^.nf^${_action 1001}^
EndText: ^.fi^
-
#
***************
*** 1306,1321 ****
#
GI: XREF
AttValue: ENDTERM
! StartText: \\fI(cross-reference to ``${_followlink ENDTERM 1000}'')\\fR\s
-
#
GI: XREF
! StartText: \\fI(cross-reference to ``${_followlink LINKEND 600})''\\fR\s
-
#
GI: _xref
SpecID: 600
! StartText: ${XREFLABEL}
Ignore: all
-
#
--- 1315,1343 ----
#
GI: XREF
AttValue: ENDTERM
! StartText: \\fI"${_followlink ENDTERM 1000}"\\fR\s
-
#
GI: XREF
! StartText: \\fI"${_followlink LINKEND 600}"\\fR\s
-
#
GI: _xref
SpecID: 600
! StartText: ${_set xreflabel no}${_isset XREFLABEL 601}${_isset xreflabel no 602}
! Ignore: all
! -
! #
! GI: _xref_label
! SpecID: 601
! StartText: ${_set xreflabel yes}${XREFLABEL}
! Ignore: all
! -
! #
! GI: _xref_title
! SpecID: 602
! Set:
! StartText: ${_followrel child TITLE 1000}
Ignore: all
-
#
***************
*** 1685,1691 ****
-
#
GI: COMMAND
! Action: 910
-
#
GI: COMPUTEROUTPUT
--- 1707,1714 ----
-
#
GI: COMMAND
! StartText: ${_action 910}\s
! Ignore: all
-
#
GI: COMPUTEROUTPUT
***************
*** 1851,1856 ****
--- 1874,1883 ----
# no special presentation
-
#
+ GI: PROMPT
+ # no special presentation
+ -
+ #
GI: SHORTCUT
# no special presentation
-
***************
*** 2125,2130 ****
--- 2152,2178 ----
#
GI: _passthrough
SpecID: 1000
+ -
+ #
+ # Used to reset trap positions, either at start of file or when .nf is
+ # restarted, such as for literal output. Assumes caller is responsible
+ # for line starting characters as appropriate. (it helps the calling
+ # definitions read more logically).
+ #
+ GI: _tabset
+ SpecID: 1001
+ StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ Ignore: all
+ -
+ #
+ # Sets up macros for push/pop of fonts to better handle nested cases.
+ # Moved reference into this file rather than assuming the wrapper script
+ # will add it, since it's tightly coupled with this file anyway.
+ #
+ GI: _fontmac
+ SpecID: 1002
+ StartText: ^${_include docbook-to-man.prolog}^
+ Ignore: all
-
#
GI: _doTitle
Index: sgml/docbook-to-man/Transpec/roff.cmap
diff -c sgml/docbook-to-man/Transpec/roff.cmap:1.1.1.1 sgml/docbook-to-man/Transpec/roff.cmap:1.2
*** sgml/docbook-to-man/Transpec/roff.cmap:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Transpec/roff.cmap Mon Nov 16 22:23:54 1998
***************
*** 43,50 ****
#
# Character strings to map for troff/nroff.
#
# From To
! #\\ \\e
^ \^
. \\&.
' \\&'
--- 43,54 ----
#
# Character strings to map for troff/nroff.
#
+ #
+ # $Id: roff.cmap,v 1.2 1998/11/16 22:23:54 db3l Exp $
+ #
+ #
# From To
! \\ \\e
^ \^
. \\&.
' \\&'
Index: sgml/docbook-to-man/Transpec/roff.sdata
diff -c sgml/docbook-to-man/Transpec/roff.sdata:1.1.1.1 sgml/docbook-to-man/Transpec/roff.sdata:1.2
*** sgml/docbook-to-man/Transpec/roff.sdata:1.1.1.1 Fri Nov 13 21:31:58 1998
--- sgml/docbook-to-man/Transpec/roff.sdata Mon Nov 16 22:23:55 1998
***************
*** 47,52 ****
--- 47,55 ----
#
# Numeric and Special Graphic ________________________________
#
+ #
+ # $Id: roff.sdata,v 1.2 1998/11/16 22:23:55 db3l Exp $
+ #
[half ] \\(12
[frac12] \\(12
[frac14] \\(14
***************
*** 202,208 ****
# [mldr ] em leader
[rdquor] \\&''
[rsquor] \\&'
! # [vellip] vertical ellipsis
# [hybull] rectangle, filled (hyphen bullet)
# [loz ] /lozenge - lozenge or total mark
# [lozf ] /blacklozenge - lozenge, filled
--- 205,212 ----
# [mldr ] em leader
[rdquor] \\&''
[rsquor] \\&'
! # Vertical ellipsis - cheat for now and treat like horizontal
! [vellip] \\&...
# [hybull] rectangle, filled (hyphen bullet)
# [loz ] /lozenge - lozenge or total mark
# [lozf ] /blacklozenge - lozenge, filled
|