Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 8597)
+++ trunk/src/board.h	(revision 8598)
@@ -70,7 +70,7 @@
 	  ThermStyle;									/* type of thermal to place with thermal tool */
 	pcb_bool Changed,									/* layout has been changed */
 	  ViaOn,											/* visibility flags */
-	  ElementOn, RatOn, InvisibleObjectsOn, PinOn, SilkActive,	/* active layer is actually silk */
+	  RatOn, InvisibleObjectsOn, PinOn, SilkActive,	/* active layer is actually silk */
 	  RatDraw;										/* we're drawing rats */
 	pcb_coord_t CursorX,									/* cursor position as saved with layout */
 	  CursorY;
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 8597)
+++ trunk/src/buffer.c	(revision 8598)
@@ -630,7 +630,7 @@
 	}
 
 	/* paste elements */
-	if (pcb->PinOn && pcb->ElementOn) {
+	if (pcb->PinOn && pcb_silk_on(pcb)) {
 		PCB_ELEMENT_LOOP(PCB_PASTEBUFFER->Data);
 		{
 #ifdef DEBUG
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 8597)
+++ trunk/src/crosshair.c	(revision 8598)
@@ -344,7 +344,7 @@
 		}
 
 	/* draw elements if visible */
-	if (PCB->PinOn && PCB->ElementOn) {
+	if (PCB->PinOn && pcb_silk_on(PCB)) {
 		PCB_ELEMENT_LOOP(Buffer->Data);
 		{
 			if (PCB_FRONT(element) || PCB->InvisibleObjectsOn)
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 8597)
+++ trunk/src/draw.c	(revision 8598)
@@ -199,7 +199,7 @@
 	 */
 	if (!conf_core.editor.check_planes && pcb_layer_gui_set_vlayer(PCB_VLY_INVISIBLE, 0)) {
 		side = PCB_SWAP_IDENT ? PCB_COMPONENT_SIDE : PCB_SOLDER_SIDE;
-		if (PCB->ElementOn) {
+		if (pcb_silk_on(PCB)) {
 			pcb_layer_id_t lsilk;
 			pcb_r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL);
 			pcb_r_search(PCB->Data->name_tree[PCB_ELEMNAME_IDX_VISIBLE()], drawn_area, NULL, draw_element_name_callback, &side, NULL);
@@ -494,7 +494,7 @@
 			DrawPolygon((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr2);
 		break;
 	case PCB_TYPE_ELEMENT:
-		if (PCB->ElementOn && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn))
+		if (pcb_silk_on(PCB) && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn))
 			DrawElement((pcb_element_t *) ptr2);
 		break;
 	case PCB_TYPE_RATLINE:
@@ -510,7 +510,7 @@
 			DrawPad((pcb_pad_t *) ptr2);
 		break;
 	case PCB_TYPE_ELEMENT_NAME:
-		if (PCB->ElementOn && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn))
+		if (pcb_silk_on(PCB) && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn))
 			DrawElementName((pcb_element_t *) ptr1);
 		break;
 	}
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 8597)
+++ trunk/src/gui_act.c	(revision 8598)
@@ -942,7 +942,7 @@
 static int pcb_act_ToggleHideName(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	const char *function = PCB_ACTION_ARG(0);
-	if (function && PCB->ElementOn) {
+	if (function && pcb_silk_on(PCB)) {
 		switch (pcb_funchash_get(function, NULL)) {
 		case F_Object:
 			{
Index: trunk/src/layer_vis.c
===================================================================
--- trunk/src/layer_vis.c	(revision 8597)
+++ trunk/src/layer_vis.c	(revision 8598)
@@ -148,7 +148,6 @@
 			pcb_layer_stack[i] = i;
 		PCB->Data->Layer[i].On = pcb_true;
 	}
-	PCB->ElementOn = pcb_true;
 	PCB->InvisibleObjectsOn = pcb_true;
 	PCB->PinOn = pcb_true;
 	PCB->ViaOn = pcb_true;
@@ -182,7 +181,7 @@
 			SavedStack.pcb_layer_stack[i] = pcb_layer_stack[i];
 		SavedStack.LayerOn[i] = PCB->Data->Layer[i].On;
 	}
-	SavedStack.ElementOn = PCB->ElementOn;
+	SavedStack.ElementOn = pcb_silk_on(PCB);
 	SavedStack.InvisibleObjectsOn = PCB->InvisibleObjectsOn;
 	SavedStack.PinOn = PCB->PinOn;
 	SavedStack.ViaOn = PCB->ViaOn;
@@ -210,7 +209,6 @@
 			pcb_layer_stack[i] = SavedStack.pcb_layer_stack[i];
 		PCB->Data->Layer[i].On = SavedStack.LayerOn[i];
 	}
-	PCB->ElementOn = SavedStack.ElementOn;
 	PCB->InvisibleObjectsOn = SavedStack.InvisibleObjectsOn;
 	PCB->PinOn = SavedStack.PinOn;
 	PCB->ViaOn = SavedStack.ViaOn;
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 8597)
+++ trunk/src/obj_elem.c	(revision 8598)
@@ -467,7 +467,7 @@
 {
 	pcb_bool change = pcb_false;
 
-	if (PCB->PinOn && PCB->ElementOn)
+	if (PCB->PinOn && pcb_silk_on(PCB))
 		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
@@ -1453,7 +1453,7 @@
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
 		return (NULL);
-	if (PCB->ElementOn)
+	if (pcb_silk_on(PCB))
 		EraseElement(Element);
 	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
@@ -1475,7 +1475,7 @@
 		}
 	}
 	PCB_END_LOOP;
