context-rst (4Mar)

git-svn-id: svn://tug.org/texlive/trunk@33092 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 64 insertions, 127 deletions

diff --git a/Master/texmf-dist/doc/context/third/rst/COPYING b/Master/texmf-dist/doc/context/third/rst/COPYING
deleted file mode 100644
index ac0eb7c9fc6..00000000000
--- a/Master/texmf-dist/doc/context/third/rst/COPYING
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright 2010-2013 Philipp Gesang. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/Master/texmf-dist/doc/context/third/rst/OMakefile b/Master/texmf-dist/doc/context/third/rst/OMakefile
new file mode 100644
index 00000000000..72dccf472e1
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/rst/OMakefile
@@ -0,0 +1,41 @@
+## Subdirectory omake makefile for the reStructuredText module
+## for Context. See the root OMakefile for details.
+## https://bitbucket.org/phg/context-rst/src/tip/OMakefile
+.PHONY: manual clean nuke
+
+name		= manual
+
+manual_src	= $(name).tex
+manual_rst	= documentation.rst
+manual_pdf	= $(name).pdf
+manual_tmp	= doc.tex
+manual_junk[]	= $(addprefix $(name), .tuc .log)
+manual_spam	= $(name)-termout.log
+
+## The manual is itself written in reStructuredText. This leads to
+## a precarious situation: the module is required to be present in
+## order for the manual to be built. We’re going to have to find
+## some solution for smooth bootstrapping, but at the moment that’s
+## a low priority goal.
+$(manual_pdf): :effects: $(manual_tmp) $(manual_junk) $(manual_spam)
+	rm -rf -- $(manual_spam)
+	echo ":: creating $(manual_tmp) from $(manual_rst)"
+	mtxrun --script rst 			\
+		--if=$(file $(manual_rst)) 	\
+		--of=$(manual_tmp) 		\
+		&> $(manual_spam)
+	echo ":: creating $@ from $(manual_src) and $(manual_tmp)"
+	context --nonstopmode $(file $(manual_src)) &>> $(manual_spam)
+
+manual: $(manual_pdf)
+
+clean:
+	rm -rf -- $(manual_junk) $(manual_tmp) $(manual_spam)
+
+nuke: clean
+	rm -rf -- $(manual_pdf)
+
+## note to self: default targets in subdirectories will
+## lead to those targets being built whenever omake is
+## invoked without arguments from the root tree as well.
+#.DEFAULT: manual
diff --git a/Master/texmf-dist/doc/context/third/rst/OMakefile.omc b/Master/texmf-dist/doc/context/third/rst/OMakefile.omc
new file mode 100644
index 00000000000..c59ffb27d35
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/rst/OMakefile.omc
diff --git a/Master/texmf-dist/doc/context/third/rst/README.rst b/Master/texmf-dist/doc/context/third/rst/README.rst
deleted file mode 100644
index 571b8aec104..00000000000
--- a/Master/texmf-dist/doc/context/third/rst/README.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-=======================================================================
-                            General Advice
-=======================================================================
-
-Read the section *Features Not Implemented* in the manual first.
-
-*Note*: if you happen to read this on BitBucket_, the error messages
-some lines below just mean that *their* implementation doesn’t
-understand |TeX| directives.  Don’t worry, |rstcontext| does.
-
-=======================================================================
-                             Installation
-=======================================================================
-With ConTeXt Standalone
-***********************
-An up to date version of the module is installed along with the ConTeXt
-distribution (*Standalone*, formerly known as *The Minimals*).
-The module should be working out of the box if you installed from the
-official source_ and provided the parameter ``--modules=all``.
-
-.. _source: http://wiki.contextgarden.net/ConTeXt_Standalone#Installing_third_party_modules
-
-Manually
-********
-Firstly, get the module source from BitBucket_ (see the *downloads*
-section).
-In order to install |rstcontext|, copy everything in the ``mod/``
-subdirectory into your local |CONTEXT| tree and update the filename
-database, i.e. ::
-
-    cp -r mod/* ~/context/tex/texmf-local/
-    context --generate
-
-if the |CONTEXT| minimal distribution happens to be installed at
-``~/context/``.
-
-=======================================================================
-                                 Usage
-=======================================================================
-
-As rstConTeXt was developed on *texlua*, you may expect it to run best
-with this interpreter. For now the script accepts two command line
-arguments: the input file and the output file. The following will
-demonstrate the main usage in a separate directory: ::
-
-    mkdir tmp; cd tmp
-    mtxrun --script rst --if=../mod/doc/context/third/rst/documentation.rst --of=doc.tex
-    context ../mod/doc/context/third/rst/manual.tex
-
-This should have gotten you the manual converted to a file ``doc.tex``
-which was subsequently run through |CONTEXT| to generate the final
-``manual.pdf``. You will find extended instructions on how to build the
-manual with some cosmetic improvements in the section *Usage* of the
-manual itself.
-
-There is also a small module ``t-rst.mkiv`` which permits direct
-typesetting of reST markup with |CONTEXT| MkIV. For usage examples see
-the files ``hybridtest.tex`` and ``moduletest.tex`` in the ``doc``
-subdirectory.
-
-=======================================================================
-                                License
-=======================================================================
-
-|rstcontext| is free software and may be redistributed under the terms
-of the 2-clause BSD license. You should have recieved a copy of this
-license in a file named “COPYING” in the source tree. If there is no
-such file then please contact the maintainer_ (Contact_).
-
-=======================================================================
-                                Contact
-=======================================================================
-
-|rstcontext| was written by Philipp Gesang, ``phg42.2a`` at ``gmail``
-dot ``com``.
-
-.. |rstcontext| ctx:: {{\em rst}\kern.5pt\CONTEXT}
-.. |TeX| ctx:: {\TEX}
-.. |CONTEXT| ctx:: {\CONTEXT}
-
-.. _Contact: phg42.2a@gmail.com
-.. _BitBucket:  http://bitbucket.org/phg/context-rst
-.. _maintainer: Contact_
diff --git a/Master/texmf-dist/doc/context/third/rst/documentation.rst b/Master/texmf-dist/doc/context/third/rst/documentation.rst
index 621528de7d7..1571d34e053 100644
--- a/Master/texmf-dist/doc/context/third/rst/documentation.rst
+++ b/Master/texmf-dist/doc/context/third/rst/documentation.rst
@@ -241,47 +241,45 @@ Save for nesting lists are fully implemented in |rstcontext|.
 The following code typesets a triple-nested list with different
 kinds of bulleting / numbering: ::
 
-    i   First order list, first entry.
+    i.   First order list, first entry.
 
-    ii  First order list, second entry.
+    ii.  First order list, second entry.
 
-    iii First order list, third entry.
+    iii. First order list, third entry.
 
         -   Second order list, first entry.
 
-            #   Third order list, first entry.
-
-            #   Third order list, second entry.
-
-            #   Third order list, third entry.
+            #.  Third order list, first entry.
+            #.  Third order list, second entry.
+            #.  Third order list, third entry.
                 Real nesting rules!
 
         -   Second order list, second entry.
 
-    iv  First order list, fourth entry.
+    iv.  First order list, fourth entry.
 
-    v   First order list, fifth entry.
+    v.   First order list, fifth entry.
 
 The result looks like this:
 
-i   First order list, first entry.
+i.   First order list, first entry.
 
-ii  First order list, second entry.
+ii.  First order list, second entry.
 
-iii First order list, third entry.
+iii. First order list, third entry.
 
     -   Second order list, first entry.
 
-        #   Third order list, first entry.
-        #   Third order list, second entry.
-        #   Third order list, third entry.
+        #.  Third order list, first entry.
+        #.  Third order list, second entry.
+        #.  Third order list, third entry.
             Real nesting rules!
 
     -   Second order list, second entry.
 
-iv  First order list, fourth entry.
+iv.  First order list, fourth entry.
 
-v   First order list, fifth entry.
+v.   First order list, fifth entry.
 
 .. caution:: 
     Don’t forget the blank lines between list items.
@@ -658,7 +656,7 @@ License
 
 ::
 
-    Copyright 2010-2013 Philipp Gesang. All rights reserved.
+    Copyright 2010-2014 Philipp Gesang. All rights reserved.
 
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the
diff --git a/Master/texmf-dist/doc/context/third/rst/manual.pdf b/Master/texmf-dist/doc/context/third/rst/manual.pdf
index 4150a13def1..566347e1ea3 100644
--- a/Master/texmf-dist/doc/context/third/rst/manual.pdf
+++ b/Master/texmf-dist/doc/context/third/rst/manual.pdf
diff --git a/Master/texmf-dist/doc/context/third/rst/manual.tex b/Master/texmf-dist/doc/context/third/rst/manual.tex
index b3d63db6989..6e30789ea6a 100644
--- a/Master/texmf-dist/doc/context/third/rst/manual.tex
+++ b/Master/texmf-dist/doc/context/third/rst/manual.tex
@@ -53,10 +53,13 @@
 \vfill
 \framed [align=right,frame=off,topframe=on] {%
 \tfxx\ss\setupinterlinespace[small]\noindentation
-Copyright 2010--2013 Philipp Gesang, Radebeul.\par
+Copyright 2010--2014 Philipp Gesang, Tübingen.\par
 Mail any bug reports, patches or suggestions to\par
-\type{string.format("%s@%s.com", "phg42.2a", "gmail")}\par
-or pay a visit to \goto{my BitBucket home}[url(http://bitbucket.org/phg/)].\par
+\type{string.format("%s@%s.com", "phg42.2a", "gmail")}.\par
+Alternatively, pay a visit
+to \goto{my BitBucket handle}[url(http://bitbucket.org/phg/)]
+or \goto{my home page}[url(https://phi-gamma.net/coding)]
+\par
 }
 \stopstandardmakeup
 \stopbuffer