diff --git a/cif/CIFhier.c b/cif/CIFhier.c index 28dbd72e..a7370d69 100644 --- a/cif/CIFhier.c +++ b/cif/CIFhier.c @@ -245,9 +245,8 @@ cifHierCopyFunc(tile, cxp) if (cxp->tc_scx->scx_use->cu_def->cd_flags & CDVENDORGDS) { if (!CIFCurStyle) - return 0; - else if (!(CIFCurStyle->cs_flags & CWF_SEE_VENDOR)) - return 0; + if (!(CIFCurStyle->cs_flags & CWF_SEE_NO_VENDOR)) + return 0; } /* Ignore space tiles, since they won't do anything anyway. */ diff --git a/cif/CIFint.h b/cif/CIFint.h index e44a17c5..88a87bf4 100644 --- a/cif/CIFint.h +++ b/cif/CIFint.h @@ -306,8 +306,8 @@ typedef struct cifstyle #define CWF_GROW_SLIVERS 0x02 #define CWF_ANGSTROMS 0x04 #define CWF_GROW_EUCLIDEAN 0x08 -#define CWF_SEE_VENDOR 0x10 /* Override vendor GDS flag in cells */ -#define CWF_NO_ERRORS 0x20 /* Do not generate error msgs and fdbk */ +#define CWF_SEE_NO_VENDOR 0x10 /* Hide magic's GDS from vendor cells */ +#define CWF_NO_ERRORS 0x20 /* Do not generate error msgs and fdbk */ #define CWF_STRING_LIMIT 0x40 /* Use older Calma format character limit */ /* procedures */ diff --git a/cif/CIFtech.c b/cif/CIFtech.c index af1ed9ad..9dab79c1 100644 --- a/cif/CIFtech.c +++ b/cif/CIFtech.c @@ -991,8 +991,8 @@ CIFTechLine(sectionName, argc, argv) CIFCurStyle->cs_flags |= CWF_PERMISSIVE_LABELS; else if (strcmp(argv[i], "grow-euclidean") == 0) CIFCurStyle->cs_flags |= CWF_GROW_EUCLIDEAN; - else if (strcmp(argv[i], "see-vendor") == 0) - CIFCurStyle->cs_flags |= CWF_SEE_VENDOR; + else if (strcmp(argv[i], "see-no-vendor") == 0) + CIFCurStyle->cs_flags |= CWF_SEE_NO_VENDOR; else if (strcmp(argv[i], "no-errors") == 0) CIFCurStyle->cs_flags |= CWF_NO_ERRORS; else if (strcmp(argv[i], "string-limit") == 0)