11 files changed, 82 insertions, 232 deletions

diff --git a/Master/texmf-dist/doc/latex/shipunov/NEWS b/Master/texmf-dist/doc/latex/shipunov/NEWS
new file mode 100644
index 00000000000..c05f20c08b5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/shipunov/NEWS
@@ -0,0 +1 @@
+1.1 Added installation information under MikTeX; updated autolist (Rpolylist, thanks to M. Muench) and flower (new symmetry signs according to Prenner et al., 2010)
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/shipunov/README b/Master/texmf-dist/doc/latex/shipunov/README
index dd390106f0e..d799a815192 100644
--- a/Master/texmf-dist/doc/latex/shipunov/README
+++ b/Master/texmf-dist/doc/latex/shipunov/README
@@ -1,126 +1,34 @@
-shipunov 2008/02/xx v1.0

-Copyright (c) Alexey Shipunov <plantago(at)herba.msu.ru>, 2008

-  

-************************************************************

-

-Contents of README

- 1. Description

- 2. Installation

- 3. Usage notes

- 4. History

- 5. Acknowledgements

- 6. Licence

- 7. Files

-

-1. Description

-----------------------

- 

-This is the version 1.0 of 'shipunov' bundle, collection of LaTeX packages and classes, along with one bibliography style, two independent examples and a set of Perl scripts for converting TeX files. Many of them intend to help field biologists and Russian writers, others have wider application.

-

