[Goodies-commits] r3979 - xfbib/trunk/src

[Jesper Karlsson]

Author: zarper
Date: 2008-02-21 22:04:24 +0000 (Thu, 21 Feb 2008)
New Revision: 3979

Modified:
   xfbib/trunk/src/entry_edit_dialog.c
   xfbib/trunk/src/parser.y
Log:
Xfbib: The parser now handles latex commands in the entry fields.

Modified: xfbib/trunk/src/entry_edit_dialog.c
===================================================================
--- xfbib/trunk/src/entry_edit_dialog.c	2008-02-21 21:15:10 UTC (rev 3978)
+++ xfbib/trunk/src/entry_edit_dialog.c	2008-02-21 22:04:24 UTC (rev 3979)
@@ -35,7 +35,7 @@
 	"PhdThesis", "Proceedings", "Techreport", "Unpublished"};
 
 const char *label_entry[] = {"Address", "Annote", "Author", "Booktitle", "Chapter",
-	"Crossref", "Edition", "Editor", "E-print", "How Published",
+	"Crossref", "Edition", "Editor", "E-print", "HowPublished",
 	"Institution", "Journal", "Key", "Month", "Note",
 	"Number", "Organization", "Pages", "Publisher", "School",
 	"Series", "Title", "Type", "URL", "Volume", "Year"};
@@ -331,7 +331,7 @@
 		vbox[i] = gtk_vbox_new(FALSE, 10);
 
 	for (i = 0; i < N_ENTRIES; i++)  {
-		edit_entry[i].label = gtk_label_new(label_entry[i]);
+		edit_entry[i].label = gtk_label_new(i == HOWPUBLISHED ? N_("How Published") : label_entry[i]);
 		edit_entry[i].entry = gtk_entry_new();
 		gtk_entry_set_width_chars(GTK_ENTRY (edit_entry[i].entry), 30);
 		gtk_widget_set_tooltip_text (edit_entry[i].entry, tooltips[i]);
@@ -351,7 +351,6 @@
 			gtk_box_pack_start (GTK_BOX (vbox[3]), edit_entry[i].hbox, FALSE, FALSE, 2);
 	}
 
-
 	notebook = gtk_notebook_new ();
 	gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP);
 	
@@ -372,7 +371,10 @@
 			set_entry_text(GTK_ENTRY(key_entry), selected->key);
 			for (tags = selected->tags; tags != NULL; tags = tags->next) {
 				pos = get_entry_pos(tags->name);
-				set_entry_text(GTK_ENTRY(edit_entry[pos].entry), tags->value);
+				if (pos != -1)
+					set_entry_text(GTK_ENTRY(edit_entry[pos].entry), tags->value);
+				else
+					_DEBUG(("Tag equals -1: Name: %s Value: %s", tags->name, tags->value));
 			}
 		} else
 			_DEBUG(("Type equals -1"));

Modified: xfbib/trunk/src/parser.y
===================================================================
--- xfbib/trunk/src/parser.y	2008-02-21 21:15:10 UTC (rev 3978)
+++ xfbib/trunk/src/parser.y	2008-02-21 22:04:24 UTC (rev 3979)
@@ -117,7 +117,8 @@
 string 	:	STRING w 			{ $$ = lookup($1) ; }
 	|	ATSTRING w 			{ $$ = $1 ; }
 	|	QUOTE noquote QUOTE w 		{ $$ = $2 ; }
-	|	LCBRACKET balbrack RCBRACKET w 	{ $$ = $2 ; }
+	|	LATEXCOMMAND w			{ $$ = $1 ; }
+	|	LCBRACKET whatever RCBRACKET w 	{ $$ = $2 ; }
 	;
 
 noquote	:	/* Empty */			{ $$ = strdup("") ; }
@@ -137,15 +138,6 @@
 			| LCBRACKET | RCBRACKET
 			;
 
-balbrack:	/* Empty */			{ $$ = strdup("") ; }
-	|	LCBRACKET balbrack RCBRACKET balbrack
-						{ $$ = scat( $2, $4 ); }
-	|	bbsym balbrack			{ $$ = scat( $1, $2 ); }
-	;
-
-bbsym 	: WHITE | ATSTRING | STRING | LBRACKET | RBRACKET | QUOTE | EQUAL | COMMA | HASHSIGN
-	;
-
 %%
 
 char *comment_cat(char *atstring, char *s_bracket, char *comment, char *e_bracket)