-	if (PCB->ElementOn) {
+	if (pcb_silk_on(PCB)) {
 		DrawElement(Element);
 	}
 	if (changed)
@@ -1655,7 +1655,7 @@
 
 	/* this call clears the polygons */
 	pcb_undo_add_obj_to_create(PCB_TYPE_ELEMENT, element, element, element);
-	if (PCB->ElementOn && (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) {
+	if (pcb_silk_on(PCB) && (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) {
 		DrawElementName(element);
 		DrawElementPackage(element);
 	}
@@ -1671,7 +1671,7 @@
 /* moves all names of an element to a new position */
 void *MoveElementName(pcb_opctx_t *ctx, pcb_element_t *Element)
 {
-	if (PCB->ElementOn && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
+	if (pcb_silk_on(PCB) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
 		EraseElementName(Element);
 		PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 		{
@@ -1704,7 +1704,7 @@
 {
 	pcb_bool didDraw = pcb_false;
 
-	if (PCB->ElementOn && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
+	if (pcb_silk_on(PCB) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
 		EraseElement(Element);
 		pcb_element_move(PCB->Data, Element, ctx->move.dx, ctx->move.dy);
 		DrawElementName(Element);
@@ -1761,7 +1761,7 @@
 void *RemoveElement_op(pcb_opctx_t *ctx, pcb_element_t *Element)
 {
 	/* erase from screen */
-	if ((PCB->ElementOn || PCB->PinOn) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
+	if ((pcb_silk_on(PCB) || PCB->PinOn) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
 		EraseElement(Element);
 		if (!ctx->remove.bulk)
 			pcb_draw();
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 8597)
+++ trunk/src/search.c	(revision 8598)
@@ -515,7 +515,7 @@
 	struct ans_info info;
 
 	/* package layer have to be switched on */
-	if (PCB->ElementOn) {
+	if (pcb_silk_on(PCB)) {
 		info.ptr1 = (void **) Element;
 		info.ptr2 = (void **) Text;
 		info.ptr3 = (void **) Dummy;
@@ -560,7 +560,7 @@
 	struct ans_info info;
 
 	/* Both package layers have to be switched on */
-	if (PCB->ElementOn && PCB->PinOn) {
+	if (pcb_silk_on(PCB) && PCB->PinOn) {
 		info.ptr1 = (void **) Element;
 		info.ptr2 = (void **) Dummy1;
 		info.ptr3 = (void **) Dummy2;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 8597)
+++ trunk/src/select.c	(revision 8598)
@@ -78,8 +78,8 @@
 	PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, element);
 
 	if (redraw) {
-		if (pcb->ElementOn && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || pcb->InvisibleObjectsOn))
-			if (pcb->ElementOn) {
+		if (pcb_silk_on(pcb) && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || pcb->InvisibleObjectsOn))
+			if (pcb_silk_on(pcb)) {
 				DrawElementName(element);
 				DrawElementPackage(element);
 			}
@@ -301,7 +301,7 @@
 		unsigned int lflg = pcb_layer_flags(pcb, n);
 
 		if ((lflg & PCB_LYT_SILK) && (PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))) {
-			if (!(pcb->ElementOn || !Flag))
+			if (!(pcb_silk_on(pcb) || !Flag))
 				continue;
 		}
 		else if ((lflg & PCB_LYT_SILK) && !(PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))) {
@@ -365,7 +365,7 @@
 	{
 		{
 			pcb_bool gotElement = pcb_false;
-			if ((pcb->ElementOn || !Flag)
+			if ((pcb_silk_on(pcb) || !Flag)
 					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, element)
 					&& ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || pcb->InvisibleObjectsOn)) {
 				if (PCB_BOX_NEAR_BOX(&PCB_ELEM_TEXT_VISIBLE(PCB, element).BoundingBox, Box)
@@ -377,7 +377,7 @@
 						append(PCB_TYPE_ELEMENT_NAME, element, text);
 					}
 					PCB_END_LOOP;
-					if (pcb->ElementOn)
+					if (pcb_silk_on(pcb))
 						DrawElementName(element);
 				}
 				if ((pcb->PinOn || !Flag) && PCB_ELEMENT_NEAR_BOX(element, Box))
@@ -628,7 +628,7 @@
 	PCB_ENDALL_LOOP;
 
 	/* elements silkscreen */
-	if (type & PCB_TYPE_ELEMENT && pcb->ElementOn && F->Element)
+	if (type & PCB_TYPE_ELEMENT && pcb_silk_on(pcb) && F->Element)
 		PCB_ELEMENT_LOOP(pcb->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
@@ -641,7 +641,7 @@
 		}
 	}
 	PCB_END_LOOP;
-	if (type & PCB_TYPE_ELEMENT_NAME && pcb->ElementOn && F->ElementName)
+	if (type & PCB_TYPE_ELEMENT_NAME && pcb_silk_on(pcb) && F->ElementName)
 		PCB_ELEMENT_LOOP(pcb->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &PCB_ELEM_TEXT_VISIBLE(PCB, element))) {
@@ -778,7 +778,7 @@
 	}
 	PCB_ENDALL_LOOP;
 
-	if (pcb->PinOn && pcb->ElementOn) {
+	if (pcb->PinOn && pcb_silk_on(pcb)) {
 		PCB_PIN_ALL_LOOP(pcb->Data);
 		{
 			if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) {
@@ -907,7 +907,7 @@
 	}
 	PCB_ENDALL_LOOP;
 
-	if (pcb->ElementOn && (Type & PCB_TYPE_ELEMENT))
+	if (pcb_silk_on(pcb) && (Type & PCB_TYPE_ELEMENT))
 		PCB_ELEMENT_LOOP(pcb->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element)
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 8597)
+++ trunk/src_plugins/export_png/png.c	(revision 8598)
@@ -1036,7 +1036,7 @@
 	if (as_shown) {
 		if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) {
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
-				return PCB->ElementOn;
+				return pcb_silk_on(PCB);
 			return 0;
 		}
 
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 8597)
+++ trunk/src_plugins/export_ps/eps.c	(revision 8598)
@@ -386,7 +386,7 @@
 
 	if (as_shown) {
 		if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
-			return PCB->ElementOn;
+			return pcb_silk_on(PCB);
 		else
 			return 0;
 	}
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8597)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8598)
@@ -124,7 +124,7 @@
 			return /* pinout ? 0 : */ PCB->InvisibleObjectsOn;
 		case PCB_LYT_SILK:
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) /*|| pinout */ )
-				return PCB->ElementOn;
+				return pcb_silk_on(PCB);
 			return 0;
 		case PCB_LYT_ASSY:
 			return 0;
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8597)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8598)
@@ -165,7 +165,7 @@
 			return 0;
 		case PCB_LYT_SILK:
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
-				return PCB->ElementOn;
+				return pcb_silk_on(PCB);
 			return 0;
 		case PCB_LYT_PASTE:
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8597)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8598)
@@ -161,7 +161,7 @@
 			return /* pinout ? 0 : */ PCB->InvisibleObjectsOn;
 		case PCB_LYT_SILK:
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) /*|| pinout */ )
-				return PCB->ElementOn;
+				return pcb_silk_on(PCB);
 			return 0;
 		case PCB_LYT_ASSY:
 			return 0;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 8597)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 8598)
@@ -2776,7 +2776,7 @@
 			return pinout ? 0 : PCB->InvisibleObjectsOn;
 		case PCB_LYT_SILK:
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) || pinout) {
-				return PCB->ElementOn;
+				return pcb_silk_on(PCB);
 			}
 			return 0;
 		case PCB_LYT_ASSY:
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 8597)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 8598)
@@ -127,7 +127,7 @@
 		for (i = 0; i < (lb->is_pick ? LB_NUMPICK : LB_NUM); i++) {
 			switch (i) {
 			case LB_SILK:
-				set = PCB->ElementOn;
+				set = pcb_silk_on(PCB);
 				break;
 			case LB_RATS:
 				set = PCB->RatOn;
@@ -232,7 +232,7 @@
 	int l, set;
 	switch (layer) {
 	case LB_SILK:
-		set = PCB->ElementOn = !PCB->ElementOn;
+		set = !pcb_silk_on(PCB);
 		PCB->Data->SILKLAYER.On = set;
 		PCB->Data->BACKSILKLAYER.On = set;
 		break;
Index: trunk/src_plugins/import_edif/edif.c
===================================================================
--- trunk/src_plugins/import_edif/edif.c	(revision 8597)
+++ trunk/src_plugins/import_edif/edif.c	(revision 8598)
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -600,7 +600,7 @@
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
+typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
 #line 201 "edif.y" /* yacc.c:355  */
@@ -611,8 +611,6 @@
 
 #line 613 "edif.c" /* yacc.c:355  */
 };
-
-typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -626,7 +624,7 @@
 
 /* Copy the second part of user declarations.  */
 
-#line 630 "edif.c" /* yacc.c:358  */
+#line 628 "edif.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -3374,535 +3372,535 @@
         case 2:
 #line 513 "edif.y" /* yacc.c:1646  */
     { PopC(); }
-#line 3378 "edif.c" /* yacc.c:1646  */
+#line 3376 "edif.c" /* yacc.c:1646  */
     break;
 
   case 11:
 #line 528 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3384 "edif.c" /* yacc.c:1646  */
+#line 3382 "edif.c" /* yacc.c:1646  */
     break;
 
   case 12:
 #line 531 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3390 "edif.c" /* yacc.c:1646  */
+#line 3388 "edif.c" /* yacc.c:1646  */
     break;
 
   case 13:
 #line 535 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 3396 "edif.c" /* yacc.c:1646  */
+#line 3394 "edif.c" /* yacc.c:1646  */
     break;
 
   case 25:
 #line 559 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3402 "edif.c" /* yacc.c:1646  */
+#line 3400 "edif.c" /* yacc.c:1646  */
     break;
 
   case 34:
 #line 576 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); }
-#line 3408 "edif.c" /* yacc.c:1646  */
+#line 3406 "edif.c" /* yacc.c:1646  */
     break;
 
   case 36:
 #line 580 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3414 "edif.c" /* yacc.c:1646  */
+#line 3412 "edif.c" /* yacc.c:1646  */
     break;
 
   case 47:
 #line 605 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3420 "edif.c" /* yacc.c:1646  */
+#line 3418 "edif.c" /* yacc.c:1646  */
     break;
 
   case 69:
 #line 653 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3426 "edif.c" /* yacc.c:1646  */
+#line 3424 "edif.c" /* yacc.c:1646  */
     break;
 
   case 70:
 #line 656 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3432 "edif.c" /* yacc.c:1646  */
+#line 3430 "edif.c" /* yacc.c:1646  */
     break;
 
   case 80:
 #line 674 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3438 "edif.c" /* yacc.c:1646  */
+#line 3436 "edif.c" /* yacc.c:1646  */
     break;
 
   case 84:
 #line 684 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3444 "edif.c" /* yacc.c:1646  */
+#line 3442 "edif.c" /* yacc.c:1646  */
     break;
 
   case 91:
 #line 699 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3450 "edif.c" /* yacc.c:1646  */
+#line 3448 "edif.c" /* yacc.c:1646  */
     break;
 
   case 102:
 #line 722 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3456 "edif.c" /* yacc.c:1646  */
+#line 3454 "edif.c" /* yacc.c:1646  */
     break;
 
   case 140:
 #line 782 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3462 "edif.c" /* yacc.c:1646  */
+#line 3460 "edif.c" /* yacc.c:1646  */
     break;
 
   case 147:
 #line 797 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3468 "edif.c" /* yacc.c:1646  */
+#line 3466 "edif.c" /* yacc.c:1646  */
     break;
 
   case 150:
 #line 804 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3474 "edif.c" /* yacc.c:1646  */
+#line 3472 "edif.c" /* yacc.c:1646  */
     break;
 
   case 182:
 #line 874 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3480 "edif.c" /* yacc.c:1646  */
+#line 3478 "edif.c" /* yacc.c:1646  */
     break;
 
   case 184:
 #line 878 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3486 "edif.c" /* yacc.c:1646  */
+#line 3484 "edif.c" /* yacc.c:1646  */
     break;
 
   case 240:
 #line 982 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3492 "edif.c" /* yacc.c:1646  */
+#line 3490 "edif.c" /* yacc.c:1646  */
     break;
 
   case 247:
 #line 995 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3498 "edif.c" /* yacc.c:1646  */
+#line 3496 "edif.c" /* yacc.c:1646  */
     break;
 
   case 278:
 #line 1042 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3504 "edif.c" /* yacc.c:1646  */
+#line 3502 "edif.c" /* yacc.c:1646  */
     break;
 
   case 279:
 #line 1045 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3510 "edif.c" /* yacc.c:1646  */
+#line 3508 "edif.c" /* yacc.c:1646  */
     break;
 
   case 333:
 #line 1131 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3516 "edif.c" /* yacc.c:1646  */
+#line 3514 "edif.c" /* yacc.c:1646  */
     break;
 
   case 336:
 #line 1138 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3522 "edif.c" /* yacc.c:1646  */
+#line 3520 "edif.c" /* yacc.c:1646  */
     break;
 
   case 337:
 #line 1141 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3528 "edif.c" /* yacc.c:1646  */
+#line 3526 "edif.c" /* yacc.c:1646  */
     break;
 
   case 344:
 #line 1154 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3534 "edif.c" /* yacc.c:1646  */
+#line 3532 "edif.c" /* yacc.c:1646  */
     break;
 
   case 346:
 #line 1158 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3540 "edif.c" /* yacc.c:1646  */
+#line 3538 "edif.c" /* yacc.c:1646  */
     break;
 
   case 347:
 #line 1159 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3546 "edif.c" /* yacc.c:1646  */
+#line 3544 "edif.c" /* yacc.c:1646  */
     break;
 
   case 348:
 #line 1160 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3552 "edif.c" /* yacc.c:1646  */
+#line 3550 "edif.c" /* yacc.c:1646  */
     break;
 
   case 369:
 #line 1201 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-2].s); }
-#line 3558 "edif.c" /* yacc.c:1646  */
+#line 3556 "edif.c" /* yacc.c:1646  */
     break;
 
   case 371:
 #line 1205 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3564 "edif.c" /* yacc.c:1646  */
+#line 3562 "edif.c" /* yacc.c:1646  */
     break;
 
   case 374:
 #line 1212 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3570 "edif.c" /* yacc.c:1646  */
+#line 3568 "edif.c" /* yacc.c:1646  */
     break;
 
   case 381:
 #line 1223 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3576 "edif.c" /* yacc.c:1646  */
+#line 3574 "edif.c" /* yacc.c:1646  */
     break;
 
   case 384:
 #line 1230 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3582 "edif.c" /* yacc.c:1646  */
+#line 3580 "edif.c" /* yacc.c:1646  */
     break;
 
   case 388:
 #line 1236 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3588 "edif.c" /* yacc.c:1646  */
+#line 3586 "edif.c" /* yacc.c:1646  */
     break;
 
   case 390:
 #line 1240 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3594 "edif.c" /* yacc.c:1646  */
+#line 3592 "edif.c" /* yacc.c:1646  */
     break;
 
   case 393:
 #line 1247 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3600 "edif.c" /* yacc.c:1646  */
+#line 3598 "edif.c" /* yacc.c:1646  */
     break;
 
   case 397:
 #line 1255 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3606 "edif.c" /* yacc.c:1646  */
+#line 3604 "edif.c" /* yacc.c:1646  */
     break;
 
   case 408:
 #line 1270 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3612 "edif.c" /* yacc.c:1646  */
+#line 3610 "edif.c" /* yacc.c:1646  */
     break;
 
   case 437:
 #line 1320 "edif.y" /* yacc.c:1646  */
     { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); }
-#line 3618 "edif.c" /* yacc.c:1646  */
+#line 3616 "edif.c" /* yacc.c:1646  */
     break;
 
   case 438:
 #line 1323 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3624 "edif.c" /* yacc.c:1646  */
+#line 3622 "edif.c" /* yacc.c:1646  */
     break;
 
   case 439:
 #line 1324 "edif.y" /* yacc.c:1646  */
     { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); }
