From 1d71839c256e764fb87c965273d743a115414fad Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 17 Aug 2010 16:31:42 -0700 Subject: [PATCH 1/2] make docs clearer --- docs/index.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 86ba0e0..fed2e6b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -84,17 +84,17 @@ shell commands to control the program output. In order to stop them you will eventually need to foreground them again and press Ctrl-C. A session could look something like this:: - (dev_env)blackbox:Cockerel ∈ ζ cockerel > cockerel.log 2>&1 & - [1] 4199 - (dev_env)blackbox:Cockerel ∈ ζ coqd > coqd.log 2>&1 & - [2] 4211 - (dev_env)blackbox:Cockerel ∈ ζ jobs - [1]- Running cockerel > cockerel.log 2>&1 & - [2]+ Running coqd > coqd.log 2>&1 & - (dev)blackbox:Cockerel ∈ ζ fg %1 - cockerel > cockerel.log 2>&1 #NOW PRESS Ctrl-C to stop - (dev)blackbox:Cockerel ∈ ζ fg %2 - coqd > coqd.log 2>& #NOW PRESS Ctrl-C to stop + cockerel > cockerel.log 2>&1 & + # [1] 4199 + coqd > coqd.log 2>&1 & + # [2] 4211 + jobs + # [1]- Running cockerel > cockerel.log 2>&1 & + # [2]+ Running coqd > coqd.log 2>&1 & + fg %1 + #NOW PRESS Ctrl-C to stop => cockerel > cockerel.log 2>&1 + fg %2 + #NOW PRESS Ctrl-C to stop => coqd > coqd.log 2>& From 66d09f260edec82db571bf9212704bd775fbc5aa Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 17 Aug 2010 16:41:40 -0700 Subject: [PATCH 2/2] fix url gen for theorems --- cockerel/webapp/templates/classes/view.html | 2 +- cockerel/webapp/views/prover/mdx_prover.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cockerel/webapp/templates/classes/view.html b/cockerel/webapp/templates/classes/view.html index 9ae6e19..0dd69b2 100644 --- a/cockerel/webapp/templates/classes/view.html +++ b/cockerel/webapp/templates/classes/view.html @@ -9,7 +9,7 @@ {% endif %} diff --git a/cockerel/webapp/views/prover/mdx_prover.py b/cockerel/webapp/views/prover/mdx_prover.py index 7c7add6..de7889e 100644 --- a/cockerel/webapp/views/prover/mdx_prover.py +++ b/cockerel/webapp/views/prover/mdx_prover.py @@ -38,7 +38,7 @@ class ProverPreprocessor(markdown.preprocessors.Preprocessor): '(?P^>{3,})[ ]*$', re.MULTILINE | re.DOTALL) WRAP = """ -
{proof}
""" +
{proof}
""" def __init__(self, md): markdown.preprocessors.Preprocessor.__init__(self, md) @@ -58,7 +58,7 @@ def run(self, lines): db.session.add(theorem) db.session.commit() proof = self.WRAP.format( - url=urlencode(dict(theorem=theorem.id)), + id=theorem.id, proof=self._escape(theorem.text)) placeholder = self.markdown.htmlStash.store(proof, safe=True)