refdb-cvs — All cvs checkins go to this list

[Refdb-cvs] CVS: refdb/src refdbd.c,1.74.2.2,1.74.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14864

Modified Files:
      Tag: Release_0_9_5_stable
	refdbd.c 
Log Message:
getbib now returns refs formatted string even if references are missing

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.74.2.2
retrieving revision 1.74.2.3
diff -u -U2 -r1.74.2.2 -r1.74.2.3
--- refdbd.c	26 Sep 2004 21:08:34 -0000	1.74.2.2
+++ refdbd.c	26 Sep 2004 21:41:07 -0000	1.74.2.3
@@ -1625,7 +1625,7 @@
 	      result = getbib(ptr_child_clrequest, &biblio_info, temp_name, ref_format, n_send_stylespec, &addresult);
 
-	      /* let the client know what happened, add 15 chars for
-		 "getbib error" string */
-	      if (addresult.msg && strlen(addresult.msg)+15 > MSG_BUF_SIZE) {
+	      /* let the client know what happened, add 160 chars for
+		 "getbib error" string and regular return msg */
+	      if (addresult.msg && strlen(addresult.msg)+160 > MSG_BUF_SIZE) {
 		child_returnmsg = (char*)realloc(child_returnmsg, strlen(addresult.msg)+16);
 	      }
@@ -1638,8 +1638,7 @@
 		  sprintf(child_returnmsg, "getbib error: %s\n", addresult.msg);
 		}
-		else {
-		  sprintf(child_returnmsg, ULLSPEC" reference(s) formatted, "ULLSPEC" failed, "ULLSPEC" not found\n", (unsigned long long)(addresult.success), (unsigned long long)(addresult.failure), (unsigned long long)(addresult.skipped));
-		}
 	      }
+
+	      sprintf(&(child_returnmsg[strlen(child_returnmsg)]), ULLSPEC" reference(s) formatted, "ULLSPEC" failed, "ULLSPEC" not found\n", (unsigned long long)(addresult.success), (unsigned long long)(addresult.failure), (unsigned long long)(addresult.skipped));
 	    }
 

[Refdb-cvs] CVS: refdb/src xmlhandler.c,1.22.2.7,1.22.2.8 xmlhandler.h,1.6.2.1,1.6.2.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8545/src

Modified Files:
      Tag: Release_0_9_5_stable
	xmlhandler.c xmlhandler.h 
Log Message:
added support for missing references

Index: xmlhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/xmlhandler.c,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
diff -u -U2 -r1.22.2.7 -r1.22.2.8
--- xmlhandler.c	16 Sep 2004 20:06:38 -0000	1.22.2.7
+++ xmlhandler.c	26 Sep 2004 21:13:06 -0000	1.22.2.8
@@ -1684,4 +1684,9 @@
       /* requested ref is not in the database */
       (*(ptr_gbdata->ptr_ndb_notfound))++;
+ 
+      /* add ID or citation key to the linked list of unfound stuff */
+      if (append_lilifstring(ptr_gbdata->ptr_notfound_first, id_string)) {
+	(*(ptr_gbdata->ptr_ndb_error))++;
+      }
     }
 

Index: xmlhandler.h
===================================================================
RCS file: /cvsroot/refdb/refdb/src/xmlhandler.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -U2 -r1.6.2.1 -r1.6.2.2
--- xmlhandler.h	26 Jul 2004 20:41:23 -0000	1.6.2.1
+++ xmlhandler.h	26 Sep 2004 21:13:06 -0000	1.6.2.2
@@ -60,6 +60,7 @@
   int* ptr_ndb_error; /* if != 0, database error occurred */
   unsigned long long* ptr_ndb_notfound; /* number of refs not found in the database */
-  struct simple_elstack *ptr_sfirst;
+  struct simple_elstack *ptr_sfirst; /* the elements from the id list */
   struct CLIENT_REQUEST *ptr_clrequest;
+  Lilifstring *ptr_notfound_first; /* list of citation keys not found */
 };
 

[Refdb-cvs] CVS: refdb/src refdbib.c,1.41,1.41.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8081/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbib.c 
Log Message:
new config variable ignore_missing

Index: refdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbib.c,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -U2 -r1.41 -r1.41.2.1
--- refdbib.c	11 Feb 2004 23:47:23 -0000	1.41
+++ refdbib.c	26 Sep 2004 21:10:59 -0000	1.41.2.1
@@ -64,5 +64,5 @@
 
 /*+ this array will hold the user preferences +*/