-#line 3630 "edif.c" /* yacc.c:1646  */
+#line 3628 "edif.c" /* yacc.c:1646  */
     break;
 
   case 455:
 #line 1350 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3636 "edif.c" /* yacc.c:1646  */
+#line 3634 "edif.c" /* yacc.c:1646  */
     break;
 
   case 459:
 #line 1360 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3642 "edif.c" /* yacc.c:1646  */
+#line 3640 "edif.c" /* yacc.c:1646  */
     break;
 
   case 460:
 #line 1363 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3648 "edif.c" /* yacc.c:1646  */
+#line 3646 "edif.c" /* yacc.c:1646  */
     break;
 
   case 462:
 #line 1369 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3654 "edif.c" /* yacc.c:1646  */
+#line 3652 "edif.c" /* yacc.c:1646  */
     break;
 
   case 463:
 #line 1372 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3660 "edif.c" /* yacc.c:1646  */
+#line 3658 "edif.c" /* yacc.c:1646  */
     break;
 
   case 483:
 #line 1414 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3666 "edif.c" /* yacc.c:1646  */
+#line 3664 "edif.c" /* yacc.c:1646  */
     break;
 
   case 484:
 #line 1417 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3672 "edif.c" /* yacc.c:1646  */
+#line 3670 "edif.c" /* yacc.c:1646  */
     break;
 
   case 492:
 #line 1431 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3678 "edif.c" /* yacc.c:1646  */
