Refined the new "gds maskhints" command option for GDS input from

yesterday's commit to allow the syntax "gds maskhints <types>", in
which mask hints can be restricted to a specific list of layers
rather than all layers which define mask hints in the cifoutput
rule.

cif/CIFrdcl.c

@@ -723,7 +723,7 @@ CIFPaintCurrent(filetype)
     /* plane for that layer, compare to the input plane, and create	*/
     /* mask hint properties to make the output the same as the input.	*/
 
-    if (CalmaMaskHints)
+    if ((CalmaMaskHints != NULL) && (!TTMaskIsZero(CalmaMaskHints)))
     {
 	int j;
     	CIFOp *op, newop, subop;
@@ -737,6 +737,8 @@ CIFPaintCurrent(filetype)
 
     	for (i = 0; i < cifNReadLayers; i++)
 	{
+	    if (!TTMaskHasType(CalmaMaskHints, i)) continue;
+
 	    /* Does the input layer have a corresponding output layer? */
 	    in_out_map[i] = -1;
 	    for (j = 0; j < CIFCurStyle->cs_nLayers; j++)
@@ -787,6 +789,8 @@ CIFPaintCurrent(filetype)
 	    char locstr[512];
 	    Plane *tempp;
 
+	    if (!TTMaskHasType(CalmaMaskHints, i)) continue;
+
 	    j = in_out_map[i];
 	    if (j < 0) continue;
 

cif/CIFrdtech.c

@@ -248,9 +248,10 @@ CIFCalmaLayerToCifLayer(layer, datatype, calmaStyle)
  */
 
 void
-CIFParseReadLayers(string, mask)
+CIFParseReadLayers(string, mask, newok)
     char *string;		/* Comma-separated list of CIF layers. */
     TileTypeBitMask *mask;	/* Where to store bit mask. */
+    bool newok;			/* If TRUE, create new layers if they don't exist */
 {
     int i;
     char *p;
@@ -265,10 +266,10 @@ CIFParseReadLayers(string, mask)
 	if (p != NULL)
 	    *p = 0;
 
-	i = CIFReadNameToType(string, TRUE);
+	i = CIFReadNameToType(string, newok);
 	if (i >= 0)
 	    TTMaskSetType(mask, i);
-	else
+	else if (newok)
 	{
 	    HashEntry *he;
 	    TileTypeBitMask *amask;
@@ -280,6 +281,8 @@ CIFParseReadLayers(string, mask)
 		TTMaskSetMask(mask, amask);
 	    }
 	}
+	else
+	    TxError("Error:  CIF layer \"%s\" is unknown.\n", string);
 
 	if (p == NULL) break;
 	*p = ',';
@@ -743,7 +746,7 @@ CIFReadTechLine(sectionName, argc, argv)
 	    cifCurReadOp = (CIFOp *) mallocMagic(sizeof(CIFOp));
 	    cifCurReadOp->co_opcode = CIFOP_OR;
 	    cifCurReadOp->co_client = (ClientData)NULL;
-	    CIFParseReadLayers(argv[2], &cifCurReadOp->co_cifMask);
+	    CIFParseReadLayers(argv[2], &cifCurReadOp->co_cifMask, TRUE);
 	    TTMaskZero(&cifCurReadOp->co_paintMask);
 	    cifCurReadOp->co_next = NULL;
 	    cifCurReadOp->co_distance = 0;
@@ -793,7 +796,7 @@ CIFReadTechLine(sectionName, argc, argv)
 	    cifCurReadOp = (CIFOp *) mallocMagic(sizeof(CIFOp));
 	    cifCurReadOp->co_opcode = CIFOP_OR;
 	    cifCurReadOp->co_client = (ClientData)NULL;
-	    CIFParseReadLayers(argv[2], &cifCurReadOp->co_cifMask);
+	    CIFParseReadLayers(argv[2], &cifCurReadOp->co_cifMask, TRUE);
 	    TTMaskZero(&cifCurReadOp->co_paintMask);
 	    cifCurReadOp->co_next = NULL;
 	    cifCurReadOp->co_distance = 0;
@@ -865,7 +868,7 @@ CIFReadTechLine(sectionName, argc, argv)
 	    else
 		goto wrongNumArgs;
 	}
-	CIFParseReadLayers(argv[1], &mask);
+	CIFParseReadLayers(argv[1], &mask, TRUE);
 	for (i=0; i<MAXCIFRLAYERS; i+=1)
 	{
 	    if (TTMaskHasType(&mask,i))
@@ -891,7 +894,7 @@ CIFReadTechLine(sectionName, argc, argv)
 	int		i;
 
 	if (argc != 2) goto wrongNumArgs;
-	CIFParseReadLayers(argv[1], &mask);
+	CIFParseReadLayers(argv[1], &mask, TRUE);
 	/* trash the value in crs_labelLayer so that any labels on this
 	   layer get junked, also. dcs 4/11/90
         */
@@ -968,7 +971,7 @@ CIFReadTechLine(sectionName, argc, argv)
 	case CIFOP_OR:
 	case CIFOP_COPYUP:
 	    if (argc != 2) goto wrongNumArgs;
-	    CIFParseReadLayers(argv[1], &newOp->co_cifMask);
+	    CIFParseReadLayers(argv[1], &newOp->co_cifMask, TRUE);
 	    break;
 	case CIFOP_GROW:
 	case CIFOP_GROW_G:

cif/cif.h

@@ -62,6 +62,7 @@ extern void CIFReadTechStyleInit();
 extern void CIFReadTechInit();
 extern bool CIFReadTechLine();
 extern void CIFReadTechFinal();
+extern void CIFParseReadLayers();
 
 /* Externally-visible procedures: */