diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-01-29 17:05:59 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-01-29 17:05:59 +0000 |
| commit | 65fe36d2ad32f2c46c67369555aa5f3461570b78 (patch) | |
| tree | 75673616a4ad43394696cda74c2a6f67b564c86a | |
| parent | 627ab72099948f785920b5bc863cc9f5e9d9ad11 (diff) | |
Solves some warning and hides some not-bad ones in doc. It remains a
few hevea warning (failure to put a vector on an expression in
Classes.tex, failure to support multirow in RecTutorial.tex).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11868 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile.doc | 5 | ||||
| -rw-r--r-- | doc/RecTutorial/RecTutorial.tex | 8 | ||||
| -rw-r--r-- | tactics/tauto.ml4 | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.doc b/Makefile.doc index 9382e1b6f..5a02817e5 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -66,6 +66,9 @@ endif HIDEBIBTEXINFO=| grep -v "^A level-1 auxiliary file" SHOWMAKEINDEXERROR=egrep "^!! Input index error|^** Input style error|^ --" +# Empty subsection levels in faq are on purpose +HEVEAFAQFILTER=|& grep -v "^Warning: List with no item" + ###################################################################### # Common ###################################################################### @@ -162,7 +165,7 @@ doc/faq/FAQ.v.pdf: doc/common/version.tex doc/common/title.tex doc/faq/FAQ.v.dvi ../tools/show_latex_messages FAQ.v.log) doc/faq/FAQ.v.html: doc/faq/FAQ.v.dvi # to ensure FAQ.v.bbl - (cd doc/faq; $(HEVEA) $(HEVEAOPTS) FAQ.v.tex) + (cd doc/faq; ($(HEVEA) $(HEVEAOPTS) FAQ.v.tex $(HEVEAFAQFILTER))) doc/faq/html/index.html: doc/faq/FAQ.v.html - rm -rf doc/faq/html diff --git a/doc/RecTutorial/RecTutorial.tex b/doc/RecTutorial/RecTutorial.tex index 372f13326..f2cb383e0 100644 --- a/doc/RecTutorial/RecTutorial.tex +++ b/doc/RecTutorial/RecTutorial.tex @@ -1890,11 +1890,13 @@ condition ``if $R$ is predicative''.} \begin{center} -\renewcommand{\multirowsetup}{\centering} \newlength{\LL} -\settowidth{\LL}{$x : R : s_1$} +%%% displease hevea less by using * in multirow rather than \LL +\renewcommand{\multirowsetup}{\centering} +%\newlength{\LL} +%\settowidth{\LL}{$x : R : U_2$} \begin{tabular}{|c|c|c|c|c|} \hline -\multirow{5}{\LL}{$x : R : U_2$} & +\multirow{5}*{$x : R : U_2$} & \multicolumn{4}{|c|}{$Q : U_1$}\\ \hline & &\textsl{Set} & \textsl{Prop} & \textsl{Type}\\ diff --git a/tactics/tauto.ml4 b/tactics/tauto.ml4 index f7713f015..3f5b0a4a3 100644 --- a/tactics/tauto.ml4 +++ b/tactics/tauto.ml4 @@ -181,7 +181,7 @@ let simplif ist = | id: ?X1 |- _ => $t_is_conj; elim id; do 2 intro; clear id | id: (Coq.Init.Logic.iff _ _) |- _ => elim id; do 2 intro; clear id | id: ?X1 |- _ => $t_is_disj; elim id; intro; clear id - | id0: ?X1-> ?X2, id1: ?X1|- _ => + | id0: ?X1 -> ?X2, id1: ?X1|- _ => (* generalize (id0 id1); intro; clear id0 does not work (see Marco Maggiesi's bug PR#301) so we instead use Assert and exact. *) @@ -201,7 +201,7 @@ let simplif ist = clear id | id: ?X1 -> ?X2|- _ => $t_flatten_contravariant_disj - (* moved from "id:(?A\/?B)->?X2|-" to "?A->?X2|-" and "?B->?X2|-" *) + (* moved from "id:(?A\/?B)->?X2|-" to "?A->?X2,?B->?X2|-" *) | |- ?X1 => $t_is_conj; split | |- (Coq.Init.Logic.iff _ _) => split end; @@ -216,7 +216,7 @@ let rec tauto_intuit t_reduce solver ist = <:tactic< ($t_simplif;$t_axioms || match reverse goal with - | id:(?X1-> ?X2)-> ?X3|- _ => + | id:(?X1 -> ?X2)-> ?X3|- _ => cut X3; [ intro; clear id; $t_tauto_intuit | cut (X1 -> X2); |