-Prefs prefs[18] = {
+Prefs prefs[19] = {
   {"serverip", ""},
   {"port", ""},
@@ -82,4 +82,5 @@
   {"startnumber", ""},
   {"toencoding", ""},
+  {"ignore_missing", ""},
   {"", ""}
 };
@@ -102,4 +103,5 @@
 char startnumber[PREFS_BUF_LEN] = ""; /* first number of reference */
 char encoding[PREFS_BUF_LEN] = ""; /* output encoding */
+char ignore_missing[PREFS_BUF_LEN] = "f"; /* ignore missing refs */
 char confdir[_POSIX_PATH_MAX+1] = ""; /* path to the config files */
 
@@ -206,4 +208,5 @@
   prefs[15].varvalue = startnumber;
   prefs[16].varvalue = encoding;
+  prefs[17].varvalue = ignore_missing;
 
   /* a slimy hack to detect options before getopt runs */
@@ -232,5 +235,5 @@
 
   /* read command line settings. These may override the config file settings */
-  while ((n_opt = getopt(argc, argv, "c:d:D:e:E:f:hi:l:L:nN:p:qS:t:T:u:vVw:y:")) != -1) {
+  while ((n_opt = getopt(argc, argv, "c:d:D:e:E:f:hi:l:L:mnN:p:qS:t:T:u:vVw:y:")) != -1) {
     switch (n_opt) {
     case 'c':
@@ -260,5 +263,5 @@
       break;
     case 'h':
-      fprintf(stderr, "Create a bibliography file based on an ID or citation key list\nThe list must be provided as an XML document using the citationlistx DTD either on stdin or by passing the file\'s path as an argument\nUsage: refdbib [-c pager ] [-d db] [-D dir] [-e logdest] [-E encoding] [-f stdin] [-h] [-i address] [-l log-level] [-L logfile] [-n] [-N number] [-p port] [-q] [-S style] [-t type] [-T time] [-u name] [-v] [-V] [-w password] [-y confdir] file\nOptions: -c pager command\n         -d use database db\n         -D save driver files in dir\n         -e log destination (0=stderr, 1=syslog, 2=custom file)\n         -E encoding set the output character encoding\n         -f stdin read data from stdin (kludge only required for Cygwin)\n         -h prints this help\n         -i set server IP address\n         -l set the log level\n         -L set the log file\n         -n send no driver file\n         -N start numbering bibliography entries with number\n         -p set server port\n         -q ignore init-file\n         -S use bibliography style\n         -t output type (db31|db31x|teix|bibtex)\n         -T set timeout in seconds\n         -u set username\n         -v show version information\n         -V switch to verbose mode\n         -w set password\n         -y look for configuration files in confdir\n");
+      fprintf(stderr, "Create a bibliography file based on an ID or citation key list\nThe list must be provided as an XML document using the citationlistx DTD either on stdin or by passing the file\'s path as an argument\nUsage: refdbib [-c pager ] [-d db] [-D dir] [-e logdest] [-E encoding] [-f stdin] [-h] [-i address] [-l log-level] [-L logfile] [-m] [-n] [-N number] [-p port] [-q] [-S style] [-t type] [-T time] [-u name] [-v] [-V] [-w password] [-y confdir] file\nOptions: -c pager command\n         -d use database db\n         -D save driver files in dir\n         -e log destination (0=stderr, 1=syslog, 2=custom file)\n         -E encoding set the output character encoding\n         -f stdin read data from stdin (kludge only required for Cygwin)\n         -h prints this help\n         -i set server IP address\n         -l set the log level\n         -L set the log file\n         -m ignore missing references\n         -n send no driver file\n         -N start numbering bibliography entries with number\n         -p set server port\n         -q ignore init-file\n         -S use bibliography style\n         -t output type (db31|db31x|teix|bibtex)\n         -T set timeout in seconds\n         -u set username\n         -v show version information\n         -V switch to verbose mode\n         -w set password\n         -y look for configuration files in confdir\n");
       exit (0);
       break;
@@ -275,4 +278,7 @@
       log_file[PREFS_BUF_LEN-1] = '\0';
       break;
+    case 'm':
+      *ignore_missing = 't';
+      break;
     case 'n':
       n_send_stylespec = 0;
@@ -319,5 +325,5 @@
       break;
     case ':':
-      fprintf(stderr, "Usage: refdbib [-c pager ] [-d db] [-D dir] [-e logdest] [-h] [-i address] [-l log-level] [-L logfile] [-n] [-p port] [-q] [-S style] [-t type] [-T time] [-u name] [-v] [-V] [-w password] [-y confdir] file\nOptions: -c pager command\n         -d use database db\n         -D save driver files in dir\n         -e log destination (0=stderr, 1=syslog, 2=custom file)\n         -h prints this help\n         -i set server IP address\n         -l set the log level\n         -L set the log file\n         -n send no driver file\n         -p set server port\n         -q ignore init-file\n         -S use bibliography style\n         -t output type (db31|db31x|teix|bibtex)\n         -T set timeout in seconds\n         -u set username\n         -v show version information\n         -V switch to verbose mode\n         -w set password\n         -y look for configuration files in confdir\n");
+      fprintf(stderr, "Usage: refdbib [-c pager ] [-d db] [-D dir] [-e logdest] [-E encoding] [-f stdin] [-h] [-i address] [-l log-level] [-L logfile] [-m] [-n] [-N number] [-p port] [-q] [-S style] [-t type] [-T time] [-u name] [-v] [-V] [-w password] [-y confdir] file\nOptions: -c pager command\n         -d use database db\n         -D save driver files in dir\n         -e log destination (0=stderr, 1=syslog, 2=custom file)\n         -E encoding set the output character encoding\n         -f stdin read data from stdin (kludge only required for Cygwin)\n         -h prints this help\n         -i set server IP address\n         -l set the log level\n         -L set the log file\n         -m ignore missing references\n         -n send no driver file\n         -N start numbering bibliography entries with number\n         -p set server port\n         -q ignore init-file\n         -S use bibliography style\n         -t output type (db31|db31x|teix|bibtex)\n         -T set timeout in seconds\n         -u set username\n         -v show version information\n         -V switch to verbose mode\n         -w set password\n         -y look for configuration files in confdir\n");
       exit (1);
       break;
@@ -907,5 +913,5 @@
   else {
     fprintf(stderr, "%s\n", inbuffer);
-    if (!strncmp(inbuffer, "getbib error", 12)) {
+    if (*ignore_missing == 'f' && !strncmp(inbuffer, "getbib error", 12)) {
       n_retval = 1;
     }

[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.10,1.36.2.11

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7890/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbdbib.c 
Log Message:
getbib(): added support for reporting missing references; initialize new addresult member msg_len

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -u -U2 -r1.36.2.10 -r1.36.2.11
--- refdbdbib.c	25 Sep 2004 21:23:33 -0000	1.36.2.10
+++ refdbdbib.c	26 Sep 2004 21:10:31 -0000	1.36.2.11
@@ -167,4 +167,5 @@
   struct BIBCONNS bibconns;
   struct lilimem sentinel;
+  Lilifstring notfound_first;
   iconv_t conv_descriptor;
 
@@ -173,4 +174,7 @@
   sentinel.varname[0] = '\0';
 
+  notfound_first.ptr_next = NULL;
+  *(notfound_first.token) = '\0';
+
   ptr_biblio_info->entry_id = NULL;
   ptr_biblio_info->xreflabel = xreflabel;
@@ -222,4 +226,5 @@
   ptr_addresult->updated = 0;
   ptr_addresult->msg = NULL;
+  ptr_addresult->msg_len = 0;
 
   /* initialize "globals" */
@@ -503,4 +508,5 @@
     gbdata.ptr_ndb_notfound = &ndb_notfound;
     gbdata.ptr_clrequest = ptr_clrequest;
+    gbdata.ptr_notfound_first = &notfound_first;
 
     XML_SetUserData(p, (void*)&gbdata);
@@ -1119,4 +1125,40 @@
   ptr_addresult->skipped = ndb_notfound;
 
+  if (ndb_notfound) {
+    Lilifstring* ptr_curr;
+    char buffer[260];
+    char* msg_temp;
+
+    if (!ptr_addresult->msg) {
+      ptr_addresult->msg = (char*)malloc(256);
+
+      if (ptr_addresult->msg) {
+	*(ptr_addresult->msg) = '\0';
+      }
+    }
+    
+    if (ptr_addresult->msg) {
+      if ((msg_temp = mstrcat(ptr_addresult->msg, "Couldn't find these references:", &(ptr_addresult->msg_len), 0)) != NULL) {
+	ptr_addresult->msg = msg_temp;
+      }
+      
+      ptr_curr = &notfound_first;
+
+      while ((ptr_curr = get_next_lilifstring(ptr_curr))) {
+	sprintf(buffer, " %s", ptr_curr->token);
+	if ((msg_temp = mstrcat(ptr_addresult->msg, buffer, &(ptr_addresult->msg_len), 0)) == NULL) {
+	  break;
+	}
+	else {
+	  ptr_addresult->msg = msg_temp;
+	}
+      }
+    }
+
+    /* clean up linked list */
+    delete_all_lilifstring(&notfound_first);
+
+  } /* end if ndb_notfound */
+
   numbyte = tread(ptr_clrequest->fd, inbuffer, COMMAND_INBUF_LEN);
   if (numbyte == -1) { /* socket read error */
@@ -2878,4 +2920,5 @@
   else {
     ptr_addresult->msg = new_msg;
+    ptr_addresult->msg_len = msg_len;
   }
   return 0;

[Refdb-cvs] CVS: refdb/src refdbd.c,1.74.2.1,1.74.2.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7410/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbd.c 
Log Message:
initialize new addresult member msg_len

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -u -U2 -r1.74.2.1 -r1.74.2.2
--- refdbd.c	26 Jul 2004 20:32:42 -0000	1.74.2.1
+++ refdbd.c	26 Sep 2004 21:08:34 -0000	1.74.2.2
@@ -793,4 +793,5 @@
 
 	    addresult.msg = NULL; 
+	    addresult.msg_len = 0;
 
 	    if ((ptr_child_clrequest = dup_client_request(ptr_clrequest)) == NULL) {

[Refdb-cvs] CVS: refdb/src linklist.c,1.9,1.9.2.1 linklist.h,1.7,1.7.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6964/src

Modified Files:
      Tag: Release_0_9_5_stable
	linklist.c linklist.h 
Log Message:
added linked list for fixed-size strings: struct lilifstring, append_lilifstring(), get_next_lilifstring(), delete_all_lilifstring()

Index: linklist.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/linklist.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -U2 -r1.9 -r1.9.2.1
--- linklist.c	2 Sep 2003 00:25:22 -0000	1.9
+++ linklist.c	26 Sep 2004 21:07:05 -0000	1.9.2.1
@@ -847,2 +847,96 @@
   return counter;
 }
+
+/*********************************************************************
+ linked list for fixed-size strings. The list keeps the original order
+ of items
+********************************************************************/
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  append_lilifstring(): appends a new member into the list. The
+                       implementation is not very efficient but is ok
+		       for a low number of entries
+
+  int append_lilifstring returns 0 if ok, or 1 if an error occurred
+                 if an error occurs
+
+  Lilifstring *ptr_first pointer to sentinel
+  
+  char* token ptr to token 
+
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+int append_lilifstring(Lilifstring *ptr_first, char* token) {
+  Lilifstring* ptr_new_item;
+  Lilifstring* ptr_last_item;
+
+  ptr_new_item = (Lilifstring*)malloc(sizeof(Lilifstring));
+
+  if (!ptr_new_item) { /* malloc failed */
+    return 1;
+  }
+
+  if (token) {
+    strncpy(ptr_new_item->token, token, LILIFSTRING_SIZE);
+    (ptr_new_item->token)[LILIFSTRING_SIZE-1] = '\0';
+  }
+  else {
+    (ptr_new_item->token)[0] = '\0';
+  }
+
+  ptr_new_item->ptr_next = NULL;
+  
+  ptr_last_item = ptr_first;
+
+  /* this is going to be inefficient for a large number of entries */
+  while (ptr_last_item->ptr_next) {
+    ptr_last_item = ptr_last_item->ptr_next;
+  }
+  ptr_last_item->ptr_next = ptr_new_item;
+
+  return 0;
+}
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  get_next_lilifstring(): retrieves next member of the list
+
+  Lilifstring* get_next_lilifstring returns a ptr to the next member or NULL
+                      if we're at the end of the list. Use this fn
+		      to loop over all list entries. In the first
+		      iteration, pass a ptr to the sentinel. In
+		      subsequent iterations, pass the ptr that the
+		      previous iteration returns.
+                   
+
+  Lilifstring *ptr_first pointer to sentinel
+  
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+Lilifstring* get_next_lilifstring(Lilifstring* ptr_first) {
+  return ptr_first->ptr_next;
+}
+
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  delete_all_lilifstring(): deletes all members from the list
+
+  int delete_all_lilifstring returns 0 if ok, or 1 if an error occurred
+
+  Lilifstring *ptr_first pointer to sentinel
+  
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+int delete_all_lilifstring(Lilifstring *ptr_first) {
+  Lilifstring* ptr_curr_item;
+  Lilifstring* ptr_next_item;
+
+  ptr_curr_item = ptr_first->ptr_next;
+  ptr_first->ptr_next = NULL;
+
+  while (ptr_curr_item) {
+    ptr_next_item = ptr_curr_item->ptr_next;
+/*      fprintf(stderr, "freeing %s\n", ptr_curr_item->varname); */
+    free(ptr_curr_item); /* free the memory allocated for the list member */
+
+    ptr_curr_item = ptr_next_item;
+  }
+  return 0;
+}
+
+

Index: linklist.h
===================================================================
RCS file: /cvsroot/refdb/refdb/src/linklist.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -U2 -r1.7 -r1.7.2.1
--- linklist.h	2 Sep 2003 00:25:22 -0000	1.7
+++ linklist.h	26 Sep 2004 21:07:05 -0000	1.7.2.1
@@ -20,4 +20,6 @@
   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 
+#define LILIFSTRING_SIZE 256
+
 /*********************************************************************
  linked list for file descriptors
@@ -125,3 +127,19 @@
 int count_lilistring(Lilistring* ptr_first);
 
+/*********************************************************************
+ linked list for fixed-size strings
+********************************************************************/
+
+typedef struct lilifstring {
+  char token[LILIFSTRING_SIZE]; /* ptr to allocated memory with the value of the item */
+  struct lilifstring *ptr_next; /* pointer to the next element in the list */
+} Lilifstring;
+
+int append_lilifstring(Lilifstring *ptr_first, char* token);
+
+Lilifstring* get_next_lilifstring(Lilifstring* ptr_first);
+
+int delete_all_lilifstring(Lilifstring *ptr_first);
+
+
 

[Refdb-cvs] CVS: refdb/etc refdbibrc,1.6,1.6.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6654/etc

Modified Files:
      Tag: Release_0_9_5_stable
	refdbibrc 
Log Message:
added ignore_missing variable

Index: refdbibrc
===================================================================
RCS file: /cvsroot/refdb/refdb/etc/refdbibrc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -U2 -r1.6 -r1.6.2.1
--- refdbibrc	3 Mar 2004 23:41:16 -0000	1.6
+++ refdbibrc	26 Sep 2004 21:05:58 -0000	1.6.2.1
@@ -82,3 +82,8 @@
 #encoding UTF-8
 
+# How to handle requested references that appear to be missing from the
+# database. If this is set to 't', refdbib issues a warning. If this is
+# set to 'f', refdbib issues an error, i.e. the return code is > 0
+ignore_missing	f
+
 # end of refdbibrc
\ No newline at end of file

[Refdb-cvs] CVS: refdb configure.in,1.49.2.3,1.49.2.4

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2215

Modified Files:
      Tag: Release_0_9_5_stable
	configure.in 
Log Message:
bumped up version number

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -U2 -r1.49.2.3 -r1.49.2.4
--- configure.in	4 Aug 2004 20:57:11 -0000	1.49.2.3
+++ configure.in	25 Sep 2004 23:54:29 -0000	1.49.2.4
@@ -6,5 +6,5 @@
 
 dnl Use automake
-AM_INIT_AUTOMAKE(refdb, 0.9.5-pre4)
+AM_INIT_AUTOMAKE(refdb, 0.9.5-pre5)
 
 dnl Find out host type

[Refdb-cvs] CVS: refdb/xsl/refdb/tei-refdb-xsl/tei-fo tei-refdb-fo.xsl.in,1.2.2.1,1.2.2.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31572/xsl/refdb/tei-refdb-xsl/tei-fo

Modified Files:
      Tag: Release_0_9_5_stable
	tei-refdb-fo.xsl.in 
Log Message:
fixed case mismatches and other errors

Index: tei-refdb-fo.xsl.in
===================================================================
RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl.in,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -U2 -r1.2.2.1 -r1.2.2.2
--- tei-refdb-fo.xsl.in	12 Sep 2004 21:11:31 -0000	1.2.2.1
+++ tei-refdb-fo.xsl.in	25 Sep 2004 21:28:54 -0000	1.2.2.2
@@ -4,5 +4,5 @@
 $Id$
 
-ho...@co... 011223
+mh...@us... 20011223
 
 Copyright blurb
@@ -54,12 +54,12 @@
     <xsl:call-template name="addID"/>
     <xsl:attribute name="space-before.optimum">
-      <xsl:value-of select="$spaceBeforeBibl"/></xsl:attribute>
-      <xsl:attribute name="space-after.optimum">
-        <xsl:value-of select="$spaceAfterBibl"/></xsl:attribute>
-      </xsl:attribute>
+      <xsl:value-of select="$spaceBeforeBibl"/>
+    </xsl:attribute>
+    <xsl:attribute name="space-after.optimum">
+      <xsl:value-of select="$spaceAfterBibl"/>
     </xsl:attribute>
     <xsl:choose>
       <xsl:when test="ancestor::listBibl/@rend = 'refdb'">
-        <xsl:apply-templates select="seg[@type='BIBLIOGRAPHY']" mode="refdb"/>
+        <xsl:apply-templates select="seg[@type='bibliography']" mode="refdb"/>
       </xsl:when>
       <xsl:otherwise>
@@ -106,17 +106,17 @@
       <fo:basic-link internal-destination='{$realtarget}'>
         <xsl:choose>
-          <xsl:when test="$ptrtype='INTEXT'">
+          <xsl:when test="$ptrtype='intext'">
             <xsl:apply-templates mode="INTEXT" select="id(@target)"/>
           </xsl:when>
-          <xsl:when test="$ptrtype='INTEXTSQ'">
+          <xsl:when test="$ptrtype='intextsq'">
             <xsl:apply-templates mode="INTEXTSQ" select="id(@target)"/>
           </xsl:when>
-          <xsl:when test="$ptrtype='AUTHORONLY'">
+          <xsl:when test="$ptrtype='authoronly'">
             <xsl:apply-templates mode="AUTHORONLY" select="id(@target)"/>
           </xsl:when>
-          <xsl:when test="$ptrtype='AUTHORONLYSQ'">
+          <xsl:when test="$ptrtype='authoronlysq'">
             <xsl:apply-templates mode="AUTHORONLYSQ" select="id(@target)"/>
           </xsl:when>
-          <xsl:when test="$ptrtype='YEARONLY'">
+          <xsl:when test="$ptrtype='yearonly'">
             <xsl:apply-templates mode="YEARONLY" select="id(@target)"/>
           </xsl:when>

[Refdb-cvs] CVS: refdb/xsl/refdb bibdb2tei.xsl,1.1,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/xsl/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31172/xsl/refdb

Modified Files:
      Tag: Release_0_9_5_stable
	bibdb2tei.xsl 
Log Message:
fixed transformation

Index: bibdb2tei.xsl
===================================================================
RCS file: /cvsroot/refdb/refdb/xsl/refdb/bibdb2tei.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -U2 -r1.1 -r1.1.2.1
--- bibdb2tei.xsl	13 Sep 2003 20:13:20 -0000	1.1
+++ bibdb2tei.xsl	25 Sep 2004 21:27:27 -0000	1.1.2.1
@@ -15,5 +15,5 @@
       <xsl:apply-templates select="./title" mode="head"/>

       <listBibl rend="refdb">

-      <xsl:apply-templates/>

+        <xsl:apply-templates select="./bibliomixed"/>

       </listBibl>

     </div>

@@ -71,4 +71,7 @@
         <xsl:value-of select="@role"/>

       </xsl:attribute>

+      <xsl:attribute name="id">

+        <xsl:value-of select="@id"/>

+      </xsl:attribute>

       <xsl:apply-templates/>

     </seg>

@@ -98,9 +101,12 @@
         <seg type="article"><xsl:apply-templates/></seg>

       </xsl:when>

+      <xsl:when test="@relation='book'">

+        <seg type="book"><xsl:apply-templates/></seg>

+      </xsl:when>

       <xsl:when test="@relation='intext'">

         <seg type="intext"><xsl:apply-templates/></seg>

       </xsl:when>

       <xsl:when test="@relation='journal'">

-        <seg type="JOUR"><xsl:apply-templates/></seg>

+        <seg type="journal"><xsl:apply-templates/></seg>

       </xsl:when>

       <xsl:when test="@relation='endtermtarget'">

[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.9,1.36.2.10

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30086/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbdbib.c 
Log Message:
added support for css for sgml; added prefix to dsssl variables

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.36.2.9
retrieving revision 1.36.2.10
diff -u -U2 -r1.36.2.9 -r1.36.2.10
--- refdbdbib.c	12 Sep 2004 21:09:55 -0000	1.36.2.9
+++ refdbdbib.c	25 Sep 2004 21:23:33 -0000	1.36.2.10
@@ -2813,14 +2813,25 @@
   }
   else { /* DSSSL */
+    strcpy(outbuffer, "(define %stylesheet% #f)\n");
+
     if (bibliofirstindent) {
-      sprintf(outbuffer, "(define text-indent \"%s\")\n", bibliofirstindent);
+      sprintf(&(outbuffer[strlen(outbuffer)]), "(define refdb-text-indent %s)\n", bibliofirstindent);
+    }
+    else {
+      strcat(outbuffer, "(define refdb-text-indent #f)\n");
     }
 
     if (biblioblockindent) {
-      sprintf(&(outbuffer[strlen(outbuffer)]), "(define start-indent \"%s\")\n", biblioblockindent);
+      sprintf(&(outbuffer[strlen(outbuffer)]), "(define refdb-start-indent %s)\n", biblioblockindent);
+    }
+    else {
+      strcat(outbuffer, "(define refdb-start-indent #f)\n");
     }
 
     if (fontsize) {
-      sprintf(&(outbuffer[strlen(outbuffer)]), "(define font-size \"%s\")\n", fontsize);
+      sprintf(&(outbuffer[strlen(outbuffer)]), "(define refdb-font-size %s)\n", fontsize);
+    }
+    else {
+      strcat(outbuffer, "(define refdb-font-size #f)\n");
     }
   }

[Refdb-cvs] CVS: refdb/scripts runbib.in,1.14.2.3,1.14.2.4

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29459/scripts

Modified Files:
      Tag: Release_0_9_5_stable
	runbib.in 
Log Message:
added support for css file for sgml;remove prolog from TEI bibliography

Index: runbib.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/runbib.in,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -U2 -r1.14.2.3 -r1.14.2.4
--- runbib.in	12 Sep 2004 21:08:10 -0000	1.14.2.3
+++ runbib.in	25 Sep 2004 21:21:01 -0000	1.14.2.4
@@ -13,7 +13,8 @@
 # stylesheets
 citlist="<myrefdblib>/dsssl/citations.dsl"
+makecss="<myrefdblib>/dsssl/makecss.dsl"
 citlistx="<myrefdblib>/xsl/citations.xsl"
 db2teix="<myrefdblib>/xsl/bibdb2tei.xsl"
-makecss="<myrefdblib>/xsl/makecss.xsl"
+makecssx="<myrefdblib>/xsl/makecss.xsl"
 teihtml="<myrefdblib>/xsl/tei-refdb-xsl/tei-html/tei-refdb-html.xsl"
 teifo="<myrefdblib>/xsl/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl"
@@ -80,5 +81,5 @@
     local basename=${1%.*}
 
-    $myxsltproc $makecss $1 > $basename.css
+    $myxsltproc $makecssx $1 > $basename.css
 
 # todo: test whether $cssfile is an url
@@ -115,4 +116,24 @@
 }
 
+mangledsssl ()
+{
+# refdb sends us a dsssl stylesheet. We need to create
+# a CSS file for all (x)html output. We first send the driver file through
+# a dsssl script to isolate the html section (otherwise we'd get another
+# definition for each variable from the print section), then grep for the
+# definitions, and convert them to css
+    local basename=${1%.*}
+
+    $myjade -t sgml -d $makecss $1 | grep "(define refdb-" | sed 's/(define refdb-text-indent \(.*\))/p.BIBLIOMIXED {text-indent: \1;}/ ;  s/(define refdb-start-indent \(.*\))/p.BIBLIOMIXED {margin-left: \1;}/ ; s/(define refdb-font-size \(.*\))/p.BIBLIOMIXED {font-size: \1;}/' > $basename.css
+
+    if [ -n "$cssfile" ] && [ "$cssfile" != "$basename.css" ]; then
+	    echo "sed 's&(define %stylesheet% #f)&(define %stylesheet% \"$cssfile\")&' < $1 > $basename.dsl$$" | sh
+	    mv $basename.dsl$$ $basename.dsl
+    elif [ -s "$basename.css" ]; then
+	    echo "sed 's&(define %stylesheet% #f)&(define %stylesheet% \"$basename.css\")&' < $1 > $basename.dsl$$" | sh
+	    mv $basename.dsl$$ $basename.dsl
+    fi
+}
+
 # read the command line options
 while getopts ":d:E:G:hi:IN:p:S:t:u:w:" opt; do
@@ -212,4 +233,7 @@
 	fi
 
+	# need to create the css file
+	mangledsssl ${style%.}.dsl
+
 ### DocBook XML
     elif [ $outtype = "db31x" ]; then
@@ -266,5 +290,7 @@
 	fi
 
-	mv $basename.bib.xml.$$ $basename.bib.xml
+	# the bibliography carries its own prolog, comment it out
+	sed 's/\(<?xml.*\)/<!-- \1 -->/ ; s/\(<!DOCTYPE.*\)/<!-- \1 -->/' < $basename.bib.xml.$$ > $basename.bib.xml
+	rm $basename.bib.xml.$$
 
 	manglexsl ${style%.}.xsl "TEI"

[Refdb-cvs] CVS: refdb/dsssl/refdb/print docbook-refdb.dsl,1.5,1.5.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/dsssl/refdb/print
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28742/dsssl/refdb/print

Modified Files:
      Tag: Release_0_9_5_stable
	docbook-refdb.dsl 
Log Message:
added support for bib formatting

Index: docbook-refdb.dsl
===================================================================
RCS file: /cvsroot/refdb/refdb/dsssl/refdb/print/docbook-refdb.dsl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -U2 -r1.5 -r1.5.2.1
--- docbook-refdb.dsl	19 Mar 2004 23:23:11 -0000	1.5
+++ docbook-refdb.dsl	25 Sep 2004 21:18:17 -0000	1.5.2.1
@@ -17,4 +17,15 @@
 &refdbvar;
 
+;; general stuff
+
+; use letter as default because it prints just fine on both letter and
+; A4 paper
+(define %paper-type%
+  "USletter")
+
+; allow pdf images in mediaobjects
+(define preferred-mediaobject-extensions
+  (list "eps" "ps" "jpg" "jpeg" "pdf"))
+
 ;;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ;; process bibliography elements
@@ -219,6 +230,13 @@
 	      space-before: %para-sep%
 	      space-after: %para-sep%
-	      start-indent: (+ (inherited-start-indent) 2pi)
-	      first-line-start-indent: -2pi
+	      start-indent: (if refdb-start-indent
+				(+ (inherited-start-indent) refdb-start-indent)
+				(+ (inherited-start-indent) 2pi))
+	      first-line-start-indent: (if refdb-text-indent
+					   refdb-text-indent
+					   (-2pi))
+	      font-size: (if refdb-font-size
+			     refdb-font-size
+			     (inherited-font-size))
 	      
 	      (with-mode biblioentry-inline-refdb-mode
@@ -719,13 +737,4 @@
 
 
-; general stuff
-
-(define %paper-type%
-  "USletter")
-
-; allow pdf images in mediaobjects
-(define preferred-mediaobject-extensions
-  (list "eps" "ps" "jpg" "jpeg" "pdf"))
-
 </style-specification-body>
 </style-specification>

[Refdb-cvs] CVS: refdb/dsssl/refdb makecss.dsl,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/dsssl/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28043

Added Files:
      Tag: Release_0_9_5_stable
	makecss.dsl 
Log Message:
initial version

--- NEW FILE ---
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN">

<style-sheet>
<style-specification>
<style-specification-body>

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; This file is part of RefDB
;; Markus Hoenicka markus at mhoenicka.de 20040924
;; $Id: makecss.dsl,v 1.1.2.1 2004/09/25 21:15:31 mhoenicka Exp $
;;
;;
;;; extracts the html specification from a RefDB-generated dsssl driver file
;
;;; Processing: jade -t sgml -d makecss.dsl stylename.dsl > stylename.css

(declare-flow-object-class element
			   "UNREGISTERED::James Clark//Flow Object Class::element")

(element STYLE-SHEET
  (make sequence
    (process-children)))

(element STYLE-SPECIFICATION
  (if (equal? (normalize (attribute-string (normalize "id"))) (normalize "html"))
      (make sequence
	(process-children))
      (empty-sosofo))
)

;; library functions

(define (normalize str)
  ;; REFENTRY normalize
  ;; PURP Normalize the str according to the SGML declaration in effect
  ;; DESC
  ;; Performs SGML general name normalization on the string;
  ;; used to compare attribute names and generic identifiers correctly
  ;; according to the SGML declaration in effect; this is necessary
  ;; since XML is case-sensitive but the reference concrete syntax and
  ;; many SGML DTDs are not.
  ;; /DESC
  ;; AUTHOR Chris Maden
  ;; /REFENTRY
  (if (string? str)
      (general-name-normalize str
			      (current-node))
      str))

</style-specification-body>
</style-specification>
</style-sheet>

[Refdb-cvs] CVS: refdb/dsssl/refdb Makefile.am,1.4,1.4.4.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/dsssl/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27850/dsssl/refdb

Modified Files:
      Tag: Release_0_9_5_stable
	Makefile.am 
Log Message:
added makecss.dsl

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/dsssl/refdb/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -U2 -r1.4 -r1.4.4.1
--- Makefile.am	19 Jun 2002 19:44:30 -0000	1.4
+++ Makefile.am	25 Sep 2004 21:14:33 -0000	1.4.4.1
@@ -3,5 +3,5 @@
 SUBDIRS = html lib print
 
-objects = bibdb2tei.dsl citations.dsl db2ris.dsl catalog
+objects = bibdb2tei.dsl citations.dsl db2ris.dsl makecss.dsl catalog
 
 EXTRA_DIST = $(objects)

[Refdb-cvs] CVS: refdb/scripts refdbnd.in,1.8.2.2,1.8.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9873

Modified Files:
      Tag: Release_0_9_5_stable
	refdbnd.in 
Log Message:
fixed stylesheet filename mangling bug

Index: refdbnd.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbnd.in,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -U2 -r1.8.2.2 -r1.8.2.3
--- refdbnd.in	12 Sep 2004 21:04:21 -0000	1.8.2.2
+++ refdbnd.in	17 Sep 2004 19:59:27 -0000	1.8.2.3
@@ -149,5 +149,5 @@
 
     # mangle stylename to generate the name of the CSS file
-    defcssfile=${style%%.*}.css
+    defcssfile=${style%.*}.css
 
     echo "Please enter the path or the URL of a custom CSS file for the"

[Refdb-cvs] CVS: refdb/src xmlhandler.c,1.22.2.6,1.22.2.7

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21941

Modified Files:
      Tag: Release_0_9_5_stable
	xmlhandler.c 
Log Message:
handle role attribute correctly for LINK, USERDEF, and MISC fields

Index: xmlhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/xmlhandler.c,v
retrieving revision 1.22.2.6
retrieving revision 1.22.2.7
diff -u -U2 -r1.22.2.6 -r1.22.2.7
--- xmlhandler.c	8 Sep 2004 20:34:35 -0000	1.22.2.6
+++ xmlhandler.c	16 Sep 2004 20:06:38 -0000	1.22.2.7
@@ -511,5 +511,8 @@
     if (strcmp((ptr_asdata->ptr_first)->elname, "AUTHORLIST") == 0 ||
 	strcmp((ptr_asdata->ptr_first)->elname, "PUBDATE") == 0 ||
-	strcmp((ptr_asdata->ptr_first)->elname, "TITLE") == 0) {
+	strcmp((ptr_asdata->ptr_first)->elname, "TITLE") == 0 ||
+	strcmp((ptr_asdata->ptr_first)->elname, "LINK") == 0 ||
+	strcmp((ptr_asdata->ptr_first)->elname, "MISC") == 0 ||
+	strcmp((ptr_asdata->ptr_first)->elname, "USERDEF") == 0) {
       ignore_role = 1;
     }

[Refdb-cvs] CVS: makestyle refdb-ms.pl,1.1,1.2

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26308

Modified Files:
	refdb-ms.pl 
Log Message:
Altered to support new elements and attributes enabling bibliography-wide formatting.

Index: refdb-ms.pl
===================================================================
RCS file: /cvsroot/refdb/makestyle/refdb-ms.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- refdb-ms.pl	12 Aug 2004 13:46:48 -0000	1.1
+++ refdb-ms.pl	14 Sep 2004 16:29:20 -0000	1.2
@@ -911,6 +911,6 @@
 		$self->set_name       ( "FORMAT" );
 		$self->add_enumeration( qw/ NO YES / );
-		$self->set_default    ( "NO" );
-		$self->set_prompt     ( "Default = \"NO\".\nDetermines whether the associated publication date will be formatted.  If set to 'YES', date format is determined by attributes SEQUENCE, YEARFORMAT, MONTHFORMAT, PADLEADINGZERO and DAYFORMAT.  If set to 'NO', date format defaults to a fourdigit year (eg. '2001') and the aforementioned date formatting attributes are ignored." );
+		$self->set_default    ( "YES" );
+		$self->set_prompt     ( "Default = \"YES\".\nDetermines whether the associated publication date will be formatted.  If set to 'YES', date format is determined by attributes SEQUENCE, YEARFORMAT, MONTHFORMAT, PADLEADINGZERO and DAYFORMAT.  If set to 'NO', date format defaults to a fourdigit year (eg. '2001') and the aforementioned date formatting attributes are ignored." );
 		return $self;
 	}
@@ -1028,4 +1028,27 @@
 	}
 
+package BiblioFirstIndent;
+	use base qw/ _Attribute /;
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name       ( "BIBLIOFIRSTINDENT" );
+		# $self->add_enumeration( qw/ BASIS BAUTHORDATE BDATEASC BDATEDESC / );
+		# $self->set_default    ( "BAUTHORDAT" );
+		$self->set_prompt     ( "Sets indent of the first line of each bibliography entry.  Is cumulative with value set for BIBLIOBLOCKINDENT.  Can be negative.  Units must be included.  Absolute units: 'cm' (centimetres), 'in' (inches), 'mm' (millimetres), 'pc' (picas) or 'pt' (points).  Relative units: '%' (of total width), 'em' (ems, relative to font size) or 'px' (pixels, relative to canvas resolution).  Examples: '5em' and '-3%'." );
+		return $self;
+	}
+
+	sub _is_valid_value {
+		if ( $_[1] =~ /^-?\d+\.?\d*(cm|em|in|mm|pc|px|pt|%)$/ ) {  # decimal number followed by units
+			1;
+		} else {
+			print "Invalid value.  Sorry, please try again.\n";
+			0;
+		}
+	}
+
 package BiblioSequence;
 	use base qw/ _Attribute /;
@@ -1042,4 +1065,50 @@
 	}
 
+package BiblioBlockIndent;
+	use base qw/ _Attribute /;
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name       ( "BIBLIOBLOCKINDENT" );
+		# $self->add_enumeration( qw/ BASIS BAUTHORDATE BDATEASC BDATEDESC / );
+		# $self->set_default    ( "BAUTHORDAT" );
+		$self->set_prompt     ( "Sets indent of the whole bibliography.  Can be negative.  Units must be included.  Absolute units: 'cm' (centimetres), 'in' (inches), 'mm' (millimetres), 'pc' (picas) or 'pt' (points).  Relative units: '%' (of total width), 'em' (ems, relative to font size) or 'px' (pixels, relative to canvas resolution).  Examples: '5em' and '-3%'." );
+		return $self;
+	}
+
+	sub _is_valid_value {
+		if ( $_[1] =~ /^-?\d+\.?\d*(cm|em|in|mm|pc|px|pt|%)$/ ) {  # decimal number followed by units
+			1;
+		} else {
+			print "Invalid value.  Sorry, please try again.\n";
+			0;
+		}
+	}
+
+package FontSize;
+	use base qw/ _Attribute /;
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name       ( "FONTSIZE" );
+		# $self->add_enumeration( qw/ BASIS BAUTHORDATE BDATEASC BDATEDESC / );
+		# $self->set_default    ( "BAUTHORDAT" );
+		$self->set_prompt     ( "Sets font size of bibliography.  Absolute sizes: 'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large' or 'xx-large'.  Relative sizes: 'smaller' or 'larger'.  Numeric sizes cannot be negative.  Numeric absolute units: 'in' (inches), 'cm' (centimetres), 'mm' (millimetres), 'pt' (points) or 'pc' (picas).  Numeric relative units: 'em' (ems, relative to parent font), 'px' (pixels, relative to canvas resolution) or '%' (relative to parent font).  If a number is used without units it is a relative multiplier of the parent font (acts as if 'em' units specified).  Examples: 'x-small', 'larger', '0.8cm', '5em' and '0.8'." );
+		return $self;
+	}
+
+	sub _is_valid_value {
+		if ( $_[1] =~ /^(((x?x-)?(small|large))|smaller|larger|\d+\.?\d*(cm|em|in|mm|pc|px|pt|%)?)$/ ) {  # see prompt for explanation
+			1;
+		} else {
+			print "Invalid value.  Sorry, please try again.\n";
+			0;
+		}
+	}
+
 package InTextSequence;
 	use base qw/ _Attribute /;
@@ -4046,4 +4115,5 @@
 			[ "RefStyle"  , "1" ] ,
 			[ "CitStyle"  , "1" ] ,
+			[ "BibStyle"  , "1" ] ,
 		] );
 		return $self;