+#line 3676 "edif.c" /* yacc.c:1646  */
     break;
 
   case 506:
 #line 1459 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3684 "edif.c" /* yacc.c:1646  */
+#line 3682 "edif.c" /* yacc.c:1646  */
     break;
 
   case 507:
 #line 1462 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3690 "edif.c" /* yacc.c:1646  */
+#line 3688 "edif.c" /* yacc.c:1646  */
     break;
 
   case 514:
 #line 1477 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3696 "edif.c" /* yacc.c:1646  */
+#line 3694 "edif.c" /* yacc.c:1646  */
     break;
 
   case 549:
 #line 1532 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3702 "edif.c" /* yacc.c:1646  */
+#line 3700 "edif.c" /* yacc.c:1646  */
     break;
 
   case 555:
 #line 1544 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3708 "edif.c" /* yacc.c:1646  */
+#line 3706 "edif.c" /* yacc.c:1646  */
     break;
 
   case 560:
 #line 1553 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3714 "edif.c" /* yacc.c:1646  */
+#line 3712 "edif.c" /* yacc.c:1646  */
     break;
 
   case 561:
 #line 1556 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3720 "edif.c" /* yacc.c:1646  */
+#line 3718 "edif.c" /* yacc.c:1646  */
     break;
 
   case 562:
 #line 1557 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3726 "edif.c" /* yacc.c:1646  */
