Extended the code of the previous commit to include attaching

labels to geometry defined using either the "port" or "text"
options of the "label" statement in a cifinput section.

calma/CalmaRdpt.c

@@ -290,7 +290,7 @@ calmaElementBoundary()
     if (rp != NULL)
     {
 	if ((ciftype >= 0) &&
-		((cifCurReadStyle->crs_labelSticky[ciftype] == LABEL_TYPE_PORT)))
+		((cifCurReadStyle->crs_labelSticky[ciftype] != LABEL_TYPE_NONE)))
 	{
 	    Label *lab;
 	    TileType type;