@@ -5062,5 +5132,5 @@
 		$self->set_attributes( {
 			mandatory => undef ,
-			optional  => [ "BiblioSequence" , "InTextSequence" , "Style" ] ,
+			optional  => [ "InTextSequence" , "Style" ] ,
 		} );
 		$self->set_order( [
@@ -5069,9 +5139,7 @@
 			[ "CitSeparator"   , "1" ] ,
 			[ "RangeSeparator" , "?" ] ,
-			[ "BiblioTitle"    , "?" ] ,
 			[ "InTextDef"      , "?" ] ,
 			[ "AuthorOnly"     , "?" ] ,
 			[ "YearOnly"       , "?" ] ,
-			[ "Months"         , "?" ] ,
 		] );
 		return $self;
@@ -5103,4 +5171,29 @@
 	sub default_copyable { undef; }
 
+package BibStyle;
+	use base qw/ _Model_Order /;
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name( "BIBSTYLE" );
+		$self->set_prompt( "Contains elements and attributes which determine the formatting of bibliographies/reference lists." );
+		$self->set_help( "Contains elements and attributes which determine the formatting of bibliographies/reference lists." );
+		$self->set_display( "name" );
+		$self->set_attributes( {
+			mandatory => undef ,
+			optional  => [ "BiblioFirstIndent" , "BiblioSequence" , "BiblioBlockIndent" , "FontSize" ] ,
+		} );
+		$self->set_order( [
+			[ "BiblioTitle"    , "?" ] ,
+			[ "Months"         , "?" ] ,
+		] );
+		return $self;
+	}
+
+	# Class methods
+	sub default_copyable { undef; }
+
 package BiblioTitle;
 	use base qw/ _Model_Childless /;

