trie des dates de la forme mar#..#apr

git-svn-id: https://www.lri.fr/svn/demons/bibtex2html/trunk@357 6aee9057-109c-4a6d-8c93-4c3f535006fd

Author: backtracking

CHANGES

@@ -1,4 +1,10 @@
 
+Version 1.81, 12/05/2006
+========================
+ o new option --print-keys to display the sorted keys (and exit)
+ o improved date sorting to handle months such as mar # "\slash " # apr
+ o no table anymore with -nokeys (only HTML paragraphs)
+
 Version 1.80, 15/3/2006
 =======================
  o remove leading ./ in front of relative URLs (was introduced a long
@@ -121,7 +127,7 @@ Version 1.54 10/7/2002
 
 Version 1.53 18/6/2002
 ======================
- o keywords displayed if a field "keywords" is present; option --no-heywords
+ o keywords displayed if a field "keywords" is present; option --no-keywords
  o aux2bib now handles multiple citations (\citation{foo,bar,gee})
    (patch by Jose Ramon Alvarez Sanchez)
 

Makefile.in

@@ -17,7 +17,7 @@ DOCDIR = $(prefix)/doc/bibtex2html
 # End of configuration part
 #########################################
 
-VERSION=1.80
+VERSION=1.81
 
 OCAMLC   = @OCAMLC@
 OCAMLOPT = @OCAMLOPT@ 

expand.ml

@@ -14,7 +14,7 @@
  * (enclosed in the file GPL).
  *)
 
-(*i $Id: expand.ml,v 1.13 2004-08-24 09:27:36 filliatr Exp $ i*)
+(*i $Id: expand.ml,v 1.14 2006-05-12 16:05:02 filliatr Exp $ i*)
 
 (*s Expansion of abbreviations in BibTeX databases. *)
 
@@ -103,10 +103,13 @@ let int_of_month = function
   | _ -> invalid_arg "int_of_month"
 
 let month_day_re = Str.regexp "\\([a-zA-Z]+\\)\\( \\|~\\)\\([0-9]+\\)"
+let month_anything = Str.regexp "\\([a-zA-Z]+\\)"
 
 let parse_month m =
   if Str.string_match month_day_re m 0 then
     int_of_month (Str.matched_group 1 m), int_of_string (Str.matched_group 3 m)
+  else if Str.string_match month_anything m 0 then
+    int_of_month (Str.matched_group 1 m), 1
   else
     int_of_month m, 1
 
@@ -119,7 +122,7 @@ let extract_year k f =
     int_of_string (List.assoc "YEAR" f)
   with Failure "int_of_string" ->
     if not !Options.quiet then
-      eprintf "Warning: incorrect year in entry %s\n" k;
+      eprintf "Warning: incorrect year in entry %s@." k;
     if !Options.warn_error then exit 2;
     0
 
@@ -143,6 +146,7 @@ let rec extract_date el (_,k,f) =
   try
     let y = extract_year k f in
     let m,d = extract_month k f in
+    (* eprintf "extract_date: year = %d month = %d day = %d@." y m d; *)
     { year = y; month = m; day = d }
   with Not_found ->
     try extract_date el (find_entry (List.assoc "CROSSREF" f) el)

latexmacros.ml

@@ -14,7 +14,7 @@
  * (enclosed in the file GPL).
  *)
 
-(*i $Id: latexmacros.ml,v 1.55 2006-03-15 09:14:15 filliatr Exp $ i*)
+(*i $Id: latexmacros.ml,v 1.56 2006-05-12 16:05:02 filliatr Exp $ i*)
 
 (*s This code is Copyright (C) 1997  Xavier Leroy. *)
 
@@ -154,6 +154,7 @@ def "\\&" [Print "&"];
 def "\\$" [Print "$"];
 def "\\%" [Print "%"];
 def "\\_" [Print "_"];
+def "\\slash" [Print "/"];
 def "\\copyright" [Print "(c)"];
 def "\\th" [Print "þ"];
 def "\\TH" [Print "Þ"];

main.ml

@@ -14,7 +14,7 @@
  * (enclosed in the file GPL).
  *)
 
-(*i $Id: main.ml,v 1.58 2004-09-16 09:39:16 filliatr Exp $ i*)
+(*i $Id: main.ml,v 1.59 2006-05-12 16:05:02 filliatr Exp $ i*)
 
 (*s Main module of bibtex2html. *)
 
@@ -246,6 +246,7 @@ let insert_title_url bib =
 i*)
 
 let parse_only = ref false
+let print_keys = ref false
 
 let translate fullname =
   let input_bib = Readbib.read_entries_from_file fullname in
@@ -268,6 +269,14 @@ let translate fullname =
       (fun (name,bibitems) -> (name,sort_entries entries bibitems))
       biblios 
   in
+  if !print_keys then begin
+    List.iter
+      (fun (_,bibitems) -> 
+	 List.iter (fun (_,_,(_,k,_)) -> printf "%s\n" k) bibitems)
+      sb;
+    flush stdout;
+    exit 0
+  end;
   format_list 
     (if !expand_abbrev_in_bib_output then 
        Bibtex.expand_abbrevs input_bib 
@@ -280,7 +289,7 @@ let translate fullname =
        let keys =
 	 List.fold_right 
 	   (fun s e -> Bibtex.KeySet.remove s e) !excluded keys in
-	 Some (Bibfilter.saturate input_bib keys)
+       Some (Bibfilter.saturate input_bib keys)
      else None)
 
 
@@ -321,6 +330,8 @@ Usage: bibtex2html <options> [filename]
   -heveaurl  use HeVeA's \\url macro
   -noabstract
              do not print the abstracts (if any)
+  -nokeywords
+             do not print the keywords (if any)
   -noheader  do not print the header (bibtex2html command)
   -nofooter  do not print the footer (bibtex2html web link)
   -noexpand  do not expand abbreviations in the BibTeX output
@@ -340,6 +351,8 @@ Usage: bibtex2html <options> [filename]
              declare a note field
   -dl        use DL lists instead of TABLEs
   -labelname use the label name when inserting a link
+  --print-keys
+             print the sorted bibtex keys and exit
   -debug     verbose mode (to find incorrect BibTeX entries)
   -q         quiet mode
   -w         stop on warning
@@ -380,7 +393,7 @@ let parse () =
     | ("-nolinks" | "-no-links" | "--no-links") :: rem -> 
 	print_links := false; parse_rec rem
     | ("-nokeys" | "-no-keys" | "--no-keys") :: rem -> 
-	nokeys := true; parse_rec rem
+	nokeys := true; table := NoTable; parse_rec rem
     | ("-usekeys" | "-use-keys" | "--use-keys") :: rem ->
 	use_keys := true; parse_rec rem
     | ("-rawurl" | "-raw-url" | "--raw-url") :: rem -> 
@@ -417,7 +430,7 @@ i*)
     | ("-both" | "--both") :: rem ->
 	both := true; parse_rec rem
     | ("-dl" | "--dl") :: rem ->
-	table := false; parse_rec rem
+	table := DL; parse_rec rem
 
     (* Controlling the translation *)
     | ("-m" | "-macros-from" | "--macros-from") :: f :: rem ->
@@ -491,6 +504,8 @@ i*)
 	Options.debug := true; parse_rec rem
     | "-parse-only" :: rem ->
 	parse_only := true; parse_rec rem
+    | ("-print-keys" | "--print-keys") :: rem ->
+	print_keys := true; parse_rec rem
 
     | [fbib] -> 
 	if not (Sys.file_exists fbib) then begin

translate.ml

@@ -14,7 +14,7 @@
  * (enclosed in the file GPL).
  *)
 
-(*i $Id: translate.ml,v 1.70 2005-01-19 13:52:02 filliatr Exp $ i*)
+(*i $Id: translate.ml,v 1.71 2006-05-12 16:05:02 filliatr Exp $ i*)
 
 (*s Production of the HTML documents from the BibTeX bibliographies. *)
 
@@ -45,10 +45,12 @@ let bibentries_file = ref ""
 let title_url = ref false
 let use_label_name = ref false
 let use_keys = ref false
-let table = ref true
 let note_fields = ref ([] : string list)
 let abstract_name = ref "Abstract"
 
+type table_kind = Table | DL | NoTable
+let table = ref Table
+
 (* internal name, plus optional external name *)
 type field_info = string * (string option)
 
@@ -156,7 +158,7 @@ let footer ch =
   Html.open_href ch own_address;
   output_string ch "bibtex2html";
   Html.close_href ch;
-  output_string ch " "; output_string ch Version.version;
+  output_string ch " "; output_string ch Version.version; output_string ch ".";
   Html.close_balise ch "em"; 
   Html.close_balise ch "p";
   output_string ch "\n";
@@ -335,37 +337,44 @@ let separate_file (b,((_,k,f) as e)) =
   close_out ch;
   in_summary := true
 
