diff --git a/libburn/trunk/cdrskin/cdrskin.c b/libburn/trunk/cdrskin/cdrskin.c
index fdf1ea37..c05b2b3d 100644
--- a/libburn/trunk/cdrskin/cdrskin.c
+++ b/libburn/trunk/cdrskin/cdrskin.c
@@ -6462,468 +6462,12 @@ ex:
 }
 
 
-/* @param flag bit0= allow two byte codes 0xNNNN or 0xNN 0xNN
-*/
-int Cdrskin__hexcode(char *payload, int flag)
-{
- unsigned int x;
- int lo, hi, l;
- char buf[10], *cpt;
-
- l= strlen(payload);
- if(strncmp(payload, "0x", 2) != 0)
-   return(-1);
- if((l == 6 || l == 9) && (flag & 1))
-   goto double_byte;
- if(strlen(payload) != 4)
-   return(-1);
- if(!(isxdigit(payload[2]) && isxdigit(payload[3])))
-   return(-1);
- sscanf(payload + 2, "%x", &x);
- return(x);
-
-double_byte:;
- strcpy(buf, payload);
- buf[4]= 0;
- hi= Cdrskin__hexcode(buf, 0);
- if(strlen(payload) == 6) {
-   buf[4]= payload[4];
-   buf[2]= '0';
-   buf[3]= 'x';
-   cpt= buf + 2;
- } else {
-   if(payload[4] != 32 && payload[4] != 9)
-     return(-1);
-   cpt= buf + 5;
- }
- lo= Cdrskin__hexcode(cpt, 0);
- if(lo < 0 || hi < 0)
-   return(-1);
- return((hi << 8) | lo);
-}
-
-
-int Cdrskin__cdtext_char_code(char *payload, int flag)
-{
- int ret;
-
- ret= Cdrskin__hexcode(payload, 0);
- if(ret >= 0)
-   return(ret);
- if(strstr(payload, "8859") != NULL)
-   return(0x00);
- else if(strstr(payload, "ASCII") != NULL)
-   return(0x01);
- else if(strstr(payload, "JIS") != NULL)
-   return(0x80);
-
- fprintf(stderr,
-         "cdrskin: SORRY : input_sheet_v07t : Unknown Text Code '%s'.\n",
-         payload);
- return(-1);
-}
-
-
-int Cdrskin__cdtext_lang_code(char *payload, int flag)
-{
- int i, ret;
- static char *languages[128] = {
-   BURN_CDTEXT_LANGUAGES_0X00,
-   BURN_CDTEXT_FILLER,
-   BURN_CDTEXT_LANGUAGES_0X45
- };
-
- ret= Cdrskin__hexcode(payload, 0);
- if(ret >= 0)
-   return(ret);
- if(payload[0] != 0)
-   for(i= 0; i < 128; i++)
-     if(strcmp(languages[i], payload) == 0)
-       return(i);
-
- fprintf(stderr,
-         "cdrskin: SORRY : input_sheet_v07t : Unknown Language Code '%s'.\n",
-         payload);
- return(-1);
-}
-
-
-int Cdrskin__cdtext_genre_code(char *payload, int flag)
-{
- int i, ret;
- static char *genres[BURN_CDTEXT_NUM_GENRES] = {
-   BURN_CDTEXT_GENRE_LIST
- };
- 
- ret= Cdrskin__hexcode(payload, 1);
- if(ret >= 0)
-   return(ret);
- for(i= 0; i < BURN_CDTEXT_NUM_GENRES; i++)
-   if(strcmp(genres[i], payload) == 0)
-     return(i);
-
- fprintf(stderr,
-         "cdrskin: SORRY : input_sheet_v07t : Unknown Genre Code '%s'.\n",
-         payload);
- return(-1);
-}
-
-
-int Cdrskin__cdtext_len_db(char *payload, int char_code,
-                           int *length, int *double_byte, int flag)
-{
- if(char_code < 0) {
-   fprintf(stderr,
- "cdrskin: SORRY : input_sheet_v07t : No 'Text Code' seen before text lines.\n"
-          );
-   return(0);
- }
- *double_byte= (char_code == 0x80);
- *length= strlen(payload) + 1 + *double_byte;
- return(1);
-}
-
-
-int Cdrskin__cdtext_to_session(struct burn_session *session, int block,
-                               char *payload, int char_code, int pack_type,
-                               char *pack_type_name, int flag)
-{
- int length, double_byte, ret;
-
- ret= Cdrskin__cdtext_len_db(payload, char_code, &length, &double_byte, 0);
- if(ret <= 0)
-   return(ret);
- ret= burn_session_set_cdtext(session, block, pack_type, pack_type_name,
-                              (unsigned char *) payload, length, double_byte);
- return(ret);
-}
-
-
-int Cdrskin__cdtext_to_track(struct burn_track *track, int block,
-                             char *payload, int char_code, int pack_type,
-                             char *pack_type_name, int flag)
-{
- int length, double_byte, ret;
-
- ret= Cdrskin__cdtext_len_db(payload, char_code, &length, &double_byte, 0);
- if(ret <= 0)
-   return(ret);
- ret= burn_track_set_cdtext(track, block, pack_type, pack_type_name,
-                            (unsigned char *) payload, length, double_byte);
- return(ret);
-}
-
-
 int Cdrskin_read_input_sheet_v07t(struct CdrskiN *skin, char *path, int block,
                         	struct burn_session *session, int flag)
 {
- int ret= 0, num_tracks, char_codes[8], copyrights[8], languages[8], i;
- int genre_code= -1, track_offset= 1, length, pack_type, tno;
- int session_attr_seen[16], track_attr_seen[16];
- struct stat stbuf;
- FILE *fp= NULL;
- char line[4096], *eq_pos, *payload, genre_text[160], track_txt[3];
- struct burn_track **tracks;
+ int ret= 0;
 
- for(i= 0; i < 8; i++)
-   char_codes[i]= copyrights[i]= languages[i]= -1;
- for(i= 0; i < 16; i++)
-   session_attr_seen[i] = track_attr_seen[i]= 0;
- genre_text[0]= 0;
-
- tracks= burn_session_get_tracks(session, &num_tracks);
- if(stat(path, &stbuf) == -1) {
-cannot_open:;
-   fprintf(stderr, "cdrskin: SORRY : Cannot open input_sheet_v07t='%s'\n",
-           path);
-   fprintf(stderr, "cdrskin: %s (errno=%d)\n", strerror(errno), errno);
-   ret= 0; goto ex;
- }
- if(!S_ISREG(stbuf.st_mode)) {
-   fprintf(stderr,
-     "cdrskin: SORRY : File is not of usable type or content: input_sheet_v07t='%s'\n",
-     path);
-   ret= 0; goto ex;
- }
-
- fp= fopen(path, "rb");
- if(fp == NULL)
-   goto cannot_open;
-
- while(1) {
-   if(Sfile_fgets(line, 4095, fp) == NULL) {
-     if(!ferror(fp))
- break;
-     fprintf(stderr,
-         "cdrskin: SORRY : Cannot read all bytes from input_sheet_v07t='%s'\n",
-             path);
-     fprintf(stderr, "cdrskin: %s (errno=%d)\n", strerror(errno), errno);
-     ret= 0; goto ex;
-   }
-   if(strlen(line) == 0)
- continue;
-   eq_pos= strchr(line, '=');
-   if(eq_pos == NULL) {
-     fprintf(stderr,
-             "cdrskin: SORRY : input_sheet_v07t : Line without '=' : '%s'.\n",
-             line);
-     ret= 0; goto ex;
-   }
-   for(payload= eq_pos + 1; *payload == 32 || *payload == 9;
-       payload++);
-   *eq_pos= 0;
-   for(eq_pos--; (*eq_pos == 32 || *eq_pos == 9) && eq_pos > line; eq_pos--)
-     *eq_pos= 0;
-
-   if(payload[0] == 0)
- continue;
-
-   if(strcmp(line, "Text Code") == 0) {
-     ret= Cdrskin__cdtext_char_code(payload, 0);
-     if(ret < 0)
-       goto ex;
-     char_codes[block]= ret;
-
-   } else if(strcmp(line, "Language Code") == 0) {
-     ret= Cdrskin__cdtext_lang_code(payload, 0);
-     if(ret < 0)
-       goto ex;
-     languages[block]= ret;
-
-   } else if(strcmp(line, "0x80") == 0 || strcmp(line, "Album Title") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "TITLE", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x0]= 1;
-
-   } else if(strcmp(line, "0x81") == 0 || strcmp(line, "Artist Name") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "PERFORMER", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x1]= 1;
-
-   } else if(strcmp(line, "0x82") == 0 || strcmp(line, "Songwriter") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "SONGWRITER", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x2]= 1;
-
-   } else if(strcmp(line, "0x83") == 0 || strcmp(line, "Composer") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "COMPOSER", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x3]= 1;
-
-   } else if(strcmp(line, "0x84") == 0 || strcmp(line, "Arranger") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "ARRANGER", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x4]= 1;
-
-   } else if(strcmp(line, "0x85") == 0 || strcmp(line, "Album Message") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload,
-                                     char_codes[block], 0, "MESSAGE", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0x5]= 1;
-
-   } else if(strcmp(line, "0x86") == 0 ||
-             strcmp(line, "Catalog Number") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload, 0x01, 0,
-                                     "DISCID", 0);
-     if(ret <= 0)
-       goto ex;
-
-   } else if(strcmp(line, "Genre Code") == 0) {
-     genre_code= Cdrskin__cdtext_genre_code(payload, 0);
-     if(genre_code < 0)
-       goto ex;
-
-   } else if(strcmp(line, "Genre Information") == 0) {
-     strncpy(genre_text, payload, sizeof(genre_text) - 1);
-     genre_text[sizeof(genre_text) - 1]= 0;
-
-   } else if(strcmp(line, "0x8d") == 0 ||
-             strcmp(line, "Closed Information") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload, 0x00, 0,
-                                     "CLOSED", 0);
-     if(ret <= 0)
-       goto ex;
-
-   } else if(strcmp(line, "0x8e") == 0 || strcmp(line, "UPC / EAN") == 0) {
-     ret= Cdrskin__cdtext_to_session(session, block, payload, 0x01, 0,
-                                     "UPC_ISRC", 0);
-     if(ret <= 0)
-       goto ex;
-     session_attr_seen[0xe]= 1;
-
-   } else if(strncmp(line, "Disc Information ", 17) == 0) {
-
-     /* >>> ??? is this good for anything ? */;
-
-   } else if(strcmp(line, "Input Sheet Version") == 0) {
-     if(strcmp(payload, "0.7T") != 0) {
-       fprintf(stderr,
-         "cdrskin: WARNING : input_sheet_v07t : Input Sheet Version '%s', expected '0.7T'.\n",
-         payload);
-     }
-
-   } else if(strcmp(line, "Remarks") == 0) {
-     ;
-
-   } else if(strcmp(line, "Text Data Copy Protection") == 0) {
-     ret = Cdrskin__hexcode(payload, 0);
-     if(ret >= 0)
-       copyrights[block]= ret;
-     else if(strcmp(payload, "ON") == 0)
-       copyrights[block]= 0x03;
-     else if(strcmp(payload, "OFF") == 0)
-       copyrights[block]= 0x00;
-     else {
-       fprintf(stderr,
-               "cdrskin: SORRY : input_sheet_v07t : Unknown Text Data Copy Protection '%s'.\n",
-               payload);
-       ret= 0; goto ex;
-     }
-
-   } else if(strcmp(line, "First Track Number") == 0) {
-     ret= -1;
-     sscanf(payload, "%d", &ret);
-     if(ret <= 0 || ret > 99) {
-bad_tno:;
-       fprintf(stderr,
-               "cdrskin: SORRY : input_sheet_v07t : Inappropriate First Track Number '%s'.\n",
-               payload);
-       ret= 0; goto ex;
-     } else {
-       track_offset= ret;
-       if(ret != 1) {
-         fprintf(stderr,
-               "cdrskin: WARNING : input_sheet_v07t : First Track Number '%s' will be mapped to 1.\n",
-               payload);
-       }
-     }
-
-   } else if(strcmp(line, "Last Track Number") == 0) {
-     ret= -1;
-     sscanf(payload, "%d", &ret);
-     if(ret < 0) {
-       goto bad_tno;
-     } else {
-
-       /* >>> ??? Is it good for anything ? */;
-
-     }
-
-   } else if(strncmp(line, "Track ", 6) == 0) {
-     tno= -1;
-     sscanf(line + 6, "%d", &tno);
-     if(tno < 0 || tno - track_offset < 0 ||
-        tno - track_offset >= num_tracks) {
-       track_txt[0]= line[6];
-       track_txt[1]= line[7];
-       track_txt[2]= 0;
-bad_track_no:;
-       if(track_offset != 1)
-         fprintf(stderr,
-               "cdrskin: SORRY : input_sheet_v07t : Inappropriate Track number '%s' (mapped to %2.2d)\n",
-               track_txt, tno - track_offset + 1);
-       else
-         fprintf(stderr,
-      "cdrskin: SORRY : input_sheet_v07t : Inappropriate Track number '%s'.\n",
-               track_txt);
-       fprintf(stderr, "cdrskin:         (acceptable range: %2.2d to %2.2d)\n",
-               track_offset, num_tracks + track_offset - 1);
-       ret= 0; goto ex;
-     }
-     tno-= track_offset;
-
-     if(strcmp(line, "0x80") == 0 || strcmp(line + 9, "Title") == 0)
-       pack_type= 0x80;
-     else if(strcmp(line, "0x81") == 0 || strcmp(line + 9, "Artist") == 0)
-       pack_type= 0x81;
-     else if(strcmp(line, "0x82") == 0 || strcmp(line + 9, "Songwriter") == 0)
-       pack_type= 0x82;
-     else if(strcmp(line, "0x83") == 0 || strcmp(line + 9, "Composer") == 0)
-       pack_type= 0x83;
-     else if(strcmp(line, "0x84") == 0 || strcmp(line + 9, "Arranger") == 0)
-       pack_type= 0x84;
-     else if(strcmp(line, "0x85") == 0 || strcmp(line + 9, "Message") == 0)
-       pack_type= 0x85;
-     else if(strcmp(line, "0x8e") == 0 || strcmp(line + 9, "ISRC") == 0)
-       pack_type= 0x8e;
-     else {
-       fprintf(stderr,
-             "cdrskin: SORRY : input_sheet_v07t : Unknown Track header '%s'\n",
-               payload);
-       ret= 0; goto ex;
-     }
-     ret= Cdrskin__cdtext_to_track(tracks[tno], block, payload, 0x00,
-                                   pack_type, "", 0);
-     if(ret <= 0)
-       goto ex;
-     track_attr_seen[pack_type - 0x80]= 1;
-
-   } else if(strncmp(line, "ISRC ", 5) == 0) {
-     /* Track variation of UPC EAN = 0x8e */
-     tno= -1;
-     sscanf(line + 5, "%d", &tno);
-     if (tno < 0 || tno - track_offset < 0 ||
-         tno - track_offset >= num_tracks) {
-       track_txt[0]= line[5];
-       track_txt[1]= line[6];
-       track_txt[2]= 0;
-       goto bad_track_no;
-     }
-     tno-= track_offset;
-     ret= Cdrskin__cdtext_to_track(tracks[tno], block, payload, 0x00,
-                                   0x8e, "", 0);
-     if(ret <= 0)
-         goto ex;
-     track_attr_seen[0xe]= 1;
-
-   } else {
-     fprintf(stderr,
-             "cdrskin: SORRY : input_sheet_v07t : Unknown line header '%s'\n",
-             line);
-     ret= 0; goto ex;
-   }
- }
-
- for(i= 0x80; i <= 0x8e; i++) {
-   if(i > 0x85 && i != 0x8e)
- continue;
-   if(session_attr_seen[i - 0x80] || !track_attr_seen[i - 0x80])
- continue;
-   ret= Cdrskin__cdtext_to_session(session, block, "", char_codes[block],
-                                   i, NULL, 0);
-   if(ret <= 0)
-     goto ex;
- }
- if(genre_code >= 0 && genre_text[0]) {
-   line[0]= (genre_code >> 8) & 0xff;
-   line[1]= genre_code & 0xff;
-   strcpy(line + 2, genre_text);
-   length= 2 + strlen(line + 2) + 1;
-   ret= burn_session_set_cdtext(session, block, 0, "GENRE",
-                              (unsigned char *) line, length, 0);
-   if(ret <= 0)
-     goto ex;
- }
- ret= burn_session_set_cdtext_par(session, char_codes, copyrights, languages,
-                                  0);
- if(ret <= 0)
-   goto ex;
-
- ret= 1;
-ex:;
- if(fp != NULL)
-   fclose(fp);
+ ret= burn_session_input_sheet_v07t(session, path, block, 0);
  return(ret);
 }
 
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 0bc3c5f7..998137a8 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.12.15.154818"
+#define Cdrskin_timestamP "2011.12.15.155642"
diff --git a/libburn/trunk/cdrskin/compile_cdrskin.sh b/libburn/trunk/cdrskin/compile_cdrskin.sh
index a2be1941..3e9ca958 100755
--- a/libburn/trunk/cdrskin/compile_cdrskin.sh
+++ b/libburn/trunk/cdrskin/compile_cdrskin.sh
@@ -145,6 +145,7 @@ then
     $cleanup_src_or_obj \
     \
     "$burn"async.o \
+    "$burn"cdtext.o \
     "$burn"debug.o \
     "$burn"drive.o \
     "$burn"file.o \