[Refdb-cvs] CVS: refdb/xsl/refdb/tei-refdb-xsl/tei-fo tei-refdb-fo.xsl.in,1.2,1.2.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4886/xsl/refdb/tei-refdb-xsl/tei-fo

Modified Files:
      Tag: Release_0_9_5_stable
	tei-refdb-fo.xsl.in 
Log Message:
added support for biblio styling

Index: tei-refdb-fo.xsl.in
===================================================================
RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -U2 -r1.2 -r1.2.2.1
--- tei-refdb-fo.xsl.in	19 Mar 2004 23:23:12 -0000	1.2
+++ tei-refdb-fo.xsl.in	12 Sep 2004 21:11:31 -0000	1.2.2.1
@@ -22,4 +22,11 @@
 <xsl:import href="../tei-lib/tei-refdblib.xsl"/>
 
+<!-- attribute sets for later use -->
+<xsl:attribute-set name="normal.para.spacing">
+  <xsl:attribute name="text-indent">-<xsl:value-of select="$indentBibl"/></xsl:attribute>
+  <xsl:attribute name="start-indent"><xsl:value-of select="$indentBibl"/></xsl:attribute>
+</xsl:attribute-set>
+
+
 <xsl:template match="listBibl[@rend='refdb']">
   <xsl:choose>