-Most of packages have example files, with `tex' extension and '-ex' postfix. Some of them are in Russian (codepage cp1251, `-ru' postfix). One example is for XeLaTeX and has `-x' postfix. Documentation files have `-doc' postfix. Besides, two examples did not related with any packages, they just demonstrate how to produce reliable forms for biological (morphometry and floristic/faunistic) fieldwork.

-

-Any suggestions concerning this package are highly appreciated.

-

-The Russian mini-review can be found in the "review.tex" file, written by Eugene Baldin, with minor corrections of bundle author.

-

-2. Installation

----------------

- 

-Extract the zip archive to the $LOCALTEXMF directory of your system. Refresh your filename database. Please see the documentation of your LaTeX distribution for further details.

- 

-3. Usage notes

---------------

- 

-For XeTeX example, the XeTeX should be installed, and appropriate system fonts listed in "\set...font" declaration(s). For Russian examples, LH fonts, "cm-super" and "cyrillic" packages should be installed. Russian hyphenation patterns should be loaded via "babel". For using "rusnat" bibliography style, some preparations are needed in the source bib file (example is in the documentation). To run bibtex on aux-file, I recommend the command like "bibtex8 -B -c cp1251.csf rusnat-ex1-ru.aux".

-

-4. History

-----------

- 

-2008/02/xx Version 1. Initial CTAN release. However, the bundle was mantained locally since 1997.

- 

-

-5. Acknowledgements

--------------------

- 

-For suggestions and contributions I would like to thank Eugeny Baldin. 99% of code and documentation for "lstable" package have been written by Robert Nilsson.

- 

-  

-6. Licence

-----------

- 

-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.

- 

-7. Files

--------- 

-

-This work consists of the following files:

-

-* README	this file, including licence

-* review.tex Russian mini-review, written by Eu. Baldin

-

-* Class files and their examples:

-

-cassete.cls	Audiocassete labels

-etiketka.cls	Herbarium labels

-cassete-ex-ru.tex

-etiketka-ex-ru.tex

-etiketka-ex1-en.tex

-etiketka-ex2-en.tex

-

-* LaTeX style files, their examples and/or documentation:

-

-altverse.sty	Typesetting verses, depends on "xtab" package

-autolist.sty	Various lists, depends on "calc" package

-biokey.sty		Pretty formatting of biological identification keys

-biolist.sty	Pretty formatting of floristic/faunistic species lists

-boldline.sty	Thick lines in tables, depends on "array" package

-classif2.sty	Pretty formatting of biological classifications

-drcaps.sty		Various drop caps

-flower.sty		Flower formulas, depends on "wasy" font package

-isyntax.sty	Interactive syntax check, depends on "ifthen" and "syntaxonly" packages

-numerus.sty	Spell numbers in Russian (with gender!)

-punct.sty		Straight punctuation marks inside italics

-sltables.sty	LaTeX modification of R. Nilson S-Tables Plain TeX macro

-starfn.sty		Footnote marks as stars, depends on "footnpag" package

-altverse-ex-en.tex

-altverse-ex1-ru.tex

-altverse-ex2-ru.tex

-autolist-ex-en.tex

-autolist-ex-ru.tex

-biokey-doc-en.tex

-biokey2html-doc-en.tex

-biokey2html-ex-en.tex

-biolist-ex-en.tex

-boldline-ex-en.tex

-classif2-ex-en.tex

-drcaps-ex-en.tex

-flower-ex-en.tex

-flower-ex-en-x.tex	XeLaTeX example to "flower" package

-isyntax-ex-en.tex

-numerus-ex-ru.tex

-punct-ex-en.tex

-sltables-doc-en.tex

-starfn-ex-ru.tex

-

-* BibTeX bibliography style, documentation and examples:

-

-rusnat.bst		Russian bibliography style, depends on "natbib" package

-rusnat-doc-ru.tex

-rusnat-ex-ru.bib

-rusnat-ex1-ru.tex

-rusnat-ex2-ru.tex

-

-* Two examples of field forms:

-

-field-form-ex1-ru.tex		Field form for morphometry

-field-form-ex2-ru.tex		Field form for floristics

-

-* Perl scripts and shell command files:

-biokey2html1.pl

-biokey2html2.pl

-biokey2html3.pl

-biokey2html.bat	Windows command file

-biokey2html.sh	Bash command file

-

-There may be also additional PDF and HTML files, results of examples processing.

-

+The bundle collects packages and classes, along with one bibliography style and examples and scripts for converting TeX files.  Many of the files in the collection are designed to support field biologists and/or Russian writers, while others have wider application.
+
+The collection includes (among others):
+
+
+    * altverse , a simple verse typesetting package;
+
+    * autolist , which provides various list formatting facilities;
+
+    * biokey , which provides a mechanism for typesetting biological identification lists;
+
+    * biolist , which typesets species lists;
+
+    * boldline , which typesets heavier separating lines in tables;
+
+    * cassete (cassette-shipunov), which lays out audio cassette inserts;
+
+    * classif2 , which typesets classification lists;
+
+    * drcaps , which provides dropped capital macros;
+
+    * etiketka, a class for typesetting business-card-sized information (including business cards);
+
+    * flower, for typesetting lists of flower formulae;
+
+    * isyntax;
+
+    * numerus;
+
+    * punct;
+
+    * sltables , which develops on the  stables  package, for use in a LaTeX context; and
+
+    * starfn.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf
index 92fb0c5af66..9db2f082de7 100644
--- a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf
+++ b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf
diff --git a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.tex b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.tex
index 431c6a6a921..8ff8a2e7b1b 100644
--- a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.tex
+++ b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.tex
@@ -107,6 +107,26 @@ Notwithstanding any other provision of this License, for material you add to a c
 
 \end{Lpolylist}
 
+\section{Rpolylist}
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+\begin{Rpolylist}[fourth]
+
+\item[a)] Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+
+\item[Beta] Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+
+\item[Third item] Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+
+\item[4th] Limiting the use for publicity purposes of names of licensors or authors of the material; or
+
+\item[5] Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+
+\item[It is sixth item] Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+\end{Rpolylist}
+
 \section{characters}
 
 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
diff --git a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf
index 99780299172..8d9f9b5d505 100644
--- a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf
+++ b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf
diff --git a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf
index 8dd34471245..e6ff6a5a0de 100644
--- a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf
+++ b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf
diff --git a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf
index 929ce7d3e56..03cc743704d 100644
--- a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf
+++ b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf
diff --git a/Master/texmf-dist/doc/latex/shipunov/review.pdf b/Master/texmf-dist/doc/latex/shipunov/review.pdf
deleted file mode 100644
index 27243d5f215..00000000000
--- a/Master/texmf-dist/doc/latex/shipunov/review.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/shipunov/review.tex b/Master/texmf-dist/doc/latex/shipunov/review.tex
deleted file mode 100644
index 1d860dfcb48..00000000000
--- a/Master/texmf-dist/doc/latex/shipunov/review.tex
+++ /dev/null
@@ -1,102 +0,0 @@
-\documentclass[a4paper,12pt]{scrartcl} 
-\usepackage[warn]{mathtext}
-\usepackage[T2A]{fontenc}
-\usepackage[koi8-r]{inputenc}
-\usepackage[english,russian]{babel}
-\usepackage{indentfirst}%first paragraph indent
-\usepackage{cmap}
-\usepackage[unicode=true]{hyperref}
-\usepackage{graphicx}
-\usepackage{amssymb}
-\usepackage{amsmath}
-\usepackage{srcltx}
-\usepackage{textcomp}
-\usepackage{floatflt}
-\usepackage{wrapfig}
-\usepackage{afterpage}
-\usepackage{ccaption}
-\captiondelim{. }
-\usepackage{xspace}
-%научные символы и смайлики \smiley \frownie
-\usepackage{wasysym}
-
-%backslash
-\newcommand{\bs}{\symbol{'134}}
-%degree
-\newcommand{\grad}{\ensuremath{{}^{\circ}}\xspace}
-
-
-\begin{document}
-
-\begin{center}
-  <<Микроревью>>
-\end{center}
-\bigskip
-
-\begin{description}
-  \item[cassete.cls] "--- простой класс для создания обложек
-  аудиокассет. Аудиокассеты "--- это вымирающий класс носителей
-  информации, но до сих пор есть много записей, которые доступны
-  только на них. В качестве ближайших аналогов можно рассматривать
-  пакеты cd и cd-cover, но для обложек CD.
-
-  \item[etiketka.cls] "--- пример создания этикеток. Класс
-  узкоспециализирован, но легко, после некоторых усилий, переделать
-  под себя. Отсутствует полное описание. В качестве аналогов можно
-  рассматривать пакеты bizcard, labels и ticket.
-
-  \item[altverse.sty] "--- ещё один способ оформления стихов. Аналог пакета
-  verse. Всё вроде присутствует.
-
-  \item[autolist.sty] "--- вложенный нумерованный список любой глубины. Здесь
-  решена проблема стандартного окружения enumerate "--- ограничение на
-  вложенность четырьмя уровнями. Обычно больше и не требуется, но
-  всякое бывает.
-
-  \item[biokey.sty] "--- не понял зачем это нужно биологам, но видимо им
-  виднее \smiley.
-
-  \item[biolist.sty] "--- список растений. Узкоспециализированный стиль.
-
-  \item[boldline.sty] "--- ещё один тип разделительной линии для таблицы
-  (жирные линии). Желательно, конечно, чтобы разделительных линий
-  таблице было как можно меньше, особенно вертикальных, но всякое
-  бывает. В качестве аналога можно рассмотреть стиль hhline из
-  коллекции tools (двойные линии) и пакет arydshln (пунктирные линии).
-
-  \item[classif2.sty] "--- опять что-то узкоспециализированное для
-  классификаторов.
-
-  \item[drcaps.sty] "--- буквицы <<для бедных>>. Может быть оказаться
-  довольно полезно для выделение начала абзаца.
-
-  \item[flower.sty] "--- <<цветочные формулы>>. То что есть химические
-  формулы я знал ещё со школы, но то, что есть ещё и цветочные\ldots
-  Специализированный пакет.
-
-  \item[isyntax.sty] "--- проверка \LaTeX"=синтаксиса при компиляции без
-  выдачи dvi в качестве результата. Не встречал такой идеи, возможно,
-  потому что использую встроенными возможностями редактора для поиска
-  ошибок компиляции.
-
- \item[numerus.sty] "--- написание чисел по русски. Давно уже есть
-  подобные пакеты для английского и немецкого. Теперь есть и для
-  русского. В пакете есть недостаток: порядковые номера больше 999 не поддерживаются, поэтому если написать
-  \verb!\propis[m]{1234}!, то исчезает результат исполнения команды, а в log-файл записыыввается предупреждение.
-
-  \item[punct.sty] "--- определяет команду для написания текста наклонным
-  шрифтом. Особенность действия команды заключается в том, что она не
-  влияет на пунктуацию.
-
-  \item[sltables.sty] "--- ещё один способ задать таблицу. Напоминает в
-  какой-то мере tabbing. Структура таблицы определяется в процессе её
-  написания без предварительного задания формата.
-
-  \item[starfn.sty] "--- Сноски звездочками. Не заработало. 
-
-\end{description}
-%\begin{thebibliography}{9}
-%\bibitem{}
-%\newblock
-%\end{thebibliography}
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/shipunov/autolist.sty b/Master/texmf-dist/tex/latex/shipunov/autolist.sty
index e1f65d9f160..d4f32b8a1dc 100644
--- a/Master/texmf-dist/tex/latex/shipunov/autolist.sty
+++ b/Master/texmf-dist/tex/latex/shipunov/autolist.sty
@@ -1,7 +1,7 @@
-% Authors: A. and A. Shipunovs, plantago@herba.msu.ru
+% Authors: A. Shipunova and A. Shipunov, plantago@herba.msu.ru
 
 \ProvidesPackage{autolist}%
-        [2008/02/06 v0.3 Various lists]
+        [2010/10/24 v0.4 Various lists]
 
 \ProvidesPackage{autolist}
 \RequirePackage{calc}
@@ -157,11 +157,23 @@
                 \itemsep=.5pt\parsep=2pt\topsep=5pt}}
         {\end{list}}
 
+% Items for several lines
 \newcommand{\Lplabel}[1]
         {\raisebox{0pt}[1ex][0pt]{\makebox[\labelwidth][l]%
         {\parbox[t]{\labelwidth}{\raggedright\hspace{0pt}#1}}}}
 
-% Items for several lines
+\newcommand{\Rplabel}[1]
+       {\raisebox{0pt}[1ex][0pt]{\makebox[\labelwidth][l]%
+       {\parbox[t]{\labelwidth}{\raggedleft\hspace{0pt}#1}}}}
+
+\newenvironment{Rpolylist}[1][\quad]%
+       {\begin{list}{}{%
+               \renewcommand{\makelabel}[1]{\Rplabel{##1}}%
+               \settowidth{\labelwidth}{{#1}}%
+               \setlength{\leftmargin}{\labelwidth+\labelsep}%
+               \itemsep=.5pt\parsep=2pt\topsep=5pt}}
+               {\end{list}}
+
 \newenvironment{Lpolylist}[1][\quad]%
         {\begin{list}{}{%
                 \renewcommand{\makelabel}[1]{\Lplabel{##1}}%
diff --git a/Master/texmf-dist/tex/latex/shipunov/flower.sty b/Master/texmf-dist/tex/latex/shipunov/flower.sty
index e7a39acf3e6..558f177ff70 100644
--- a/Master/texmf-dist/tex/latex/shipunov/flower.sty
+++ b/Master/texmf-dist/tex/latex/shipunov/flower.sty
@@ -1,7 +1,7 @@
 % Author: Alexey B. Shipunov (plantago@herba.msu.ru)
 
 \ProvidesPackage{flower}%
-        [2008/02/06 v1.2 Typesetting botanical sings]
+        [2010/10/24 v1.3 Typesetting botanical sings]
 
 % Fonts `wasy' required
 \DeclareRobustCommand\wasyfamily
@@ -23,6 +23,17 @@
 % Zygomorphy
 \DeclareMathSymbol{\Zyg}{\mathord}{symbols}{"22}
 
+% NEW SYMMETRY SIGNS FROM Prenner et al., 2010
+% Median monosymmetry (downwards arrow; Unicode: 2193): \downarrow
+% Transverse monosymmetry (sidewards arrow; Unicode: 2192): \rightarrow
+% Oblique monosymmetry (Latin capital letter O with stroke; Unicode: 00D8): \O
+% Polysymmetry (asterisk): \Act
+% Asymmetry (partial differential; Unicode 2202): \partial
+% Obdiplostemonous / obhaplostemonous androecium (followed by "left right arrow"; Unicode 2194): \leftrightarrow
+% Resupination (registered sign; Unicode 00AE): \textregistered
+% Disymmetry (box drawings light vertical and horizontal; Unicode 253C):
+\def\DS{\mbox{\lower.2ex\hbox{\rule{.4pt}{1.55ex}}\kern-.17em\lower-.5ex\hbox{\rule{.3em}{.4pt}}\kern.2em}}
+
 % FLORAL UNITS
 % Perianth
 \def\P#1{\mathrm{\PName}_{#1}}