knittingpattern 1 (25feb10)

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

12 files changed, 467 insertions, 3 deletions

diff --git a/Master/texmf-dist/doc/latex/knittingpattern/README b/Master/texmf-dist/doc/latex/knittingpattern/README
new file mode 100644
index 00000000000..b95a539ac8d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/README
@@ -0,0 +1,15 @@
+This package provides a LaTeX class provides a number of commands for
+typesetting simple, attractive and easy to follow knitting patterns.
+
+This package is released under the LaTeX Project Public License. See
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for
+the details of that license.
+
+As per the LPPL, no restrictions are placed on running this package. In
+particular, no restrictions are placed by the package author on selling
+or distributing patterns typeset using this package. Not all LaTeX
+packages may be used in commercial products; if you use other packages
+to produce a PDF or paper document, you must check their documentation
+to see if you are allowed to sell the result.
+
+For more information, see the documentation file introduction.pdf.
diff --git a/Master/texmf-dist/doc/latex/knittingpattern/introduction.pdf b/Master/texmf-dist/doc/latex/knittingpattern/introduction.pdf
new file mode 100644
index 00000000000..d9b45c2e0e6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/introduction.pdf
diff --git a/Master/texmf-dist/doc/latex/knittingpattern/introduction.tex b/Master/texmf-dist/doc/latex/knittingpattern/introduction.tex
new file mode 100644
index 00000000000..8ea64cab15d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/introduction.tex
@@ -0,0 +1,223 @@
+\documentclass{article}
+
+\usepackage{fancyhdr}
+
+%% introduction.tex, version 1
+  %% Copyright 2010 Hugh Griffiths
+  %
+  % This work may be distributed and/or modified under the conditions
+  % of the LaTeX Project Public License, either version 1.3 of this
+  % license or (at your option) any later version.  The latest version
+  % of this license is in http://www.latex-project.org/lppl.txt and
+  % version 1.3 or later is part of all distributions of LaTeX version
+  % 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is Hugh Griffiths.
+  %
+  % This work consists of the files knittingpattern.cls, template.tex,
+  % template.pdf, introduction.tex and introduction.pdf
+
+\title{How to use the Knitting Pattern class} 
+\author{Hugh Griffiths}
+
+\begin{document}
+
+\maketitle
+
+\pagestyle{fancy}
+\fancyhead{}
+\fancyfoot{}
+\renewcommand{\footrulewidth}{.4pt}
+\renewcommand{\headrulewidth}{0pt}
+\fancyfoot[R]{\copyright 2010 Hugh Griffiths}
+\thispagestyle{fancy}
+
+Thank you for downloading the Knitting Pattern class!  The purpose of this class is to provide a simple, effective method for knitters to produce high-quality, attractive patterns using \LaTeX.  It does this by providing commands to handle as much of the layout of the document as possible, leaving the author free to concentrate on the pattern itself.
+
+\section*{Contents}
+In this directory you'll find:
+\begin{itemize}
+\item
+knittingpattern.cls
+\item
+template.tex
+\item
+template.pdf
+\item
+lion.png
+\item
+readme.txt
+\item
+introduction.tex
+\item
+introduction.pdf
+\end{itemize}
+
+The first is the class file, you'll need to download that and put it
+in the directory you're working in (or `somewhere where TeX will find
+it').  ``template.tex'' is a sample of how this might be used,
+although here it's just creating a basic block diagram document.
+``template.pdf'' is the compiled version, so you can see how it looks.
+The image used throughout (lion.png) is the CTAN lion, drawn by Duane
+Bibby.  The last two files are, of course, this introduction.
+
+Some quick notes on how to use the Knitting Pattern class.  First, the
+class requires a number of other packages: graphicx, float, fancyhdr,
+longtable, calc and xcolor.  These are standard and are most likely
+included in your copy of latex.  Second, a note on the
+``\textbackslash{}definecolor'' command - this comes from the xcolor
+package, and allows you to specify colours using HTML colour codes.
+If you're not familiar with these,
+\begin{verbatim}
+http://html-color-codes.com/
+\end{verbatim}
+has a nice chart.  It's important to use capital letters in these
+codes.
+
+\section*{Copyright notice}
+
+The gist of this is that you can use, distribute and modify this
+package freely.  In particular, you're very welcome to sell patterns
+produced using it:
+
+This work may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.3 of this license
+or (at your option) any later version.  The latest version of this
+license is in 
+\begin{verbatim}
+http://www.latex-project.org/lppl.txt
+\end{verbatim}
+and version 1.3 or later is part of all distributions of LaTeX version
+2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+ 
+The Current Maintainer of this work is Hugh Griffiths.
+
+This work consists of the files knittingpattern.cls, template.tex,
+template.pdf, introduction.tex and introduction.pdf
+
+\section*{How to use the Knitting Pattern class}
+After copying the .cls file into the appropriate directory, begin your document with:
+\begin{verbatim}
+  \documentclass{knittingpattern}
+\end{verbatim}
+You will then be able to make use of the following commands:
+\begin{itemize}
+\item
+\begin{verbatim}
+\intro{Text}{pic}
+\end{verbatim}
+Divides the page into two columns, the first containing the `Text'
+section, and the second the image `pic'.  This will work best if your
+text is long enough that it ends up with a vertical length close to
+that of `pic'.  By default the picture will take up a quarter of the
+page width.
+
+\item
+\begin{verbatim}
+\note{borderColour}{backgroundColour}{Title}{Text}
+\end{verbatim}
+Produces a centred box with coloured background and border, containing
+the `Title' text and `Text'.  The `Title' part is underlined, in a
+larger font and appears on a separate line.  The box defaults to 90\%
+of the page width.
+
+\item
+\begin{verbatim}
+\diagram{diag}
+\end{verbatim}
+Gives a centred, bordered box containing the image
+`diag'.  The default width is half of the page width.
+
+\item
+\begin{verbatim}
+\important{borderColour}{backgroundColour}{Text}
+\end{verbatim}
+Produces a centred, coloured box and border containing `Text', for
+anything you feel needs to be highlighted.  Like \textbackslash{}note,
+the box defaults to 90\% of the page width.
+
+\item
+\begin{verbatim}
+\cpyrght{Name} 
+\end{verbatim}
+This sets up the footer.  It removes the page numbering, puts a
+horizontal bar at the bottom and adds `Name' on the right-hand side.
+It's important that this command appear within the first page (but
+after the title), so it's best to put this immediately after
+\textbackslash{}maketitle (otherwise the footer on the first page is
+not set up correctly).
+
+Not to be confused with \textbackslash{}copyright, which gives a
+copyright symbol.
+
+\item
+\begin{verbatim}
+\biog{pic}{Text}
+\end{verbatim}
+Produces a biographical note.  Place this on the last page of your
+pattern.  As with \textbackslash{}intro, this is divided into two
+columns, with an image `pic' on the left and `Text' on the right.
+This will appear as a float at the bottom of the page.  The image
+will take up a quarter of the page width by default.
+
+\item
+\begin{verbatim}
+\begin{pattern}{colour1}{colour2}
+Instructions & (st) \\
+...
+\end{pattern}
+\end{verbatim}
+Produces a table of knitting instructions.  Each row has two entries,
+the first for the instructions for that row of knitting, and the
+second for the number of stitches.  The rows have alternating colours
+for ease of reading.
+\end{itemize}
+
+All of these commands (except \textbackslash{}cpyrght) also accept an
+optional argument which will vary the default sizes.  For
+\textbackslash{}note, \textbackslash{}diagram,
+\textbackslash{}important and \textbackslash{}begin\{pattern\} this
+changes the width of the object:
+
+For example,
+\begin{verbatim}
+\diagram[width]{diag}
+\end{verbatim}
+ will produce a diagram covering a
+proportion `width' of the page width.
+
+For the ``pattern'' environment, this optional argument will vary the
+width of the second column, adjusting the other column appropriately:
+\begin{verbatim}
+\begin{pattern}[width]{colour1}{colour2}
+...
+\end\pattern} 
+\end{verbatim}
+gives a pattern table whose second column has width  `width' as a
+proportion of the page.  The default value for this width is 0.05.
+
+For \textbackslash{}intro and \textbackslash{}biog the optional
+argument changes the width of the image, adjusting the size of the
+other column to account for this.  So
+\begin{verbatim}
+\intro[0.5]{Text}{pic}
+\end{verbatim}
+ will produce two columns half the width of the page, the first
+ containing ``Text'' and the second containing the image ``pic''.
+
+\section*{Suggestions}
+
+If you have any suggestions for improvements or extra functions you'd
+like added, or if you'd like to report any bugs, please email me at
+\begin{verbatim}
+griffiths(dot)hugh(at)gmail(dot)com.
+\end{verbatim}
+
+All of the commands are easily modifiable, and I would encourage you
+to edit them to find a style you like, or to make the commands more
+user-friendly.
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/knittingpattern/lion.png b/Master/texmf-dist/doc/latex/knittingpattern/lion.png
new file mode 100644
index 00000000000..00264778966
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/lion.png
diff --git a/Master/texmf-dist/doc/latex/knittingpattern/template.pdf b/Master/texmf-dist/doc/latex/knittingpattern/template.pdf
new file mode 100644
index 00000000000..fc900f5cc92
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/template.pdf
diff --git a/Master/texmf-dist/doc/latex/knittingpattern/template.tex b/Master/texmf-dist/doc/latex/knittingpattern/template.tex
new file mode 100644
index 00000000000..0909c672687
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/knittingpattern/template.tex
@@ -0,0 +1,151 @@
+\documentclass{knittingpattern}
+
+% Commands
+% \intro{Text}{pic}
+% \note{borderColour}{backgroundColour}{Title}{Text}
+% \diagram{diag}
+% \begin{pattern}{colour1}{colour2} Col & (st) \end{pattern}
+% \important{borderColour}{backgroundColour}{Text}
+% \biog{pic}{Text}
+% \cpyrght{Name}
+
+% template.tex, version 1
+  %% Copyright 2010 Hugh Griffiths
+  %
+  % This work may be distributed and/or modified under the conditions
+  % of the LaTeX Project Public License, either version 1.3 of this
+  % license or (at your option) any later version.  The latest version
+  % of this license is in http://www.latex-project.org/lppl.txt and
+  % version 1.3 or later is part of all distributions of LaTeX version
+  % 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is Hugh Griffiths.
+  %
+  % This work consists of the files knittingpattern.cls, template.tex, template.pdf, introduction.tex and introduction.pdf
+
+\definecolor{colour0}{HTML}{000000}
+\definecolor{colour1}{HTML}{6699FF}
+\definecolor{colour2}{HTML}{CC99FF}
+\definecolor{colour3}{HTML}{99CCFF}
+\definecolor{colour4}{HTML}{9966FF}
+\definecolor{colour5}{HTML}{CCFFCC}
+
+\begin{document}
+
+\title{Title}
+\author{Author}
+\date{\today}
+\maketitle
+
+\cpyrght{\copyright 2010 Hugh Griffiths}
+
+\intro{
+Introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction.
+Introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction.
+Introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction
+introduction introduction introduction introduction introduction.
+}{lion.png}
+
+\note{colour0}{colour2}{Materials}{
+Wool wool wool wool wool wool.
+}
+
+\diagram{lion.png}
+
+\note{colour0}{colour4}{Abbreviations}{K P Kfb etc.}
+
+\section*{Section 1}
+
+\intro{
+Note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note.
+}{lion.png}
+
+\begin{pattern}{colour2}{colour4}
+Cast on & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+\quad\vdots & \quad\vdots\\
+\end{pattern}
+
+Note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note.
+
+\section*{Section 2}
+
+\intro{
+Note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note.
+}{lion.png}
+
+\begin{pattern}{colour2}{colour4}
+Cast on & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+Instructions & (st)\\
+\quad\vdots & \quad\vdots\\
+\end{pattern}
+
+\important{colour0}{colour5}{
+Making up, making up, making up, making up, making up, making up,
+making up, making up, making up, making up, making up, making up,
+making up, making up, making up, making up, making up, making up,
+making up, making up, making up, making up, making up, making up,
+making up, making up, making up, making up, making up, making up.
+}
+
+Note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note note note note note note note note note note note note
+note note note.
+
+\biog[.4]{lion.png}{Biographical information.  Talk about self, talk about
+self, talk about self, talk about self, talk about self, talk about
+self.}
+
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/knittingpattern/knittingpattern.cls b/Master/texmf-dist/tex/latex/knittingpattern/knittingpattern.cls
new file mode 100644
index 00000000000..9666716d6cd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/knittingpattern/knittingpattern.cls
@@ -0,0 +1,72 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{knittingpattern}[2009/11/13 Formatting for knitting patterns]
+
+%% knittingpattern.cls, version 1
+  %% Copyright 2010 Hugh Griffiths
+  %
+  % This work may be distributed and/or modified under the conditions
+  % of the LaTeX Project Public License, either version 1.3 of this
+  % license or (at your option) any later version.  The latest version
+  % of this license is in http://www.latex-project.org/lppl.txt and
+  % version 1.3 or later is part of all distributions of LaTeX version
+  % 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is Hugh Griffiths.
+  %
+  % This work consists of the files knittingpattern.cls, template.tex, template.pdf, introduction.tex and introduction.pdf
+
+\LoadClass{article}
+
+\RequirePackage{graphicx, float, fancyhdr, longtable, calc}
+\RequirePackage[table]{xcolor}
+
+% This section is from Manas Tungare's ``lesspaper.sty'', which he has
+ % generously donated to the public domain.
+\setlength{\textwidth}{7.5in}
+\setlength{\textheight}{9.5in}
+\setlength{\evensidemargin}{-0.5in}
+\setlength{\oddsidemargin}{-0.5in}
+\setlength{\topmargin}{-0.5in}
+\setlength{\voffset}{-0.5in}
+
+\newcommand{\intro}[3][.25]{\begin{tabular}{m{\textwidth - 4\tabcolsep
+- #1\textwidth}m{#1\textwidth}}
+#2&\fbox{\includegraphics[width=#1\textwidth]{#3}}
+\end{tabular}}
+
+\newcommand{\note}[5][.9]{\begin{center}
+\fcolorbox{#2}{#3}{\parbox{#1\textwidth}{\underline{\Large{#4}} \\ #5 }
+}
+\end{center}
+} 
+
+\newcommand{\diagram}[2][.5]{\begin{center}
+\fbox{\includegraphics[width=#1\textwidth]{#2}}
+\end{center}
+}
+
+\newenvironment{pattern}[3][.05]{\begin{center}
+\rowcolors{1}{#2}{#3}
+\begin{longtable}{p{\textwidth-#1\textwidth- 4\tabcolsep} p{#1\textwidth}}}{\end{longtable}\end{center}}
+
+\newcommand{\important}[4][.9]{\begin{center}\fcolorbox{#2}{#3}{\parbox{#1\textwidth}{#4}}\end{center}}
+
+\newcommand{\biog}[3][.25]{\begin{table}[b]\begin{tabular}{m{#1\textwidth}m{\textwidth-#1\textwidth-4\tabcolsep}}
+\fbox{\includegraphics[width=#1\textwidth]{#2}}& #3
+\end{tabular} \end{table}}
+
+\newcommand{\cpyrght}[1]{
+\pagestyle{fancy}
+\fancyhead{}
+\fancyfoot{}
+\renewcommand{\footrulewidth}{.4pt}
+\renewcommand{\headrulewidth}{0pt}
+\fancyfoot[R]{#1}
+\thispagestyle{fancy}
+}
+
+\setlength{\fboxrule}{2pt}
+\setlength{\tabcolsep}{0.025\textwidth}
+
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 76863913ef9..ea62091867a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -157,7 +157,7 @@ my @TLP_working = qw(
     jura juraabbrev jurabib juramisc jurarsp js-misc
   kalender kastrup kerkis kerntest
     keycommand keyreader keystroke
-    knitting knuth koma-script kpfonts
+    knitting knittingpattern knuth koma-script kpfonts
   l2picfaq l2tabu l2tabu-english l2tabu-french l2tabu-it l2tabu-spanish
     labbook labelcas labels lastpage
     latex latex-course latex-doc-ptr latex-notes-zh-cn
@@ -314,7 +314,8 @@ my @TLP_working = qw(
 
 # these packages we do not expect to check:
 my @TLP_no_check = qw(
-  afm2pl  # not on CTAN
+  afm2pl    # not on CTAN
+  fontname  # tl-update-auto
 );
 
 exit (&main ());
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 13d421bb422..265f9767c83 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -254,6 +254,7 @@ $Master = "$mydir/../..";
 # 'flowfram',	"&MAKEflatten",
  'font-change',	"&MAKEflatten",
  'fontinst',	"&MAKEfontinst",
+ 'fontname',	"die 'skipping, done through tl-update-auto'",
  'footnpag',	"&MAKEfootnpag",
  'fourier',	"&MAKEflatten",
  'fouriernc',	"&MAKEflatten",
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 673bebaa87a..b52853979a5 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -22,6 +22,8 @@ depend fig4latex
 depend gnuplottex
 depend here
 depend hvfloat
+depend knitting
+depend knittingpattern
 depend miniplot
 depend pb-diagram
 depend petri-nets
diff --git a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
index 6f09b1fafa7..bc3676ebd07 100644
--- a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
@@ -37,7 +37,6 @@ depend imtekda
 depend jhep
 depend jpsj
 depend kluwer
-depend knitting
 depend lps
 depend macqassign
 depend mentis
diff --git a/Master/tlpkg/tlpsrc/knittingpattern.tlpsrc b/Master/tlpkg/tlpsrc/knittingpattern.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/knittingpattern.tlpsrc