@@ -44,5 +51,5 @@
      function as a link target -->
 <xsl:template match="bibl">
-  <fo:block>
+  <fo:block xsl:use-attribute-sets="refdb.bibliomset">
     <xsl:call-template name="addID"/>
     <xsl:attribute name="space-before.optimum">
@@ -50,7 +57,5 @@
       <xsl:attribute name="space-after.optimum">
         <xsl:value-of select="$spaceAfterBibl"/></xsl:attribute>
-        <xsl:attribute name="text-indent">-<xsl:value-of select="$indentBibl"/>
       </xsl:attribute>
-      <xsl:attribute name="start-indent"><xsl:value-of select="$indentBibl"/>
     </xsl:attribute>
     <xsl:choose>

[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.8,1.36.2.9

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4507/src

Modified Files:
      Tag: Release_0_9_5_stable
	refdbdbib.c 
Log Message:
added support for css files

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.36.2.8
retrieving revision 1.36.2.9
diff -u -U2 -r1.36.2.8 -r1.36.2.9
--- refdbdbib.c	9 Sep 2004 21:34:03 -0000	1.36.2.8
+++ refdbdbib.c	12 Sep 2004 21:09:55 -0000	1.36.2.9
@@ -2639,5 +2639,5 @@
   }
   else {
-    sprintf(outbuffer, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n<!-- REFDBSTYLESHEET --><xsl:import href=""/><!-- /REFDBSTYLESHEET -->\n");
+    sprintf(outbuffer, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n<!-- REFDBSTYLESHEET --><xsl:import href=\"\"/><!-- /REFDBSTYLESHEET -->\n");
   }
 
@@ -2791,5 +2791,5 @@
 
   if (!type) { /* XSLT */
-    strcpy(outbuffer, "<!-- REFDBBIBSTYLE --><xsl:attribute-set name=\"refdb.bibliomset\" use-attribute-sets=\"normal.para.spacing\">");
+    strcpy(outbuffer, "<!--CSSFILE/--><!-- REFDBBIBSTYLE --><xsl:attribute-set name=\"refdb.bibliomset\" use-attribute-sets=\"normal.para.spacing\">");
 
     if (bibliofirstindent) {

[Refdb-cvs] CVS: refdb/scripts runbib.in,1.14.2.2,1.14.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4126/scripts

Modified Files:
      Tag: Release_0_9_5_stable
	runbib.in 
Log Message:
added support for css files

Index: runbib.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/runbib.in,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -U2 -r1.14.2.2 -r1.14.2.3
--- runbib.in	8 Sep 2004 20:19:59 -0000	1.14.2.2
+++ runbib.in	12 Sep 2004 21:08:10 -0000	1.14.2.3
@@ -15,4 +15,5 @@
 citlistx="<myrefdblib>/xsl/citations.xsl"
 db2teix="<myrefdblib>/xsl/bibdb2tei.xsl"
+makecss="<myrefdblib>/xsl/makecss.xsl"
 teihtml="<myrefdblib>/xsl/tei-refdb-xsl/tei-html/tei-refdb-html.xsl"
 teifo="<myrefdblib>/xsl/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl"
@@ -50,4 +51,5 @@
 startnumber="1"
 numopt=""
+cssfile=""
 
 # this allows to include or ignore marked sections in the SGML file
@@ -75,26 +77,53 @@
 # one html stylesheet and one fo stylesheet by importing the proper
 # refdb xsl stylesheets. DocBook gets an additional xhtml stylesheet
+# we'll also create a CSS file for all (x)html output
     local basename=${1%.*}
 
-    if [ $2 = "TEI" ]; then
-	echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teihtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&&' < $1 > $basename.html.xsl" | sh
-	echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teifo\"/>&' < $1 > $basename.fo.xsl" | sh
-    elif [ $2 = "DOCBOOK" ]; then
-	echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&&' < $1 > $basename.html.xsl" | sh
-	echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkxhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&&' < $1 > $basename.xhtml.xsl" | sh
-	echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkfo\"/>&' < $1 > $basename.fo.xsl" | sh
+    $myxsltproc $makecss $1 > $basename.css
+
+# todo: test whether $cssfile is an url
+    if [ -n "$cssfile" ] && [ "$cssfile" != "$basename.css" ]; then
+	if [ $2 = "TEI" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teihtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$cssfile</xsl:param>&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teifo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	elif [ $2 = "DOCBOOK" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$cssfile</xsl:param>&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkxhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$cssfile</xsl:param>&' < $1 > $basename.xhtml.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkfo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	fi
+    elif [ -s "$basename.css" ]; then
+	if [ $2 = "TEI" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teihtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$basename.css</xsl:param>&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teifo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	elif [ $2 = "DOCBOOK" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$basename.css</xsl:param>&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkxhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&<xsl:param name=\"html.stylesheet\">$basename.css</xsl:param>&' < $1 > $basename.xhtml.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkfo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	fi
+    else
+	if [ $2 = "TEI" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teihtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$teifo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	elif [ $2 = "DOCBOOK" ]; then
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&&' < $1 > $basename.html.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkxhtml\"/>& ; s&<!-- REFDBBIBSTYLE -->.*<!-- /REFDBBIBSTYLE -->&& ; s&<!--CSSFILE/-->&&' < $1 > $basename.xhtml.xsl" | sh
+	    echo "sed 's&<!-- REFDBSTYLESHEET -->.*<!-- /REFDBSTYLESHEET -->&<xsl:import href=\"$docbkfo\"/>& ; s&<!--CSSFILE/-->&&' < $1 > $basename.fo.xsl" | sh
+	fi
     fi
+
     rm $1
 }
 
 # read the command line options
-while getopts ":d:E:hi:IN:p:S:t:u:w:" opt; do
+while getopts ":d:E:G:hi:IN:p:S:t:u:w:" opt; do
   case $opt in
     d  ) databaseopt="-d "$OPTARG;;
     E  ) encodingopt="-E "$OPTARG;;
+    G  ) cssfile=$OPTARG;;
     h  ) echo "creates refdb bibliography from a SGML, XML, or Latex document"
-	 echo 'usage: runbib [-d database] [-E encoding] [-h] [-i includevar] [-I] [-N number] [-S style] [-t type] [-u username] [-w password] file1 [file2...]'
+	 echo 'usage: runbib [-d database] [-E encoding] [-G cssfile] [-h] [-i includevar] [-I] [-N number] [-S style] [-t type] [-u username] [-w password] file1 [file2...]'
 	 echo "Options: -d select default database"
 	 echo "         -E set output character encoding"
+	 echo "         -G set the path or URL of a CSS file for (x)html output"
 	 echo "         -h print this help and exit"
 	 echo "         -i specify variable to include marked sections"
@@ -114,5 +143,5 @@
     u  ) username=$OPTARG;;
     w  ) passwd=$OPTARG;;
-    \? ) echo 'usage: runbib [-d database] [-h] [-i includevar] [-I] [-N number] [-S style] [-t type] [-u username] [-w password] file1 [file2...]'
+    \? ) echo 'usage: runbib [-d database] [-G cssfile] [-h] [-i includevar] [-I] [-N number] [-S style] [-t type] [-u username] [-w password] file1 [file2...]'
 	 echo 'type runbib -h to invoke help'
 	 exit 1;;

