diff --git a/cif/CIFgen.c b/cif/CIFgen.c index 8e03f1f8..a35e7215 100644 --- a/cif/CIFgen.c +++ b/cif/CIFgen.c @@ -5603,7 +5603,7 @@ CIFGenLayer( } break; - case CIFOP_LABELED: + case CIFOP_TAGGED: if (hier) { hstop = TRUE; /* Stop hierarchical processing */ @@ -5613,8 +5613,8 @@ CIFGenLayer( /* * Find all relevant labels by text matching and then continue * like CIFOP_BLOATALL. CIFOP_BLOATALL uses a BloatData record - * which is not part of CIFOP_LABELED. Create a BloatData record - * on the fly for each labeled area based on type, and swap it for + * which is not part of CIFOP_TAGGED. Create a BloatData record + * on the fly for each tagged area based on type, and swap it for * the text, so that cifBloatAllFunc believes this is actually a * CIFOP_BLOATALL operation. Note that we don't actually care * what layer the label is attached to (lab_type). We are looking diff --git a/cif/CIFint.h b/cif/CIFint.h index ba29bd94..11219d09 100644 --- a/cif/CIFint.h +++ b/cif/CIFint.h @@ -146,7 +146,7 @@ typedef struct cifop * CIFOP_BRIDGELIM - Added 27/07/20---Bridge across catecorner gaps, but with limiting layers * CIFOP_MASKHINTS - Added 12/14/20---Add geometry from cell properties, if any. * CIFOP_NOTSQUARE - Added 2/26/26---Keep only geometry which is not square. - * CIFOP_LABELED - Added 3/11/26---Find geometry attached to the given text label + * CIFOP_TAGGED - Added 3/11/26---Find geometry attached to the given text label */ #define CIFOP_AND 1 @@ -175,7 +175,7 @@ typedef struct cifop #define CIFOP_BRIDGELIM 24 #define CIFOP_MASKHINTS 25 #define CIFOP_NOTSQUARE 26 -#define CIFOP_LABELED 27 +#define CIFOP_TAGGED 27 /* Definitions of bit fields used in the value of co_client for CIFOP_INTERACT */ #define CIFOP_INT_NOT 0x1 /* Inverted sense (not interacting) */ diff --git a/cif/CIFrdtech.c b/cif/CIFrdtech.c index 107d1c31..6157e480 100644 --- a/cif/CIFrdtech.c +++ b/cif/CIFrdtech.c @@ -333,7 +333,7 @@ cifNewReadStyle(void) for (op = layer->crl_ops; op != NULL; op = op->co_next) { if (op->co_opcode == CIFOP_MASKHINTS || - op->co_opcode == CIFOP_LABELED) + op->co_opcode == CIFOP_TAGGED) freeMagic((char *)op->co_client); freeMagic1(&mm1, (char *)op); } @@ -999,8 +999,8 @@ CIFReadTechLine( newOp->co_opcode = CIFOP_NOTSQUARE; else if (strcmp(argv[0], "mask-hints") == 0) newOp->co_opcode = CIFOP_MASKHINTS; - else if (strcmp(argv[0], "labeled") == 0) - newOp->co_opcode = CIFOP_LABELED; + else if (strcmp(argv[0], "tagged") == 0) + newOp->co_opcode = CIFOP_TAGGED; else { TechError("Unknown statement \"%s\".\n", argv[0]); @@ -1031,7 +1031,7 @@ CIFReadTechLine( if (argc != 2) goto wrongNumArgs; newOp->co_client = (ClientData)StrDup((char **)NULL, argv[1]); break; - case CIFOP_LABELED: + case CIFOP_TAGGED: if (argc != 3) goto wrongNumArgs; newOp->co_client = (ClientData)StrDup((char **)NULL, argv[1]); CIFParseReadLayers(argv[2], &newOp->co_cifMask, TRUE); diff --git a/cif/CIFtech.c b/cif/CIFtech.c index 38e42238..9d01468b 100644 --- a/cif/CIFtech.c +++ b/cif/CIFtech.c @@ -1107,8 +1107,8 @@ CIFTechLine( newOp->co_opcode = CIFOP_BBOX; else if (strcmp(argv[0], "net") == 0) newOp->co_opcode = CIFOP_NET; - else if (strcmp(argv[0], "labeled") == 0) - newOp->co_opcode = CIFOP_LABELED; + else if (strcmp(argv[0], "tagged") == 0) + newOp->co_opcode = CIFOP_TAGGED; else if (strcmp(argv[0], "maxrect") == 0) newOp->co_opcode = CIFOP_MAXRECT; else if (strcmp(argv[0], "boundary") == 0) @@ -1359,7 +1359,7 @@ bloatCheck: bloatDone: break; case CIFOP_NET: - case CIFOP_LABELED: + case CIFOP_TAGGED: if (argc != 3) goto wrongNumArgs; newOp->co_client = (ClientData)StrDup((char **)NULL, argv[1]); cifParseLayers(argv[2], CIFCurStyle, &newOp->co_paintMask, @@ -1674,12 +1674,12 @@ cifComputeRadii( for (op = layer->cl_ops; op != NULL; op = op->co_next) { - /* BBOX, NET, LABELED, and MASKHINTS operators should never be */ + /* BBOX, NET, TAGGED, and MASKHINTS operators should never be */ /* used hierarchically so ignore any grow/shrink operators that */ /* come after them. */ if (op->co_opcode == CIFOP_BBOX || op->co_opcode == CIFOP_NET || - op->co_opcode == CIFOP_LABELED || op->co_opcode == CIFOP_MASKHINTS) + op->co_opcode == CIFOP_TAGGED || op->co_opcode == CIFOP_MASKHINTS) break; /* If CIF layers are used, switch to the max of current @@ -1992,7 +1992,7 @@ CIFTechFinal(void) /* of the SquaresData pointer from a following operator. */ /* CIFOP_BBOX and CIFOP_MAXRECT uses the co_client field */ /* as a flag field, while CIFOP_NET, CIFOP_MASKHINTS, and */ - /* CIFOP_LABELED use it for a string. */ + /* CIFOP_TAGGED use it for a string. */ else { switch (op->co_opcode) @@ -2004,7 +2004,7 @@ CIFTechFinal(void) case CIFOP_MAXRECT: case CIFOP_MANHATTAN: case CIFOP_NET: - case CIFOP_LABELED: + case CIFOP_TAGGED: break; case CIFOP_BRIDGELIM: case CIFOP_BRIDGE: @@ -2540,7 +2540,7 @@ CIFTechOutputScale( case CIFOP_MAXRECT: case CIFOP_MANHATTAN: case CIFOP_NET: - case CIFOP_LABELED: + case CIFOP_TAGGED: case CIFOP_INTERACT: break; case CIFOP_BRIDGELIM: @@ -2657,7 +2657,7 @@ CIFTechOutputScale( /* op->co_opcode in CIFOP_OR is a pointer copy, */ /* in CIFOP_BBOX and CIFOP_MAXRECT is a flag, */ /* and in CIFOP_NET, CIFOP_MASKHINTS, and */ - /* CIFOP_LABELED is a string. */ + /* CIFOP_TAGGED is a string. */ break; } }