+#line 3724 "edif.c" /* yacc.c:1646  */
     break;
 
   case 582:
 #line 1599 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3732 "edif.c" /* yacc.c:1646  */
+#line 3730 "edif.c" /* yacc.c:1646  */
     break;
 
   case 585:
 #line 1602 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3738 "edif.c" /* yacc.c:1646  */
+#line 3736 "edif.c" /* yacc.c:1646  */
     break;
 
   case 586:
 #line 1605 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-1].s); }
-#line 3744 "edif.c" /* yacc.c:1646  */
+#line 3742 "edif.c" /* yacc.c:1646  */
     break;
 
   case 587:
 #line 1608 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3750 "edif.c" /* yacc.c:1646  */
+#line 3748 "edif.c" /* yacc.c:1646  */
     break;
 
   case 589:
 #line 1612 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3756 "edif.c" /* yacc.c:1646  */
+#line 3754 "edif.c" /* yacc.c:1646  */
     break;
 
   case 590:
 #line 1613 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3762 "edif.c" /* yacc.c:1646  */
+#line 3760 "edif.c" /* yacc.c:1646  */
     break;
 
   case 591:
 #line 1614 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3768 "edif.c" /* yacc.c:1646  */
+#line 3766 "edif.c" /* yacc.c:1646  */
     break;
 
   case 592:
 #line 1617 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3774 "edif.c" /* yacc.c:1646  */