[Refdb-cvs] CVS: refdb/scripts refdbxml.in,1.12.2.2,1.12.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3739/scripts

Modified Files:
      Tag: Release_0_9_5_stable
	refdbxml.in 
Log Message:
fixed typo in comment

Index: refdbxml.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbxml.in,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -U2 -r1.12.2.2 -r1.12.2.3
--- refdbxml.in	10 Jul 2004 19:58:49 -0000	1.12.2.2
+++ refdbxml.in	12 Sep 2004 21:06:40 -0000	1.12.2.3
@@ -102,5 +102,5 @@
 # set processor launch commands for functions which follow
 # more maintainable (and less ugly -- check out saxon-xerces!)
-# note: saxon|saxon-xerces habe command-line options for catalog resolving
+# note: saxon|saxon-xerces have command-line options for catalog resolving
 case $xslt_processor in
 	xalan    ) xslt_launch="org.apache.xalan.xslt.Process";;

[Refdb-cvs] CVS: refdb/scripts refdbnd.in,1.8.2.1,1.8.2.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3369/scripts

Modified Files:
      Tag: Release_0_9_5_stable
	refdbnd.in 
Log Message:
added support for css files

Index: refdbnd.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbnd.in,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -U2 -r1.8.2.1 -r1.8.2.2
--- refdbnd.in	24 Jun 2004 20:28:33 -0000	1.8.2.1
+++ refdbnd.in	12 Sep 2004 21:04:21 -0000	1.8.2.2
@@ -30,6 +30,8 @@
 defstyle="J.Biol.Chem."
 defencoding="utf-8"
