luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed the cif output style option "see-vendor" to "see-no-vendor" 

and made the default behavior equivalent to "see-vendor".  While it is
true that running "cif see" on a readonly cell shows layers that are
not necessarily representative of what is in the file, the opposite
behavior manifests itself in ways that are confusing.
This commit is contained in:
Tim Edwards 2020-12-14 16:55:29 -05:00
parent ea9d8cc3e5
commit 69bd2fe57b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cif/CIFhier.c
View File

@ -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. */

4
cif/CIFint.h
View File

@ -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 */

4
cif/CIFtech.c
View File

@ -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)