+#line 3772 "edif.c" /* yacc.c:1646  */
     break;
 
   case 593:
 #line 1618 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3780 "edif.c" /* yacc.c:1646  */
+#line 3778 "edif.c" /* yacc.c:1646  */
     break;
 
   case 594:
 #line 1621 "edif.y" /* yacc.c:1646  */
     { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); }
-#line 3786 "edif.c" /* yacc.c:1646  */
+#line 3784 "edif.c" /* yacc.c:1646  */
     break;
 
   case 595:
 #line 1624 "edif.y" /* yacc.c:1646  */
     { (yyval.pl)=(yyvsp[0].pl); }
-#line 3792 "edif.c" /* yacc.c:1646  */
+#line 3790 "edif.c" /* yacc.c:1646  */
     break;
 
   case 611:
 #line 1646 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-2].ps)); }
-#line 3798 "edif.c" /* yacc.c:1646  */
+#line 3796 "edif.c" /* yacc.c:1646  */
     break;
 
   case 632:
 #line 1683 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3804 "edif.c" /* yacc.c:1646  */
+#line 3802 "edif.c" /* yacc.c:1646  */
     break;
 
   case 633:
 #line 1684 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3810 "edif.c" /* yacc.c:1646  */
+#line 3808 "edif.c" /* yacc.c:1646  */
     break;
 
   case 634:
 #line 1688 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3816 "edif.c" /* yacc.c:1646  */
+#line 3814 "edif.c" /* yacc.c:1646  */
     break;
 
   case 639:
 #line 1697 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3822 "edif.c" /* yacc.c:1646  */
