From 6131f89f6b91c45e641dd877df8719fa77987453 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>
Date: Sun, 4 Mar 2018 10:59:35 +0100
Subject: Fix typos.

---
 doc/refman/RefMan-pro.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/refman/RefMan-pro.tex b/doc/refman/RefMan-pro.tex
index 6b24fdde7..0113c8df3 100644
--- a/doc/refman/RefMan-pro.tex
+++ b/doc/refman/RefMan-pro.tex
@@ -306,7 +306,7 @@ This command restores to focus the goal that were suspended by the
 last {\tt Focus} command.
 
 \subsection[\tt Unfocused.]{\tt Unfocused.\comindex{Unfocused}}
-Succeeds in the proof is fully unfocused, fails is there are some
+Succeeds in the proof if fully unfocused, fails if there are some
 goals out of focus.
 
 \subsection[\tt \{ \textrm{and} \}]{\tt \{ \textrm{and} \}\comindex{\{}\comindex{\}}}\label{curlybacket}
-- 
cgit v1.2.3


From ba0a37d773c5d42f96b3b88714767ba2e7fb7a3b Mon Sep 17 00:00:00 2001
From: Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>
Date: Sun, 4 Mar 2018 12:10:31 +0100
Subject: Deprecate Focus and Unfocus.

---
 CHANGES                   |  1 +
 doc/refman/RefMan-pro.tex |  6 +++++-
 parsing/g_proofs.ml4      | 30 +++++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/CHANGES b/CHANGES
index 2040c1b57..f17110c09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,7 @@ Focusing
 - Focusing bracket `{` now supports single-numbered goal selector,
   e.g. `2: {` will focus on the second sub-goal. As usual, unfocus
   with `}` once the sub-goal is fully solved.
+  The `Focus` and `Unfocus` commands are now deprecated.
 
 Vernacular Commands
 
diff --git a/doc/refman/RefMan-pro.tex b/doc/refman/RefMan-pro.tex
index 0113c8df3..bd74a40d7 100644
--- a/doc/refman/RefMan-pro.tex
+++ b/doc/refman/RefMan-pro.tex
@@ -298,13 +298,17 @@ subgoals which clutter your screen.
 \begin{Variant}
 \item {\tt Focus {\num}.}\\ 
 This focuses the attention on the $\num^{th}$ subgoal to prove.
-
 \end{Variant}
 
+\emph{This command is deprecated since 8.8: prefer the use of bullets or
+  focusing brackets instead, including {\tt {\num}: \{}}.
+
 \subsection[\tt Unfocus.]{\tt Unfocus.\comindex{Unfocus}}
 This command restores to focus the goal that were suspended by the
 last {\tt Focus} command.
 
+\emph{This command is deprecated since 8.8.}
+
 \subsection[\tt Unfocused.]{\tt Unfocused.\comindex{Unfocused}}
 Succeeds in the proof if fully unfocused, fails if there are some
 goals out of focus.
diff --git a/parsing/g_proofs.ml4 b/parsing/g_proofs.ml4
index 482373150..44f46578c 100644
--- a/parsing/g_proofs.ml4
+++ b/parsing/g_proofs.ml4
@@ -19,6 +19,24 @@ let thm_token = G_vernac.thm_token
 
 let hint = Gram.entry_create "hint"
 
+let warn_deprecated_focus =
+  CWarnings.create ~name:"deprecated-focus" ~category:"deprecated"
+         (fun () ->
+           Pp.strbrk
+             "The Focus command is deprecated; use bullets or focusing brackets instead"
+         )
+
+let warn_deprecated_focus_n n =
+  CWarnings.create ~name:"deprecated-focus" ~category:"deprecated"
+         (fun () ->
+           Pp.(str "The Focus command is deprecated;" ++ spc ()
+               ++ str "use '" ++ int n ++ str ": {' instead")
+         )
+
+let warn_deprecated_unfocus =
+  CWarnings.create ~name:"deprecated-unfocus" ~category:"deprecated"
+         (fun () -> Pp.strbrk "The Unfocus command is deprecated")
+
 (* Proof commands *)
 GEXTEND Gram
   GLOBAL: hint command;
@@ -49,9 +67,15 @@ GEXTEND Gram
       | IDENT "Undo" -> VernacUndo 1
       | IDENT "Undo"; n = natural -> VernacUndo n
       | IDENT "Undo"; IDENT "To"; n = natural -> VernacUndoTo n
-      | IDENT "Focus" -> VernacFocus None
-      | IDENT "Focus"; n = natural -> VernacFocus (Some n)
-      | IDENT "Unfocus" -> VernacUnfocus
+      | IDENT "Focus" ->
+         warn_deprecated_focus ~loc:!@loc ();
+         VernacFocus None
+      | IDENT "Focus"; n = natural ->
+         warn_deprecated_focus_n n ~loc:!@loc ();
+         VernacFocus (Some n)
+      | IDENT "Unfocus" ->
+         warn_deprecated_unfocus ~loc:!@loc ();
+         VernacUnfocus
       | IDENT "Unfocused" -> VernacUnfocused
       | IDENT "Show" -> VernacShow (ShowGoal OpenSubgoals)
       | IDENT "Show"; n = natural -> VernacShow (ShowGoal (NthGoal n))
-- 
cgit v1.2.3