+defcssfile=""
 xfile=""
 encoding=""
+cssfile=""
 
 # Makefile-generated defaults
@@ -77,7 +79,7 @@
 }
 
-# if we have six command line arguments, we'll use them. Otherwise
+# if we have seven command line arguments, we'll use them. Otherwise
 # ask interactively
-if [ -z "$*" ] || [ "$#" -ne 6 ]; then
+if [ -z "$*" ] || [ "$#" -ne 7 ]; then
     # get arguments interactively
     clear
@@ -142,4 +144,17 @@
     fi
 
+    if [ -z "$style" ]; then
+	style=$defstyle
+    fi
+
+    # mangle stylename to generate the name of the CSS file
+    defcssfile=${style%%.*}.css
+
+    echo "Please enter the path or the URL of a custom CSS file for the"
+    echo "(x)html output. Hit ENTER if you do not use a custom CSS file"
+    echo "[$defcssfile]"
+    read cssfile
+    echo ""
+
     # apply defaults to empty strings
     if [ -z "$basename" ]; then
@@ -155,10 +170,10 @@
 	database=$defdatabase
     fi
-    if [ -z "$style" ]; then
-	style=$defstyle
-    fi
     if [ -z "$encoding" ]; then
 	encoding=$defencoding
     fi
+    if [ -z "$cssfile" ]; then
+	cssfile=$defcssfile
+    fi
 
 else