+#line 3820 "edif.c" /* yacc.c:1646  */
     break;
 
   case 644:
 #line 1708 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3828 "edif.c" /* yacc.c:1646  */
+#line 3826 "edif.c" /* yacc.c:1646  */
     break;
 
   case 698:
 #line 1810 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); }
-#line 3834 "edif.c" /* yacc.c:1646  */
+#line 3832 "edif.c" /* yacc.c:1646  */
     break;
 
   case 701:
 #line 1817 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3840 "edif.c" /* yacc.c:1646  */
+#line 3838 "edif.c" /* yacc.c:1646  */
     break;
 
   case 727:
 #line 1869 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3846 "edif.c" /* yacc.c:1646  */
+#line 3844 "edif.c" /* yacc.c:1646  */
     break;
 
   case 730:
 #line 1876 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3852 "edif.c" /* yacc.c:1646  */
+#line 3850 "edif.c" /* yacc.c:1646  */
     break;
 
   case 747:
 #line 1911 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 3858 "edif.c" /* yacc.c:1646  */
+#line 3856 "edif.c" /* yacc.c:1646  */
     break;
 
   case 766:
 #line 1942 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3864 "edif.c" /* yacc.c:1646  */
+#line 3862 "edif.c" /* yacc.c:1646  */
     break;
 
   case 789:
 #line 1977 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3870 "edif.c" /* yacc.c:1646  */
+#line 3868 "edif.c" /* yacc.c:1646  */
     break;
 
   case 791:
 #line 1983 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3876 "edif.c" /* yacc.c:1646  */
+#line 3874 "edif.c" /* yacc.c:1646  */
     break;
 
   case 803:
 #line 1999 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3882 "edif.c" /* yacc.c:1646  */
+#line 3880 "edif.c" /* yacc.c:1646  */
     break;
 
   case 818:
 #line 2018 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3888 "edif.c" /* yacc.c:1646  */
+#line 3886 "edif.c" /* yacc.c:1646  */
     break;
 
   case 823:
 #line 2029 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3894 "edif.c" /* yacc.c:1646  */
+#line 3892 "edif.c" /* yacc.c:1646  */
     break;
 
   case 827:
 #line 2035 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3900 "edif.c" /* yacc.c:1646  */
+#line 3898 "edif.c" /* yacc.c:1646  */
     break;
 
   case 829:
 #line 2039 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3906 "edif.c" /* yacc.c:1646  */
+#line 3904 "edif.c" /* yacc.c:1646  */
     break;
 
   case 831:
@@ -3919,251 +3917,251 @@
 	(yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s));
     }
 }
-#line 3923 "edif.c" /* yacc.c:1646  */
+#line 3921 "edif.c" /* yacc.c:1646  */
     break;
 
   case 832:
 #line 2058 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3929 "edif.c" /* yacc.c:1646  */
+#line 3927 "edif.c" /* yacc.c:1646  */
     break;
 
   case 833:
 #line 2059 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3935 "edif.c" /* yacc.c:1646  */
+#line 3933 "edif.c" /* yacc.c:1646  */
     break;
 
   case 834:
 #line 2060 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3941 "edif.c" /* yacc.c:1646  */
+#line 3939 "edif.c" /* yacc.c:1646  */
     break;
 
   case 835:
 #line 2061 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3947 "edif.c" /* yacc.c:1646  */
+#line 3945 "edif.c" /* yacc.c:1646  */
     break;
 
   case 848:
 #line 2088 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3953 "edif.c" /* yacc.c:1646  */
+#line 3951 "edif.c" /* yacc.c:1646  */
     break;
 
   case 849:
 #line 2091 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3959 "edif.c" /* yacc.c:1646  */
+#line 3957 "edif.c" /* yacc.c:1646  */
     break;
 
   case 881:
 #line 2144 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); }
-#line 3965 "edif.c" /* yacc.c:1646  */
+#line 3963 "edif.c" /* yacc.c:1646  */
     break;
 
   case 882:
 #line 2147 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3971 "edif.c" /* yacc.c:1646  */
+#line 3969 "edif.c" /* yacc.c:1646  */
     break;
 
   case 883:
 #line 2148 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3977 "edif.c" /* yacc.c:1646  */
+#line 3975 "edif.c" /* yacc.c:1646  */
     break;
 
   case 884:
 #line 2151 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3983 "edif.c" /* yacc.c:1646  */
+#line 3981 "edif.c" /* yacc.c:1646  */
     break;
 
   case 885:
 #line 2152 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=NULL; }
-#line 3989 "edif.c" /* yacc.c:1646  */
+#line 3987 "edif.c" /* yacc.c:1646  */
     break;
 
   case 889:
 #line 2162 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3995 "edif.c" /* yacc.c:1646  */