-let open_table ch = 
-  Html.open_balise ch (if !table then "table" else "dl")
-
-let close_table ch =
-  Html.close_balise ch (if !table then "table" else "dl")
-
-let open_row ch =
-  if !table then begin
-    Html.open_balise ch "tr valign=\"top\""; output_string ch "\n";
-    Html.open_balise ch "td align=\"right\""; output_string ch "\n"
-  end else begin
-    Html.open_balise ch "dt"; output_string ch "\n"
-  end
-
-let new_column ch =
-  if !table then begin
-    Html.close_balise ch "td"; output_string ch "\n";
-    Html.open_balise ch "td"; output_string ch "\n"
-  end else begin
-    Html.close_balise ch "dt"; output_string ch "\n";
-    Html.open_balise ch "dd"; output_string ch "\n"
-  end
-
-let close_row ch =
-  if !table then begin
-    Html.close_balise ch "td"; output_string ch "\n";
-    Html.close_balise ch "tr"; output_string ch "\n"
-  end else begin
-    (* JK Html.paragraph ch; output_string ch "\n"; *)
-    Html.close_balise ch "dd"; output_string ch "\n"
-  end
+let open_table ch = match !table with
+  | Table -> Html.open_balise ch "table"
+  | DL -> Html.open_balise ch "dl"
+  | NoTable -> ()
+
+let close_table ch = match !table with
+  | Table -> Html.close_balise ch "table"
+  | DL -> Html.close_balise ch "dl"
+  | NoTable -> ()
+
+let open_row ch = match !table with
+  | Table ->
+      Html.open_balise ch "tr valign=\"top\""; output_string ch "\n";
+      Html.open_balise ch "td align=\"right\""; output_string ch "\n"
+  | DL ->
+      Html.open_balise ch "dt"; output_string ch "\n"
+  | NoTable ->
+      Html.open_balise ch "p"
+
+let new_column ch = match !table with
+  | Table ->
+      Html.close_balise ch "td"; output_string ch "\n";
+      Html.open_balise ch "td"; output_string ch "\n"
+  | DL ->
+      Html.close_balise ch "dt"; output_string ch "\n";
+      Html.open_balise ch "dd"; output_string ch "\n"
+  | NoTable ->
+      output_string ch "\n"
+
+let close_row ch = match !table with
+  | Table ->
+      Html.close_balise ch "td"; output_string ch "\n";
+      Html.close_balise ch "tr"; output_string ch "\n"
+  | DL ->
+      (* JK Html.paragraph ch; output_string ch "\n"; *)
+      Html.close_balise ch "dd"; output_string ch "\n"
+  | NoTable ->
+      Html.close_balise ch "p"
 
 let one_entry_summary ch biblio (_,b,((_,k,f) as e)) =
   if !Options.debug then begin
@@ -380,9 +389,8 @@ let one_entry_summary ch biblio (_,b,((_,k,f) as e)) =
     if !multiple then Html.open_href ch (k ^ !link_suffix);
     latex2html ch (if !use_keys then k else Hashtbl.find cite_tab k);
     if !multiple then Html.close_href ch;
-  end
-  else
-    output_string ch " ";
+  end else
+    if !table <> NoTable then output_string ch "&nbsp;";
   Html.close_anchor ch;
   if (not !nokeys) or !multiple then output_string ch "]";
   (* end of JK changes *)
@@ -493,13 +501,14 @@ let format_list biblio sorted_bl keys =
   first_pass sorted_bl;
   bibentries_file := !output_file ^ "_bib";
   if !both then begin
+    let old_print_keywords = !print_keywords in
     (* short version *)
     print_abstract := false;
     print_keywords := false;
     summary biblio sorted_bl;
     (* long version with abstracts and keywords *)
     print_abstract := true;
-    print_keywords := true;
+    print_keywords := old_print_keywords;
     let old_output = !output_file in
     output_file := !output_file ^ "_abstracts";
     summary biblio sorted_bl;

translate.mli

@@ -14,7 +14,7 @@
  * (enclosed in the file GPL).
  *)
 
-(*i $Id: translate.mli,v 1.8 2004-09-16 09:39:16 filliatr Exp $ i*)
+(*i $Id: translate.mli,v 1.9 2006-05-12 16:05:02 filliatr Exp $ i*)
 
 (*s Production of the HTML documents from the BibTeX bibliographies. *)
 
@@ -43,7 +43,9 @@ val bib_entries : bool ref
 val input_file : string ref
 val output_file : string ref
 val use_label_name : bool ref
-val table : bool ref
+
+type table_kind = Table | DL | NoTable
+val table : table_kind ref
 
 (*s Inserting links for some BibTeX fields. *)