@@ -171,4 +186,5 @@
     style=$5
     encoding=$6
+    cssfile=$7
 fi
 
@@ -180,4 +196,5 @@
 echo "Bibliography style: $style"
 echo "Encoding:           $encoding"
+echo "CSS file:           $cssfile"
 
 echo ""
@@ -228,5 +245,5 @@
 
 # substitute values
-sed "s%<doctypeswitch>%$doctypeswitch%" < $maketemplate | sed "s%<pubtype>%$pubtype%" | sed "s%<basename>%$basename%" | sed "s%<extension>%$extension%" | sed "s%<style>%$style%" | sed "s%<htmlstylesheet>%$htmlstylesheet%" | sed "s%<xhtmlstylesheet>%$xhtmlstylesheet%" | sed "s%<printstylesheet>%$printstylesheet%" | sed "s%<database>%$database%" | sed "s%all: pdf rtf html%$makeall%" | sed "s%dist: pdfdist rtfdist htmldist%$dist%" | sed "s%<transformscript>%$transformscript%"  | sed "s%<encoding>%$encoding%" > Makefile
+sed "s%<doctypeswitch>%$doctypeswitch%" < $maketemplate | sed "s%<pubtype>%$pubtype%" | sed "s%<basename>%$basename%" | sed "s%<extension>%$extension%" | sed "s%<style>%$style%" | sed "s%<htmlstylesheet>%$htmlstylesheet%" | sed "s%<xhtmlstylesheet>%$xhtmlstylesheet%" | sed "s%<printstylesheet>%$printstylesheet%" | sed "s%<database>%$database%" | sed "s%all: pdf rtf html%$makeall%" | sed "s%dist: pdfdist rtfdist htmldist%$dist%" | sed "s%<transformscript>%$transformscript%"  | sed "s%<encoding>%$encoding%" | sed "s%<cssfile>%$cssfile%" > Makefile
 
 echo "Makefile created."

[Refdb-cvs] CVS: refdb/examples Makefile.template,1.8.2.1,1.8.2.2

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3131/examples

Modified Files:
      Tag: Release_0_9_5_stable
	Makefile.template 
Log Message:
added support for css files

Index: Makefile.template
===================================================================
RCS file: /cvsroot/refdb/refdb/examples/Makefile.template,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -U2 -r1.8.2.1 -r1.8.2.2
--- Makefile.template	24 Jun 2004 20:27:59 -0000	1.8.2.1
+++ Makefile.template	12 Sep 2004 21:03:12 -0000	1.8.2.2
@@ -27,4 +27,10 @@
 encoding = <encoding>
 
+# the RefDB-generated CSS file
+cssfile=${stylename:.=}.css
+
+# the CSS file the (x)html output should link to
+customcssfile=<cssfile>
+
 # the stylesheet driver files for PDF and HTML output
 htmlstylesheet = ${stylename:.=}<htmlstylesheet>
@@ -50,4 +56,12 @@
 endif
 
+# if no custom css file is specified, use the default css file
+ifeq ($(customcssfile),$(cssfile))
+customcssfile = $(cssfile)
+cssarchive = $(cssfile)
+else
+cssarchive = $(cssfile) $(customcssfile)
+endif
+
 pdf: $(basename).pdf
 
@@ -74,8 +88,8 @@
 
 htmldist: $(pubtype)1.html
-	tar -czf $(basename).html.tar.gz *.html
+	tar -czf $(basename).html.tar.gz *.html $(cssarchive)
 
 xhtmldist: $(pubtype)1.xhtml
-	tar -czf $(basename).xhtml.tar.gz *.xhtml
+	tar -czf $(basename).xhtml.tar.gz *.xhtml $(cssarchive)
 clean:
 	rm -f $(basename).pdf
@@ -98,4 +112,5 @@
 	rm -f $(htmlstylesheet)
 	rm -f $(xhtmlstylesheet)
+	rm -f $(cssfile)
 	rm -f $(basename)*.tar.gz
 
@@ -119,3 +134,3 @@
 
 $(basename).bib.$(extension): $(basename).$(extension)
-	runbib -d $(database) -S $(stylename) -t $(doctypeswitch) -E $(encoding) $(basename).$(extension)
+	runbib -d $(database) -G $(customcssfile) -S $(stylename) -t $(doctypeswitch) -E $(encoding) $(basename).$(extension)

[Refdb-cvs] CVS: refdb/xsl/refdb makecss.xsl,1.1.2.2,1.1.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/xsl/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18393

Modified Files:
      Tag: Release_0_9_5_stable
	makecss.xsl 
Log Message:
fixed syntax errors in css output; export start-indent as margin-left

Index: makecss.xsl
===================================================================
RCS file: /cvsroot/refdb/refdb/xsl/refdb/Attic/makecss.xsl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -U2 -r1.1.2.2 -r1.1.2.3
--- makecss.xsl	9 Sep 2004 21:32:05 -0000	1.1.2.2
+++ makecss.xsl	11 Sep 2004 22:57:28 -0000	1.1.2.3
@@ -16,13 +16,17 @@
 

   <xsl:template match="xsl:attribute[@name='text-indent']">

-div.bibliomixed {text-indent: <xsl:value-of select="."/>};

+div.bibliomixed {text-indent: <xsl:value-of select="."/>;}

+  </xsl:template>

+

+  <xsl:template match="xsl:attribute[@name='start-indent']">

+div.bibliomixed {margin-left: <xsl:value-of select="."/>;}

   </xsl:template>

 

   <xsl:template match="xsl:attribute[@name='font-size']">

-div.bibliomixed {font-size: <xsl:value-of select="."/>};

+div.bibliomixed {font-size: <xsl:value-of select="."/>;}

   </xsl:template>

 

   <xsl:template match="xsl:attribute[@name='font-size-adjust']">

-div.bibliomixed {font-size-adjust: <xsl:value-of select="."/>};

+div.bibliomixed {font-size-adjust: <xsl:value-of select="."/>;}

   </xsl:template>