+#line 3993 "edif.c" /* yacc.c:1646  */
     break;
 
   case 891:
 #line 2168 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4001 "edif.c" /* yacc.c:1646  */
+#line 3999 "edif.c" /* yacc.c:1646  */
     break;
 
   case 892:
 #line 2169 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4007 "edif.c" /* yacc.c:1646  */
+#line 4005 "edif.c" /* yacc.c:1646  */
     break;
 
   case 893:
 #line 2172 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4013 "edif.c" /* yacc.c:1646  */
+#line 4011 "edif.c" /* yacc.c:1646  */
     break;
 
   case 894:
 #line 2175 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4019 "edif.c" /* yacc.c:1646  */
+#line 4017 "edif.c" /* yacc.c:1646  */
     break;
 
   case 896:
 #line 2181 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4025 "edif.c" /* yacc.c:1646  */
+#line 4023 "edif.c" /* yacc.c:1646  */
     break;
 
   case 898:
 #line 2183 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4031 "edif.c" /* yacc.c:1646  */
+#line 4029 "edif.c" /* yacc.c:1646  */
     break;
 
   case 903:
 #line 2194 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4037 "edif.c" /* yacc.c:1646  */
+#line 4035 "edif.c" /* yacc.c:1646  */
     break;
 
   case 935:
 #line 2258 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4043 "edif.c" /* yacc.c:1646  */
+#line 4041 "edif.c" /* yacc.c:1646  */
     break;
 
   case 943:
 #line 2274 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4049 "edif.c" /* yacc.c:1646  */
+#line 4047 "edif.c" /* yacc.c:1646  */
     break;
 
   case 946:
 #line 2279 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4055 "edif.c" /* yacc.c:1646  */
+#line 4053 "edif.c" /* yacc.c:1646  */
     break;
 
   case 973:
 #line 2324 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4061 "edif.c" /* yacc.c:1646  */
+#line 4059 "edif.c" /* yacc.c:1646  */
     break;
 
   case 987:
 #line 2346 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4067 "edif.c" /* yacc.c:1646  */
+#line 4065 "edif.c" /* yacc.c:1646  */
     break;
 
   case 994:
 #line 2362 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-6].s)); free((yyvsp[-5].s)); free((yyvsp[-4].s)); free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4073 "edif.c" /* yacc.c:1646  */
+#line 4071 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1054:
 #line 2469 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4079 "edif.c" /* yacc.c:1646  */
+#line 4077 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1055:
 #line 2470 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4085 "edif.c" /* yacc.c:1646  */
+#line 4083 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1056:
 #line 2471 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4091 "edif.c" /* yacc.c:1646  */
+#line 4089 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1057:
 #line 2472 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4097 "edif.c" /* yacc.c:1646  */
+#line 4095 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1059:
 #line 2476 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4103 "edif.c" /* yacc.c:1646  */
+#line 4101 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1061:
 #line 2480 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4109 "edif.c" /* yacc.c:1646  */
+#line 4107 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1063:
 #line 2484 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4115 "edif.c" /* yacc.c:1646  */
+#line 4113 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1085:
 #line 2520 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4121 "edif.c" /* yacc.c:1646  */
+#line 4119 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1086:
 #line 2523 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4127 "edif.c" /* yacc.c:1646  */
+#line 4125 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1107:
 #line 2564 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4133 "edif.c" /* yacc.c:1646  */
+#line 4131 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1109:
 #line 2566 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 4139 "edif.c" /* yacc.c:1646  */
+#line 4137 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1126:
 #line 2593 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4145 "edif.c" /* yacc.c:1646  */
+#line 4143 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1127:
 #line 2596 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4151 "edif.c" /* yacc.c:1646  */
+#line 4149 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1128:
 #line 2599 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4157 "edif.c" /* yacc.c:1646  */
+#line 4155 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1129:
 #line 2602 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4163 "edif.c" /* yacc.c:1646  */
+#line 4161 "edif.c" /* yacc.c:1646  */
     break;
 
 
-#line 4167 "edif.c" /* yacc.c:1646  */
+#line 4165 "edif.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
Index: trunk/src_plugins/import_edif/edif.h
===================================================================
--- trunk/src_plugins/import_edif/edif.h	(revision 8597)
+++ trunk/src_plugins/import_edif/edif.h	(revision 8598)
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -342,7 +342,7 @@
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
+typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
 #line 201 "edif.y" /* yacc.c:1909  */
@@ -353,8 +353,6 @@
 
 #line 355 "edif.h" /* yacc.c:1909  */
 };
-
-typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif