From 208a0f7bfa5249f9795e6e225f309cbe715c0fad Mon Sep 17 00:00:00 2001
From: Samuel Mimram <smimram@debian.org>
Date: Tue, 21 Nov 2006 21:38:49 +0000
Subject: Imported Upstream version 8.1~gamma

---
 tools/coqdoc/coqdoc.sty |  2 +-
 tools/coqdoc/index.mll  |  3 ++-
 tools/coqdoc/output.ml  |  4 ++--
 tools/coqdoc/pretty.mll | 25 ++++++++++++++-----------
 4 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'tools/coqdoc')

diff --git a/tools/coqdoc/coqdoc.sty b/tools/coqdoc/coqdoc.sty
index 597152f5..2c07b9fc 100644
--- a/tools/coqdoc/coqdoc.sty
+++ b/tools/coqdoc/coqdoc.sty
@@ -50,7 +50,7 @@
 %HEVEA\newcommand{\coqdocindent}[1]{\hspace{#1}\hspace{#1}}
 
 % macro for typesetting the title of a module implementation
-\newcommand{\coqdocmodule}[1]{\section*{Module #1}\markboth{Module #1}{}
+\newcommand{\coqdocmodule}[1]{\chapter{Module #1}\markboth{Module #1}{}
 }
 
 %HEVEA\newcommand{\lnot}{\coqwkw{not}}
diff --git a/tools/coqdoc/index.mll b/tools/coqdoc/index.mll
index 9b5716ff..5b281b8b 100644
--- a/tools/coqdoc/index.mll
+++ b/tools/coqdoc/index.mll
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: index.mll 8863 2006-05-26 10:33:21Z notin $ i*)
+(*i $Id: index.mll 9204 2006-10-04 13:05:58Z notin $ i*)
 
 {
 
@@ -364,6 +364,7 @@ and end_ident = parse
 and module_ident = parse
   | space+
       { module_ident lexbuf }
+  | '"' { string lexbuf; module_ident lexbuf }
   | ident space* ":="
       { () }
   | ident
diff --git a/tools/coqdoc/output.ml b/tools/coqdoc/output.ml
index e6a0a72b..84e03d92 100644
--- a/tools/coqdoc/output.ml
+++ b/tools/coqdoc/output.ml
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: output.ml 8863 2006-05-26 10:33:21Z notin $ i*)
+(*i $Id: output.ml 9245 2006-10-17 12:53:34Z notin $ i*)
 
 open Cdglobals
 open Index
@@ -118,7 +118,7 @@ module Latex = struct
 
   let header () =
     if !header_trailer then begin
-      printf "\\documentclass[12pt]{article}\n";
+      printf "\\documentclass[12pt]{report}\n";
       if !inputenc != "" then printf "\\usepackage[%s]{inputenc}\n" !inputenc;
       printf "\\usepackage[T1]{fontenc}\n";
       printf "\\usepackage{fullpage}\n";
diff --git a/tools/coqdoc/pretty.mll b/tools/coqdoc/pretty.mll
index 5c6c7952..bdb58f86 100644
--- a/tools/coqdoc/pretty.mll
+++ b/tools/coqdoc/pretty.mll
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: pretty.mll 8861 2006-05-24 15:52:15Z notin $ i*)
+(*i $Id: pretty.mll 9204 2006-10-04 13:05:58Z notin $ i*)
 
 (*s Utility functions for the scanners *)
 
@@ -398,19 +398,22 @@ and coq = parse
       { () }
   | gallina_kw_to_hide
       { let s = lexeme lexbuf in
-	  if !light && section_or_end s then begin 
-	    let eol = skip_to_dot lexbuf in
-	      if eol then coq_bol lexbuf else coq lexbuf 
-	  end else begin
-	    ident s (lexeme_start lexbuf); 
-	    let eol=body lexbuf in 
-	      if eol then coq_bol lexbuf else coq lexbuf
-	  end }
+	  if !light && section_or_end s then 
+	    begin 
+	      let eol = skip_to_dot lexbuf in
+		if eol then coq_bol lexbuf else coq lexbuf 
+	    end 
+	  else 
+	    begin
+	      ident s (lexeme_start lexbuf); 
+	      let eol=body lexbuf in 
+		if eol then coq_bol lexbuf else coq lexbuf
+	    end }
   | gallina_kw
       { let s = lexeme lexbuf in 
 	  ident s (lexeme_start lexbuf); 
-	  let eol = body lexbuf in
-	    if eol then coq_bol lexbuf else coq lexbuf }
+	let eol = body lexbuf in
+	  if eol then coq_bol lexbuf else coq lexbuf }
   | space+ { char ' '; coq lexbuf }
   | eof 
       { () }
-- 
cgit v1.2.3