summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-08 03:00:28 +0000
committerNorbert Preining <norbert@preining.info>2019-10-08 03:00:28 +0000
commite5ffc42ed260285f76383ae18dd0f4a603c07fa8 (patch)
tree7d901aebae17ed14f1c9812c9339a88d68dc74e4 /macros
parentba86549c94b1e8b6b19bc82b01e85a7e513e7586 (diff)
CTAN sync 201910080300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/aeb-minitoc/README.md5
-rw-r--r--macros/latex/contrib/aeb-minitoc/aeb-minitoc.dtx29
-rw-r--r--macros/latex/contrib/aeb-minitoc/doc/aeb-minitoc.pdfbin305767 -> 307794 bytes
-rw-r--r--macros/latex/contrib/aeb-minitoc/doc/aebminitocman.pdfbin276674 -> 219042 bytes
-rw-r--r--macros/latex/contrib/aeb-minitoc/doc/aebminitocman.tex3
-rw-r--r--macros/latex/contrib/aeb-minitoc/examples/minitoc-art.pdfbin123829 -> 139921 bytes
-rw-r--r--macros/latex/contrib/dccpaper/dccpaper.dtx17
-rw-r--r--macros/latex/contrib/dccpaper/dccpaper.pdfbin255950 -> 254082 bytes
-rw-r--r--macros/latex/contrib/gindex/README.md8
-rw-r--r--macros/latex/contrib/gindex/gindex.ist14
-rw-r--r--macros/latex/contrib/gindex/gindex.pdfbin26534 -> 30705 bytes
-rw-r--r--macros/latex/contrib/gindex/gindex.sty62
-rw-r--r--macros/latex/contrib/gindex/gindex.tex82
-rw-r--r--macros/latex/contrib/gindex/gindexh.ist42
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.pdfbin183898 -> 184987 bytes
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.sty4
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.tex31
-rw-r--r--macros/latex/contrib/shipunov/README66
-rw-r--r--macros/latex/contrib/shipunov/bibtex/rusnat.bst (renamed from macros/latex/contrib/shipunov/bibtex/bst/shipunov/rusnat.bst)0
-rw-r--r--macros/latex/contrib/shipunov/bibtex/rusnat_bst.readme1
-rw-r--r--macros/latex/contrib/shipunov/doc/NEWS13
-rw-r--r--macros/latex/contrib/shipunov/doc/README (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/README)86
-rw-r--r--macros/latex/contrib/shipunov/doc/add2-ex.pdfbin0 -> 75273 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/add2-ex.tex893
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex-en.pdfbin0 -> 56928 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex1-ru.pdfbin0 -> 132762 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex1-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex2-ru.pdfbin0 -> 73978 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex2-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex3-ru.pdfbin0 -> 19239 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/altverse-ex3-ru.tex51
-rw-r--r--macros/latex/contrib/shipunov/doc/autolist-ex-en.pdfbin0 -> 49170 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/autolist-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/autolist-ex-ru.pdf (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.pdf)bin181240 -> 181226 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/autolist-ex-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey-doc-en.pdfbin0 -> 122777 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey-doc-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.tex)44
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey-ex-en.pdfbin0 -> 24662 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey-ex-en.tex25
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey2html-doc-en.pdfbin0 -> 94056 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey2html-doc-en.tex177
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey2html-ex-en.html (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en.html)0
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey2html-ex-en1.pdf (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en1.pdf)bin17130 -> 17130 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biokey2html-ex-en2.pdf (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en2.pdf)bin17990 -> 17990 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biolist-ex-en.pdfbin0 -> 117404 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/biolist-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/boldline-ex-en.pdfbin0 -> 27773 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/boldline-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/cassete-ex-ru.pdfbin0 -> 39228 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/cassete-ex-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/classif2-ex-en.pdfbin0 -> 154415 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/classif2-ex-en.tex596
-rw-r--r--macros/latex/contrib/shipunov/doc/dline-ex.pdfbin0 -> 22447 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/dline-ex.tex76
-rw-r--r--macros/latex/contrib/shipunov/doc/drcaps-ex-en.pdfbin0 -> 26346 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/drcaps-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex-ru.pdfbin0 -> 60504 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex1-en.pdfbin0 -> 36850 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex1-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.tex)2
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex2-en.pdfbin0 -> 56430 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/etiketka-ex2-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/exam-ex.pdfbin0 -> 101799 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/exam-ex.tex285
-rw-r--r--macros/latex/contrib/shipunov/doc/field-form-ex1-ru.pdfbin0 -> 101898 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/field-form-ex1-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.tex)6
-rw-r--r--macros/latex/contrib/shipunov/doc/field-form-ex2-ru.pdfbin0 -> 135179 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/field-form-ex2-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.tex)2
-rw-r--r--macros/latex/contrib/shipunov/doc/flower-ex-en.pdfbin0 -> 118382 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/flower-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/isyntax-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/isyntax-ex-en.tex)3
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/NEWS1
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.pdfbin53846 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.pdfbin141939 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.pdfbin82488 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.pdfbin49211 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.pdfbin71257 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.pdfbin60466 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.tex175
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.pdfbin73430 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.pdfbin15725 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.pdfbin43768 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.pdfbin108656 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.tex596
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.pdfbin14563 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.pdfbin58557 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.pdfbin18926 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.pdfbin28669 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.pdfbin108399 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.pdfbin141714 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.pdfbin62578 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.tex186
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.pdfbin118539 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.pdfbin31767 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.pdfbin19080 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.pdfbin200511 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.pdfbin174623 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.pdfbin126159 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.pdfbin112450 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.pdfbin40981 -> 0 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/lecture-slides-ex.pdfbin0 -> 243510 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/lecture-slides-ex.tex565
-rw-r--r--macros/latex/contrib/shipunov/doc/numerus-ex-ru.pdfbin0 -> 29048 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/numerus-ex-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/punct-ex-en.pdfbin0 -> 30988 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/punct-ex-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/qqru-ex-en.pdfbin0 -> 21451 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/qqru-ex-en.tex36
-rw-r--r--macros/latex/contrib/shipunov/doc/qqru-ex-ru.pdfbin0 -> 22803 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/qqru-ex-ru.tex36
-rw-r--r--macros/latex/contrib/shipunov/doc/review.pdfbin0 -> 78250 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/review.tex102
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-doc-ru.pdfbin0 -> 239105 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-doc-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.tex)2
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-ex-ru.bib (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex-ru.bib)0
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.pdfbin0 -> 169425 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.pdfbin0 -> 130482 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/sltables-doc-en.pdfbin0 -> 184076 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/sltables-doc-en.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.tex)2
-rw-r--r--macros/latex/contrib/shipunov/doc/starfn-ex-ru.pdfbin0 -> 48625 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/starfn-ex-ru.tex (renamed from macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.tex)0
-rw-r--r--macros/latex/contrib/shipunov/doc/textfrac-ex.pdfbin0 -> 25969 bytes
-rw-r--r--macros/latex/contrib/shipunov/doc/textfrac-ex.tex18
-rw-r--r--macros/latex/contrib/shipunov/scripts/abs2rel.pl40
-rw-r--r--macros/latex/contrib/shipunov/scripts/biokey2html.bat (renamed from macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.bat)0
-rw-r--r--macros/latex/contrib/shipunov/scripts/biokey2html.sh (renamed from macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.sh)0
-rw-r--r--macros/latex/contrib/shipunov/scripts/biokey2html1.pl (renamed from macros/latex/contrib/shipunov/scripts/shipunov/biokey2html1.pl)0
-rw-r--r--macros/latex/contrib/shipunov/scripts/biokey2html2.pl (renamed from macros/latex/contrib/shipunov/scripts/shipunov/biokey2html2.pl)0
-rw-r--r--macros/latex/contrib/shipunov/scripts/biokey2html3.pl (renamed from macros/latex/contrib/shipunov/scripts/shipunov/biokey2html3.pl)0
-rw-r--r--macros/latex/contrib/shipunov/scripts/txt2qq.pl58
-rw-r--r--macros/latex/contrib/shipunov/tex/add2.sty49
-rw-r--r--macros/latex/contrib/shipunov/tex/altverse.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/altverse.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/autolist.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/autolist.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/biokey.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/biokey.sty)63
-rw-r--r--macros/latex/contrib/shipunov/tex/biolist.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/biolist.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/boldline.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/boldline.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/cassete.cls (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/cassete.cls)4
-rw-r--r--macros/latex/contrib/shipunov/tex/classif2.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/classif2.sty)7
-rw-r--r--macros/latex/contrib/shipunov/tex/dline.sty37
-rw-r--r--macros/latex/contrib/shipunov/tex/drcaps.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/drcaps.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/etiketka.cls (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/etiketka.cls)22
-rw-r--r--macros/latex/contrib/shipunov/tex/flower.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/flower.sty)12
-rw-r--r--macros/latex/contrib/shipunov/tex/isyntax.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/isyntax.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/numerus.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/numerus.sty)20
-rw-r--r--macros/latex/contrib/shipunov/tex/punct.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/punct.sty)6
-rw-r--r--macros/latex/contrib/shipunov/tex/qqru.sty56
-rw-r--r--macros/latex/contrib/shipunov/tex/sltables.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/sltables.sty)6
-rw-r--r--macros/latex/contrib/shipunov/tex/starfn.sty (renamed from macros/latex/contrib/shipunov/tex/latex/shipunov/starfn.sty)2
-rw-r--r--macros/latex/contrib/shipunov/tex/textfrac.sty14
-rw-r--r--macros/latex/contrib/tasks/README2
-rw-r--r--macros/latex/contrib/tasks/tasks.sty15
-rw-r--r--macros/latex/contrib/tasks/tasks_en.pdfbin448511 -> 448291 bytes
-rw-r--r--macros/latex/contrib/tasks/tasks_en.tex2
-rw-r--r--macros/latex/contrib/xsim/README2
-rw-r--r--macros/latex/contrib/xsim/code/xsim.environments.code.tex171
-rw-r--r--macros/latex/contrib/xsim/code/xsim.solutions.code.tex3
-rw-r--r--macros/latex/contrib/xsim/code/xsim.sty33
-rw-r--r--macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex15
-rw-r--r--macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.pdfbin56889 -> 57235 bytes
-rw-r--r--macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.tex4
-rw-r--r--macros/latex/contrib/xsim/doc/xsim-manual.cls108
-rw-r--r--macros/latex/contrib/xsim/doc/xsim.history1
-rw-r--r--macros/latex/contrib/xsim/doc/xsim_manual.pdfbin1225761 -> 1220136 bytes
-rw-r--r--macros/latex/contrib/xsim/doc/xsim_manual.tex22
-rw-r--r--macros/xetex/latex/xecyr/README47
-rw-r--r--macros/xetex/latex/xecyr/bin/xecyr/rubibtexx.bat9
-rw-r--r--macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx.bat8
-rw-r--r--macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx2.bat8
-rw-r--r--macros/xetex/latex/xecyr/doc/NEWS8
-rw-r--r--macros/xetex/latex/xecyr/doc/README2
-rw-r--r--macros/xetex/latex/xecyr/doc/combined_hyphenation/README4
-rw-r--r--macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.pdfbin0 -> 8399 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.tex19
-rw-r--r--macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.pdfbin0 -> 22179 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.tex18
-rw-r--r--macros/xetex/latex/xecyr/doc/grafika_v_tex.pdfbin0 -> 19971 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/grafika_v_tex.tex101
-rw-r--r--macros/xetex/latex/xecyr/doc/howto-tex-ru-x.pdfbin0 -> 37189 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/howto-tex-ru-x.tex152
-rw-r--r--macros/xetex/latex/xecyr/doc/inputs/1251.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/1251.tex)0
-rw-r--r--macros/xetex/latex/xecyr/doc/inputs/866.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/866.tex)0
-rw-r--r--macros/xetex/latex/xecyr/doc/inputs/iso.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/iso.tex)0
-rw-r--r--macros/xetex/latex/xecyr/doc/inputs/koi8-r.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/koi8-r.tex)0
-rw-r--r--macros/xetex/latex/xecyr/doc/listings-utf8-ex.pdfbin0 -> 13894 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/listings-utf8-ex.tex18
-rw-r--r--macros/xetex/latex/xecyr/doc/old/1251.tex19
-rw-r--r--macros/xetex/latex/xecyr/doc/old/866.tex5
-rw-r--r--macros/xetex/latex/xecyr/doc/old/iso.tex11
-rw-r--r--macros/xetex/latex/xecyr/doc/old/koi8-r.tex16
-rw-r--r--macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.pdf)bin13894 -> 13894 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/pict2e-ex.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.pdf)bin11535 -> 11535 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/pict2e-ex.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.pdf)bin36093 -> 36093 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/rubibtex-ex.bib (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex.bib)0
-rw-r--r--macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.pdf)bin23709 -> 23709 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.pdf)bin19853 -> 19853 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf)bin52505 -> 52505 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf)bin41061 -> 41061 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf)bin16814 -> 16814 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf)bin4743 -> 4743 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf)bin42828 -> 42828 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf)bin14095 -> 14095 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.pdf (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf)bin29170 -> 29170 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.tex (renamed from macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex)2
-rw-r--r--macros/xetex/latex/xecyr/doc/pict2e-ex.pdfbin0 -> 11568 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/pict2e-ex.tex21
-rw-r--r--macros/xetex/latex/xecyr/doc/rubibtex-ex-x.pdfbin0 -> 28435 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/rubibtex-ex-x.sh6
-rw-r--r--macros/xetex/latex/xecyr/doc/rubibtex-ex-x.tex94
-rw-r--r--macros/xetex/latex/xecyr/doc/rubibtex-ex.bib75
-rw-r--r--macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.pdfbin0 -> 20655 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.tex66
-rw-r--r--macros/xetex/latex/xecyr/doc/rumakeindex.sh6
-rw-r--r--macros/xetex/latex/xecyr/doc/sample2e-ru-x.pdfbin0 -> 35253 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/sample2e-ru-x.tex207
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-doc-ru.pdfbin0 -> 22966 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-doc-ru.tex38
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.pdfbin0 -> 16738 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.tex60
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.pdfbin0 -> 4978 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.tex26
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.pdfbin0 -> 62847 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.tex18
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.pdfbin0 -> 14367 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.tex59
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.pdfbin0 -> 26182 bytes
-rw-r--r--macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.tex38
-rw-r--r--macros/xetex/latex/xecyr/doc/xelatex/xecyr/NEWS1
-rw-r--r--macros/xetex/latex/xecyr/doc/xelatex/xecyr/README46
-rw-r--r--macros/xetex/latex/xecyr/tex/generic/xecyr/language.dat.add1
-rw-r--r--macros/xetex/latex/xecyr/tex/generic/xecyr/xu-ruenhyph.tex59
-rw-r--r--macros/xetex/latex/xecyr/tex/xecyr.sty (renamed from macros/xetex/latex/xecyr/tex/xelatex/xecyr/xecyr.sty)35
245 files changed, 5014 insertions, 1439 deletions
diff --git a/macros/latex/contrib/aeb-minitoc/README.md b/macros/latex/contrib/aeb-minitoc/README.md
index 4cd0160e5b..b1749e21f9 100644
--- a/macros/latex/contrib/aeb-minitoc/README.md
+++ b/macros/latex/contrib/aeb-minitoc/README.md
@@ -1,12 +1,15 @@
The aeb-minitoc package
Author: D. P. Story
-Dated: 2018-09-29
+Dated: 2019-10-06
This package creates mini-TOCs through the use of the \insertminitoc command.
The system is powerful and flexible and allows for some amount of logic.
The package works for a the usual workflows
+What's New (2019-10-06) The introduction of \protected@file@percent broke this package, this version
+heals the package.
+
What's New (2018-09-29): Delayed the redefinition of \addtocontents until beginning of document,
to avoid incompatability with the siunitx package.
diff --git a/macros/latex/contrib/aeb-minitoc/aeb-minitoc.dtx b/macros/latex/contrib/aeb-minitoc/aeb-minitoc.dtx
index 873a1e4635..139e2f2d36 100644
--- a/macros/latex/contrib/aeb-minitoc/aeb-minitoc.dtx
+++ b/macros/latex/contrib/aeb-minitoc/aeb-minitoc.dtx
@@ -16,7 +16,7 @@
%</copyright>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{aeb-minitoc}
-%<package> [2018/09/29 v1.7 Creates a simple mini-toc]
+%<package> [2019/10/06 v1.9 Creates a simple mini-toc]
%<*driver>
\documentclass{ltxdoc}
\usepackage[colorlinks,hyperindex=false,linktocpage,bookmarksnumbered]{hyperref}
@@ -343,15 +343,28 @@
\def\mtoc@TOC{toc}
\def\mtocCL#1#2{#1}
% \end{macrocode}
+% (2019/10/06) Fix the \cs{protected@file@percent} problem, the solution continues
+% into the definition of \cs{addtocontents@mtoc}.
+% \changes{v1.8}{2019/10/05}{\string\cs{LaTeX}/\string\pkg{hyperref} introduced
+% \string\cs{protected@file@percent}, which breaks this package. We do a fix.}
+% \changes{v1.9}{2019/10/06}{Additional fix to \string\cs{protected@file@percent} solution}
+% \begin{macrocode}
+\@ifundefined{add@percent@to@temptokena}
+ {\let\protected@file@percent\@empty\def\mtoc@protect{}}
+ {\def\mtoc@protect{\protect}}
+% \end{macrocode}
% Here, we modify the macro \cs{addtocontents} to insert \cs{mtocCL}.
% \changes{v1.7}{2018/09/29}{Delay redefinition of \string\cs{addtocontents} until beginning of document,
-% to avoid incompatability with \string\pkg{siunitx}.}
-% \begin{macrocode}
-\newcommand\addtocontents@mtoc[2]{%
- \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC
- \global\advance\@minitocCnt\@ne
- \mtoc@addtocontents{#1}{\protect\mtocCL{#2}{\the\@minitocCnt}}\else
- \mtoc@addtocontents{#1}{#2}\fi}
+% to avoid incompatibility with \string\pkg{siunitx}.}
+% \begin{macrocode}
+\newcommand\addtocontents@mtoc[2]{\bgroup
+ \let\protected@file@percent\@empty
+ \def\mt@rgi{#1}\ifx\mt@rgi\mtoc@TOC
+ \global\advance\@minitocCnt\@ne
+ \mtoc@addtocontents{#1}{\protect
+ \mtocCL{#2}{\the\@minitocCnt}\mtoc@protect
+ \protected@file@percent}\else
+ \mtoc@addtocontents{#1}{#2}\fi\egroup}
\AtBeginDocument{\let\mtoc@addtocontents\addtocontents
\let\addtocontents\addtocontents@mtoc}
% \end{macrocode}
diff --git a/macros/latex/contrib/aeb-minitoc/doc/aeb-minitoc.pdf b/macros/latex/contrib/aeb-minitoc/doc/aeb-minitoc.pdf
index 05f0568b41..56471660f8 100644
--- a/macros/latex/contrib/aeb-minitoc/doc/aeb-minitoc.pdf
+++ b/macros/latex/contrib/aeb-minitoc/doc/aeb-minitoc.pdf
Binary files differ
diff --git a/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.pdf b/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.pdf
index a224aabf4c..99b68e3baf 100644
--- a/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.pdf
+++ b/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.pdf
Binary files differ
diff --git a/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.tex b/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.tex
index 3ae2c755a5..f91ed3434b 100644
--- a/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.tex
+++ b/macros/latex/contrib/aeb-minitoc/doc/aebminitocman.tex
@@ -75,7 +75,7 @@
email={dpstory@acrotex.net},
subject={Documentation for the aeb-minitoc package from AcroTeX: Inserting TOCs within a section},
talksite={\url{www.acrotex.net}},
- version={1.7, 2018/09/29},
+ version={1.9, 2019/10/06},
Keywords={AcroTeX, mini-toc},
copyrightStatus=True,
copyrightNotice={Copyright (C) \the\year, D. P. Story},
@@ -253,7 +253,6 @@ the document body, and this is the result of that favor.
%\end{minipage}
%\end{center}
-
\section{Required packages and options}
This package has been tested for the \texttt{book}, \texttt{report}, and \texttt{article} classes. It uses
diff --git a/macros/latex/contrib/aeb-minitoc/examples/minitoc-art.pdf b/macros/latex/contrib/aeb-minitoc/examples/minitoc-art.pdf
index 9bec18617e..0994a3a5b1 100644
--- a/macros/latex/contrib/aeb-minitoc/examples/minitoc-art.pdf
+++ b/macros/latex/contrib/aeb-minitoc/examples/minitoc-art.pdf
Binary files differ
diff --git a/macros/latex/contrib/dccpaper/dccpaper.dtx b/macros/latex/contrib/dccpaper/dccpaper.dtx
index d92ca942a9..e669fdb0bd 100644
--- a/macros/latex/contrib/dccpaper/dccpaper.dtx
+++ b/macros/latex/contrib/dccpaper/dccpaper.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<*internal|ijdc9|idcc|base>
-\def\Version{2019/03/08 v1.8}
+\def\Version{2019/10/07 v1.8.1}
%</internal|ijdc9|idcc|base>
%<*internal>
\iffalse
@@ -414,8 +414,6 @@ Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
\usepackage{dcolumn,csquotes}
\usepackage[iso,british]{isodate}
-% The following line is only needed for microtype 2.7a
-\usepackage{luatexbase}
\usepackage[expansion=false]{microtype}
\ifXeTeX\else\DisableLigatures{family=tt*}\fi
\usepackage[tightLists=false]{markdown}
@@ -838,6 +836,8 @@ Any acknowledgements should be placed in a section immediately before the refere
\section{Appendix A: Change History}
\begin{description}
+\item[v1.8.1] 2019-10-07\\
+Updated to work with changed \LaTeX\ internals.
\item[v1.8] 2019-03-08\\
Added details of IDCC 2020.
\item[v1.7.1] 2018-05-14\\
@@ -1401,11 +1401,12 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
\RequirePackage[british]{babel}
% \end{macrocode}
%
-% The macro patching commands from \pkg{etoolbox} come in useful for handling
-% author and date information, and also for compatibility with \pkg{apacite}.
+% The macro patching commands from \pkg{etoolbox} and \pkg{xpatch} come in
+% useful for handling author and date information, and also for
+% compatibility with \pkg{apacite}.
%
% \begin{macrocode}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox,xpatch}
% \end{macrocode}
%
% The \pkg{dccpaper} classes use Times as the main text font. We prefer
@@ -1842,8 +1843,8 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
% \pkg{memoir} class (2005/09/25 v1.618).
%
% \begin{macrocode}
-\pretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
-\apptocmd{\date}{%
+\xpretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
+\xapptocmd{\date}{%
\begingroup
\renewcommand{\thanks}[1]{}
\protected@xdef\thedate{#1}
diff --git a/macros/latex/contrib/dccpaper/dccpaper.pdf b/macros/latex/contrib/dccpaper/dccpaper.pdf
index e75dc06836..d52ac28741 100644
--- a/macros/latex/contrib/dccpaper/dccpaper.pdf
+++ b/macros/latex/contrib/dccpaper/dccpaper.pdf
Binary files differ
diff --git a/macros/latex/contrib/gindex/README.md b/macros/latex/contrib/gindex/README.md
index ab045e6f42..6677a53fec 100644
--- a/macros/latex/contrib/gindex/README.md
+++ b/macros/latex/contrib/gindex/README.md
@@ -16,6 +16,14 @@ Then you can define `\indexitem` and the like to whatever you want.
### Recent changes
```
+0.2 2019-10-07
+ - Fix - Misplaced R in page_precedence.
+ - Fix - The last item was discarded.
+ - \indexspecial, for literal unformatted entries.
+ - delim_n now set with a macro (\indexpagessep).
+ - gindex.ist does not add headings anymore. A new style
+ gindexh.ist does.
+
0.1 2019-10-01
- First released version, with the most basic tools.
```
diff --git a/macros/latex/contrib/gindex/gindex.ist b/macros/latex/contrib/gindex/gindex.ist
index 9200efe193..c5992630bf 100644
--- a/macros/latex/contrib/gindex/gindex.ist
+++ b/macros/latex/contrib/gindex/gindex.ist
@@ -1,7 +1,7 @@
%
% Copyright (C) 2019 Javier Bezos http://www.texnia.com
%
-% 2019/10/01 v0.1
+% 2019/10/07 v0.2
%
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
@@ -25,18 +25,18 @@ group_skip "}\n%\n\\addindexskip{"
heading_prefix "}\n%\n\\addindexheading{"
heading_suffix "}\n%\n{"
preamble "\\begin{theindex}\\indexpreamble\n\n{"
-postamble "}\n\\indexpostamble\\end{theindex}"
+postamble "}\n\\indexflushitem\\indexpostamble\\end{theindex}"
indent_space ""
indent_length 0
-delim_r "{\\indexrangesep}"
+delim_n "\\indexpagessep "
+delim_r "\\indexrangesep "
% Modify to fit your own requirements
% -----------------------------------
-headings_flag -1 % Usually redefining \indexheading is better
+headings_flag 0
actual '@'
quote '"'
level '!'
-page_precedence "rnaRA"
-keyword "\\indexentry"
-delim_n ", " \ No newline at end of file
+page_precedence "rRnaA"
+keyword "\\indexentry" \ No newline at end of file
diff --git a/macros/latex/contrib/gindex/gindex.pdf b/macros/latex/contrib/gindex/gindex.pdf
index f2c092f75d..c51d724fdb 100644
--- a/macros/latex/contrib/gindex/gindex.pdf
+++ b/macros/latex/contrib/gindex/gindex.pdf
Binary files differ
diff --git a/macros/latex/contrib/gindex/gindex.sty b/macros/latex/contrib/gindex/gindex.sty
index 36311da7f9..5d86fe60a6 100644
--- a/macros/latex/contrib/gindex/gindex.sty
+++ b/macros/latex/contrib/gindex/gindex.sty
@@ -7,45 +7,50 @@
% Repository: https://github.com/jbezos/gindex
%
-\ProvidesPackage{gindex}[2019/10/01 v0.1 Formatting indexes]
+\ProvidesPackage{gindex}[2019/10/07 v0.2 Formatting indexes]
\newcounter{indexsubitems}
-\let\esx@save\@empty
+\let\gix@save\@empty
\let\indexnoitem\@gobbletwo
-\def\addindexitem#1#2{%
- \esx@save
- \indexnoitem{}{}%
- \setcounter{indexsubitems}{0}%
- \let\esx@save\@empty
- \g@addto@macro\esx@save{\indexitem{#1}{#2}}}
+%------------------------
-\def\addindexskip#1{%
- \esx@save
- \indexnoitem{}{}%
- \setcounter{indexsubitems}{0}%
- \let\esx@save\@empty
- \indexskip{#1}}
+\let\indexspecial\relax
-\def\addindexheading#1{%
- \esx@save
- \indexnoitem{}{}%
- \setcounter{indexsubitems}{0}%
- \let\esx@save\@empty
- \indexheading{#1}}
+% #4 current macro, #5 locator
+\def\gix@getspecial#1\indexspecial#2\indexspecial#3\@@#4#5{%
+ \ifx\indexspecial#3\@empty
+ \g@addto@macro\gix@save{#2}%
+ \else
+ \g@addto@macro\gix@save{#4{#1}{#5}}%
+ \fi}
+
+%------------------------
+
+\def\addindexitem#1#2{%
+ \indexflushitem
+ \gix@getspecial#1\indexspecial\indexspecial\@@\indexitem{#2}}
\def\addindexsubitem#1#2{%
\stepcounter{indexsubitems}%
- \g@addto@macro\esx@save{\indexsubitem{#1}{#2}}}
+ \gix@getspecial#1\indexspecial\indexspecial\@@\indexsubitem{#2}}
\def\addindexsubsubitem#1#2{%
- \g@addto@macro\esx@save{\indexsubsubitem{#1}{#2}}}
+ \gix@getspecial#1\indexspecial\indexspecial\@@\indexsubsubitem{#2}}
\newcommand\indexitem[2]{\item #1\ifx\\#2\\\else, #2\fi}
\newcommand\indexsubitem[2]{\subitem #1\ifx\\#2\\\else, #2\fi}
\newcommand\indexsubsubitem[2]{\subsubitem #1\ifx\\#2\\\else, #2\fi}
+\def\indexflushitem{%
+ \gix@save
+ \indexnoitem{}{}%
+ \setcounter{indexsubitems}{0}%
+ \let\gix@save\@empty}
+
+% ----------------------
+
\newcommand\indexitemhang[6]{%
\par\hangindent#2\relax
\ifdim#1=0pt\relax\else
@@ -58,6 +63,16 @@
#4#6%
\fi}
+%----------------------
+
+\def\addindexskip#1{%
+ \indexflushitem
+ \indexskip{#1}}
+
+\def\addindexheading#1{%
+ \indexflushitem
+ \indexheading{#1}}
+
\ifx\indexspace\@undefined
\newcommand\indexskip[1]{\par\vskip10\p@\@plus5\p@\@minus3\p@\relax}
\else
@@ -69,10 +84,13 @@
\hfil}%
\nopagebreak}
+%---------------------
+
\let\indexpreamble\relax
\let\indexpostamble\relax
\def\indexrangesep{-}
+\def\indexpagessep{, }
\endinput
diff --git a/macros/latex/contrib/gindex/gindex.tex b/macros/latex/contrib/gindex/gindex.tex
index c240281dfd..42670dfc31 100644
--- a/macros/latex/contrib/gindex/gindex.tex
+++ b/macros/latex/contrib/gindex/gindex.tex
@@ -4,16 +4,16 @@
% This file may be distributed and/or modified under the conditions of
% the MIT License. A version can be found at the end of this file.
%
-% Repository: https://github.com/jbezos/esindex
+% Repository: https://github.com/jbezos/gindex
%
\documentclass[a4paper]{ltxguide}
-\title{\textsf{gindex}\\\large Version 0.1}
+\title{\textsf{gindex}\\\large Version 0.2}
\author{Javier Bezos\\\texttt{http://www.texnia.com}}
-\date{2019-10-01}
+\date{2019-10-07}
\raggedright
\parskip=.8ex
@@ -42,8 +42,9 @@
{\fontsize{48}{48}\selectfont \color{notes}{gindex}\par}
{\LARGE Formatting indexes with \LaTeX\par}
\vspace*{1ex}
-Version 0.1 (2019-10-01)\par
-Javier Bezos (\texttt{http://www.texnia.com})
+Version 0.2 (2019-10-07)\par
+\texttt{https://github.com/jbezos/gindex}\par
+Javier Bezos (\texttt{http://www.texnia.com})\par
\vspace*{6ex}
@@ -53,7 +54,7 @@ the format of index entries from within \LaTeX. With standard classes,
it works out of the box with some predefined values, which you can (and
in fact should) redefine with |\renewcommand|.
-Note it is version 0.1. Changes of the existing features are unlikely
+Note it is version 0.2. Changes of the existing features are unlikely
to happen (but who knows), but new features, on the other hand, will be
added in the near future.
@@ -67,7 +68,8 @@ What it does is to generate blocks like this for each first-level entry:
\end{verbatim}
As you can see, when |\indexitem| is executed, you know the number of
-subitems, which is necessary for some styles.
+subitems, which is necessary for some styles. Subsubitems are allowed,
+but not counted. Only subitems are counted.
The default values are:
\begin{verbatim}
@@ -93,12 +95,9 @@ example will be:
This explains the line |\indexnoitem{}{}| above, which by default does
nothing. By inspecting the third parameter you decide how to format the
current parameter (of course, in most cases you must emit it again at
-the end of your definition of |\indexitem|).
+the end of your definition of |\indexitem|). See the example below.
-Subsubitems are allowed, but not counted. Only subitems are counted.
-
-
-There is a tool to define the most usual entry format, which is used in
+There is a tool to define the most usual entry format, which is uesd in
the following way:
\begin{verbatim}
\renewcommand\indexitem[2]{%
@@ -118,7 +117,8 @@ Other macros are:
\verb|\end{theindex}| (\verb|\relax| by default).
\item \verb|\indexskip|, which is \verb|\indexspace| by default,
with similar purpose.
-\item \verb|\indexheading|, is defined as follows:
+\item \verb|\indexheading|, which is added by |gindexh.ist| but no by
+|gindex.ist|, is defined as follows:
\begin{verbatim}
\newcommand\indexheading[1]{%
{\bfseries\hfil
@@ -127,15 +127,58 @@ with similar purpose.
\nopagebreak}
\end{verbatim}
\item \verb|\indexrangesep|, which by default is |-|.
+\item \verb|\indexpagessep|, which by default is |, |.
\end{itemize}
Remember to set the style to |gindex| when running \textsf{makeindex}:
\begin{verbatim}
makeindex -s gindex yourfile
\end{verbatim}
+Or if you want |\indexheading|'s to be included:
+\begin{verbatim}
+ makeindex -s gindexh yourfile
+\end{verbatim}
+
+Note also there is usually no need to run \textsf{makeindex} to fine
+tune the format.
+
+\begin{example}
+ With the following definitions, items and subitems are typeset, as
+ usual, as separate paragraphs. However, if the item has no locator,
+ and there is exactly one subitem, they are joined with a comma as
+ separator (the code is somewhat low-level):
+\begin{verbatim}
+\renewcommand\indexitem[5]{%
+ \def\next{%
+ \indexitemhang{0pt}{20pt}{:}{, }{#1}{#2}%
+ #3{#4}{#5}}%
+ \ifnum\value{indexsubitems}=1\relax
+ \ifx\\#2\\%
+ \def\next{%
+ \indexitemhang{0pt}{20pt}{:}{, }{#1, #4}{#5}}%
+ \fi
+ \fi
+ \next}
+
+\renewcommand\indexsubitem[2]{%
+ \indexitemhang{0pt}{40pt}{}{, }{--- #1}{#2}}
+\end{verbatim}
+\end{example}
+
+If an item starts with |\indexspecial|, what follows replaces the
+current item.
+\begin{example}
+With |gindex.ist|, you can generate your own headings. If you are sure
+there is nothing before |a '''| and |l '''| (actually, it can be
+anything provided it is sorted at the right place), the following two
+entries will ``group'' the items under two headings.
+\begin{verbatim}
+\index{a '''@\indexspecial\indexheading{a-k}}
+\index{l '''@\indexspecial\indexheading{l-z}}
+\end{verbatim}
+\end{example}
+
-Note also there is no need to run \textsf{makeindex} to fine tune the
-format.
\section{Internals}
@@ -148,16 +191,15 @@ The |ind| files is generated by |gindex.ist| with generic macros like:
What \textsf{gindex} does is to convert them to the above format. Some
parameters should be cuntomized in the |ist| file, however. These are:
\begin{verbatim}
-headings_flag -1
+headings_flag 0
actual '@'
quote '"'
level '!'
-page_precedence "rnaRA"
+page_precedence "rRnaA"
keyword "\\indexentry"
-delim_n ", "
\end{verbatim}
-As to |headings_flag|, the recommended way to deal with case is with
-|\indexheading|.
+As to |headings_flag|, its value is |-1| with |gindexh| and the
+recommended way to deal with case is with |\indexheading|
\end{document}
diff --git a/macros/latex/contrib/gindex/gindexh.ist b/macros/latex/contrib/gindex/gindexh.ist
new file mode 100644
index 0000000000..4c1e0d07cb
--- /dev/null
+++ b/macros/latex/contrib/gindex/gindexh.ist
@@ -0,0 +1,42 @@
+%
+% Copyright (C) 2019 Javier Bezos http://www.texnia.com
+%
+% 2019/10/07 v0.2
+%
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/gindex
+%
+% Required by gindex
+% ------------------
+
+item_0 "}\n\\addindexitem{"
+item_1 "}\n \\addindexsubitem{"
+item_01 "}\n \\addindexsubitem{"
+item_x1 "}{}\n \\addindexsubitem{"
+item_2 "}\n \\addindexsubsubitem{"
+item_12 "}\n \\addindexsubsubitem{"
+item_x2 "}{}\n \\addindexsubsubitem{"
+delim_0 "}{"
+delim_1 "}{"
+delim_2 "}{"
+group_skip "}\n%\n\\addindexskip{"
+heading_prefix "}\n%\n\\addindexheading{"
+heading_suffix "}\n%\n{"
+preamble "\\begin{theindex}\\indexpreamble\n\n{"
+postamble "}\n\\indexflushitem\\indexpostamble\\end{theindex}"
+indent_space ""
+indent_length 0
+delim_n "\\indexpagessep "
+delim_r "\\indexrangesep "
+
+% Modify to fit your own requirements
+% -----------------------------------
+
+headings_flag -1 % Usually redefining \indexheading is better
+actual '@'
+quote '"'
+level '!'
+page_precedence "rRnaA"
+keyword "\\indexentry" \ No newline at end of file
diff --git a/macros/latex/contrib/practicalreports/practicalreports.pdf b/macros/latex/contrib/practicalreports/practicalreports.pdf
index 6aee7762b1..36fa9ae4d0 100644
--- a/macros/latex/contrib/practicalreports/practicalreports.pdf
+++ b/macros/latex/contrib/practicalreports/practicalreports.pdf
Binary files differ
diff --git a/macros/latex/contrib/practicalreports/practicalreports.sty b/macros/latex/contrib/practicalreports/practicalreports.sty
index d574797bcf..e46dfb4ef7 100644
--- a/macros/latex/contrib/practicalreports/practicalreports.sty
+++ b/macros/latex/contrib/practicalreports/practicalreports.sty
@@ -2,7 +2,7 @@
%%License: LPPL 1.3c
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{practicalreports}[01/10/2019 v2.0.2 Practical Report Package]
+\ProvidesPackage{practicalreports}[071/10/2019 v2.0.3 Practical Report Package]
\RequirePackage{mathtools, array, longtable, scrextend, float, fancyhdr, lastpage, tikzducks, pdfpages, pgffor}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -192,7 +192,7 @@ tshirt=brown!50!black, jacket=brown!30!gray, speech={of},bubblecolour=cyan!20!wh
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Make sure yor filenames are all one word, this can include underscores and each report is separated by a comma.
-\newcommand{\joinreports}[1]{
+\newcommand{\joinpdfs}[1]{
\foreach \report in {#1} {
\includepdfmerge{\report, -}
}
diff --git a/macros/latex/contrib/practicalreports/practicalreports.tex b/macros/latex/contrib/practicalreports/practicalreports.tex
index de97a6c2f8..4ed5200f25 100644
--- a/macros/latex/contrib/practicalreports/practicalreports.tex
+++ b/macros/latex/contrib/practicalreports/practicalreports.tex
@@ -1,7 +1,6 @@
\documentclass[12pt]{article}
\usepackage[right=1in, top=1in, left=1in, bottom=1in]{geometry}
-\usepackage{amssymb,amsmath, mathtools}
\usepackage[parfill]{parskip}
@@ -13,9 +12,9 @@
\begin{titlepage}
\vspace*{\fill}
\begin{center}
-{\Huge Practical Reports Documentation}\\[0.5cm]
-{\Large Version: 2.0.2}\\[0.4cm]
-{\Large Date: $1^{st}$ of October 2019}\\[0.2cm]
+{\Huge \textbf{practicalreports} Documentation}\\[0.5cm]
+{\Large Version: 2.0.3}\\[0.4cm]
+{\Large Date: $7^{th}$ of October 2019}\\[0.2cm]
{\small Author: Justin Cawood}
\end{center}
\vspace*{\fill}
@@ -30,6 +29,22 @@ This package provides macros for displaying scientific notation, simple title pa
\section{Importing the Package}
Import the package by typing $\backslash$usepackage\{practicalreports\} at the top of the tex file.
+\section{Required Packages}
+All of the below packages are required for the macros within this package. They should be installed when you install this package
+
+\begin{itemize}
+\item \textbf{array}
+\item \textbf{mathtools}
+\item \textbf{longtable}
+\item \textbf{scrextend}
+\item \textbf{float}
+\item \textbf{fancyhdr}
+\item \textbf{lastpage}
+\item \textbf{pdfpages}
+\item \textbf{pdffor}
+\end{itemize}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Exponent Macro}
@@ -94,12 +109,12 @@ $\backslash$newsfigure\{Caption\}\{Description\}\{file\_ name.jpg\}\{reference\}
\subsubsection{Shrink Example}
\reffigure{example-shrink-figure}, shows an example of decreasing the size of a figure.
-\newsfigure{Example Figure}{Result of using $\backslash$newfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{0.4\}}{example_figure.jpeg}{example-shrink-figure}{0.4}
+\newsfigure{Example Figure}{Result of using $\backslash$newsfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{0.4\}}{example_figure.jpeg}{example-shrink-figure}{0.4}
\subsubsection{Expand Example}
\reffigure{example-expand-figure}, shows an example of increasing the size of a figure.
-\newsfigure{Example Figure}{Result of using $\backslash$newfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{1.6\}}{example_figure.jpeg}{example-expand-figure}{1.6}
+\newsfigure{Example Figure}{Result of using $\backslash$newsfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{1.6\}}{example_figure.jpeg}{example-expand-figure}{1.6}
\subsection{Referencing a Figure}
This macro allows figures to be referenced by simply typing $\backslash$reffigure\{reference\}. If a figure is ever added or removed, this macro will take care of the numbering so the figures are always referenced correctly. An example is shown below.
@@ -313,9 +328,9 @@ Tables can be shifted.
The $\backslash$goodfoot macro will do the footer for you in the form "Page x of n". The page mus be set to fancy first though using the $\backslash$setpagefancy macro.
\subsection{Join Multiple Reports}
-To combine multiple pdf files together into one single pdf file use the macro $\backslash$joinreports\{\}. You don't need the file extension just list all the pdf files that you wish to join as follows.
+To combine multiple pdf files together into one single pdf file use the macro $\backslash$joinpdfs\{\}. You don't need the file extension just list all the pdf files that you wish to join as follows.
-$\backslash$joinreports\{pdf\_1, pdf\_2, pdf\_3, pdf\_4, .....\}.
+$\backslash$joinpdfs\{pdf\_1, pdf\_2, pdf\_3, pdf\_4, .....\}.
This macro should be used in a new tex file because the pdf files will be joined as one file with the name of the tex file this macro is used in.
diff --git a/macros/latex/contrib/shipunov/README b/macros/latex/contrib/shipunov/README
index d799a81519..2cce1e0f43 100644
--- a/macros/latex/contrib/shipunov/README
+++ b/macros/latex/contrib/shipunov/README
@@ -1,34 +1,66 @@
-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 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):
+The collection includes:
+add2 -- Save trees. Quick way to fit as many as possible into one page.
+Good for handouts.
- * altverse , a simple verse typesetting package;
+altverse -- Typesetting verse. Straightforward typesetting, using the
+xtab package to aid layout.
- * autolist , which provides various list formatting facilities;
+autolist -- More lists. A means to define various sorts of list.
- * biokey , which provides a mechanism for typesetting biological identification lists;
+biokey -- Flexible identification key tables in LaTeX. The package provides
+straightforward macros to typeset sets of biological identification
+keys. Layout is flexible, and the macros will be useful in other
+disciplines.
- * biolist , which typesets species lists;
+biolist -- List observed species. Pretty formatting of species lists of
+flora and fauna.
- * boldline , which typesets heavier separating lines in tables;
+boldline -- Heavier lines in tables. The package provides commands
+replacing \hline and \cline, as well as a table preamble element, that
+generate heavy lines.
- * cassete (cassette-shipunov), which lays out audio cassette inserts;
+cassette-shipunov ('cassete', with one 't') -- Print labels for audio cassettes.
+This is a LaTeX2e class file (the only other cassette package on CTAN is
+'cassette' (with two 't'), written for Plain TeX).
- * classif2 , which typesets classification lists;
+classif2 -- Biological classification tables. The package defines
+an environment classif that simplifies the process of typesetting
+classification tables.
- * drcaps , which provides dropped capital macros;
+dline -- Double line on the left of text.
- * etiketka, a class for typesetting business-card-sized information (including business cards);
+drcaps -- Simple dropped capitals. The package offers simple macros
+for dropped capitals, in a couple of forms.
- * flower, for typesetting lists of flower formulae;
+etiketka -- Class for typesetting business-card-sized information
+(including business cards).
- * isyntax;
+flower -- Typesetting lists of flower formulas.
- * numerus;
+isyntax -- Interactively check LaTeX file syntax.
- * punct;
+numerus -- Spell numbers in Russian words.
- * sltables , which develops on the stables package, for use in a LaTeX context; and
+punct -- Within italicized text, punctuation is still straight, this is
+typographically more aesthetic.
- * starfn. \ No newline at end of file
+qqru -- Universal quotation marks, for Russian and English. It is able also
+to convert uniform typewriter "quotes" into left or right typographic quotes.
+
+rusnat -- Bibliography style file, now deprecated.
+
+sltables -- Simplified tables for LaTeX. These macros develop the concepts
+of the stables, which are designed to offer table macros whose use is
+"as simple as one might hope". Some would claim that LaTeX's built-in
+table specifications are as simple as one might hope, but this package
+offers many short-cuts and optimization of the mechanisms of tables.
+
+starfn -- Stars as footnote marks.
+
+textfrac -- Simple slanted fractions.
diff --git a/macros/latex/contrib/shipunov/bibtex/bst/shipunov/rusnat.bst b/macros/latex/contrib/shipunov/bibtex/rusnat.bst
index e646a53ae3..e646a53ae3 100644
--- a/macros/latex/contrib/shipunov/bibtex/bst/shipunov/rusnat.bst
+++ b/macros/latex/contrib/shipunov/bibtex/rusnat.bst
diff --git a/macros/latex/contrib/shipunov/bibtex/rusnat_bst.readme b/macros/latex/contrib/shipunov/bibtex/rusnat_bst.readme
new file mode 100644
index 0000000000..40642f2a24
--- /dev/null
+++ b/macros/latex/contrib/shipunov/bibtex/rusnat_bst.readme
@@ -0,0 +1 @@
+rusnat.bst is now deprecated, use bibtex8 / bibtexu with 'gost' bibliography style files \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/doc/NEWS b/macros/latex/contrib/shipunov/doc/NEWS
new file mode 100644
index 0000000000..fb0bdf131b
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/NEWS
@@ -0,0 +1,13 @@
+shipunov 1.2:
+ updated packages: biokey, flower, numerus, etiketka;
+ corrected authorship lines in other packages;
+ corrected documentation and examples;
+ added documentation: lecture slides, exam sheets templates;
+ added packages: add2, dline, textfrac;
+ added scripts: abs2rel.pl, txt2qq.pl;
+ 'rusnat.bst' is now deprecated.
+
+shipunov 1.1:
+ added installation information under MikTeX;
+ updated autolist (Rpolylist, thanks to M. Muench);
+ updated flower (new symmetry signs according to Prenner et al., 2010) \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/README b/macros/latex/contrib/shipunov/doc/README
index 9279ac32e9..80a009b717 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/README
+++ b/macros/latex/contrib/shipunov/doc/README
@@ -1,5 +1,6 @@
-shipunov 2010/10/24 v1.1
-Copyright (c) Alexey Shipunov <plantago(at)herba.msu.ru>, 2010
+shipunov 2019/10/03 version 1.2
+
+Alexey Shipunov <dactylorhiza(at)gmail.com>, 2019
************************************************************
@@ -9,15 +10,15 @@ Contents of README
3. Usage notes
4. History
5. Acknowledgements
- 6. Licence
+ 6. License
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.
+This is the version 1.2 of "shipunov" bundle, collection of LaTeX packages and classes, along with one bibliography style, some 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 broader 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.
+Most of packages have example files, with "tex" extension and "-ex" postfix. Some of them are in Russian (codepage Windows-1251 or UTF-8, "-ru" postfix). Documentation files have "-doc" postfix. Besides, some examples did not related with any packages, they just demonstrate how to produce reliable forms for biological (morphometry and floristic/faunistic) fieldwork and also slides and exam sheets for teaching biology.
Any suggestions concerning this package are highly appreciated.
@@ -37,19 +38,21 @@ b. Then in the "Settings" GUI program of MikTex the "Refresh FNDB" button should
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".
+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". However, there is an evidence that simple "bibtex rusnat-ex1-ru.aux" works as well. Note that "rusnat" bibliography style is now deprecated in favor of "gost" styles.
4. History
----------
-2008/02/xx Version 1. Initial CTAN release. However, the bundle was mantained locally since 1997.
+2008/02/01 Version 1. Initial CTAN release. However, the bundle was mantained locally since 1997.
2010/10/24 Version 1.1 (See NEWS for changelog).
+2019/10/03 Version 1.2 (See NEWS for changelog).
+
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.
+For suggestions and contributions I would like to thank Eugeny Baldin and Anna Shipunova.
6. Licence
----------
@@ -61,71 +64,88 @@ This work may be distributed and/or modified under the conditions of the LaTeX P
This work consists of the following files:
-* README this file, including licence
-* review.tex Russian mini-review, written by Eu. Baldin
+* NEWS List of changes
+* README (here, in doc/latex/shipunov directory) This file, including license
+* review.tex Russian mini-review, written by Eu. Baldin
+* README (in the root directory of the bundle) Short descriptions of packages
* Class files and their examples:
cassete.cls Audiocassete labels
-etiketka.cls Herbarium labels
cassete-ex-ru.tex
-etiketka-ex-ru.tex
+etiketka.cls Herbarium labels
etiketka-ex1-en.tex
etiketka-ex2-en.tex
+etiketka-ex-ru.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
+add2-ex.tex
+add2.sty Save trees
altverse-ex1-ru.tex
altverse-ex2-ru.tex
+altverse-ex3-ru.tex
+altverse-ex-en.tex
+altverse.sty Typesetting verses, depends on "xtab" package
autolist-ex-en.tex
autolist-ex-ru.tex
-biokey-doc-en.tex
+autolist.sty Various lists, depends on "calc" package
biokey2html-doc-en.tex
-biokey2html-ex-en.tex
+biokey-doc-en.tex
+biokey.sty Pretty formatting of biological identification keys
+biokey-ex-en.tex
biolist-ex-en.tex
+biolist.sty Pretty formatting of floristic/faunistic species lists
boldline-ex-en.tex
+boldline.sty Thick lines in tables, depends on "array" package
classif2-ex-en.tex
+classif2.sty Pretty formatting of biological classifications
+dline-ex.tex
+dline.sty Double lines
drcaps-ex-en.tex
+drcaps.sty Various drop caps
flower-ex-en.tex
-flower-ex-en-x.tex XeLaTeX example to "flower" package
+flower.sty Flower formulas, depends on "wasy" font package
isyntax-ex-en.tex
+isyntax.sty Interactive syntax check, depends on "ifthen" and "syntaxonly" packages
numerus-ex-ru.tex
+numerus.sty Spell numbers in Russian (with gender!)
punct-ex-en.tex
+punct.sty Straight punctuation marks inside italics
+qqru-ex-en.tex
+qqru-ex-ru.tex
+qqru.sty Universal quotes
sltables-doc-en.tex
+sltables.sty LaTeX modification of R. Nilson S-Tables Plain TeX macro
starfn-ex-ru.tex
+starfn.sty Footnote marks as stars, depends on "footnpag" package
+textfrac-ex.tex
+textfrac.sty Slanted fractions
* BibTeX bibliography style, documentation and examples:
-rusnat.bst Russian bibliography style, depends on "natbib" package
+rusnat.bst Russian bibliography style, now DEPRECATED, depends on "natbib" package
+rusnat_bst.readme Deprecation note
rusnat-doc-ru.tex
rusnat-ex-ru.bib
rusnat-ex1-ru.tex
rusnat-ex2-ru.tex
-* Two examples of field forms:
+* Some other examples (e.g., field forms):
-field-form-ex1-ru.tex Field form for morphometry
-field-form-ex2-ru.tex Field form for floristics
+exam-ex.tex Exam sheet example
+field-form-ex1-ru.tex Field form for morphometry
+field-form-ex2-ru.tex Field form for floristics
+lecture-slides-ex.tex Lecture slides example
* Perl scripts and shell command files:
+abs2rel.pl Convert from absolute to relative (automatic) keys
biokey2html1.pl
biokey2html2.pl
biokey2html3.pl
biokey2html.bat Windows command file
biokey2html.sh Bash command file
+txt2qq.pl Convert from simple text to LaTeX with universal quotes
There may be also additional PDF and HTML files, results of examples processing.
+
diff --git a/macros/latex/contrib/shipunov/doc/add2-ex.pdf b/macros/latex/contrib/shipunov/doc/add2-ex.pdf
new file mode 100644
index 0000000000..ced30afac8
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/add2-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/add2-ex.tex b/macros/latex/contrib/shipunov/doc/add2-ex.tex
new file mode 100644
index 0000000000..c5db7f91f2
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/add2-ex.tex
@@ -0,0 +1,893 @@
+\documentclass{article}
+\usepackage{add2}
+\nofiles
+
+\begin{document}
+
+\section*{THE ADVENTURE OF THE ENGINEER'S THUMB}
+
+Of all the problems which have been submitted to my friend, Mr. Sherlock
+Holmes, for solution during the years of our intimacy, there were only two
+which I was the means of introducing to his notice---that of Mr. Hatherley's
+thumb, and that of Colonel Warburton's madness. Of these the latter
+may have afforded a finer field for an acute and original observer,
+but the other was so strange in its inception and so dramatic in its
+details that it may be the more worthy of being placed upon record,
+even if it gave my friend fewer openings for those deductive methods of
+reasoning by which he achieved such remarkable results. The story has,
+I believe, been told more than once in the newspapers, but, like all
+such narratives, its effect is much less striking when set forth en
+bloc in a single half-column of print than when the facts slowly evolve
+before your own eyes, and the mystery clears gradually away as each new
+discovery furnishes a step which leads on to the complete truth. At the
+time the circumstances made a deep impression upon me, and the lapse of
+two years has hardly served to weaken the effect.
+
+It was in the summer of '89, not long after my marriage, that the events
+occurred which I am now about to summarise. I had returned to civil
+practice and had finally abandoned Holmes in his Baker Street rooms,
+although I continually visited him and occasionally even persuaded
+him to forgo his Bohemian habits so far as to come and visit us. My
+practice had steadily increased, and as I happened to live at no very
+great distance from Paddington Station, I got a few patients from among
+the officials. One of these, whom I had cured of a painful and lingering
+disease, was never weary of advertising my virtues and of endeavouring
+to send me on every sufferer over whom he might have any influence.
+
+One morning, at a little before seven o'clock, I was awakened by the maid
+tapping at the door to announce that two men had come from Paddington
+and were waiting in the consulting-room. I dressed hurriedly, for I
+knew by experience that railway cases were seldom trivial, and hastened
+downstairs. As I descended, my old ally, the guard, came out of the room
+and closed the door tightly behind him.
+
+``I've got him here,'' he whispered, jerking his thumb over his shoulder;
+``he's all right.''
+
+``What is it, then?'' I asked, for his manner suggested that it was some
+strange creature which he had caged up in my room.
+
+``It's a new patient,'' he whispered. ``I thought I'd bring him round
+myself; then he couldn't slip away. There he is, all safe and sound. I
+must go now, Doctor; I have my dooties, just the same as you.'' And off
+he went, this trusty tout, without even giving me time to thank him.
+
+I entered my consulting-room and found a gentleman seated by the table. He
+was quietly dressed in a suit of heather tweed with a soft cloth cap
+which he had laid down upon my books. Round one of his hands he had a
+handkerchief wrapped, which was mottled all over with bloodstains. He
+was young, not more than five-and-twenty, I should say, with a strong,
+masculine face; but he was exceedingly pale and gave me the impression
+of a man who was suffering from some strong agitation, which it took
+all his strength of mind to control.
+
+``I am sorry to knock you up so early, Doctor,'' said he, ``but I have
+had a very serious accident during the night. I came in by train this
+morning, and on inquiring at Paddington as to where I might find a doctor,
+a worthy fellow very kindly escorted me here. I gave the maid a card,
+but I see that she has left it upon the side-table.''
+
+I took it up and glanced at it. ``Mr. Victor Hatherley, hydraulic
+engineer, 16A, Victoria Street (3rd floor).'' That was the name,
+style, and abode of my morning visitor. ``I regret that I have kept you
+waiting,'' said I, sitting down in my library-chair. ``You are fresh
+from a night journey, I understand, which is in itself a monotonous
+occupation.''
+
+``Oh, my night could not be called monotonous,'' said he, and laughed. He
+laughed very heartily, with a high, ringing note, leaning back in his
+chair and shaking his sides. All my medical instincts rose up against
+that laugh.
+
+``Stop it!'' I cried; ``pull yourself together!'' and I poured out some
+water from a caraffe.
+
+It was useless, however. He was off in one of those hysterical outbursts
+which come upon a strong nature when some great crisis is over and
+gone. Presently he came to himself once more, very weary and pale-looking.
+
+``I have been making a fool of myself,'' he gasped.
+
+``Not at all. Drink this.'' I dashed some brandy into the water, and
+the colour began to come back to his bloodless cheeks.
+
+``That's better!'' said he. ``And now, Doctor, perhaps you would kindly
+attend to my thumb, or rather to the place where my thumb used to be.''
+
+He unwound the handkerchief and held out his hand. It gave even my
+hardened nerves a shudder to look at it. There were four protruding
+fingers and a horrid red, spongy surface where the thumb should have
+been. It had been hacked or torn right out from the roots.
+
+``Good heavens!'' I cried, ``this is a terrible injury. It must have
+bled considerably.''
+
+``Yes, it did. I fainted when it was done, and I think that I must have
+been senseless for a long time. When I came to I found that it was still
+bleeding, so I tied one end of my handkerchief very tightly round the
+wrist and braced it up with a twig.''
+
+``Excellent! You should have been a surgeon.''
+
+``It is a question of hydraulics, you see, and came within my own
+province.''
+
+``This has been done,'' said I, examining the wound, ``by a very heavy
+and sharp instrument.''
+
+``A thing like a cleaver,'' said he.
+
+``An accident, I presume?''
+
+``By no means.''
+
+``What! a murderous attack?''
+
+``Very murderous indeed.''
+
+``You horrify me.''
+
+I sponged the wound, cleaned it, dressed it, and finally covered it over
+with cotton wadding and carbolised bandages. He lay back without wincing,
+though he bit his lip from time to time.
+
+``How is that?'' I asked when I had finished.
+
+``Capital! Between your brandy and your bandage, I feel a new man. I
+was very weak, but I have had a good deal to go through.''
+
+``Perhaps you had better not speak of the matter. It is evidently trying
+to your nerves.''
+
+``Oh, no, not now. I shall have to tell my tale to the police; but,
+between ourselves, if it were not for the convincing evidence of this
+wound of mine, I should be surprised if they believed my statement,
+for it is a very extraordinary one, and I have not much in the way of
+proof with which to back it up; and, even if they believe me, the clues
+which I can give them are so vague that it is a question whether justice
+will be done.''
+
+``Ha!'' cried I, ``if it is anything in the nature of a problem which
+you desire to see solved, I should strongly recommend you to come to my
+friend, Mr. Sherlock Holmes, before you go to the official police.''
+
+``Oh, I have heard of that fellow,'' answered my visitor, ``and I should
+be very glad if he would take the matter up, though of course I must use
+the official police as well. Would you give me an introduction to him?''
+
+``I'll do better. I'll take you round to him myself.''
+
+``I should be immensely obliged to you.''
+
+``We'll call a cab and go together. We shall just be in time to have a
+little breakfast with him. Do you feel equal to it?''
+
+``Yes; I shall not feel easy until I have told my story.''
+
+``Then my servant will call a cab, and I shall be with you in an
+instant.'' I rushed upstairs, explained the matter shortly to my wife,
+and in five minutes was inside a hansom, driving with my new acquaintance
+to Baker Street.
+
+Sherlock Holmes was, as I expected, lounging about his sitting-room in
+his dressing-gown, reading the agony column of The Times and smoking
+his before-breakfast pipe, which was composed of all the plugs and
+dottles left from his smokes of the day before, all carefully dried
+and collected on the corner of the mantelpiece. He received us in his
+quietly genial fashion, ordered fresh rashers and eggs, and joined us
+in a hearty meal. When it was concluded he settled our new acquaintance
+upon the sofa, placed a pillow beneath his head, and laid a glass of
+brandy and water within his reach.
+
+``It is easy to see that your experience has been no common one,
+Mr. Hatherley,'' said he. ``Pray, lie down there and make yourself
+absolutely at home. Tell us what you can, but stop when you are tired
+and keep up your strength with a little stimulant.''
+
+``Thank you,'' said my patient, ``but I have felt another man since
+the doctor bandaged me, and I think that your breakfast has completed
+the cure. I shall take up as little of your valuable time as possible,
+so I shall start at once upon my peculiar experiences.''
+
+Holmes sat in his big armchair with the weary, heavy-lidded expression
+which veiled his keen and eager nature, while I sat opposite to him, and
+we listened in silence to the strange story which our visitor detailed
+to us.
+
+``You must know,'' said he, ``that I am an orphan and a bachelor, residing
+alone in lodgings in London. By profession I am a hydraulic engineer,
+and I have had considerable experience of my work during the seven years
+that I was apprenticed to Venner \& Matheson, the well-known firm, of
+Greenwich. Two years ago, having served my time, and having also come into
+a fair sum of money through my poor father's death, I determined to start
+in business for myself and took professional chambers in Victoria Street.
+
+``I suppose that everyone finds his first independent start in business
+a dreary experience. To me it has been exceptionally so. During two years
+I have had three consultations and one small job, and that is absolutely
+all that my profession has brought me. My gross takings amount to . 27
+10s. Every day, from nine in the morning until four in the afternoon,
+I waited in my little den, until at last my heart began to sink, and I
+came to believe that I should never have any practice at all.
+
+``Yesterday, however, just as I was thinking of leaving the office,
+my clerk entered to say there was a gentleman waiting who wished to
+see me upon business. He brought up a card, too, with the name of
+`Colonel Lysander Stark' engraved upon it. Close at his heels came the
+colonel himself, a man rather over the middle size, but of an exceeding
+thinness. I do not think that I have ever seen so thin a man. His whole
+face sharpened away into nose and chin, and the skin of his cheeks was
+drawn quite tense over his outstanding bones. Yet this emaciation seemed
+to be his natural habit, and due to no disease, for his eye was bright,
+his step brisk, and his bearing assured. He was plainly but neatly
+dressed, and his age, I should judge, would be nearer forty than thirty.
+
+```Mr. Hatherley?' said he, with something of a German accent. `You
+have been recommended to me, Mr. Hatherley, as being a man who is not
+only proficient in his profession but is also discreet and capable of
+preserving a secret.'
+
+``I bowed, feeling as flattered as any young man would at such an
+address. `May I ask who it was who gave me so good a character?'
+
+```Well, perhaps it is better that I should not tell you that just at
+this moment. I have it from the same source that you are both an orphan
+and a bachelor and are residing alone in London.'
+
+```That is quite correct,' I answered; `but you will excuse me
+if I say that I cannot see how all this bears upon my professional
+qualifications. I understand that it was on a professional matter that
+you wished to speak to me?'
+
+```Undoubtedly so. But you will find that all I say is really to the
+point. I have a professional commission for you, but absolute secrecy
+is quite essential---absolute secrecy, you understand, and of course we
+may expect that more from a man who is alone than from one who lives in
+the bosom of his family.'
+
+```If I promise to keep a secret,' said I, `you may absolutely depend
+upon my doing so.'
+
+``He looked very hard at me as I spoke, and it seemed to me that I had
+never seen so suspicious and questioning an eye.
+
+```Do you promise, then?' said he at last.
+
+```Yes, I promise.'
+
+```Absolute and complete silence before, during, and after? No reference
+to the matter at all, either in word or writing?'
+
+```I have already given you my word.'
+
+```Very good.' He suddenly sprang up, and darting like lightning across
+the room he flung open the door. The passage outside was empty.
+
+```That's all right,' said he, coming back. `I know that clerks are
+sometimes curious as to their master's affairs. Now we can talk in
+safety.' He drew up his chair very close to mine and began to stare at
+me again with the same questioning and thoughtful look.
+
+``A feeling of repulsion, and of something akin to fear had begun to rise
+within me at the strange antics of this fleshless man. Even my dread of
+losing a client could not restrain me from showing my impatience.
+
+```I beg that you will state your business, sir,' said I; `my time is
+of value.' Heaven forgive me for that last sentence, but the words came
+to my lips.
+
+```How would fifty guineas for a night's work suit you?' he asked.
+
+```Most admirably.'
+
+```I say a night's work, but an hour's would be nearer the mark. I
+simply want your opinion about a hydraulic stamping machine which has
+got out of gear. If you show us what is wrong we shall soon set it right
+ourselves. What do you think of such a commission as that?'
+
+```The work appears to be light and the pay munificent.'
+
+```Precisely so. We shall want you to come to-night by the last train.'
+
+```Where to?'
+
+```To Eyford, in Berkshire. It is a little place near the borders of
+Oxfordshire, and within seven miles of Reading. There is a train from
+Paddington which would bring you there at about 11:15.'
+
+```Very good.'
+
+```I shall come down in a carriage to meet you.'
+
+```There is a drive, then?'
+
+```Yes, our little place is quite out in the country. It is a good seven
+miles from Eyford Station.'
+
+```Then we can hardly get there before midnight. I suppose there would
+be no chance of a train back. I should be compelled to stop the night.'
+
+```Yes, we could easily give you a shake-down.'
+
+```That is very awkward. Could I not come at some more convenient hour?'
+
+```We have judged it best that you should come late. It is to recompense
+you for any inconvenience that we are paying to you, a young and
+unknown man, a fee which would buy an opinion from the very heads of
+your profession. Still, of course, if you would like to draw out of the
+business, there is plenty of time to do so.'
+
+``I thought of the fifty guineas, and of how very useful they would
+be to me. `Not at all,' said I, `I shall be very happy to accommodate
+myself to your wishes. I should like, however, to understand a little
+more clearly what it is that you wish me to do.'
+
+```Quite so. It is very natural that the pledge of secrecy which we have
+exacted from you should have aroused your curiosity. I have no wish to
+commit you to anything without your having it all laid before you. I
+suppose that we are absolutely safe from eavesdroppers?'
+
+```Entirely.'
+
+```Then the matter stands thus. You are probably aware that fuller's-earth
+is a valuable product, and that it is only found in one or two places
+in England?'
+
+```I have heard so.'
+
+```Some little time ago I bought a small place---a very small place---within
+ten miles of Reading. I was fortunate enough to discover that there was a
+deposit of fuller's-earth in one of my fields. On examining it, however, I
+found that this deposit was a comparatively small one, and that it formed
+a link between two very much larger ones upon the right and left---both of
+them, however, in the grounds of my neighbours. These good people were
+absolutely ignorant that their land contained that which was quite as
+valuable as a gold-mine. Naturally, it was to my interest to buy their
+land before they discovered its true value, but unfortunately I had no
+capital by which I could do this. I took a few of my friends into the
+secret, however, and they suggested that we should quietly and secretly
+work our own little deposit and that in this way we should earn the
+money which would enable us to buy the neighbouring fields. This we have
+now been doing for some time, and in order to help us in our operations
+we erected a hydraulic press. This press, as I have already explained,
+has got out of order, and we wish your advice upon the subject. We guard
+our secret very jealously, however, and if it once became known that we
+had hydraulic engineers coming to our little house, it would soon rouse
+inquiry, and then, if the facts came out, it would be good-bye to any
+chance of getting these fields and carrying out our plans. That is why
+I have made you promise me that you will not tell a human being that
+you are going to Eyford to-night. I hope that I make it all plain?'
+
+```I quite follow you,' said I. `The only point which I could not quite
+understand was what use you could make of a hydraulic press in excavating
+fuller's-earth, which, as I understand, is dug out like gravel from
+a pit.'
+
+```Ah!' said he carelessly, `we have our own process. We compress the
+earth into bricks, so as to remove them without revealing what they
+are. But that is a mere detail. I have taken you fully into my confidence
+now, Mr. Hatherley, and I have shown you how I trust you.' He rose as
+he spoke. `I shall expect you, then, at Eyford at 11:15.'
+
+```I shall certainly be there.'
+
+```And not a word to a soul.' He looked at me with a last long,
+questioning gaze, and then, pressing my hand in a cold, dank grasp,
+he hurried from the room.
+
+``Well, when I came to think it all over in cool blood I was very much
+astonished, as you may both think, at this sudden commission which had
+been intrusted to me. On the one hand, of course, I was glad, for the fee
+was at least tenfold what I should have asked had I set a price upon my
+own services, and it was possible that this order might lead to other
+ones. On the other hand, the face and manner of my patron had made an
+unpleasant impression upon me, and I could not think that his explanation
+of the fuller's-earth was sufficient to explain the necessity for my
+coming at midnight, and his extreme anxiety lest I should tell anyone of
+my errand. However, I threw all fears to the winds, ate a hearty supper,
+drove to Paddington, and started off, having obeyed to the letter the
+injunction as to holding my tongue.
+
+``At Reading I had to change not only my carriage but my station. However,
+I was in time for the last train to Eyford, and I reached the little
+dim-lit station after eleven o'clock. I was the only passenger who got
+out there, and there was no one upon the platform save a single sleepy
+porter with a lantern. As I passed out through the wicket gate, however, I
+found my acquaintance of the morning waiting in the shadow upon the other
+side. Without a word he grasped my arm and hurried me into a carriage, the
+door of which was standing open. He drew up the windows on either side,
+tapped on the wood-work, and away we went as fast as the horse could go.''
+
+``One horse?'' interjected Holmes.
+
+``Yes, only one.''
+
+``Did you observe the colour?''
+
+``Yes, I saw it by the side-lights when I was stepping into the
+carriage. It was a chestnut.''
+
+``Tired-looking or fresh?''
+
+``Oh, fresh and glossy.''
+
+``Thank you. I am sorry to have interrupted you. Pray continue your most
+interesting statement.''
+
+``Away we went then, and we drove for at least an hour. Colonel Lysander
+Stark had said that it was only seven miles, but I should think, from
+the rate that we seemed to go, and from the time that we took, that
+it must have been nearer twelve. He sat at my side in silence all the
+time, and I was aware, more than once when I glanced in his direction,
+that he was looking at me with great intensity. The country roads
+seem to be not very good in that part of the world, for we lurched and
+jolted terribly. I tried to look out of the windows to see something of
+where we were, but they were made of frosted glass, and I could make
+out nothing save the occasional bright blur of a passing light. Now
+and then I hazarded some remark to break the monotony of the journey,
+but the colonel answered only in monosyllables, and the conversation
+soon flagged. At last, however, the bumping of the road was exchanged
+for the crisp smoothness of a gravel-drive, and the carriage came to a
+stand. Colonel Lysander Stark sprang out, and, as I followed after him,
+pulled me swiftly into a porch which gaped in front of us. We stepped,
+as it were, right out of the carriage and into the hall, so that I failed
+to catch the most fleeting glance of the front of the house. The instant
+that I had crossed the threshold the door slammed heavily behind us,
+and I heard faintly the rattle of the wheels as the carriage drove away.
+
+``It was pitch dark inside the house, and the colonel fumbled about
+looking for matches and muttering under his breath. Suddenly a door
+opened at the other end of the passage, and a long, golden bar of light
+shot out in our direction. It grew broader, and a woman appeared with
+a lamp in her hand, which she held above her head, pushing her face
+forward and peering at us. I could see that she was pretty, and from
+the gloss with which the light shone upon her dark dress I knew that
+it was a rich material. She spoke a few words in a foreign tongue in
+a tone as though asking a question, and when my companion answered in
+a gruff monosyllable she gave such a start that the lamp nearly fell
+from her hand. Colonel Stark went up to her, whispered something in her
+ear, and then, pushing her back into the room from whence she had come,
+he walked towards me again with the lamp in his hand.
+
+```Perhaps you will have the kindness to wait in this room for a few
+minutes,' said he, throwing open another door. It was a quiet, little,
+plainly furnished room, with a round table in the centre, on which several
+German books were scattered. Colonel Stark laid down the lamp on the top
+of a harmonium beside the door. `I shall not keep you waiting an instant,'
+said he, and vanished into the darkness.
+
+``I glanced at the books upon the table, and in spite of my ignorance
+of German I could see that two of them were treatises on science, the
+others being volumes of poetry. Then I walked across to the window,
+hoping that I might catch some glimpse of the country-side, but an oak
+shutter, heavily barred, was folded across it. It was a wonderfully
+silent house. There was an old clock ticking loudly somewhere in the
+passage, but otherwise everything was deadly still. A vague feeling of
+uneasiness began to steal over me. Who were these German people, and what
+were they doing living in this strange, out-of-the-way place? And where
+was the place? I was ten miles or so from Eyford, that was all I knew,
+but whether north, south, east, or west I had no idea. For that matter,
+Reading, and possibly other large towns, were within that radius, so
+the place might not be so secluded, after all. Yet it was quite certain,
+from the absolute stillness, that we were in the country. I paced up and
+down the room, humming a tune under my breath to keep up my spirits and
+feeling that I was thoroughly earning my fifty-guinea fee.
+
+``Suddenly, without any preliminary sound in the midst of the utter
+stillness, the door of my room swung slowly open. The woman was standing
+in the aperture, the darkness of the hall behind her, the yellow light
+from my lamp beating upon her eager and beautiful face. I could see at a
+glance that she was sick with fear, and the sight sent a chill to my own
+heart. She held up one shaking finger to warn me to be silent, and she
+shot a few whispered words of broken English at me, her eyes glancing
+back, like those of a frightened horse, into the gloom behind her.
+
+```I would go,' said she, trying hard, as it seemed to me, to speak
+calmly; `I would go. I should not stay here. There is no good for you
+to do.'
+
+```But, madam,' said I, `I have not yet done what I came for. I cannot
+possibly leave until I have seen the machine.'
+
+```It is not worth your while to wait,' she went on. `You can pass through
+the door; no one hinders.' And then, seeing that I smiled and shook my
+head, she suddenly threw aside her constraint and made a step forward,
+with her hands wrung together. `For the love of Heaven!' she whispered,
+`get away from here before it is too late!'
+
+``But I am somewhat headstrong by nature, and the more ready to engage
+in an affair when there is some obstacle in the way. I thought of my
+fifty-guinea fee, of my wearisome journey, and of the unpleasant night
+which seemed to be before me. Was it all to go for nothing? Why should
+I slink away without having carried out my commission, and without
+the payment which was my due? This woman might, for all I knew,
+be a monomaniac. With a stout bearing, therefore, though her manner
+had shaken me more than I cared to confess, I still shook my head and
+declared my intention of remaining where I was. She was about to renew
+her entreaties when a door slammed overhead, and the sound of several
+footsteps was heard upon the stairs. She listened for an instant, threw
+up her hands with a despairing gesture, and vanished as suddenly and as
+noiselessly as she had come.
+
+``The newcomers were Colonel Lysander Stark and a short thick man with
+a chinchilla beard growing out of the creases of his double chin, who
+was introduced to me as Mr. Ferguson.
+
+```This is my secretary and manager,' said the colonel. `By the way,
+I was under the impression that I left this door shut just now. I fear
+that you have felt the draught.'
+
+```On the contrary,' said I, `I opened the door myself because I felt
+the room to be a little close.'
+
+``He shot one of his suspicious looks at me. `Perhaps we had better
+proceed to business, then,' said he. `Mr. Ferguson and I will take you
+up to see the machine.'
+
+```I had better put my hat on, I suppose.'
+
+```Oh, no, it is in the house.'
+
+```What, you dig fuller's-earth in the house?'
+
+```No, no. This is only where we compress it. But never mind that. All
+we wish you to do is to examine the machine and to let us know what is
+wrong with it.'
+
+``We went upstairs together, the colonel first with the lamp, the fat
+manager and I behind him. It was a labyrinth of an old house, with
+corridors, passages, narrow winding staircases, and little low doors,
+the thresholds of which were hollowed out by the generations who had
+crossed them. There were no carpets and no signs of any furniture
+above the ground floor, while the plaster was peeling off the walls,
+and the damp was breaking through in green, unhealthy blotches. I tried
+to put on as unconcerned an air as possible, but I had not forgotten the
+warnings of the lady, even though I disregarded them, and I kept a keen
+eye upon my two companions. Ferguson appeared to be a morose and silent
+man, but I could see from the little that he said that he was at least
+a fellow-countryman.
+
+``Colonel Lysander Stark stopped at last before a low door, which he
+unlocked. Within was a small, square room, in which the three of us
+could hardly get at one time. Ferguson remained outside, and the colonel
+ushered me in.
+
+```We are now,' said he, `actually within the hydraulic press, and it
+would be a particularly unpleasant thing for us if anyone were to turn it
+on. The ceiling of this small chamber is really the end of the descending
+piston, and it comes down with the force of many tons upon this metal
+floor. There are small lateral columns of water outside which receive the
+force, and which transmit and multiply it in the manner which is familiar
+to you. The machine goes readily enough, but there is some stiffness in
+the working of it, and it has lost a little of its force. Perhaps you will
+have the goodness to look it over and to show us how we can set it right.'
+
+``I took the lamp from him, and I examined the machine very
+thoroughly. It was indeed a gigantic one, and capable of exercising
+enormous pressure. When I passed outside, however, and pressed down
+the levers which controlled it, I knew at once by the whishing sound
+that there was a slight leakage, which allowed a regurgitation of water
+through one of the side cylinders. An examination showed that one of the
+india-rubber bands which was round the head of a driving-rod had shrunk
+so as not quite to fill the socket along which it worked. This was clearly
+the cause of the loss of power, and I pointed it out to my companions, who
+followed my remarks very carefully and asked several practical questions
+as to how they should proceed to set it right. When I had made it clear
+to them, I returned to the main chamber of the machine and took a good
+look at it to satisfy my own curiosity. It was obvious at a glance that
+the story of the fuller's-earth was the merest fabrication, for it would
+be absurd to suppose that so powerful an engine could be designed for so
+inadequate a purpose. The walls were of wood, but the floor consisted of
+a large iron trough, and when I came to examine it I could see a crust
+of metallic deposit all over it. I had stooped and was scraping at this
+to see exactly what it was when I heard a muttered exclamation in German
+and saw the cadaverous face of the colonel looking down at me.
+
+```What are you doing there?' he asked.
+
+``I felt angry at having been tricked by so elaborate a story as that
+which he had told me. `I was admiring your fuller's-earth,' said I;
+`I think that I should be better able to advise you as to your machine
+if I knew what the exact purpose was for which it was used.'
+
+``The instant that I uttered the words I regretted the rashness of my
+speech. His face set hard, and a baleful light sprang up in his grey eyes.
+
+```Very well,' said he, `you shall know all about the machine.' He took
+a step backward, slammed the little door, and turned the key in the
+lock. I rushed towards it and pulled at the handle, but it was quite
+secure, and did not give in the least to my kicks and shoves. `Hullo!' I
+yelled. `Hullo! Colonel! Let me out!'
+
+``And then suddenly in the silence I heard a sound which sent my heart
+into my mouth. It was the clank of the levers and the swish of the leaking
+cylinder. He had set the engine at work. The lamp still stood upon the
+floor where I had placed it when examining the trough. By its light I
+saw that the black ceiling was coming down upon me, slowly, jerkily, but,
+as none knew better than myself, with a force which must within a minute
+grind me to a shapeless pulp. I threw myself, screaming, against the door,
+and dragged with my nails at the lock. I implored the colonel to let me
+out, but the remorseless clanking of the levers drowned my cries. The
+ceiling was only a foot or two above my head, and with my hand upraised
+I could feel its hard, rough surface. Then it flashed through my mind
+that the pain of my death would depend very much upon the position in
+which I met it. If I lay on my face the weight would come upon my spine,
+and I shuddered to think of that dreadful snap. Easier the other way,
+perhaps; and yet, had I the nerve to lie and look up at that deadly black
+shadow wavering down upon me? Already I was unable to stand erect, when
+my eye caught something which brought a gush of hope back to my heart.
+
+``I have said that though the floor and ceiling were of iron, the walls
+were of wood. As I gave a last hurried glance around, I saw a thin line
+of yellow light between two of the boards, which broadened and broadened
+as a small panel was pushed backward. For an instant I could hardly
+believe that here was indeed a door which led away from death. The next
+instant I threw myself through, and lay half-fainting upon the other
+side. The panel had closed again behind me, but the crash of the lamp,
+and a few moments afterwards the clang of the two slabs of metal, told
+me how narrow had been my escape.
+
+``I was recalled to myself by a frantic plucking at my wrist, and I
+found myself lying upon the stone floor of a narrow corridor, while a
+woman bent over me and tugged at me with her left hand, while she held
+a candle in her right. It was the same good friend whose warning I had
+so foolishly rejected.
+
+```Come! come!' she cried breathlessly. `They will be here in a
+moment. They will see that you are not there. Oh, do not waste the
+so-precious time, but come!'
+
+``This time, at least, I did not scorn her advice. I staggered to my
+feet and ran with her along the corridor and down a winding stair. The
+latter led to another broad passage, and just as we reached it we heard
+the sound of running feet and the shouting of two voices, one answering
+the other from the floor on which we were and from the one beneath. My
+guide stopped and looked about her like one who is at her wit's end. Then
+she threw open a door which led into a bedroom, through the window of
+which the moon was shining brightly.
+
+```It is your only chance,' said she. `It is high, but it may be that
+you can jump it.'
+
+``As she spoke a light sprang into view at the further end of the passage,
+and I saw the lean figure of Colonel Lysander Stark rushing forward with a
+lantern in one hand and a weapon like a butcher's cleaver in the other. I
+rushed across the bedroom, flung open the window, and looked out. How
+quiet and sweet and wholesome the garden looked in the moonlight, and it
+could not be more than thirty feet down. I clambered out upon the sill,
+but I hesitated to jump until I should have heard what passed between
+my saviour and the ruffian who pursued me. If she were ill-used, then at
+any risks I was determined to go back to her assistance. The thought had
+hardly flashed through my mind before he was at the door, pushing his
+way past her; but she threw her arms round him and tried to hold him back.
+
+```Fritz! Fritz!' she cried in English, `remember your promise after
+the last time. You said it should not be again. He will be silent! Oh,
+he will be silent!'
+
+```You are mad, Elise!' he shouted, struggling to break away from
+her. `You will be the ruin of us. He has seen too much. Let me pass,
+I say!' He dashed her to one side, and, rushing to the window, cut at
+me with his heavy weapon. I had let myself go, and was hanging by the
+hands to the sill, when his blow fell. I was conscious of a dull pain,
+my grip loosened, and I fell into the garden below.
+
+``I was shaken but not hurt by the fall; so I picked myself up and rushed
+off among the bushes as hard as I could run, for I understood that I was
+far from being out of danger yet. Suddenly, however, as I ran, a deadly
+dizziness and sickness came over me. I glanced down at my hand, which was
+throbbing painfully, and then, for the first time, saw that my thumb had
+been cut off and that the blood was pouring from my wound. I endeavoured
+to tie my handkerchief round it, but there came a sudden buzzing in my
+ears, and next moment I fell in a dead faint among the rose-bushes.
+
+``How long I remained unconscious I cannot tell. It must have been a
+very long time, for the moon had sunk, and a bright morning was breaking
+when I came to myself. My clothes were all sodden with dew, and my
+coat-sleeve was drenched with blood from my wounded thumb. The smarting
+of it recalled in an instant all the particulars of my night's adventure,
+and I sprang to my feet with the feeling that I might hardly yet be safe
+from my pursuers. But to my astonishment, when I came to look round me,
+neither house nor garden were to be seen. I had been lying in an angle
+of the hedge close by the highroad, and just a little lower down was
+a long building, which proved, upon my approaching it, to be the very
+station at which I had arrived upon the previous night. Were it not for
+the ugly wound upon my hand, all that had passed during those dreadful
+hours might have been an evil dream.
+
+``Half dazed, I went into the station and asked about the morning
+train. There would be one to Reading in less than an hour. The same porter
+was on duty, I found, as had been there when I arrived. I inquired of
+him whether he had ever heard of Colonel Lysander Stark. The name was
+strange to him. Had he observed a carriage the night before waiting for
+me? No, he had not. Was there a police-station anywhere near? There was
+one about three miles off.
+
+``It was too far for me to go, weak and ill as I was. I determined to
+wait until I got back to town before telling my story to the police. It
+was a little past six when I arrived, so I went first to have my wound
+dressed, and then the doctor was kind enough to bring me along here. I
+put the case into your hands and shall do exactly what you advise.''
+
+We both sat in silence for some little time after listening to this
+extraordinary narrative. Then Sherlock Holmes pulled down from the shelf
+one of the ponderous commonplace books in which he placed his cuttings.
+
+``Here is an advertisement which will interest you,'' said he. ``It
+appeared in all the papers about a year ago. Listen to this: `Lost,
+on the 9th inst., Mr. Jeremiah Hayling, aged twenty-six, a hydraulic
+engineer. Left his lodgings at ten o'clock at night, and has not been
+heard of since. Was dressed in,' etc., etc. Ha! That represents the last
+time that the colonel needed to have his machine overhauled, I fancy.''
+
+``Good heavens!'' cried my patient. ``Then that explains what the
+girl said.''
+
+``Undoubtedly. It is quite clear that the colonel was a cool and desperate
+man, who was absolutely determined that nothing should stand in the
+way of his little game, like those out-and-out pirates who will leave
+no survivor from a captured ship. Well, every moment now is precious,
+so if you feel equal to it we shall go down to Scotland Yard at once as
+a preliminary to starting for Eyford.''
+
+Some three hours or so afterwards we were all in the train together,
+bound from Reading to the little Berkshire village. There were Sherlock
+Holmes, the hydraulic engineer, Inspector Bradstreet, of Scotland Yard,
+a plain-clothes man, and myself. Bradstreet had spread an ordnance map
+of the county out upon the seat and was busy with his compasses drawing
+a circle with Eyford for its centre.
+
+``There you are,'' said he. ``That circle is drawn at a radius of ten
+miles from the village. The place we want must be somewhere near that
+line. You said ten miles, I think, sir.''
+
+``It was an hour's good drive.''
+
+``And you think that they brought you back all that way when you were
+unconscious?''
+
+``They must have done so. I have a confused memory, too, of having been
+lifted and conveyed somewhere.''
+
+``What I cannot understand,'' said I, ``is why they should have spared
+you when they found you lying fainting in the garden. Perhaps the villain
+was softened by the woman's entreaties.''
+
+``I hardly think that likely. I never saw a more inexorable face in
+my life.''
+
+``Oh, we shall soon clear up all that,'' said Bradstreet. ``Well, I have
+drawn my circle, and I only wish I knew at what point upon it the folk
+that we are in search of are to be found.''
+
+``I think I could lay my finger on it,'' said Holmes quietly.
+
+``Really, now!'' cried the inspector, ``you have formed your
+opinion! Come, now, we shall see who agrees with you. I say it is south,
+for the country is more deserted there.''
+
+``And I say east,'' said my patient.
+
+``I am for west,'' remarked the plain-clothes man. ``There are several
+quiet little villages up there.''
+
+``And I am for north,'' said I, ``because there are no hills there,
+and our friend says that he did not notice the carriage go up any.''
+
+``Come,'' cried the inspector, laughing; ``it's a very pretty diversity
+of opinion. We have boxed the compass among us. Who do you give your
+casting vote to?''
+
+``You are all wrong.''
+
+``But we can't all be.''
+
+``Oh, yes, you can. This is my point.'' He placed his finger in the
+centre of the circle. ``This is where we shall find them.''
+
+``But the twelve-mile drive?'' gasped Hatherley.
+
+``Six out and six back. Nothing simpler. You say yourself that the horse
+was fresh and glossy when you got in. How could it be that if it had
+gone twelve miles over heavy roads?''
+
+``Indeed, it is a likely ruse enough,'' observed Bradstreet
+thoughtfully. ``Of course there can be no doubt as to the nature of
+this gang.''
+
+``None at all,'' said Holmes. ``They are coiners on a large scale,
+and have used the machine to form the amalgam which has taken the place
+of silver.''
+
+``We have known for some time that a clever gang was at work,'' said the
+inspector. ``They have been turning out half-crowns by the thousand. We
+even traced them as far as Reading, but could get no farther, for they
+had covered their traces in a way that showed that they were very old
+hands. But now, thanks to this lucky chance, I think that we have got
+them right enough.''
+
+But the inspector was mistaken, for those criminals were not destined to
+fall into the hands of justice. As we rolled into Eyford Station we saw
+a gigantic column of smoke which streamed up from behind a small clump
+of trees in the neighbourhood and hung like an immense ostrich feather
+over the landscape.
+
+``A house on fire?'' asked Bradstreet as the train steamed off again on
+its way.
+
+``Yes, sir!'' said the station-master.
+
+``When did it break out?''
+
+``I hear that it was during the night, sir, but it has got worse, and
+the whole place is in a blaze.''
+
+``Whose house is it?''
+
+``Dr. Becher's.''
+
+``Tell me,'' broke in the engineer, ``is Dr. Becher a German, very thin,
+with a long, sharp nose?''
+
+The station-master laughed heartily. ``No, sir, Dr. Becher is an
+Englishman, and there isn't a man in the parish who has a better-lined
+waistcoat. But he has a gentleman staying with him, a patient, as
+I understand, who is a foreigner, and he looks as if a little good
+Berkshire beef would do him no harm.''
+
+The station-master had not finished his speech before we were all
+hastening in the direction of the fire. The road topped a low hill,
+and there was a great widespread whitewashed building in front of us,
+spouting fire at every chink and window, while in the garden in front
+three fire-engines were vainly striving to keep the flames under.
+
+``That's it!'' cried Hatherley, in intense excitement. ``There is the
+gravel-drive, and there are the rose-bushes where I lay. That second
+window is the one that I jumped from.''
+
+``Well, at least,'' said Holmes, ``you have had your revenge upon
+them. There can be no question that it was your oil-lamp which, when
+it was crushed in the press, set fire to the wooden walls, though no
+doubt they were too excited in the chase after you to observe it at the
+time. Now keep your eyes open in this crowd for your friends of last
+night, though I very much fear that they are a good hundred miles off
+by now.''
+
+And Holmes' fears came to be realised, for from that day to this no word
+has ever been heard either of the beautiful woman, the sinister German,
+or the morose Englishman. Early that morning a peasant had met a cart
+containing several people and some very bulky boxes driving rapidly in the
+direction of Reading, but there all traces of the fugitives disappeared,
+and even Holmes' ingenuity failed ever to discover the least clue as to
+their whereabouts.
+
+The firemen had been much perturbed at the strange arrangements which
+they had found within, and still more so by discovering a newly severed
+human thumb upon a window-sill of the second floor. About sunset,
+however, their efforts were at last successful, and they subdued the
+flames, but not before the roof had fallen in, and the whole place been
+reduced to such absolute ruin that, save some twisted cylinders and
+iron piping, not a trace remained of the machinery which had cost our
+unfortunate acquaintance so dearly. Large masses of nickel and of tin
+were discovered stored in an out-house, but no coins were to be found,
+which may have explained the presence of those bulky boxes which have
+been already referred to.
+
+How our hydraulic engineer had been conveyed from the garden to the
+spot where he recovered his senses might have remained forever a mystery
+were it not for the soft mould, which told us a very plain tale. He had
+evidently been carried down by two persons, one of whom had remarkably
+small feet and the other unusually large ones. On the whole, it was most
+probable that the silent Englishman, being less bold or less murderous
+than his companion, had assisted the woman to bear the unconscious man
+out of the way of danger.
+
+``Well,'' said our engineer ruefully as we took our seats to return once
+more to London, ``it has been a pretty business for me! I have lost my
+thumb and I have lost a fifty-guinea fee, and what have I gained?''
+
+``Experience,'' said Holmes, laughing. ``Indirectly it may be of value,
+you know; you have only to put it into words to gain the reputation of
+being excellent company for the remainder of your existence.''
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/altverse-ex-en.pdf b/macros/latex/contrib/shipunov/doc/altverse-ex-en.pdf
new file mode 100644
index 0000000000..743b06c382
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.tex b/macros/latex/contrib/shipunov/doc/altverse-ex-en.tex
index 2e06b4f3dc..2e06b4f3dc 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/altverse-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/altverse-ex1-ru.pdf
new file mode 100644
index 0000000000..e7946a9fe9
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex1-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.tex b/macros/latex/contrib/shipunov/doc/altverse-ex1-ru.tex
index c14009b4ee..c14009b4ee 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex1-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/altverse-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/altverse-ex2-ru.pdf
new file mode 100644
index 0000000000..585c33b1e8
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex2-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.tex b/macros/latex/contrib/shipunov/doc/altverse-ex2-ru.tex
index 7c3a845ef0..7c3a845ef0 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex2-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.pdf b/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.pdf
new file mode 100644
index 0000000000..109488ff06
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.tex b/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.tex
new file mode 100644
index 0000000000..e408a2ccb2
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/altverse-ex3-ru.tex
@@ -0,0 +1,51 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[russian]{babel}
+
+\usepackage{altverse}
+
+\author{}
+\title{ΠŸΠ΅Ρ€Π°ΡˆΠΊΠΈ}
+\date{}
+\begin{document}
+\maketitle
+
+\begin{Verse}
+висит Π½Π° сцСнС Π² ΠΏΠ΅Ρ€Π²ΠΎΠΌ Π°ΠΊΡ‚Π΅\\
+Π±Π΅Π½Π·ΠΎΠΏΠΈΠ»Π° Π²Π΅Π΄Ρ€ΠΎ ΠΈ Ρ‘ΠΆ\\
+Π·Π°ΠΈΠ½Ρ‚Ρ€ΠΈΠ³ΠΎΠ²Π°Π½ станиславский\\
+боится Π²Ρ‹ΠΉΡ‚ΠΈ Π² Ρ‚ΡƒΠ°Π»Π΅Ρ‚\\
+\\
+\_ ΡŽΠ΄ΠΈΡ„ΡŒ Π½Π΅ Π²Ρ‹Π΄Π΅Ρ€ΠΆΠ°Π»Π° ΡΡ‡Π°ΡΡ‚ΡŒΡ\\
+\_ ΠΈ бросила Π΅Π³ΠΎ Π² кусты\\
+\_ ΠΈΠ΄Π΅Ρ‚ нСсчастная Ρ€Ρ‹Π΄Π°Π΅Ρ‚\\
+\_ кусты счастливыС стоят\\
+\\
+Π½Π΅ всю Π»ΡŽΠ΄ΠΌΠΈΠ»Ρƒ Π»ΡŽΠ±ΠΈΡ‚ ΠΈΠ³ΠΎΡ€ΡŒ\\
+Π° лишь ΠΎΠ΄ΠΈΠ½ Π΅Ρ‘ Ρ„Ρ€Π°Π³ΠΌΠ΅Π½Ρ‚\\
+ΠΎΠ΄Π½Π°ΠΊΠΎ взял ТСнился сдуру\\
+Π½Π° всСй людмилС Ρ†Π΅Π»ΠΈΠΊΠΎΠΌ\\
+\\
+\_ Π»Π΅ΠΆΠΈΡ‚ ΡƒΠ±ΠΈΡ‚Ρ‹ΠΉ Π°Π½Π°Ρ‚ΠΎΠ»ΠΈΠΉ\\
+\_ Ρ‚Ρ€ΠΈ Π΄Ρ‹Ρ€ΠΊΠΈ Π² Ρ‚Π΅Π»Π΅ Ρƒ Π½Π΅Π³ΠΎ\\
+\_ Π° рядом Π½ΠΈΠΊΠΎΠ»Π°ΠΉ с Ρ‚Ρ€Π΅Π·ΡƒΠ±Ρ†Π΅ΠΌ\\
+\_ Π½ΠΎ это совпадСниС\\
+\\
+Π°Ρ€ΠΊΠ°Π΄ΠΈΠΉ осСдлал ΠΊΠΎΡ€ΠΎΠ²Ρƒ\\
+ΠΈ сразу понял Π²ΠΎΡ‚ ΠΎΠ½ΠΎ\\
+Ρ‚ΠΎ Ρ‡Ρ‚ΠΎ искал ΠΎΠ½ Π±Π΅Π·Π½Π°Π΄Π΅ΠΆΠ½ΠΎ\\
+всю Тизнь мСняя лошадСй\\
+\\
+\_ Π² Π°Π΄Ρƒ для пСрфСкционистов\\
+\_ Π½ΠΈ сСры Π½Π΅Ρ‚Ρƒ Π½ΠΈ огня\\
+\_ Π° лишь слСгка нСсиммСтрично\\
+\_ стоят Ρ‰Π΅Ρ€Π±Π°Ρ‚Ρ‹Π΅ ΠΊΠΎΡ‚Π»Ρ‹\\
+\\
+Π½Π΅Ρ‚ Π½ΠΈΡ‡Π΅Π³ΠΎ Π³Π»ΡƒΠΏΠ΅ΠΉ Π½Π° свСтС\\
+Ρ‡Π΅ΠΌ дрСссированный Π±Π°Π½Π°Π½\\
+Π΅ΠΌΡƒ Π΄Π°Ρ‘ΡˆΡŒ Π΄Π°Ρ‘ΡˆΡŒ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹\\
+Π° ΠΎΠ½ Π»Π΅ΠΆΠΈΡ‚ ΠΌΠΎΠ»Ρ‡ΠΈΡ‚ ΠΈ всё\\
+\end{Verse}
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/autolist-ex-en.pdf b/macros/latex/contrib/shipunov/doc/autolist-ex-en.pdf
new file mode 100644
index 0000000000..ef620ac8fd
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/autolist-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.tex b/macros/latex/contrib/shipunov/doc/autolist-ex-en.tex
index 8ff8a2e7b1..8ff8a2e7b1 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/autolist-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/autolist-ex-ru.pdf
index 8d9f9b5d50..861ed657b2 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.pdf
+++ b/macros/latex/contrib/shipunov/doc/autolist-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.tex b/macros/latex/contrib/shipunov/doc/autolist-ex-ru.tex
index aebb93dbae..aebb93dbae 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/autolist-ex-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/biokey-doc-en.pdf b/macros/latex/contrib/shipunov/doc/biokey-doc-en.pdf
new file mode 100644
index 0000000000..ddeeb28df1
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biokey-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.tex b/macros/latex/contrib/shipunov/doc/biokey-doc-en.tex
index 17b3009475..26dd3625d7 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.tex
+++ b/macros/latex/contrib/shipunov/doc/biokey-doc-en.tex
@@ -1,8 +1,8 @@
\documentclass{article}
-\usepackage[pdftex,bookmarks=false,colorlinks=true]{hyperref}
+\usepackage[bookmarks=false,colorlinks=true,hypertexnames=false]{hyperref}
\usepackage{biokey}
-\author{A.\,Shipunov\footnote{e-mail: \texttt{plantago at herba.msu.ru}}}
+\author{A.\,Shipunov\footnote{e-mail: \texttt{dactylorhiza at gmail}}}
\title{\texttt{biokey}, the package for precious and flexible identification keys}
\date{}
@@ -13,8 +13,8 @@ This package can be used for creating biological identification keys. Different
\section{General usage}
-This is the textual (``Swedish'') key:
-
+This is the textual key:
+
\begin{verbatim}
1. It is an animal ... 2.
- It is a plant ... 3.
@@ -30,6 +30,9 @@ The interpretation in suggested language is follows:
\bigskip\hrule
\begin{verbatim}
+
+\begin{biokey}
+
\Z1. It is an animal \T 2.
\AN It is a plant \T 3.
@@ -43,10 +46,15 @@ The interpretation in suggested language is follows:
\ZZ3(1). Lots of wood \TT Spruce
\AN No wood \TT Daisy
+
+\end{biokey}
+
\end{verbatim}
\hrule\bigskip
+\begin{biokey}
+
\Z1. It is an animal \T 2.
\AN It is a plant \T 3.
@@ -61,11 +69,13 @@ The interpretation in suggested language is follows:
\AN No wood \TT Daisy
+\end{biokey}
+
\bigskip\hrule\bigskip
For aesthetics, I recommend that text before \verb|\T| should not end with dot (with the exception of abbreviations). \verb|\T| and \verb|\TT| are just the same thing, but second is better to designate names, and first is better for numbers. Sometimes, these two commands cannot format the paragraph without overfulls, in these (rare) cases I recommend the \verb|\TTTT| or ``old-style'' \verb|\TTT| which results are less precious but require less handwork.
-\verb|\Z| and \verb|\ZZ| are different only for the second is used for reverse (``Williamsonian'') links, or for typical in serial zoological keys references for theses and antitheses. These two commands along with \verb|\AN|, \verb|\AAN|, and (not used in the example above) \verb|\AAAN| are used also for aesthetic hanging indentation.
+\verb|\Z| and \verb|\ZZ| are different only for the second is used for backreferences, or for typical in serial zoological keys references for theses and antitheses. These two commands along with \verb|\AN|, \verb|\AAN|, and (not used in the example above) \verb|\AAAN| are used also for aesthetic hanging indentation.
Commands \verb|\N|, \verb|\NN| and \verb|\NNN| are for end-level objects (species, for example). They did not produce leading dots, but justify following object right, next with some space, or on next line, respectively.
@@ -88,6 +98,9 @@ This sort of key can put numbers automatically. The example (needs two \LaTeX\ r
\bigskip\hrule
\begin{verbatim}
+
+\begin{biokey}
+
\TE{ani} It is an animal \SS{spi}
\AN It is a plant \SS{pla}
@@ -101,10 +114,15 @@ This sort of key can put numbers automatically. The example (needs two \LaTeX\ r
\SE{pla}{ani} Lots of wood \TT Spruce
\AN No wood \TT Daisy
+
+\end{biokey}
+
\end{verbatim}
\hrule\bigskip
+\begin{biokey}
+
\TE{ani} It is an animal \SS{spi}
\AN It is a plant \SS{pla}
@@ -119,17 +137,22 @@ This sort of key can put numbers automatically. The example (needs two \LaTeX\ r
\AN No wood \TT Daisy
+\end{biokey}
+
\bigskip\hrule\bigskip
The biggest advantage of this type of key is that it is much easier to correct. It is possible to convert ``ordinary'' key to ``automatic'' key and further to HTML, with the help of \texttt{biokey2html} scripts (see documentation). See also how hyper-references working here.
-\section{Leveled keys}
+\section{Indented keys}
-And, finally, the different key layout---so-called ``English'', or leveled keys:
+And, finally, the different key layout---so-called indented keys:
\bigskip\hrule
\begin{verbatim}
+
+\begin{biokey}
+
\Z A. It is an animal
\begin{LE}
@@ -157,10 +180,15 @@ And, finally, the different key layout---so-called ``English'', or leveled keys:
\Z DD. No wood \TT Daisy
\end{LE}
+
+\end{biokey}
+
\end{verbatim}
\hrule\bigskip
+\begin{biokey}
+
\Z A. It is an animal
\begin{LE}
@@ -189,6 +217,8 @@ And, finally, the different key layout---so-called ``English'', or leveled keys:
\end{LE}
+\end{biokey}
+
\bigskip\hrule\bigskip
It is more complicated then previous examples, so one may to consider \texttt{dichokey} package, but it is much less flexible.
diff --git a/macros/latex/contrib/shipunov/doc/biokey-ex-en.pdf b/macros/latex/contrib/shipunov/doc/biokey-ex-en.pdf
new file mode 100644
index 0000000000..9a96c78053
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biokey-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/biokey-ex-en.tex b/macros/latex/contrib/shipunov/doc/biokey-ex-en.tex
new file mode 100644
index 0000000000..c88fb734bb
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biokey-ex-en.tex
@@ -0,0 +1,25 @@
+\documentclass{article}
+\usepackage[bookmarks=false,colorlinks=true,hypertexnames=false]{hyperref}
+\usepackage{biokey}
+
+\begin{document}
+
+\begin{biokey}
+
+\Z1. It is an animal \T 2.
+
+\AN It is a plant \T 3.
+
+\Z2. It is spiny \TT Hedgehog
+
+\AN It is not very spiny \TT Swift
+
+\AAN It is not spiny at all \TT Siskin
+
+\ZZ3(1). Lots of wood \TT Spruce
+
+\AN No wood \TT Daisy
+
+\end{biokey}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.pdf b/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.pdf
new file mode 100644
index 0000000000..f7dea62e4d
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.tex b/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.tex
new file mode 100644
index 0000000000..34a6a5942c
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biokey2html-doc-en.tex
@@ -0,0 +1,177 @@
+\documentclass[a4paper,12pt]{article} \usepackage{biokey}
+
+\author{Anna Shipunova, Alexey Shipunov}
+
+\title{``\texttt{biokey2html}'',\\ the primer of hypertext web/typography
+identification key}
+
+\date{} \begin{document} \maketitle
+
+\subsection*{Example A}
+
+This is the plain text source:
+
+\bigskip\hrule \begin{verbatim}
+
+1. Leaves pinnatifid ... 2.
+
+-- Leaves entire ... 3.
+
+2. Plants perennial, leaves dissected to numerous lanceolate lobes
+... Polemonium L.---Jacob's ladder.
+
+-- Annual plants, leaves with narrow lobes ... Gilia L.---Gilia.
+
+3(1). The compact inflorescence is surrounded by leaflike bracts
+... Collomia Nutt.---Collomia.
+
+-- The sparse inflorescence without specialised bracts ... Plox
+L.---Phlox, Sweet-william.
+
+\end{verbatim}
+
+\subsection*{Example B}
+
+This is the \TeX/\LaTeX variant (with stable numbers) of the same
+key. Please look to the Collomia---the italicizing is pretty simple
+(fo binomials one need to use \verb|\NN| command)q:
+
+\bigskip\hrule \begin{verbatim}
+
+\Z1. Leaves pinnatifid \T 2.
+
+\AN Leaves entire \T 3.
+
+\Z2. Plants perennial, leaves dissected to numerous lanceolate lobes \T
+Polem\'onium L.---Jacob's ladder.
+
+\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
+
+\ZZ3(1). The compact inflorescence is surrounded by leaflike bracts
+\T\KN Coll\'omia Nutt.---Collomia.
+
+-- The sparse inflorescence without specialised bracts \T Plox L.---Phlox,
+Sweet-william.
+
+\end{verbatim}
+
+\subsection*{Example C}
+
+This is the typorgaphic PDF output. To produce this, you need special
+style file, \texttt{biokey.sty}:
+
+\bigskip\hrule\bigskip
+
+\Z1. Leaves pinnatifid \T 2.
+
+\AN Leaves entire \T 3.
+
+\Z2. Plants perennial, leaves dissected to numerous lanceolate lobes \T
+Polem\'onium L.---Jacob's ladder.
+
+\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
+
+\ZZ3(1). The compact inflorescence is surrounded by leaflike bracts
+\T Coll\'omia Nutt.---Collomia.
+
+\AN The sparse inflorescence without specialised bracts \T Plox
+L.---Phlox, Sweet-william.
+
+\subsection*{Example D}
+
+This is the variant with \textbf{automatic} numeration (you need to
+run \LaTeX{} twice to obtain results) \emph{with PDF hyperlinks}. You
+can produce if from example B manually, or can use the Perl-script
+(see below):
+
+\bigskip\hrule \begin{verbatim}
+
+\TEZA{AA} Leaves pinnatifid \SSYLKA{AB}
+
+\AN Leaves entire \SSYLKA{AC}
+
+\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate
+lobes \T Polem\'onium L.---Jacob's ladder.
+
+\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
+
+\STEZA{AC}{AA} The compact inflorescence is surrounded by leaflike bracts
+\T Coll\'omia Nutt.---Collomia.
+
+\AN The sparse inflorescence without specialised bracts \T Plox
+L.---Phlox, Sweet-william.
+
+\end{verbatim}
+
+And output:
+
+\bigskip
+
+\TEZA{AA} Leaves pinnatifid \SSYLKA{AB}
+
+\AN Leaves entire \SSYLKA{AC}
+
+\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate
+lobes \T Polem\'onium L.---Jacob's ladder.
+
+\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
+
+\STEZA{AC}{AA} The compact inflorescence is surrounded by leaflike bracts
+\T Coll\'omia Nutt.---Collomia.
+
+\AN The sparse inflorescence without specialised bracts \T Plox
+L.---Phlox, Sweet-william.
+
+\subsection*{Example F}
+
+Three simple \textsf{Perl} scripts do the main work. You can run them
+all by command \texttt{biokey2html.sh} under UNIX shell on \textsf{Mac
+OS X} or \textsf{Linux}, or command \texttt{biokey2html.bat} under
+\textsf{Windows} console:
+
+\begin{verbatim} $ chmod 755 biokey2html.sh biokey2html*.pl $
+./biokey2html.sh biokey2html-ex-en.tex Making relative LaTeX key...
+Making HTML title and paragrafs tags... Making reference tags...
+\end{verbatim}
+
+If you want only to produce "automatic" PDF-key with hyperlinks, you
+should use the file with \texttt{.2} extension, which appears after
+\texttt{biokey2html.sh} run (see \texttt{biokey2html-ex-en.pdf}).
+
+And the HTML result (part of code):
+
+\bigskip\hrule \begin{verbatim}
+
+<p class="ST"><span class="TEZA"><a name="AA">1</a>.</span> Leaves
+pinnatifid ... <span class="SSYLKA"><a href="#AB">2</a>. </span>
+
+<p class="ST">-- Leaves entire ... <span class="SSYLKA"> <a
+href="#AC">3</a>.</span>
+
+<p class="ST"><span class="TEZA"><a name="AB">2</a>. </span>
+Plants perennial, leaves dissected to numerous lanceolate lobes
+... <!--<a href="">--><span class="SP"> Polemonium L.--Jacob's ladder.
+</span><!--</a>-->
+
+<p class="ST">-- Annual plants, leaves with narrow lobes ... <!--<a
+href="">--><span class="SP"> Glia L.--Gilia.</span> <!--</a>-->
+
+\end{verbatim}
+
+The commented anchors placed there just in case if you are interested to
+insert links for images etc. The real examples of keys (which is widely
+used) are on the web-pages:
+
+\begin{itemize}
+
+\item Abramova L.A. et al. The key for most frequent plants in
+Chupa Gulf environs. [Electronic resource]. 2005. Mode of access:
+\texttt{http://herba.msu.ru\\/shipunov2/belomor/2005/flora/ws\_key/ws\_key.htm}
+
+\item Abramova L.A. et al. The key for most frequent plants in
+Chupa Gulf environs. [Electronic resource]. 2004. Mode of access:
+\texttt{http://herba.msu.ru\\/shipunov/belomor/2004/flora/ws\_key.pdf}
+
+\end{itemize}
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en.html b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en.html
index e0a7b153b2..e0a7b153b2 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en.html
+++ b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en.html
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en1.pdf b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en1.pdf
index ed0fcbff02..ed0fcbff02 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en1.pdf
+++ b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en1.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en2.pdf b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en2.pdf
index 1a56c394c1..1a56c394c1 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-ex-en2.pdf
+++ b/macros/latex/contrib/shipunov/doc/biokey2html-ex-en2.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/biolist-ex-en.pdf b/macros/latex/contrib/shipunov/doc/biolist-ex-en.pdf
new file mode 100644
index 0000000000..fd6dd62006
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/biolist-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.tex b/macros/latex/contrib/shipunov/doc/biolist-ex-en.tex
index a6c4ef7771..a6c4ef7771 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/biolist-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/boldline-ex-en.pdf b/macros/latex/contrib/shipunov/doc/boldline-ex-en.pdf
new file mode 100644
index 0000000000..973c80f505
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/boldline-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.tex b/macros/latex/contrib/shipunov/doc/boldline-ex-en.tex
index b07299efbe..b07299efbe 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/boldline-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/cassete-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/cassete-ex-ru.pdf
new file mode 100644
index 0000000000..cce8159b19
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/cassete-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.tex b/macros/latex/contrib/shipunov/doc/cassete-ex-ru.tex
index e470bc8ece..e470bc8ece 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/cassete-ex-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/classif2-ex-en.pdf b/macros/latex/contrib/shipunov/doc/classif2-ex-en.pdf
new file mode 100644
index 0000000000..04cbe101bd
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/classif2-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/classif2-ex-en.tex b/macros/latex/contrib/shipunov/doc/classif2-ex-en.tex
new file mode 100644
index 0000000000..85edb057e4
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/classif2-ex-en.tex
@@ -0,0 +1,596 @@
+\documentclass[12pt]{article}
+\usepackage{classif2}
+\usepackage[vmargin=2.5cm]{geometry}
+\nofiles
+
+\def\SYN #1 {=~\textit{#1} }
+
+\LevelName{1.0}{\EmptyName{Species}}
+\LevelName{1.5}{Sectio\Reset{Level}}
+\LevelName{1.2}{Series\Reset{Level}}
+\Globaltrue
+
+\title{A phylogenetic study of the Plantaginaceae\thanks{Classification only. Some name corrections were applied.}}
+\author{Knud Rahn}
+\date{Botanical Journal of Linnean Society (1996),\\ 120: 145--198}
+
+\begin{document}
+\maketitle
+
+\begin{classif}{1.0}
+
+/*2.0 Plantago L.
+
+/1.8 Plantago
+
+/1.5 Plantago
+
+ /1.0 {Plantago rugelii} Decne.
+
+ /1.0 {Plantago major} L.
+
+ /1.0 {Plantago asiatica} L.
+
+ /1.0 {Plantago erosa} Wall.
+
+ /1.0 {Plantago incisa} Hassk.
+
+ /1.0 {Plantago taquetii} Lev.
+
+ /1.0 {Plantago coreana} Lev.
+
+ /1.0 {Plantago hasskarlii} Decne.
+
+ /1.0 {Plantago schneideri} Pilg.
+
+ /1.0 {Plantago centralis} Pilg.
+
+ /1.0 {Plantago cavaleriei} Lev.
+
+ /1.0 {Plantago alata} Nakai
+
+ /1.0 {Plantago himalaica} Pilg.
+
+ /1.0 {Plantago aitchisonii} Pilg.
+
+ /1.0 {Plantago sawadai} Yamam.
+
+ /1.0 {Plantago formosana} Tateishi \& Masam.
+
+ /1.0 {Plantago japonica} Franch. \& Sav.
+
+ /1.0 {Plantago yezoensis} Pilg.
+
+ /1.0 {Plantago hakusanensis} Koidz.
+
+ \medskip
+
+ /1.0 {Plantago gentianoides} Sibth. \& Sm.
+
+ /1.0 {Plantago reniformis} Beck
+
+ /1.0 {Plantago cornuti} Gouan
+
+ /1.0 {Plantago palmata} Hook.f.
+
+ /1.0 {Plantago africana} Verde.
+
+ \medskip
+
+ /1.0 {Plantago tanalensis} Baker
+
+ /1.0 {Plantago longissima} Decne.
+
+ /1.0 {Plantago sparsiflora} Michx.
+
+ /1.0 {Plantago fischeri} Engl.
+
+ /1.0 {Plantago remota} Lam.
+
+ \medskip
+
+ /1.0 {Plantago aucklandica} Hook.f.
+
+ /1.0 {Plantago rapensis} Pilg.
+
+ /1.0 {Plantago fernandezia} Barneoud
+
+ /1.0 {Plantago rupicola} Pilg.
+
+ \medskip
+
+ /1.0 {Plantago robusta} Roxb.
+
+ \medskip
+
+ /1.0 {Plantago eriopoda} Torr.
+
+ /1.0 {Plantago tweedyi} A. Gray
+
+ \medskip
+
+ /1.0 {Plantago cordata} Lam.
+
+ \medskip
+
+ /1.0 {Plantago hedleyi} Maiden
+
+ \medskip
+
+ /1.0 {Plantago media} L.
+
+ /1.0 {Plantago maxima} Jacq.
+
+ /1.0 {Plantago canescens} Adams
+
+ /1.0 {Plantago macrocarpa} Cham. \& Schltdl.
+
+ /1.0 {Plantago princeps} Cham. \& Schltdl.
+
+ /1.0 {Plantago hawaiensis} (Gray) Pilg.
+
+ /1.0 {Plantago pachyphylla} A. Gray \INCL{
+ \SYN {Plantago muscicola} Pilg.,
+ \SYN {Plantago hillebrandii} Pilg.,
+ \SYN {Plantago glabrifolia} (Rock) Pilg.,
+ \SYN {Plantago melanochrous} Pilg.,
+ \SYN {Plantago krajinai} Pilg.,
+ \SYN {Plantago grayana} Pilg.}
+
+ /1.0 {Plantago laxiflora} Decne
+
+/1.5 Micropsyllium Decne
+
+ /1.0 {Plantago bigelovii} A. Gray
+
+ /1.0 {Plantago elongata} Pursh
+
+ /1.0 {Plantago heterophylla} Nutt.
+
+ /1.0 {Plantago pusilla} Nutt.
+
+ \medskip
+
+ /1.0 {Plantago polysperma} Kar. \& Kir.
+
+ /1.0 {Plantago tenuiflora} Waldst. \& Kit.
+
+/1.5 Mesembrynia (Decne.) Rahn
+
+ /1.0 {Plantago montisdicksonii} P. Royen
+
+ /1.0 {Plantago papuana} P. Royen
+
+ /1.0 {Plantago trichophora} Merr. \& Perry
+
+ /1.0 {Plantago cladarophylla} Briggs et al.
+
+ /1.0 {Plantago alpestris} Briggs et al.
+
+ /1.0 {Plantago euryphylla} Briggs et al.
+
+ /1.0 {Plantago daltonii} Decne.
+
+ /1.0 {Plantago tasmanica} Hook.f.
+
+ /1.0 {Plantago raoulii} Decne.
+
+ \medskip
+
+ /1.0 {Plantago cunninghamii} Decne.
+
+ /1.0 {Plantago turrifera} Briggs et al.
+
+ /1.0 {Plantago multiscapa} Briggs
+
+ /1.0 {Plantago debilis} R.Br
+
+ /1.0 {Plantago euana} Huerlimann
+
+ \medskip
+
+ /1.0 {Plantago drummondii} Decne.
+
+ /1.0 {Plantago pentasperma} Hemsl.
+
+ \medskip
+
+ /1.0 {Plantago exilis} Decne.
+
+ /1.0 {Plantago gaudichaudii} Barneoud
+
+ /1.0 {Plantago bellidioides} Decne.
+
+ /1.0 {Plantago varia} R.Br.
+
+ /1.0 {Plantago glabrata} Hook.f.
+
+ /1.0 {Plantago hispida} R.Br
+
+ /1.0 {Plantago spathulata} Hook.f.
+
+ /1.0 {Plantago stauntonii} Reichardt
+
+ \medskip
+
+ /1.0 {Plantago antarctica} Decne.
+
+ /1.0 {Plantago picta} Colenso
+
+ /1.0 {Plantago schwarzenbergiana} Schur
+
+ /1.0 {Plantago depressa} Willd.
+
+ /1.0 {Plantago camtschatica} Link
+
+ \medskip
+
+ /1.0 {Plantago komarovii} Pavl.
+
+ /1.0 {Plantago perssonii} Pilg.
+
+ /1.0 {Plantago arachnoidea} Schrenk
+
+/1.5 Virginica Barneoud
+
+
+ /1.0 {Plantago galapagensis} Rahn
+
+ /1.0 {Plantago virginica} L.
+
+ /1.0 {Plantago rhodosperma} Decne.
+
+ /1.0 {Plantago firma} Walp. \INCL{
+ \SYN {Plantago skottsbergii} Pilg.}
+
+ \medskip
+
+ /1.0 {Plantago tenuipala} Rahn
+
+ /1.0 {Plantago myosuros} Lam.
+
+ \medskip
+
+ /1.0 {Plantago penantha} Griseb.
+
+ /1.0 {Plantago pachyneura} Steud.
+
+ /1.0 {Plantago orbignyana} Decne.
+
+ /1.0 {Plantago dielsiana} Pilg.
+
+ /1.0 {Plantago jujuyensis} Rahn
+
+ /1.0 {Plantago venturii} Pilg.
+
+ /1.0 {Plantago buchtienii} Pilg.
+
+ /1.0 {Plantago truncata} Cham. \& Schltdl.
+
+ /1.0 {Plantago berroi} Pilg.
+
+ /1.0 {Plantago subnuda} Pilg.
+
+ /1.0 {Plantago alismatifolia} Pilg.
+
+ /1.0 {Plantago australis} Lam.
+
+ /1.0 {Plantago turficola} Rahn
+
+ \medskip
+
+ /1.0 {Plantago catharinea} Decne.
+
+ /1.0 {Plantago argentina} Pilg.
+
+ /1.0 {Plantago ventanensis} Pilg.
+
+ \medskip
+
+ /1.0 {Plantago floccosa} Decne.
+
+ /1.0 {Plantago guilleminiana} Decne.
+
+ /1.0 {Plantago weddelliana} Decne.
+
+ /1.0 {Plantago tomentosa} Lam.
+
+ /1.0 {Plantago commersoniana} Barneoud
+
+ /1.0 {Plantago trinitatis} Rahn
+
+/1.5 Oliganthos Barneoud
+
+/1.2 Oliganthos Rahn
+
+ /1.0 {Plantago barbata} G. Forst
+
+ /1.0 {Plantago moorei} Rahn
+
+ /1.0 {Plantago tehuelcha} Speg.
+
+ /1.0 {Plantago correae} Rahn
+
+ /1.0 {Plantago uniglumis} Walp
+
+ /1.0 {Plantago sempervivoides} Dusen
+
+ /1.0 {Plantago pulvinata} Speg.
+
+ /1.0 {Plantago triantha} Spreng.
+
+/1.2 Microcalyx (Pilg.) Rahn
+
+
+ /1.0 {Plantago novae-zelandiae} L.B. Moore
+
+ /1.0 {Plantago muelleri} Pilg.
+
+ /1.0 {Plantago palustris} Fraser et al.
+
+ /1.0 {Plantago glacialis} Briggs et al.
+
+ \medskip
+
+ /1.0 {Plantago aundensis} P. Royen
+
+ /1.0 {Plantago stenophylla} Merr. \& Perry
+
+ /1.0 {Plantago polita} Craven
+
+ /1.0 {Plantago depauperata} Merr. \& Perry
+
+ \medskip
+
+ /1.0 {Plantago unibracteata} Rahn \INCL{
+ \SYN {Plantago uniflora} Hook.f., non L.}
+
+ /1.0 {Plantago triandra} Berggr.
+
+ /1.0 {Plantago gunnii} Hook.f.
+
+ /1.0 {Plantago obconica} Sykes
+
+/1.5 Carpophorae (Rahn) Rahn
+
+ /1.0 {Plantago rigida} Kunth
+
+ /1.0 {Plantago tubulosa} Decne.
+
+/1.8 Coronopus (Lam. \& DC.) Rahn
+
+/1.5 Maritima H.Dietr
+
+ /1.0 {Plantago subulata} L. \INCL{
+ \SYN {Plantago holosteum} Scop.,
+ \SYN {Plantago radicata} Hoffmans. \& Link,
+ \SYN {Plantago insularis} (Godr.) Nyman,
+ \SYN {Plantago penyalarensis} Pau}
+
+ /1.0 {Plantago maritima} L. \INCL{
+ \SYN {Plantago serpentina} All.,
+ \SYN {Plantago oliganthos} Roem. \& Schult.,
+ \SYN {Plantago atlantica} Batt.}
+
+ /1.0 {Plantago alpina} L.
+
+ /1.0 {Plantago rhizoxylon} Emb.
+
+/1.5 Coronopus
+
+ /1.0 {Plantago asphodeloides} Svent
+
+ /1.0 {Plantago crassifolia} Forssk.
+
+ /1.0 {Plantago serraria} L. \INCL{
+ \SYN {Plantago peloritana} Lojac}
+
+ /1.0 {Plantago coronopus} L. \INCL{
+ \SYN {Plantago aschersonii} Bolle}
+
+ /1.0 {Plantago crypsoides} Boiss.
+
+ /1.0 {Plantago macrorhiza} Poir.
+
+ /1.0 {Plantago subspathulata} Pilg.
+
+/1.8 Littorella (P.J. Bergius) Rahn
+
+ /1.0 {Plantago araucana} Rahn
+
+ /1.0 {Plantago americana} (Fernald) Rahn
+
+ /1.0 {Plantago uniflora} L.
+
+/1.8 Psyllium Juss.
+
+ /1.0 {Plantago euphratica} Barneoud
+
+ /1.0 {Plantago sinaica} Barneoud.
+
+ /1.0 {Plantago mauritanica} Boiss. \& Reut.
+
+ /1.0 {Plantago asperrima} Hervier
+
+ /1.0 {Plantago sempervirens} Crantz \INCL{
+ \SYN {Plantago cynops} L. 1762, nom. illeg.;
+ \SYN {Plantago suffruticosa} Lam.}
+
+ /1.0 {Plantago famarae} Svent
+
+ /1.0 {Plantago webbii} Barn.
+
+ /1.0 {Plantago arborescens} Poir. \INCL{
+ \SYN {Plantago costae} Menezes,
+ \SYN {Plantago maderensis} Decne.}
+
+ \medskip
+
+ /1.0 {Plantago arenaria} Waldst. \& Kit. \INCL{
+ \SYN {Plantago indica} L. 1759, nom. illeg.,
+ \SYN {Plantago psyllium} L. 1753, nom. ambig.,
+ \SYN {Plantago scabra} Moench, nom. illeg.}
+
+ /1.0 {Plantago afra} L. \INCL{
+ \SYN {Plantago cynops} L. 1753 nom. ambig. non L. 1762,
+ \SYN {Plantago psyllium} L. 1762, non L. 1753,
+ \SYN {Plantago squalida} Salisb.}
+
+ /1.0 {Plantago exigua} Murray
+
+ /1.0 {Plantago maris-mortui} Eig
+
+ /1.0 {Plantago phaeostoma} Boiss. \& Heldr.
+
+ \medskip
+
+ /1.0 {Plantago squarrosa} Murray
+
+ /1.0 {Plantago sarcophylla} Boiss. ex Decne.
+
+ /1.0 {Plantago chamaepsyllium} Zohary
+
+/1.8 Bougueria (Decne.) Rahn
+
+ /1.0 {Plantago nubicola} (Decne.) Rahn
+
+/1.8 Albicans Rahn
+
+/1.5 Montana Barneoud
+
+ /1.0 {Plantago notata} Lag.
+
+ /1.0 {Plantago loeflingii} L.
+
+ /1.0 {Plantago cafra} Decne.
+
+ /1.0 {Plantago monosperma} Pourr.
+
+ /1.0 {Plantago nivalis} Boiss
+
+ /1.0 {Plantago atrata} Hoppe
+
+/1.5 Lanceifolia Barneoud
+
+ /1.0 {Plantago argentea} Chaix
+
+ /1.0 {Plantago altissima} L.
+
+ /1.0 {Plantago lagopus} L.
+
+ /1.0 {Plantago lacustris} Maire
+
+ /1.0 {Plantago leiopetala} Lowe \INCL{
+ \SYN {Plantago malato-belizii} Lawalree}
+
+ /1.0 {Plantago lanceolata} L.
+
+/1.5 Bauphula Decne.
+
+ /1.0 {Plantago amplexicaulis} Cav.
+
+/1.5 Hymenopsyllium Pilg.
+
+ /1.0 {Plantago cretica} L.
+
+ /1.0 {Plantago cyrenaica} Durand \& Barratte
+
+ /1.0 {Plantago bellardi} All.
+
+/1.5 Albicans Barneoud
+
+/1.2 Ovatae Rahn
+
+ /1.0 {Plantago ovata} Forssk.
+
+/1.2 Minutae Rahn \INCL{
+= Lachnanthae Rahn}
+
+ /1.0 {Plantago lachnantha} Bunge \INCL{
+ \SYN {Plantago evacina} Boiss.}
+
+ /1.0 {Plantago minuta} Pall. \INCL{
+ \SYN {Plantago lessingii} Fisch. \& C.A. Mey.}
+
+ /1.0 {Plantago stocksii} Boiss.
+
+/1.2 Albicantes Rahn
+
+ /1.0 {Plantago albicans} L.
+
+ /1.0 {Plantago cylindrica} Forssk.
+
+ /1.0 {Plantago boissieri} Hausskn. \& Bornm.
+
+/1.2 Ciliatae Rahn
+
+ /1.0 {Plantago ciliata} Desf.
+
+ /1.0 {Plantago psammophila} Agnew \& Chal.-Kabi
+
+ /1.0 {Plantago tunetana} Murb.
+
+ /1.0 {Plantago akkensis} Coss.
+
+ /1.0 {Plantago lagocephala} Bunge
+
+/1.5 Gnaphaloides Barneoud
+
+/1.2 Hispidulae Rahn
+
+ /1.0 {Plantago limensis} Pers.
+
+ /1.0 {Plantago litorea} Phil.
+
+ /1.0 {Plantago rancaguae} Steud.
+
+ /1.0 {Plantago hispidula} Ruiz \& Pav.
+
+ /1.0 {Plantago lundborgii} Sparre.
+
+/1.2 Sericeae Rahn
+
+ /1.0 {Plantago linearis} Kunth
+
+ /1.0 {Plantago nivea} Kunth
+
+ /1.0 {Plantago tolucensis} Pilg.
+
+ /1.0 {Plantago sericea} Ruiz \& Pav.
+
+ /1.0 {Plantago lamprophylla} Pilg.
+
+ /1.0 {Plantago bismarckii} Niederl.
+
+ /1.0 {Plantago grandiflora} Meyen
+
+ /1.0 {Plantago johnstonii} Pilg.
+
+/1.2 Brasilienses Rahn
+
+ /1.0 {Plantago brasiliensis} Sims
+
+ /1.0 {Plantago densa} Pilg.
+
+ /1.0 {Plantago tandilensis} Pilg.
+
+/1.2 Gnaphaloides Rahn
+
+ /1.0 {Plantago argyrea} Morris
+
+ /1.0 {Plantago erecta} Morris
+
+ /1.0 {Plantago helleri} Small
+
+ /1.0 {Plantago wrightiana} Decne.
+
+ /1.0 {Plantago aristata} Michx.
+
+ /1.0 {Plantago hookeriana} Decne.
+
+ /1.0 {Plantago patagonica} Jacq.
+
+\end{classif}
+
+\end{document}
+
diff --git a/macros/latex/contrib/shipunov/doc/dline-ex.pdf b/macros/latex/contrib/shipunov/doc/dline-ex.pdf
new file mode 100644
index 0000000000..9df0ebf63d
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/dline-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/dline-ex.tex b/macros/latex/contrib/shipunov/doc/dline-ex.tex
new file mode 100644
index 0000000000..8e3ed27155
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/dline-ex.tex
@@ -0,0 +1,76 @@
+\documentclass{article}
+\usepackage[english]{babel}
+\usepackage{dline}
+
+\nofiles
+
+\begin{document}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Purus semper eget
+duis at tellus at. Blandit volutpat maecenas volutpat blandit aliquam
+etiam erat velit. Feugiat in fermentum posuere urna nec. Laoreet id donec
+ultrices tincidunt arcu non. Eget magna fermentum iaculis eu. Pellentesque
+elit ullamcorper dignissim cras tincidunt lobortis feugiat. Mauris
+ultrices eros in cursus turpis massa. Sit amet justo donec enim diam
+vulputate ut. Sapien faucibus et molestie ac feugiat sed lectus. Vitae
+congue eu consequat ac felis donec. Lacus suspendisse faucibus interdum
+posuere lorem ipsum dolor sit. Lorem ipsum dolor sit amet. Maecenas
+pharetra convallis posuere morbi. Nibh ipsum consequat nisl vel.
+
+Leo urna molestie at elementum eu facilisis. Quam pellentesque nec
+nam aliquam. Dolor sed viverra ipsum nunc aliquet bibendum enim. Amet
+justo donec enim diam vulputate ut pharetra sit. Pulvinar neque laoreet
+suspendisse interdum consectetur libero id faucibus. Quis hendrerit
+dolor magna eget est lorem. Sed faucibus turpis in eu mi bibendum neque
+egestas congue. Laoreet sit amet cursus sit amet dictum sit. Aliquet risus
+feugiat in ante metus dictum at. Tincidunt praesent semper feugiat nibh.
+
+\begin{dline}
+
+Et netus et malesuada fames ac turpis egestas. Lectus mauris ultrices
+eros in cursus turpis massa tincidunt. Sit amet commodo nulla facilisi
+nullam vehicula ipsum a arcu. Lorem ipsum dolor sit amet consectetur
+adipiscing elit pellentesque. Vestibulum rhoncus est pellentesque elit
+ullamcorper. Id ornare arcu odio ut sem nulla pharetra diam. Arcu bibendum
+at varius vel pharetra. Cras fermentum odio eu feugiat pretium nibh
+ipsum consequat nisl. Condimentum vitae sapien pellentesque habitant
+morbi tristique senectus et. Aliquet enim tortor at auctor urna nunc
+id cursus. Eget dolor morbi non arcu. Pharetra et ultrices neque
+ornare aenean euismod elementum. Amet consectetur adipiscing elit ut
+aliquam. Ornare arcu odio ut sem nulla pharetra diam sit. Cursus eget
+nunc scelerisque viverra mauris in aliquam sem. Eget mauris pharetra et
+ultrices neque.
+
+Vel facilisis volutpat est velit egestas dui. Aliquet porttitor lacus
+luctus accumsan tortor posuere ac. Metus aliquam eleifend mi in nulla. Est
+ultricies integer quis auctor elit sed vulputate. Id diam maecenas
+ultricies mi eget mauris. Viverra vitae congue eu consequat ac felis donec
+et odio. Placerat vestibulum lectus mauris ultrices. Suspendisse potenti
+nullam ac tortor vitae purus faucibus. Non odio euismod lacinia at. Odio
+pellentesque diam volutpat commodo sed. Adipiscing tristique risus nec
+feugiat. Pretium quam vulputate dignissim suspendisse in est. Diam in
+arcu cursus euismod quis viverra. Fringilla est ullamcorper eget nulla
+facilisi etiam. Ut venenatis tellus in metus vulputate eu scelerisque
+felis. Adipiscing tristique risus nec feugiat. Senectus et netus et
+malesuada.
+
+\end{dline}
+
+Est ante in nibh mauris. Eu scelerisque felis imperdiet proin fermentum
+leo vel orci porta. Vel fringilla est ullamcorper eget nulla facilisi
+etiam dignissim diam. Placerat duis ultricies lacus sed. Sit amet mauris
+commodo quis. Risus ultricies tristique nulla aliquet enim tortor at
+auctor. Velit scelerisque in dictum non. Scelerisque purus semper eget
+duis at tellus at urna condimentum. Tortor posuere ac ut consequat semper
+viverra nam. At ultrices mi tempus imperdiet nulla malesuada pellentesque
+elit eget. Faucibus scelerisque eleifend donec pretium vulputate sapien
+nec sagittis aliquam. Rhoncus aenean vel elit scelerisque. Etiam tempor
+orci eu lobortis elementum nibh. Turpis egestas maecenas pharetra
+convallis posuere morbi leo. Id aliquet risus feugiat in ante. Faucibus
+pulvinar elementum integer enim neque volutpat ac tincidunt. Egestas
+integer eget aliquet nibh praesent tristique magna sit. Enim nec dui nunc
+mattis enim. Dolor sit amet consectetur adipiscing. Non tellus orci ac
+auctor augue mauris augue neque gravida.
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/drcaps-ex-en.pdf b/macros/latex/contrib/shipunov/doc/drcaps-ex-en.pdf
new file mode 100644
index 0000000000..8172aa8c21
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/drcaps-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.tex b/macros/latex/contrib/shipunov/doc/drcaps-ex-en.tex
index 4f7b697962..4f7b697962 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/drcaps-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/etiketka-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/etiketka-ex-ru.pdf
new file mode 100644
index 0000000000..a592212684
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.tex b/macros/latex/contrib/shipunov/doc/etiketka-ex-ru.tex
index 1fc864a55e..1fc864a55e 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/etiketka-ex1-en.pdf b/macros/latex/contrib/shipunov/doc/etiketka-ex1-en.pdf
new file mode 100644
index 0000000000..fb8daf8101
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex1-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.tex b/macros/latex/contrib/shipunov/doc/etiketka-ex1-en.tex
index d7a17e5f7f..35eea9a5a4 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.tex
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex1-en.tex
@@ -10,7 +10,7 @@
\Dist Severomorsk district
-\Loc 10 km to NW from vill. Dal’niye Zelentsy
+\Loc 10 km to NW from vill. Dal'niye Zelentsy
\Habit Western shore of Gavrilovskaya bay
diff --git a/macros/latex/contrib/shipunov/doc/etiketka-ex2-en.pdf b/macros/latex/contrib/shipunov/doc/etiketka-ex2-en.pdf
new file mode 100644
index 0000000000..d0989ea580
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex2-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.tex b/macros/latex/contrib/shipunov/doc/etiketka-ex2-en.tex
index 0fb2e3083b..0fb2e3083b 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.tex
+++ b/macros/latex/contrib/shipunov/doc/etiketka-ex2-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/exam-ex.pdf b/macros/latex/contrib/shipunov/doc/exam-ex.pdf
new file mode 100644
index 0000000000..bf340142ba
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/exam-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/exam-ex.tex b/macros/latex/contrib/shipunov/doc/exam-ex.tex
new file mode 100644
index 0000000000..9cc7b186d8
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/exam-ex.tex
@@ -0,0 +1,285 @@
+\documentclass[letterpaper]{article}
+\usepackage{multicol,graphicx,array}
+
+% ===
+
+\makeatletter
+\newcommand{\Bigstrut}{\raisebox{-1.5ex}{\rule{0pt}{5ex}}}
+\newcommand*{\NUMBER}{\relax}
+\providecommand*{\LIN}[1][2em]{\leavevmode\hbox to #1{\hrulefill}}
+\renewcommand*{\@oddfoot}{\raisebox{0pt}[\headheight][0pt]{%
+\vbox{\hrule \hbox to\textwidth{\vrule\,\strut\itshape
+BIOL 154 \hfil \NUMBER\ (Page \thepage)\,%
+\vrule}\hrule}}}
+\renewcommand*{\@oddhead}{\raisebox{0pt}[\headheight][0pt]{%
+\vbox{\hrule \hbox to\textwidth{\vrule\,\Bigstrut\itshape
+BIOL 154 \hfil ID \LIN[12cm] \hfil
+\vrule}\hrule}}}
+\renewcommand{\_}{\mbox{}\hrulefill}
+
+\renewcommand*\thesection{\Roman{section}.}
+
+\renewcommand\theenumii{\@Alph\c@enumii}
+\renewcommand\theenumiii{\@roman\c@enumiii}
+\renewcommand\theenumiv{\@alph\c@enumiv}
+\renewcommand\labelenumi{\theenumi.}
+\renewcommand\labelenumii{\theenumii.}
+\renewcommand\labelenumiii{\theenumiii.}
+\renewcommand\labelenumiv{\theenumiv.}
+\renewcommand\p@enumii{\theenumi}
+\renewcommand\p@enumiii{\theenumi(\theenumii)}
+\renewcommand\p@enumiv{\p@enumiii\theenumiii}
+\renewcommand{\arraystretch}{1.5}
+
+\newcommand{\be}{\begin{enumerate}}
+\newcommand{\ee}{\end{enumerate}}
+
+\topmargin=-1cm
+\headheight=0cm
+\headsep=0.5cm
+\textheight=24cm
+\textwidth=18.5cm
+\oddsidemargin=-1.5cm
+\parindent=0cm
+\nofiles
+\columnseprule=0.4pt
+\makeatother
+
+% ===
+
+\renewcommand{\NUMBER}{Exam 4}
+
+\begin{document}
+
+\emph{Start time \LIN[5cm] \hfill End time \LIN[5cm]}
+
+\section{Multiple choice (58 points)}
+
+Each question in this section costs either 2 or 0. Please \textbf{mark} the appropriate answer on the \textbf{scantron}.
+
+\begin{multicols}{2}
+
+\be
+
+\item Which of the following groups is tightly adapted to insect pollination?
+ \be
+ \item Orchids
+ \item Grasses
+ \item Ferns
+ \ee
+
+\item Which life form is prevalent in North Dakota?
+ \be
+ \item Phanerophytes
+ \item Cryptophytes
+ \item Xerophytes
+ \ee
+
+\item What is the botanical name of organs like potato vegetable?
+ \be
+ \item Bulb
+ \item Tuber
+ \item Rhizome
+ \ee
+
+\item A pollen grain is:
+ \be
+ \item Composed of 5 cells, each is a spore
+ \item Male gametophyte
+ \item Diplont
+ \ee
+
+\item An embryo is:
+ \be
+ \item Composed of $1n$ tissue
+ \item Composed of $2n$ tissue
+ \item A mature gametophyte
+ \ee
+
+\item Gametophytes in ferns, conifers, and flowering plants tend to be:
+ \be
+ \item Small
+ \item Diploid
+ \item Dominant
+ \ee
+
+\item The name for the complete female zone of a flower is the:
+ \be
+ \item Ovule
+ \item Gynoecium
+ \item Perianth
+ \ee
+
+\item All of the \_ taken together compose a corolla.
+ \be
+ \item Petals
+ \item Anthers
+ \item Sepals and petals
+ \ee
+
+\item Which choice does NOT belong to the pistil?
+ \be
+ \item Macrosporangium
+ \item Ovule
+ \item Endoderm
+ \ee
+
+\item Microspores (male spores) are produced by:
+ \be
+ \item Mitosis
+ \item Meiosis
+ \ee
+
+\item In a flowering plant life cycle, female gametophyte is:
+ \be
+ \item Gynoecium
+ \item Pollen grain
+ \item Embryo sac
+ \ee
+
+\item Which of the following choices represents the correct sequence?
+ \be
+ \item Microspores $\rightarrow$ meiosis $\rightarrow$ gametophyte $\rightarrow$ sperm cell
+ \item Meiosis $\rightarrow$ microspores $\rightarrow$ gametophyte $\rightarrow$ sperm cell
+ \item Gametophyte $\rightarrow$ meiosis $\rightarrow$ egg cell $\rightarrow$ megaspore
+ \ee
+
+\item The oocyte (egg cell) is:
+ \be
+ \item Diploid
+ \item Triploid
+ \item Haploid
+ \ee
+
+\item The endosperm$_2$ (endosperm of angiosperms) is:
+ \be
+ \item Tetraploid
+ \item Triploid or diploid
+ \item Haploid
+ \ee
+
+\item The endosperm$_1$ (endosperm of gymnosperms) is:
+ \be
+ \item Tetraploid
+ \item Triploid or diploid
+ \item Haploid
+ \ee
+
+\item Double fertilization in flowering plants refers to the union of:
+ \be
+ \item One sperm with the egg and one sperm with nucellus
+ \item Two sperms with two eggs
+ \item One sperm with the egg and one sperm with central cell
+ \ee
+
+\item ABC-genes are involved in:
+ \be
+ \item Determination of different parts of flower
+ \item Determination of different parts of fruit
+ \item Determination of different parts of seed
+ \ee
+
+\item Flowers pollinated by bats should:
+ \be
+ \item Open at nights
+ \item Have big size
+ \item Both of above
+ \ee
+
+\item Which is NOT part of a seed?
+ \be
+ \item Embryo
+ \item Pericarp
+ \item Endosperm
+ \ee
+
+\item The reproductive cycle of the bryophytes resembles other land plants because:
+ \be
+ \item Their life cycle is gametic
+ \item Their life cycle is sporic
+ \item Their diploid stage is dominant
+ \ee
+
+\item Which of the following is the adaptation for animal distribution?
+ \be
+ \item Wings on the fruit or seed
+ \item Hard seed coat
+ \item Floatable pericarp
+ \ee
+
+\item Male heads of the \textit{Mnium} moss contain all of the following except:
+ \be
+ \item Paraphyses
+ \item Antheridia
+ \item Venter surrounding the egg
+ \ee
+
+\item Which of the following is NOT true for seed plants?
+ \be
+ \item They took female gametophyte under the cover of mother sporophyte
+ \item They invented pollination
+ \item They did not resolve a conflict between sizes of gametophyte and sporophyte
+ \ee
+
+\item Which group is more basal?
+ \be
+ \item Angiosperms
+ \item Conifers
+ \item Cycads
+ \ee
+
+\item Which of the following is NOT a conifer?
+ \be
+ \item Fir
+ \item Cedar
+ \item Ginkgo
+ \item Cypress
+ \ee
+
+\item Second fertilization in angiosperms:
+ \be
+ \item Issues a finishing signal to endosperm development
+ \item Starts the development of normal embryo
+ \item Helps plant to avoid the creation of non-fertilized seeds
+ \ee
+
+\item Mature pine tree is:
+ \be
+ \item An angiosperm
+ \item A haploid plant body
+ \item A sporophyte
+ \item All of the above
+ \ee
+
+\item The most ancestral living angiosperm is:
+ \be
+ \item \emph{Gikngo}
+ \item \emph{Amborella}
+ \item \emph{Archaefructus}
+ \ee
+
+\ee
+
+\end{multicols}
+
+\newpage
+
+\section{Short answers (42 or even more points)}
+
+\be
+
+\item Mycoparasitic, achlorophyllous plant \emph{Lacandonia schismatica} (below) grows in the rain forests of Mexico. It is called ``\emph{schismatica}'' (i.e. heretical) because its flowers have pistils placed outside of stamens, and stamens---in the center of flower. How could this placement be favorable for the plant? (\emph{plausible explanation $=10$ points})
+
+\begin{center}
+\includegraphics[width=.9\textwidth]{example-image-a}%
+\end{center}
+
+\vspace{\stretch{1}}
+
+\item Please describe what could be a plant ``located'' at the point \textbf{A} in the morphospace of life forms below. How might this plant look? If you have an example in mind, please list it here. (\emph{plausible explanation with example $= 10$ points, without example $= 5$ points})
+
+\vspace{\stretch{2}}
+
+\ee
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/field-form-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/field-form-ex1-ru.pdf
new file mode 100644
index 0000000000..e2dfe0ec0f
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/field-form-ex1-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.tex b/macros/latex/contrib/shipunov/doc/field-form-ex1-ru.tex
index e0028305d7..ac2bdc3f09 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/field-form-ex1-ru.tex
@@ -7,14 +7,14 @@
\topmargin=-2cm
\headheight=0cm
-\headsep=.5cm
+\headsep=0cm
\textheight=27cm
\footskip=.5cm
\textwidth=18cm
\oddsidemargin=-1.25cm
-\evensidemargin=-1.75cm
+\evensidemargin=-1.75cm
\parindent=0pt
-\renewcommand{\baselinestretch}{.95}
+\renewcommand{\baselinestretch}{.95}
\nofiles
\pagestyle{empty}
diff --git a/macros/latex/contrib/shipunov/doc/field-form-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/field-form-ex2-ru.pdf
new file mode 100644
index 0000000000..5c0d569237
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/field-form-ex2-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.tex b/macros/latex/contrib/shipunov/doc/field-form-ex2-ru.tex
index be25ee2e39..180721155b 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/field-form-ex2-ru.tex
@@ -7,7 +7,7 @@
\topmargin=-2cm
\headheight=0cm
-\headsep=.5cm
+\headsep=0cm
\textheight=27cm
\footskip=.5cm
\textwidth=18cm
diff --git a/macros/latex/contrib/shipunov/doc/flower-ex-en.pdf b/macros/latex/contrib/shipunov/doc/flower-ex-en.pdf
new file mode 100644
index 0000000000..b547c44580
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/flower-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.tex b/macros/latex/contrib/shipunov/doc/flower-ex-en.tex
index 36afed6f9c..36afed6f9c 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/flower-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/isyntax-ex-en.tex b/macros/latex/contrib/shipunov/doc/isyntax-ex-en.tex
index 2f19399fa2..960f892058 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/isyntax-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/isyntax-ex-en.tex
@@ -12,9 +12,8 @@ how dreary and gray our homes are, we people of flesh and blood would
rather live there than in any other country, be it ever so beautiful.
There is no place like home.''
-The Scarecrow sighed.
% The error is here:
-\THEERRORISHERE
+\TheScarecrowsighed.
``Of course I cannot understand it,'' he said. ``If your heads were
stuffed with straw, like mine, you would probably all live in the
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/NEWS b/macros/latex/contrib/shipunov/doc/latex/shipunov/NEWS
deleted file mode 100644
index c05f20c08b..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-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/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.pdf
deleted file mode 100644
index 2df7a4d50a..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.pdf
deleted file mode 100644
index e76a0441e2..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex1-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.pdf
deleted file mode 100644
index 8828efa165..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/altverse-ex2-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.pdf
deleted file mode 100644
index 9db2f082de..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/autolist-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.pdf
deleted file mode 100644
index 686c9dfccb..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey-doc-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.pdf
deleted file mode 100644
index 4b06034f80..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.tex b/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.tex
deleted file mode 100644
index 03a417497d..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biokey2html-doc-en.tex
+++ /dev/null
@@ -1,175 +0,0 @@
-\documentclass[a4paper,12pt]{article}
-\usepackage{biokey}
-
-\author{\IN A.V.Shipunova, \IN A.B.Shipunov}
-
-\title{``\texttt{biokey2html}'',\\ the primer of hypertext web/typography identification key}
-
-\date{}
-\begin{document}
-\maketitle
-
-\subsection*{Example A}
-
-This is the plain text source:
-
-\bigskip\hrule
-\begin{verbatim}
-
-1. Leaves pinnatifid ... 2.
-
--- Leaves entire ... 3.
-
-2. Plants perennial, leaves dissected to numerous lanceolate
-lobes ... Polemonium L.---Jacob's ladder.
-
--- Annual plants, leaves with narrow lobes ...
-Gilia L.---Gilia.
-
-3(1). The compact inflorescence is surrounded by leaflike
-bracts ... Collomia Nutt.---Collomia.
-
--- The sparse inflorescence without specialised bracts ...
-Plox L.---Phlox, Sweet-william.
-
-\end{verbatim}
-
-\subsection*{Example B}
-
-This is the \TeX/\LaTeX variant (with stable numbers) of the same key. Please look to the Collomia---the italicizing is pretty simple (fo binomials one need to use \verb|\NN| command)q:
-
-\bigskip\hrule
-\begin{verbatim}
-
-\Z1. Leaves pinnatifid \T 2.
-
-\AN Leaves entire \T 3.
-
-\Z2. Plants perennial, leaves dissected to numerous lanceolate
-lobes \T Polem\'onium L.---Jacob's ladder.
-
-\AN Annual plants, leaves with narrow lobes \T
-G\'\i{}lia L.---Gilia.
-
-\ZZ3(1). The compact inflorescence is surrounded by leaflike
-bracts \T\KN Coll\'omia Nutt.---Collomia.
-
--- The sparse inflorescence without specialised bracts \T
-Plox L.---Phlox, Sweet-william.
-
-\end{verbatim}
-
-\subsection*{Example C}
-
-This is the typorgaphic PDF output. To produce this, you need special style file, \texttt{biokey.sty}:
-
-\bigskip\hrule\bigskip
-
-\Z1. Leaves pinnatifid \T 2.
-
-\AN Leaves entire \T 3.
-
-\Z2. Plants perennial, leaves dissected to numerous lanceolate
-lobes \T Polem\'onium L.---Jacob's ladder.
-
-\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
-
-\ZZ3(1). The compact inflorescence is surrounded by leaflike
-bracts \T\KN Coll\'omia Nutt.---Collomia.
-
-\AN The sparse inflorescence without specialised bracts \T
-Plox L.---Phlox, Sweet-william.
-
-\subsection*{Example D}
-
-This is the variant with \textbf{automatic} numeration (you need to run \LaTeX{} twice to obtain results) \emph{with PDF hyperlinks}. You can produce if from example B manually, or can use the Perl-script (see below):
-
-\bigskip\hrule
-\begin{verbatim}
-
-\TEZA{AA} Leaves pinnatifid \SSYLKA{AB}
-
-\AN Leaves entire \SSYLKA{AC}
-
-\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate
-lobes \T Polem\'onium L.---Jacob's ladder.
-
-\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
-
-\STEZA{AC}{AA} The compact inflorescence is surrounded by leaflike
-bracts \T Coll\'omia Nutt.---Collomia.
-
-\AN The sparse inflorescence without specialised bracts \T
-Plox L.---Phlox, Sweet-william.
-
-\end{verbatim}
-
-And output:
-
-\bigskip
-
-\TEZA{AA} Leaves pinnatifid \SSYLKA{AB}
-
-\AN Leaves entire \SSYLKA{AC}
-
-\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate
-lobes \T Polem\'onium L.---Jacob's ladder.
-
-\AN Annual plants, leaves with narrow lobes \T G\'\i{}lia L.---Gilia.
-
-\STEZA{AC}{AA} The compact inflorescence is surrounded by leaflike
-bracts \T Coll\'omia Nutt.---Collomia.
-
-\AN The sparse inflorescence without specialised bracts \T
-Plox L.---Phlox, Sweet-william.
-
-\subsection*{Example F}
-
-Three simple \textsf{Perl} scripts do the main work. You can run them all by command \texttt{biokey2html.sh} under UNIX shell on \textsf{Mac OS X} or \textsf{Linux}, or command \texttt{biokey2html.bat} under \textsf{Windows} console:
-
-\begin{verbatim}
-$ chmod 755 biokey2html.sh biokey2html*.pl
-$ ./biokey2html.sh biokey2html-ex-en.tex
-Making relative LaTeX key...
-Making HTML title and paragrafs tags...
-Making reference tags...
-\end{verbatim}
-
-If you want only to produce "automatic" PDF-key with hyperlinks, you should use the file with \texttt{.2} extension, which appears after \texttt{biokey2html.sh} run (see \texttt{biokey2html-ex-en.pdf}).
-
-And the HTML result (part of code):
-
-\bigskip\hrule
-\begin{verbatim}
-
-<p class="ST"><span class="TEZA"><a name="AA">1</a>.</span>
-Leaves pinnatifid ... <span class="SSYLKA"><a href="#AB">2</a>.
-</span>
-
-<p class="ST">-- Leaves entire ... <span class="SSYLKA">
-<a href="#AC">3</a>.</span>
-
-<p class="ST"><span class="TEZA"><a name="AB">2</a>.
-</span> Plants perennial, leaves dissected to numerous lanceolate
-lobes ... <!--<a href="">--><span class="SP"> Polemonium L.--Jacob's ladder.
-</span><!--</a>-->
-
-<p class="ST">-- Annual plants, leaves with narrow lobes ...
-<!--<a href="">--><span class="SP"> Glia L.--Gilia.</span>
-<!--</a>-->
-
-\end{verbatim}
-
-The commented anchors placed there just in case if you are interested to insert links for images etc. The real examples of keys (which is widely used) are on the web-pages:
-
-\begin{itemize}
-
-\item Abramova L.A. et al. The key for most frequent plants in Chupa Gulf environs. [Electronic resource]. 2005. Mode of access:
-\texttt{http://herba.msu.ru\\/shipunov2/belomor/2005/flora/ws\_key/ws\_key.htm}
-
-\item Abramova L.A. et al. The key for most frequent plants in Chupa Gulf environs. [Electronic resource]. 2004. Mode of access:
-\texttt{http://herba.msu.ru\\/shipunov/belomor/2004/flora/ws\_key.pdf}
-
-\end{itemize}
-
-\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.pdf
deleted file mode 100644
index 108cbaf037..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/biolist-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.pdf
deleted file mode 100644
index 22bf88ca8d..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/boldline-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.pdf
deleted file mode 100644
index 36c6acc661..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/cassete-ex-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.pdf
deleted file mode 100644
index 09dc3c52ce..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.tex b/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.tex
deleted file mode 100644
index 6531ab332c..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/classif2-ex-en.tex
+++ /dev/null
@@ -1,596 +0,0 @@
-\documentclass{article}
-
-\usepackage{classif2}
-
-\begin{document}
-
-\begin{classif}{1.0}
-\LevelName{1.0}{\EmptyName{Species}}
-\LevelName{1.5}{Sectio\Reset{Level}}
-
-/*3.0 Plantaginaceae Juss.
-
-/2.0 PLANTAGO L.
-
-/1.8 PLANTAGO
-
-/1.5 Plantago
-
- /1.0 {P. africana} Verdc.
-
- /1.0 {P. densiflora} J. Z. Liu
-
- /1.0 {P. major} L. \sl \footnote{Incl. \KURN P.
- himalaica Pilger?, \KURN P. crassa Willd., \KURN P.
- japonica Fr. et Sav., \KURN P. togashii Mayabe ex Tatew,
- \KURN P. yezomaritima Koidz.}
-
- /1.0 {P. uliginosa} F. W. Schmidt \footnote{Incl. \KURN
- P. winteri Wirtg.}
-
-/1.5 Palaeopsyllium Pilger
-
- /1.0 {P. alata} Nakai?
-
- /1.0 {P. cavaleriei} Leveille?
-
- /1.0 {P. formosana} Tateishi et Masamune?
-
- /1.0 {P. sawadai} Yamamoto?
-
- /1.0 {P. aitchinsonii} Pilger
-
- /1.0 {P. anatolica} Tutel et Mill.
-
- /1.0 {P. asiatica} L. \footnote{Incl. \KURN P. popovii
- Tzvel., \KURN P. taquettii Leveille, \KURN P. yezoensis
- Pilger}
-
- /1.0 {P. aucklandica} Hook. fil.
-
- /1.0 {P. cordata} Lam.
-
- /1.0 {P. coreana} Leveille
-
- /1.0 {P. cornuti} Gouan
-
- /1.0 {P. dielsiana} Pilger
-
- /1.0 {P. eriopoda} Torrey
-
- /1.0 {P. erosa} Wall. \footnote{Incl. \KURN P. centralis
- Pilger?}
-
- /1.0 {P. fernandezia} Bertero ex Barn.
-
- /1.0 {P. fisheri} Engler
-
- /1.0 {P. gentianoides} Sibth. et Smith \footnote{Incl.
- \KURN P. griffithii Decne.}
-
- /1.0 {P. hakusanensis} Koidzumi
-
- /1.0 {P. hasskarlii} Decne.
-
- /1.0 {P. hawaiinensis} (Gray) Pilger
-
- /1.0 {P. hedleyi} Maiden
-
- /1.0 {P. incisa} Hassk.
-
- /1.0 {P. laxiflora} Decne.
-
- /1.0 {P. longissima} Decne.
-
- /1.0 {P. pachyphylla} Gray \sl \footnote{Incl. \KURN P.
- muscicola Pilger, \KURN P. hillebrandii Pilger, \KURN P.
- glabrifolia (Rock) Pilger, \KURN P. melanochrous Pilger,
- \KURN P. krainai Pilger, \KURN P. grayana Pilger}
-
- /1.0 {P. palmata} Hook.f.
-
- /1.0 {P. princeps} Cham. et Schlecht.
-
- /1.0 {P. rapensis} F. Brown
-
- /1.0 {P. remota} Lam.
-
- /1.0 {P. robusta} Roxb.
-
- /1.0 {P. rugellii} Decne.
-
- /1.0 {P. rupicola} Pilger
-
- /1.0 {P. schneideri} Pilger
-
- /1.0 {P. shastensis} Greene
-
- /1.0 {P. sparsiflora} Michx.
-
- /1.0 {P. tanalensis} Baker
-
- /1.0 {P. tweedyi} A. Gray
-
-/1.5 Virginica Barn.
-
- /1.0 {P. alismatifolia} Pilger
-
- /1.0 {P. argentina} Pilger
-
- /1.0 {P. australis} Lam. \sl \footnote{Incl. \KURN P.
- ecuadorensis Pilger, \KURN P. hartwegii Decne. \Pp,
- \KURN P. valida Pilger, \KURN P. bicallosa Decne. \Pp,
- \KURN P. durvillei Del. ex Fisch. et Mey., \KURN P.
- macrostachys Decne., \KURN P. hirtella Kunth, \KURN P.
- myosuros Lam. \Pp, \KURN P. cumingiana Fisch. et Mey.,
- \KURN P. carrenleofuensis Spegazz., \KURN P. goudotiana
- Decne., \KURN P. asplundii Pilger, \KURN P. sodiroana
- Pilger, \KURN P. lasioneura Pilger}
-
- /1.0 {P. berroi} Pilger
-
- /1.0 {P. buchtienii} Pilger
-
- /1.0 {P. catharinea} Decne.
-
- /1.0 {P. commersoniana} Decne. ex Barn.
-
- /1.0 {P. dielsiana} Pilg.
-
- /1.0 {P. firma} Kunze ex Walp.
-
- /1.0 {P. floccosa} Decne.
-
- /1.0 {P. galapagensis} Rahn
-
- /1.0 {P. guilleminiana} Decne.
-
- /1.0 {P. jujuensis} Rahn
-
- /1.0 {P. myosuros} Lam. \sl \footnote{Incl. \KURN P.
- humilior Pilger, \KURN P. nigritella Pilger, \KURN P.
- rojasii Pilger, \KURN P. taraxacoides Pilger}
-
- /1.0 {P. orbignyana} Steinh. ex Decne. \footnote{Incl.
- \KURN P. hartwegii Decne. \Pp, \KURN P. niederleinii
- Pilger}
-
- /1.0 {P. pachyneura} Steud.
-
- /1.0 {P. penantha} Griseb.
-
- /1.0 {P. rhodosperma} Decne.
-
- /1.0 {P. subnuda} Pilger
-
- /1.0 {P. tenuipala} (Rahn) Rahn
-
- /1.0 {P. tomentosa} Lam. \sl \footnote{Incl. \KURN P.
- hypoleuca Pilger, \KURN P. paralias Decne., \KURN P.
- achalensis Pilger, \KURN P. arechavaletai Pilger, \KURN
- P. bicallosa Decne. \Pp}
-
- /1.0 {P. trinitatis} Rahn
-
- /1.0 {P. truncata} Cham. et Schlecht.
-
- /1.0 {P. turficola} Rahn
-
- /1.0 {P. ventanensis} Pilger
-
- /1.0 {P. venturii} Pilger
-
- /1.0 {P. virginica} L.
-
- /1.0 {P. weddeliana} Decne.
-
-/1.5 Holopsyllium Pilger
-
- /1.0 {P. macrocarpa} Cham. ex Schlecht.
-
-/1.5 Carpophorae Rahn
-
- /1.0 {P. rigida} Kunth.
-
- /1.0 {P. tubulosa} Decne.
-
-/1.5 Microcalyx Pilger
-
- /1.0 {P. aundensis} Royen
-
- /1.0 {P. depauperata} Merr. et Perry
-
- /1.0 {P. glacialis} B. G. Briggs et al.
-
- /1.0 {P. gunnii} J. D. Hooker
-
- /1.0 {P. lanigera} J. D. Hooker
-
- /1.0 {P. muelleri} Pilger
-
- /1.0 {P. novae-zelandiae} L. B. Moore
-
- /1.0 {P. obconica} W. R. Sykes
-
- /1.0 {P. palustris} Fraser et Vickery
-
- /1.0 {P. paradoxa} J. D. Hooker
-
- /1.0 {P. polita} Craven
-
- /1.0 {P. stenophylla} Merr. et Perry
-
- /1.0 {P. triandra} Bergg \sl \footnote{Incl. \KURN P.
- masonae Cheesem.}
-
- /1.0 {P. unibracteata} Rahn
-
-/1.5 Oliganthos Barn.
-
- /1.0 {P. barbata} Forst.
-
- /1.0 {P. correae} Rahn
-
- /1.0 {P. moorei} Rahn
-
- /1.0 {P. pulvinata} Spegazz.
-
- /1.0 {P. sempervivoides} Dusen
-
- /1.0 {P. techuelcha} Spegazz.
-
- /1.0 {P. triantha} Spreng.
-
- /1.0 {P. uniglumis} Wallr.
-
-/1.5 Mesembrynia Decne.
-
- /1.0 {P. alpestris} B. G. Briggs et al.
-
- /1.0 {P. antarctica} Decne.
-
- /1.0 {P. arachnoidea} Schrenk
-
- /1.0 {P. bellidoides} Decne.
-
- /1.0 {P. camtschatica} Link
-
- /1.0 {P. cladarophylla} B. G. Briggs et al.
-
- /1.0 {P. cunninghamii} Decne. \footnote{Incl. \KURN P.
- mitchellii Decne.}
-
- /1.0 {P. daltonii} Decne.
-
- /1.0 {P. debilis} R. Br.
-
- /1.0 {P. depressa} Willd.
-
- /1.0 {P. drummondii} Decne. \footnote{Incl. \KURN P.
- pritzelii Pilger}
-
- /1.0 {P. euana} Hurlim
-
- /1.0 {P. euryphylla} B. G. Briggs et al.
-
- /1.0 {P. exilis} Decne.
-
- /1.0 {P. gaudichaudii} Barn. \footnote{Incl. \KURN P.
- bakeri Pilger, \KURN P. sericophylla Decne.}
-
- /1.0 {P. glabrata} J. D. Hooker
-
- /1.0 {P. hispida} R. Br. \footnote{Incl. \KURN P.
- tildeniae Pilger}
-
- /1.0 {P. komarovii} Pavl.
-
- /1.0 {P. montisdicksonii} van Royen
-
- /1.0 {P. multiscapa} B. G. Briggs
-
- /1.0 {P. papuana} van Royen
-
- /1.0 {P. pentasperma} Hemsley
-
- /1.0 {P. perssonii} Pilger
-
- /1.0 {P. picta} Colenso
-
- /1.0 {P. rauolii} Decne.
-
- /1.0 {P. schwarzenbergiana} Schur
-
- /1.0 {P. spathulata} J. D. Hooker
-
- /1.0 {P. stauntonii} Reich.
-
- /1.0 {P. tasmanica} J. D. Hooker
-
- /1.0 {P. trichophora} Merr. et Perry
-
- /1.0 {P. turrifera} B. G. Briggs et al.
-
- /1.0 {P. varia} R. Br. \footnote{Incl. \KURN P.
- acutiloba Pilger, \KURN P. sthruthionis Cunnungh. ex
- Decne.}
-
-/1.5 Lamprosantha Decne.
-
- /1.0 {P. canescens} Adams.
-
- /1.0 {P. jurtzevii} Tzvel.
-
- /1.0 {P. maxima} Juss. ex Jacq.
-
- /1.0 {P. media} L. \footnote{Incl. \KURN P. urvillei
- Opiz}
-
- /*0.8 {Subsp.} media
-
- /*0.8 {Subsp.} stepposa (Kuprian.) So\'o
-
- /1.0 {P. reniformis} G. Beck
-
-/1.5 Micropsyllium Decne.
-
- /1.0 {P. bigelovii} A. Gray
-
- /1.0 {P. elongata} Pursh
-
- /1.0 {P. heterophylla} Nutt.
-
- /1.0 {P. polysperma} Kar. et Kir.
-
- /1.0 {P. pusilla} Nutt.
-
- /1.0 {P. tenuiflora} Waldst. et Kit.
-
-/1.8 CORONOPUS (Lam. et DC.) Rahn
-
-/1.5 Uralensae Shipunov
-
- /1.0 {P. krascheninnikovii} Ye. V. Serg.
-
-/1.5 Maritima Dietrich
-
- /1.0 {P. alpina} L.
-
- /1.0 {P. atlantica} Battandier
-
- /1.0 {P. eocoronopus} Pilger
-
- /1.0 {P. maritima} L. \footnote{Incl. \KURN P. salsa
- Pall., \KURN P. subpolaris Andr., \KURN P. neumannii
- Opiz, \KURN P. oliganthos Roem. et Schult.}
-
- /*0.8 {Subsp.} maritima
-
- /*0.8 {Subsp.} subpolaris (Andrejev) Tzvel.
-
- /1.0 {P. rhizoxylon} Emberg.
-
- /1.0 {P. schrenkii} C. Koch.
-
- /1.0 {P. subulata} L. \footnote{Incl. \KURN P. insularis
- (Godr.) Nyman, \KURN P. humilis Guss., \KURN P.
- holosteum Scop., \KURN P. carinata Schrad., \KURN P.
- penyalarensis Pau, \KURN P. radicata Hoffm. et Link.}
-
-/1.5 Coronopus Lam. et DC.
-
- /1.0 {P. asphodeloides} Svent.
-
- /1.0 {P. coronopus} L. \footnote{Incl. \KURN P.
- ashersonii Bolle, \KURN P. maxonnoi Senn.}
-
- /1.0 {P. crassifolia} Forsk.
-
- /1.0 {P. crypsoides} Boiss.
-
- /1.0 {P. macrorhiza} Poir.
-
- /1.0 {P. serraria} L. \footnote{Incl. \KURN P.
- peloritana Lojac.}
-
- /1.0 {P. subspathulata} Pilger
-
-/1.8 ALBICANS Rahn
-
-/1.5 Lanceifolia Barn.
-
- /1.0 {P. altissima} L.
-
- /1.0 {P. argentea} Chaix \footnote{Incl. \KURN P.
- serpentinicola Reich.}
-
- /1.0 {P. lacustris} Maire
-
- /1.0 {P. lagopus} L.
-
- /1.0 {P. lanceolata} L. \sl \footnote{Incl. \KURN P.
- dubia L.}
-
- /1.0 {P. leiopetala} Lowe \footnote{Incl. \KURN P.
- malato-belizii Lawalree}
-
-/1.5 Montanae Barn.
-
- /1.0 {P. atrata} Hoppe \sl \footnote{Incl. \KURN P.
- discolor Gand., \KURN P. monosperma Pourr., \KURN P.
- saxatilis Bieb.}
-
- /1.0 {P. nivalis} Boiss.
-
-/1.5 Albicans Barn.
-
- /1.0 {P. baltistanica} Hartmann?
-
- /1.0 {P. akkensis} Cosson
-
- /1.0 {P. albicans} L. \footnote{Incl. \KURN P.
- albicantiformis Senn.}
-
- /1.0 {P. amplexicaulis} Cav. \sl \footnote{Incl. \KURN
- P. bauphula Edgew.}
-
- /1.0 {P. annua} Ryding
-
- /1.0 {P. boissierii} Hausskn.
-
- /1.0 {P. cafra} Decne.
-
- /1.0 {P. ciliata} Desf.
-
- /1.0 {P. cylindrica} Forsk.
-
- /1.0 {P. lachnantha} Bunge \sl \footnote{Incl. \KURN P.
- evacina Boiss.}
-
- /1.0 {P. lagocephala} Bunge
-
- /1.0 {P. loeflingii} L. \footnote{Incl. \KURN P.
- scabrifolia Thieb.?}
-
- /1.0 {P. minuta} Pall. \sl \footnote{Incl. \KURN P.
- lessingii Fisch. et Mey.}
-
- /1.0 {P. notata} Lagasca
-
- /1.0 {P. ovata} Forsk. \sl \footnote{Incl. \KURN P.
- fastigiata Morris, \KURN P. mauritii Senn.}
-
- /1.0 {P. psammophila} Agnew et Chalabi-Ka'bi
-
- /1.0 {P. sharifii} Rechinger
-
- /1.0 {P. stocksii} Boiss.
-
- /1.0 {P. tunetana} Murbeck
-
-/1.5 Gnaphaloides Barn.
-
- /1.0 {P. argyrea} Morris
-
- /1.0 {P. aristata} Michx.
-
- /1.0 {P. bismarckii} Niederl.
-
- /1.0 {P. brasiliensis} Sims \sl \footnote{Incl. \KURN P.
- linearis Kunth \Pp}
-
- /1.0 {P. densa} (Pilger) Rahn
-
- /1.0 {P. erecta} Morris \sl \footnote{Incl. \KURN P.
- dura Morris, \KURN P. speciosa Morris}
-
- /1.0 {P. grandiflora} Meyen
-
- /1.0 {P. helleri} Small
-
- /1.0 {P. hispidula} Ruiz. et Pav.
-
- /1.0 {P. hookeriana} Decne.
-
- /1.0 {P. johnstoni} Pilger
-
- /1.0 {P. lamprophylla} Pilger \sl \footnote{Incl. \KURN
- P. godeti Beauv., \KURN P. weberbaueri Pilger}
-
- /1.0 {P. limensis} Pers. \sl \footnote{Incl. \KURN P.
- tacnensis Pilger}
-
- /1.0 {P. linearis} H. B. K. \sl \footnote{Incl. \KURN P.
- amblyacme Pilger}
-
- /1.0 {P. litorea} Phil.
-
- /1.0 {P. lundborgii} Sparre
-
- /1.0 {P. nivea} H. B. K. \footnote{Incl. \KURN P.
- linearis Kunth \Pp}
-
- /1.0 {P. patagonica} Jacq. \sl \footnote{Incl. \KURN P.
- purshii Roem. ex Schult., \KURN P. spinulosa Decne.}
-
- /1.0 {P. rancagua} Steud.
-
- /1.0 {P. sericea} Ruiz. et Pav. \sl \footnote{Incl.
- \KURN P. argyrophylla Decne., \KURN P. caulescens
- Watson, \KURN P. monticola Decne, \KURN P. nubigena
- Kunth, \KURN P. perreymondii Barn., \KURN P. polyclada
- Pilger, \KURN P. compsophylla Pilger, \KURN P. extensa
- Pilger, \KURN P. fiebrigii Pilger, \KURN P. lorentzii
- Pilger, \KURN P. tarattotrix Pilger, \KURN P. tarijensis
- Pilger, \KURN P. congesta Ruiz. et Pav., \KURN P.
- macbridei Pilger}
-
- /1.0 {P. tandilensis} (Pilger) Rahn
-
- /1.0 {P. tolucensis} Pilger
-
- /1.0 {P. wrightiana} Decne.
-
-/1.5 Hymenopsyllium Pilger
-
- /1.0 {P. bellardi} All.
-
- /1.0 {P. cretica} L.
-
- /1.0 {P. cyrenaica} Durand. et Barratte
-
-/2.0 PSYLLIUM Mill.
-
- /1.0 {Ps. arborescens} (Poir.) Mirb.
-
- /1.0 {Ps. arenarium} (Waldst. et Kit.) Mirb.
- \footnote{Incl. \KURN Ps. scabrum (Moench.) Holub}
-
- /*0.8 {Subsp.} arenarium
-
- /*0.8 {Subsp.} orientalis (So\'o) Soj\'ak
-
- /1.0 {Ps. asperrimum} (Gand.) Holub \footnote{Incl.
- \KURN P. assoana Senn.}
-
- /1.0 {Ps. chamaepsyllium} (Zoh.) Holub
-
- /1.0 {Ps. euphraticum} (Decne. ex Barn.) Soj\'ak
-
- /1.0 {Ps. exiguum} (Murr.) Soj\'ak
-
- /1.0 {Ps. famarae} (Svent.) C. Kunkel
-
- /1.0 {Ps. maris-mortui} (Eig) Holub
-
- /1.0 {Ps. mauritanicum} (Boiss. et Reut.) Soj\'ak
-
- /1.0 {Ps. phaeostomum} (Boiss. ex Heldr.) Soj\'ak
-
- /1.0 {Ps. sarcophyllum} (Zoh.) Holub
-
- /1.0 {Ps. sempervirens} (Crantz) Soj\'ak
-
- /1.0 {Ps. sinaicum} (Barn. ex Decne.) Holub
-
- /1.0 {Ps. squalidum} (Salisb.) Soj\'ak
-
- /1.0 {Ps. squarrosum} (Murr.) Dum.
-
- /1.0 {Ps. webbii} (Barn.) Soj\'ak
-
-/2.0 LITTORELLA Bergius
-
- /1.0 {L. americana} Fernald
-
- /1.0 {L. australis} Griseb.
-
- /1.0 {L. uniflora} (L.) Ashers.
-
-/2.0 BOUGUERIA Decne.
-
- /1.0 {B. nubicola} Decne.
-
-\end{classif}
-
-\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.pdf
deleted file mode 100644
index 1332843cea..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/drcaps-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.pdf
deleted file mode 100644
index c367006ebf..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.pdf
deleted file mode 100644
index ac878e63f7..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex1-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.pdf
deleted file mode 100644
index 9d1933b104..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/etiketka-ex2-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.pdf
deleted file mode 100644
index 18324f4bf4..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex1-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.pdf
deleted file mode 100644
index 418c687591..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/field-form-ex2-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.pdf
deleted file mode 100644
index e6ff6a5a0d..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.tex b/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.tex
deleted file mode 100644
index 9367d7bbef..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en-x.tex
+++ /dev/null
@@ -1,186 +0,0 @@
-ο»Ώ\documentclass[12pt]{article}
-\usepackage{xunicode,fontspec,longtable,a4wide}
-\usepackage[table]{xcolor}
-
-\defaultfontfeatures{Mapping=tex-text}
-\setmainfont[Scale=1.0,
- BoldFont={* Bold},
- ItalicFont={* Italic},
- BoldItalicFont={* Bold Italic}]
- {DejaVu Serif}
-
-\colorlet{tableheadcolor}{gray!25}
-\colorlet{tablerowcolor}{gray!12.5}
-
-\title{Flower formulas for different plant families,\\ mostly from Middle Russia}
-\author{}
-\date{}
-
-\usepackage{flower}
-
-\begin{document}
-\maketitle
-
-\rowcolors{3}{tablerowcolor}{}
-\extrarowheight2pt
-\begin{longtable}{lc}
-\hline\rowcolor{tableheadcolor}\textbf{Family}&\textbf{Formula}\\[2pt]
-\endhead
-\hline
-\endfoot
-Acoraceae & $\Act\P{6}\A{6}\Ge(3)$\\[2pt]
-Actinidiaceae & $\Act\K{5}\C{5}\A{\infty}\Ge(\infty)$\\[2pt]
-Adoxaceae (\textit{Adoxa}) & $\Act[\K{2}\C{4}\A{4\times2}]\vee[\K{3}\C{5}\A{5\times2}]\Gm(2)$\\[2pt]
-Adoxaceae (\textit{Sambucus}) & $\Act\K{(5)}\C{(5)}\A{5}\Gm(2)$\\[2pt]
-Aizoaceae (\textit{Mollugo}) & $\Act\P{(5)}\A{5}\Ge(3)$\\[2pt]
-Alismataceae & $\Act\K{3}\C{3}\A{6\vee\infty}\Ge{\infty}$\\[2pt]
-Amaranthaceae & $\Act\P{3-5}\A{3-5}\Ge(2)$\\[2pt]
-Amaryllidaceae & $\Act\P{3+3}\A{3+3}\Gi(3)$\\[2pt]
-Anacardiaceae & $\Act\K{5}\C{5}\A{10-5}\Ge(1-3)$\\[2pt]
-Apocynaceae & $\Act\K{(5)}\C{(5)}\A{5}\Ge{2}$\\[2pt]
-Araceae (\textit{Calla}) & $\Act\A{6}\Ge(3)$\\[2pt]
-Araliaceae & $\Act\K{5}\C{5}\A{5}\Gi(1-5)$\\[2pt]
-Aristolochiaceae & $\Zyg\P{1}(\A{6}\Gi(3))$\\[2pt]
-Asaraceae & $\Act\P{(3)}\A{12}\Gi(3)$\\[2pt]
-Asparagaceae & $\Act\P{4\vee(6)}\A{3+3}\Ge(3)$\\[2pt]
-Balsaminaceae & $\Zyg\K{1,2}\C{1,2,2}\A{(5)}\Ge(5)$\\[2pt]
-Begoniaceae & $\P{2-6}\Gi(3)\vee\P{2\vee[2+2]}\A{\infty}$\\[2pt]
-Berberidaceae & $\Act\K{3+3}\C{3+3}\A{3+3}\Ge{1}$\\[2pt]
-Betulaceae & $\P{0\vee2\vee(4)}\A{4-12}\vee\P{0\vee(\infty)}\Gi(2)$\\[2pt]
-Boraginaceae & $\Act\vee\Zyg\K{(5)}\C{(5)}\A{5}\Ge(2\times2)$\\[2pt]
-Bromeliaceae & $\Act\K{3}\C{3}\A{3+3}\Gi{3}$\\[2pt]
-Butomaceae & $\Act\K{3}\C{3}\A{9}\Ge{6}$\\[2pt]
-Cactaceae & $\Act\K{\infty}\C{\infty}\A{\infty}\Ge(3)$\\[2pt]
-Callitrichaceae & $\A{1}\vee\Ge(2\times2)$\\[2pt]
-Campanulaceae (most) & $\Act\K{(5)}\C{(5)}\A{5}\Gi(2\vee3\vee5)$\\[2pt]
-Campanulaceae (\textit{Lobelia}) & $\Zyg\K{(5)}\C{(2,3)}\A{(5)}\Gi(3)$\\[2pt]
-Cannaceae & $\K{3}\C{3}\?{S}{2\frac{1}{2}}\A{\frac{1}{2}}\Gi(3)$\\[2pt]
-Caprifoliaceae & $\Act\vee\Zyg\K{(5)}\C{(5)}\A{5\vee4}\Gi(2)$\\[2pt]
-Caprifoliaceae (\textit{Linnaea}) & $\Zyg\K{(5)}\C{5}\A{2,[3\vee2]}\Gi(2)$\\[2pt]
-Caryophyllaceae & $\Act\K{5\vee(5)}\C{5\vee0}\A{5\vee10}\Ge(3\vee5)$\\[2pt]
-Celastraceae & $\Act\K{(4)}\C{4}\A{4}\Ge(2)$\\[2pt]
-Ceratophyllaceae & $\Act\P{12}\A{\infty}\vee\Act\P{8-12}\Ge{1}$\\[2pt]
-Chenopodiaceae & $\Act\P{3-5}\A{1-5}\Ge(2)$\\[2pt]
-Cistaceae & $\Act\K{2+3}\C{5}\A{\infty}\Ge(3)$\\[2pt]
-Commelinaceae & $\K{3}\C{1,2}\A{3}\Ge(3)$\\[2pt]
-Compositae & $\Act\vee\Zyg\K{0\vee5}\C{(5\vee3)}\A{(5)}\Gi(2)$\\[2pt]
-Convolvulaceae & $\Act\K{(5\vee4)}\C{(5\vee4)}\A{5\vee4}\Ge(2)$\\[2pt]
-Cornaceae & $\Act\K{(4)}\C{4}\A{4}\Gi(2)$\\[2pt]
-Crassulaceae & $\Act\K{(5-20)}\C{5-20}\A{10-40}\Ge{5-20}$\\[2pt]
-Cruciferae & $\Act\K{4}\C{4}\A{2+4}\Ge(2)$\\[2pt]
-Cucurbitaceae & $\Act\K{(5)}\C{(5)}\A{(5)}\vee\Act\K{(5)}\C{(5)}\Gi(3-5)$\\[2pt]
-Cyperaceae & $\Zyg\vee\Act\P{0-6}\A{3\vee2}\Ge(3\vee2)$\\[2pt]
-Dipsacaceae & $\Zyg\?{E}{(4\vee8)}\K{(5\vee3)\vee0}\C{(4\vee5)}\A{4}\Gi(2)$\\[2pt]
-Droseraceae & $\Act\K{5}\C{5}\A{5}\Ge(3)$\\[2pt]
-Elaeagnaceae & $\Act\P{(2-4)}\A{4}\Gi(2)$\\[2pt]
-Elatinaceae & $\Act\K{2-4}\C{2-4}\A{3-8}\Ge(2-4)$\\[2pt]
-Empetraceae & $\Act\K{3}\C{3}\A{3}\Ge(3)$\\[2pt]
-Ericaceae & $\Act\K{(4\vee5)}\C{[(4\vee5)]\vee5}\A{4\vee5+4\vee5}\Ge(4\vee5)\vee\Gi(4)$\\[2pt]
-Ericaceae (Pyroloideae) & $\Act\K{(5)}\C{5}\A{10}\Ge(5)$\\[2pt]
-Ericaceae (\textit{Oxycoccus}) & $\Act\K{4}\C{(4)}\A{4+4}\Gi(4)$\\[2pt]
-Ericaceae (\textit{Monotropa}) & $\Act\K{4\vee5}\C{4\vee5}\A{4\vee5+4\vee5}\Ge(4\vee5)$\\[2pt]
-Ericaceae (\textit{Vaccinium}) & $\Act\K{(5)}\C{(5)}\A{5}\Gi(4)$\\[2pt]
-Euphorbiaceae & $\A{1}\vee\Ge(3)$\\[2pt]
-Fagaceae & $\Act\P{(5-9)}\A{5-10}\vee\Act\P{\infty}\Gi(2)$\\[2pt]
-Gentianaceae & $\Act\K{(5\vee[4-7])}\C{(5\vee[4-7])}\A{4-7}\Ge(2)$\\[2pt]
-Geraniaceae & $\Act\K{5}\C{5}\A{[5+5]\vee(5)}\Ge(5)$\\[2pt]
-Gramineae & $\Zyg\P{2\vee3}\A{[3-1]\vee6}\Ge(2)$\\[2pt]
-Haloragaceae & $\Act\K{4}\C{4}\A{4+4}\vee\Act\K{4}\C{4}\Gi{4}$\\[2pt]
-Hippuridaceae & $\Zyg(\A{1}\Gi{1})$\\[2pt]
-Hydrangeaceae (\textit{Philadelphus}) & $\Act\K{4\vee5}\C{4\vee5}\A{\infty}\Gi(4)$\\[2pt]
-Hydrocharitaceae (\textit{Hydrocharis}) & $\Act\P{3+3}\A{3+3+3}\vee\Act\P{3+3}\Gi{6}$\\[2pt]
-Hydrocharitaceae (\textit{Stratiotes}) & $\Act\K{3}\C{3}\A{\infty}\Gi{6}$\\[2pt]
-Hydrocharitaceae (\textit{Elodea}) & $\Act\K{(3)}\C{3}\?{S}{1-3}\Gi{3}$\\[2pt]
-Hydrophyllaceae (\textit{Phacelia}) & $\Act\K{(5)}\C{(5)}\A{5}\Ge(2)$\\[2pt]
-Hypericaceae & $\Act\K{5}\C{5}\A{3\times\infty}\Ge(3)$\\[2pt]
-Iridaceae & $\Act\vee\Zyg\P{(3+3)}\A{3}\Gi(3)$\\[2pt]
-Juglandaceae & $\P{3-6}\A{3-40}\vee\P{4}\Gi(1)$\\[2pt]
-Juncaceae & $\Act\P{3+3}\A{[3+3]\vee3}\Ge(3)$\\[2pt]
-Labiatae & $\Zyg\K{(5)}\C{(2,3)}\A{[2,2]\vee2}\Ge(2\times2)$\\[2pt]
-Lauraceae & $\Act\P{3+3}\A{3+3+3}\Ge{1}$\\[2pt]
-Leguminosae & $\Zyg\K{(5\vee3)}\C{[1,2,(2)]\vee(1,2,2)}\A{[1,(4+5)]\vee(10)}\Ge{1}$\\[2pt]
-Lemnaceae & $\A{1}\vee\Ge{1}$\\[2pt]
-Lentibulariaceae (\textit{Pinguicula}) & $\Zyg\K{(2)}\C{(2)}\A{2}\Ge{1}$\\[2pt]
-Lentibulariaceae (\textit{Lentibularia}) & $\Zyg\K{(2)}\C{(2)}\A{2}\Ge(2)$\\[2pt]
-Liliaceae & $\Act\P{3+3}\A{3+3}\Ge(3)$\\[2pt]
-Linaceae & $\Act\K{4\vee5}\C{4\vee5}\A{4\vee5}\Ge(4\vee5)$\\[2pt]
-Lythraceae (\textit{Peplis}) & $\Act\K{(6+6)}\C{0\vee6}\A{6}\Ge(2)$\\[2pt]
-Lythraceae (\textit{Lythrum}) & $\Act\K{(6+6)}\C{6}\A{[6+6]\vee6}\Ge(2)$\\[2pt]
-Magnoliaceae & $\Act\P{3+3+3+3}\A{\infty}\Ge{\infty}$\\[2pt]
-Malvaceae & $\Act\?{H}{0\vee3-8\vee(3-8)}\K{5}\C{5}\A{(\infty)}\Ge{(\infty)\vee\infty}$\\[2pt]
-Melanthiaceae (\textit{Veratrum}) & $\Act\P{3+3}\A{3+3}\Ge{3}$\\[2pt]
-Menyanthaceae (\textit{Nymphoides}) & $\Act\K{(5)}\C{(5)}\A{5}\Ge(2)$\\[2pt]
-Menyanthaceae (\textit{Manyanthes}) & $\Act\K{(5)}\C{(5)}\A{5}\Ge(2)$\\[2pt]
-Moraceae & $\P{4}\A{4}\vee\P{4}\Ge(2)$\\[2pt]
-Musaceae & $\Zyg\P{5,1}\A{5,1}\vee\Gi{3}$\\[2pt]
-Myrtaceae & $\Act\K{4-5}\C{4-5}\A{\infty}\Gi{2}$\\[2pt]
-Najadaceae & $\P{1}\A{1}\vee\Ge{1}$\\[2pt]
-Nitrariaceae & $\Act\K{5}\C{5}\A{5+5}\Ge(3)$\\[2pt]
-Nyctaginaceae & $\P{5}\A{1-\infty}\Ge{1}$\\[2pt]
-Nymphaeaceae & $\Act\K{4-6}\C{\infty}\A{\infty}\Ge(\infty)\vee\Gm(\infty)$\\[2pt]
-Oleaceae & $\Act\K{(4)}\C{(4)}\A{2}\Ge(2)$\\[2pt]
-Oleaceae (\textit{Fraxinus} & $\K{0\vee4}\A{2}\Ge(2)$\\[2pt]
-Onagraceae & $\Act\K{2\vee4}\C{2\vee4}\A{2\vee[4+4]}\Gi(2-5)$\\[2pt]
-Onagraceae (\textit{Chamaenerion}) & $\Zyg\K{4}\C{1,3}\A{4+4}\Gi(2)$\\[2pt]
-Orchidaceae & $\Zyg\P{3\vee[(2),1]+2,1}(\A{1\vee2}\Gi(3))$\\[2pt]
-Oxalidaceae & $\Act\K{5}\C{5}\A{(5+5)}\Ge(5)$\\[2pt]
-Paeoniaceae & $\K{5}\C{5}\A{\infty}\Ge(2-4)$\\[2pt]
-Palmae & $\Act\P{3+3}\A{3+3}\vee\Ge{3}$\\[2pt]
-Papaveraceae (Fumarioideae) & $\Zyg\K{2}\C{(1,3)}\A{2\times3}\Ge(2)$\\[2pt]
-Papaveraceae (Papaveroideae) & $\Act\K{2}\C{4}\A{\infty}\Ge(2)$\\[2pt]
-Parnassiaceae & $\Act\K{(5)}\C{5}\?{S}{5}\A{5}\Ge(3)$\\[2pt]
-Plantaginaceae & $\Act\K{4\vee3}\C{(4)}\A{4}\Ge(2)$\\[2pt]
-Plumbaginaceae & $\Act\K{(5)}\C{(5)}\A{5}\Ge{1}$\\[2pt]
-Polemoniaceae & $\Act\K{(5)}\C{(5)}\A{5}\Ge(3)$\\[2pt]
-Polygalaceae & $\Zyg\K{2,3}\C{([1,2]\vee[1,4])}\A{(8)}\Ge(2)$\\[2pt]
-Polygalaceae & $\Zyg\K{2,3}\C{[1,2]\vee[1,4]}\A{(8)}\Ge(2)$\\[2pt]
-Polygonaceae & $\P{(4\vee5)\vee3-6}\A{5-9}\Ge(3)$\\[2pt]
-Portulacaceae (\textit{Montia}) & $\Act\K{(2)}\C{(5)}\A{3}\Ge(3)$\\[2pt]
-Potamogetonaceae & $\Act\P{4}\A{4}\Ge{4}$\\[2pt]
-Primulaceae & $\Act\K{(5\vee4\vee7)}\C{(5\vee4\vee7)}\A{5\vee4\vee7}\Ge(5\vee4\vee7)$\\[2pt]
-Primulaceae (\textit{Trientalis}) & $\Act\K{7}\C{7}\A{7}\Ge(7)$\\[2pt]
-Primulaceae (\textit{Hottonia}) & $\Act\K{5}\C{(5)}\A{5}\Ge(5)$\\[2pt]
-Ranunculaceae & $\Act\vee\Zyg [\K{3-15}\C{2-25}]\vee[\P{5-6}]\A{5-\infty}\Ge{1-\infty}$\\[2pt]
-Ranunculaceae (\textit{Batrachium}) & $\Act\K{5}\C{5}\A{\infty}\Ge{\infty}$\\[2pt]
-Ranunculaceae (\textit{Atragene}) & $\Act\K{4}\C{4}\A{\infty}\Ge{\infty}$\\[2pt]
-Resedaceae & $\Zyg\K{4-6}\C{4-6}\A{10-\infty}\Ge(3)$\\[2pt]
-Rhamnaceae & $\Act\K{(4\vee5)}\C{4\vee5}\A{4\vee5}\Ge(2)$\\[2pt]
-Rosaceae & $\Act\K{(5)}\C{5}\A{\infty}\Ge{1}\vee\Gi(2-5)$\\[2pt]
-Rosaceae (Rosoideae) & $\Act\?{H}{(5\vee4\vee0)}\K{(5\vee4)}\C{5\vee4\vee0\vee6}\A{4-\infty}\Ge{1-\infty}$\\[2pt]
-Rosaceae (\textit{Alchemilla, Sanguisorba}) & $\Act\?{H}{0\vee4}\K{4}\A{4}\Ge{1}$\\[2pt]
-Rubiaceae & $\Act\K{0\vee(4\vee5)}\C{(4\vee3\vee5)}\A{4\vee3\vee5}\Gi(2)$\\[2pt]
-Rutaceae & $\Act\K{4-5}\C{4-5}\A{[4-5]\vee[8-10]}\Ge(4-5)$\\[2pt]
-Salicaceae & $\A{3-20}\vee\Ge(2)$\\[2pt]
-Santalaceae (\textit{Viscum}) & $\Act\P{2+2}\A{2+2}\vee\Act\P{2+2}\Gi(2)$\\[2pt]
-Santalaceae (\textit{Thesium}) & $\Act\P{(5\vee4)}\A{5\vee4}\Gi(2)$\\[2pt]
-Sapindaceae & $\Act\vee\Zyg\K{5}\C{5}\A{5-12}\Ge(2)$\\[2pt]
-Sapindaceae (\textit{Acer negundo}) & $\Act\P{(5)}\A{4-6}\vee\Act\P{5}\Ge(2)$\\[2pt]
-Saxifragaceae (\textit{Saxifraga}) & $\Act\K{5}\C{5}\A{10}\Ge(2)$\\[2pt]
-Saxifragaceae (\textit{Chrysosplenium}) & $\Act\P{(4\vee5)}\A{8}\Gi(2)$\\[2pt]
-Saxifragaceae (\textit{Ribes} s.\,l.) & $\Act\K{(5\vee4)}\C{5\vee4}\A{5\vee4}\Gi(2)$\\[2pt]
-Scheuchzeriaceae (\textit{Triglochin}) & $\Act\P{3}\A{3}\P{3}\A{3}\Ge(3)$\\[2pt]
-Scheuchzeriaceae (\textit{Scheuchzeria}) & $\Act\P{3+3}\A{3+3}\Ge{3}$\\[2pt]
-Scrophulariaceae & $\Zyg\vee\Act\K{(4\vee5)}\C{([2,3]\vee4\vee5)}\A{[2,2]\vee2\vee5}\Ge(2)$\\[2pt]
-Scrophulariaceae (\textit{Veronica}) & $\Zyg\K{(4)}\C{(4)}\A{2}\Ge(2)$\\[2pt]
-Scrophulariaceae (\textit{Limosella}) & $\Act\K{(5)}\C{(5)}\A{4\vee2}\Ge(2)$\\[2pt]
-Solanaceae & $\Act\K{(5)}\C{(5)}\A{5}\Ge(2)$\\[2pt]
-Tamaricaceae & $\Act\K{5}\C{5}\A{5}Ge(1)$\\[2pt]
-Theaceae & $\Act\K{5}\C{5}\A{\infty}\Ge(3)$\\[2pt]
-Thymelaeaceae (\textit{Daphne}) & $\Act\P{(4)}\A{8}\Ge(2)$\\[2pt]
-Tiliaceae & $\Act\K{5}\C{5}\A{\infty}\Ge(3)$\\[2pt]
-Trapaceae & $\Act\K{4}\C{4}\A{4}\Gi(2)$\\[2pt]
-Trilliaceae (\textit{Paris}) & $\Act\P{4+4}\A{4}\Ge(4)$\\[2pt]
-Tropaeolaceae & $\Zyg\K{1,4}\C{2,3}\A{8}\Ge(3)$\\[2pt]
-Typhaceae & $\P{0\vee3-6}\A{3\vee(3)}\vee\P{0\vee3-6}\Ge{1}$\\[2pt]
-Typhaceae (\textit{Sparganium}) & $\Act\P{3-6}\A{3}\vee\Act\P{3-6}\Ge{1}$\\[2pt]
-Ulmaceae & $\Act\P{(4-6)}\A{4-6}\Ge{1}$\\[2pt]
-Umbelliferae & $\Act\vee\Zyg\K{5}\C{5}\A{5}\Gi(2)$\\[2pt]
-Urticaceae & $\Act\P{4\vee5}\A{4\vee5}\vee\Act\P{4\vee0}\Ge{1}$\\[2pt]
-Valerianaceae & $\Asx\K{0}\C{(5-3)}\A{3}\Gi(2)$\\[2pt]
-Violaceae & $\Zyg\K{5}\C{[1,4]\vee0}\A{2,3}\Ge(3)$\\[2pt]
-Vitaceae & $\Act\K{5}\C{(5)}\A{5}\Ge(2)$\\[2pt]
-Zannichelliaceae & $\Zyg\P{1}\A{1}\Ge{3-5}$\\[2pt]
-Zygophyllaceae & $\Act\K{5}\C{5}\A{5+5}\Ge(5)$\\[2pt]\hline
-\end{longtable}
-
-\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.pdf
deleted file mode 100644
index 03cc743704..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/flower-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.pdf
deleted file mode 100644
index 945a72e9e5..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.pdf
deleted file mode 100644
index 6ba709bbb8..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.pdf
deleted file mode 100644
index ecd2b57f45..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.pdf
deleted file mode 100644
index 9e8ba1d668..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.pdf
deleted file mode 100644
index 5c4c82d5f8..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.pdf
deleted file mode 100644
index 40d5fbf355..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.pdf
deleted file mode 100644
index 5d9af7f308..0000000000
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/lecture-slides-ex.pdf b/macros/latex/contrib/shipunov/doc/lecture-slides-ex.pdf
new file mode 100644
index 0000000000..29d6f94796
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/lecture-slides-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/lecture-slides-ex.tex b/macros/latex/contrib/shipunov/doc/lecture-slides-ex.tex
new file mode 100644
index 0000000000..6594b03cbf
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/lecture-slides-ex.tex
@@ -0,0 +1,565 @@
+\documentclass{beamer}
+
+\mode<presentation>
+{
+\usetheme{Montpellier}
+\setbeamercovered{transparent}
+\usecolortheme[RGB={0,128,54}]{structure}
+\useoutertheme{infolines}
+\beamertemplatenavigationsymbolsempty
+}
+
+\usepackage[english]{babel}
+\usepackage[latin1]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[normalem]{ulem}
+
+\title{Biogeography}
+
+\author[Shipunov]{Alexey~Shipunov}
+
+\institute[MSU]{Minot State University}
+
+\date{Lectures 31--34}
+
+\subject{}
+
+% \pgfdeclareimage[height=0.5cm]{university-logo}{../../msu_logo.pdf}
+% \logo{\pgfuseimage{university-logo}}
+
+\newcommand{\be}{\begin{enumerate}}
+\newcommand{\ee}{\end{enumerate}}
+\renewcommand{\arraystretch}{1.5}
+
+\newcommand{\Max}[1]{\includegraphics[width=\textwidth,height=.91\textheight,keepaspectratio]{#1}}
+\newcommand{\May}[1]{\includegraphics[width=\textwidth,height=.8\textheight,keepaspectratio]{#1}}
+
+\newcommand{\GI}[1]{\href{http://www.google.com/search?q=#1&tbm=isch}{\dashuline{#1}}}
+\newcommand{\GII}[1]{\href{http://www.google.com/search?q=#1&tbm=isch}{\emph{\dashuline{#1}}}}
+
+\AtBeginSubsection{
+\begin{frame}
+\begin{center}
+\structure{\Huge\insertsection\\\bigskip\huge\insertsubsection}
+\end{center}
+\end{frame}
+}
+
+\begin{document}
+
+\begin{frame}
+\titlepage
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Outline}
+\tableofcontents[pausesections]
+\end{frame}
+
+% ===
+
+\section{Biogeography of the World}
+\subsection{Biogeography of Indo-Pacific region}
+
+% ===
+
+\begin{frame}
+\frametitle{Western Indo-Pacific}
+
+\centering
+
+\Max{example-image-a}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Eastern Indo-Pacific}
+
+\centering
+
+% \Max{pics/ip_physical2.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Oceania cultures}
+
+\centering
+
+% \Max{pics/polynesia.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific: temperatures}
+
+\centering
+
+% \Max{pics/ip_avganntemp_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific: precipitation}
+
+\centering
+
+% \Max{pics/ip_anntotprecip_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific geology: the ``giant puzzle''}
+
+\centering
+
+% \Max{pics/ip_geology.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific: potential biomes}
+
+\centering
+
+% \Max{pics/ip_potentialveg_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific: biogeographical regions and Wallace line}
+
+\centering
+
+% \Max{pics/ip_regions.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific: 8 biogeographical regions}
+
+\begin{enumerate}
+
+\item North India
+
+\item Deccan Plateau and South India
+
+\item Sundaland: Indochina
+
+\item Sundaland: Malay archipelago
+
+\item Wallacea
+
+\item New Guinea and Melanesia
+
+\item Coral Pacific Islands
+
+\item Volcanic Pacific Islands
+
+\end{enumerate}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Indo-Pacific regions: key features}
+
+\begin{enumerate}\fontsize{7pt}{8pt}\selectfont
+
+\item \textbf{North India}: Asian lions (\GII{Panthera leo persica}) and tigers (\GII{Panthera tigris})
+
+\item \textbf{Deccan Plateau and South India}: the most ``African'' fauna outside of Africa, e.g., Asian elephant (\GII{Elephas maximus}) (smaller ears and less skinny), Indian rhinoceros (\GII{Rhinoceros unicornis}) and multiple species of antelopes like gazelles (\GII{Gazella gazella}); also, many ``true'' Asian elements like king cobra (\GII{Ophiophagus hannah}), the largest venomous snake.
+
+\item \textbf{Indochina}: domestication center of many animals like cattle (e.g., wild gaur \GII{Bos gaurus}) and chicken, Red Junglefowl (\GII{Gallus gallus}). Terrestrial leeches (\GI{Haemadipsidae}).
+
+\item \textbf{Malay archipelago}: one of the most species-rich regions of the World. Unique animals: orangutans (\GII{Pongo pygmaeus} and \GII{Pongo abelii}), gibbons (family \GI{Hylobatidae}), flying lemurs (order \GI{Dermoptera}), flying lizards (\GII{Draco volans}) and even flying frogs (\GII{Rhacophorus})! Hornbills (family \GI{Bucerotidae}, substitute of South American toucans) and scaly anteaters (order \GI{Pholidota}) are common with African biota. Lots of epiphytes (e.g., orchids) but no bromeliads. Pitcher vine \GII{Nepenthes} (some in symbiosis with tree shrews, order \GI{Scandentia}) is also specific to the region. Famous island Krakatoa exploded in 1883 is located here, between Java and Sumatra.
+
+\item \textbf{Wallacea}: border between \GI{Sundaland} and \GI{Sahul}; islands which have never been connected with Asia (some of them like Sulawesi are disputable) and therefore ``stepstones to Australia''. Most famous is Komodo, the island of Komodo dragon (\GII{Varanus komodoensis}), the largest terrestrial reptile (up to 3.1 m)
+
+\item \textbf{New Guinea and Melanesia}: have multiple Australian elements like echidna (\GII{Zaglossus}) but also placental mammals (like \GI{Muridae}, mice) and endemic groups (like birds of paradise, family \GI{Paradisaeidae}).
+
+\item \textbf{Coral Pacific Islands}: very poor soils and consequently poor biota
+
+\item \textbf{Volcanic Pacific Islands like Hawaii}: recently radiated flora and ornithofauna (like Hawaiian honeycreepers, \GI{Drepanididae}) and relatively poor terrestrial fauna.
+
+\end{enumerate}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Summary for Indo-Pacific}
+
+\begin{itemize}
+
+\item Geological ``puzzle'', region with extremely complex history
+
+\item Humid and rich
+
+\item Numerous borders (like Wallace line) and connections (like Madagascar / Indonesia disjunctions)
+
+\end{itemize}
+
+\end{frame}
+
+% ===
+
+\subsection{The basics of island biogeography}
+
+% ===
+
+\begin{frame}
+\frametitle{The basics of island biogeography}
+
+\begin{itemize}
+
+\item Immigration and extinction
+
+\item Distance effect
+
+\item Species-area curve and the effect of island size
+
+\end{itemize}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Species-logarea line for reptiles and amphibians in Caribbean}
+
+\centering
+
+% \Max{pics/caribbean_herpetofauna.png}%
+
+\end{frame}
+
+% ===
+
+\subsection{Biogeography of Australian region}
+
+% ===
+
+\begin{frame}
+\frametitle{Australian region}
+
+\centering
+
+% \Max{pics/au_physical.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australia: temperatures}
+
+\centering
+
+% \Max{pics/atl_avganntemp_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australia: precipitation}
+
+\centering
+
+% \Max{pics/atl_anntotprecip_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australian geology}
+
+\centering
+
+% \Max{pics/au_geology.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australia: potential biomes}
+
+\centering
+
+% \Max{pics/atl_potentialveg_oce.jpg}%
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australian: 7 biogeographical regions}
+
+\begin{enumerate}
+
+\item Tropical North
+
+\item Tropical East: Queensland
+
+\item Desert Center
+
+\item Australian core: South and Southeast
+
+\item Australian Southwest
+
+\item Tasmania
+
+\item Zealandia, partly submerged microcontinent: New Zealand, Lord Howe and New Caledonia
+
+\end{enumerate}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australian: 7 regions}
+
+\centering
+
+% \Max{pics/au_regions.jpg}%
+
+\tiny Thin line is a border of Zealandia
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Australian regions: key features}
+
+\begin{enumerate}\fontsize{7.5pt}{6.5pt}\selectfont
+
+\item \textbf{Tropical North}: climate similar to Gran Chaco in South America, developed rain and extremely dry seasons. Billabongs (shallow drying lakes) are common. The east of region is Australian grasslands, home of many bird species like emu (\GII{Dromaius novaehollandiae}), malleefowl (\GII{Leipoa ocellata}), numerous cockatoo parrots (\GI{Cacatuoidea}) and Rainbow bee-eaters (\GII{Merops ornatus}). Extinct ``marsuplial hippo'', \GII{Diprotodon}, also lived here.
+
+\item \textbf{Queensland}: One of three richest regions. Wet forests. Cuscuses (\GII{Phalanger}) there replace monkeys, \GII{Agathis} conifer substitute for angiosperm tree dominants. Forest ``ostrich'' cassowary (\GII{Casuarius})
+
+\item \textbf{Desert Center}: similar to Sahara. Species-poor. Bowerbirds (\GI{Ptilonorhynchidae}) are probably most famous animals here.
+
+\item \textbf{Australian core}: ``all what you know about Australia'', platypus (\GII{Ornithorhynchus anatinus}), koala (\GII{Phascolarctos cinereus}), kangaroo (\GII{Macropus giganteus}) and other marsupials, Proteaceae and Myrtaceae plants like \GII{Banksia} and \GII{Eucalyptus}, each with many species. Home of living fossil Wollemi pine, \GII{Wollemia nobilis}. Among birds, many ``non-singing'' passerines like lyrebird (\GII{Menura novaehollandiae}).
+
+\item \textbf{Australian Southwest}: Very small but rich region with high endemism. Many interesting marsupials like numbats (\GII{Myrmecobius fasciatus}, replacement of anteater), the only Australian pitcher plant (\GII{Cephalotus follicularis}), grass trees (\GII{Xanthorrhoea}), moloch lizard (\GII{Moloch horridus}) and many others.
+
+\item \textbf{Tasmania}: the temperate variant of Australian biota, the only glaciated (50\%) region. Most famous representatives are two marsupial carnivores, Tasmanian devil (\GII{Sarcophilus harrisii}) and (now extinct) Tasmanian wolf (or tiger) (\GII{Thylacinus cynocephalus}). Lots of unusual plants like Huon pine, \GII{Lagarostrobos} or \GII{Tasmannia}.
+
+\item \textbf{Zealandia}: shatters of microcontinent, probably close to the extinct biota of Antarctic. \textbf{No mammals}. Extinct moa (\GII{Dinornis}) and extant kiwi bird (\GII{Apteryx}). Tuatara (\GII{Sphenodon}). The most primitive flowering plant (\GII{Amborella}).
+
+\end{enumerate}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Summary for Australia}
+
+\begin{itemize}
+
+\item The most biogeographically isolated region
+
+\item High and dry: similar to Africa
+
+\item New Zealand (Aotearoa) has multiple ``Holantarctic'' connections
+
+\end{itemize}
+
+\end{frame}
+
+% ===
+
+\subsection{Rising seas}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: Antarctica}
+\centering
+% \Max{pics/rs_web_antarctica_15m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: Asia}
+\centering
+% \Max{pics/rs_web_asia_17m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: Australia}
+\centering
+% \Max{pics/rs_web_aus_12_5m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: Europe}
+\centering
+% \Max{pics/rs_web_eu_8m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: North America}
+\centering
+% \Max{pics/rs_web_na_15m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: South America}
+\centering
+% \Max{pics/rs_web_sa_15m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Rising seas: Africa}
+\centering
+% \Max{pics/rs_web_africa_15m_v3.jpg}%
+\end{frame}
+
+% ===
+
+\subsection{Very basics of Ocean biogeography}
+
+% ===
+
+\begin{frame}
+\frametitle{Biogeography of Ocean}
+
+\begin{itemize}
+
+\item Diversity in 3D space
+
+\item Rich cool and poor tropical waters
+
+\item Rich coastal and poor open ocean waters
+
+\item Whereas surface biogeography of ocean is determined by continents and currents, biogeography of abyssal is unique.
+
+\end{itemize}
+
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Ocean depths}
+\centering
+% \Max{pics/ocean_depths.png}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Ocean temperatures}
+\centering
+% \Max{pics/ocean_temperatures.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Ocean productivity}
+\centering
+% \Max{pics/ocean_productivity.jpg}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Abyssal provinces from Watling et al., 2013}
+\centering
+% \Max{pics/abyssal_provinces.png}%
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{Short anonymous absolutely voluntary survey}
+
+\begin{enumerate}
+
+\item What do you \textbf{like} most in biogeography course (except the trip ;-)?
+
+\item What do you \textbf{dislike} most in biogeography course?
+
+\item Please grade (1---bad, 5---excellent):
+
+\begin{enumerate}
+
+\item Lectures
+
+\item The trip
+
+\item Presentations
+
+\item Exams
+
+\end{enumerate}
+
+\item Please recommend something for the next Biogeography class.
+
+\end{enumerate}
+\end{frame}
+
+% ===
+
+\begin{frame}
+\frametitle{For Further Reading}
+
+\begin{thebibliography}{10}
+\beamertemplatearticlebibitems\scriptsize
+
+\bibitem{1} Sundaland. \newblock \url{http://en.wikipedia.org/wiki/Sundaland}
+
+\bibitem{2} Oceania. \newblock \url{http://en.wikipedia.org/wiki/Oceania}
+
+\bibitem{3} Australia. \newblock \url{http://en.wikipedia.org/wiki/Australia}
+
+\bibitem{4} New Zealand. \newblock \url{http://en.wikipedia.org/wiki/New_Zaaland}
+
+\bibitem{5} A.~Shipunov. {\em Biogeography}. 2014---onwards. \newblock \url{http://ashipunov.info/shipunov/school/biol_330}
+
+\bibitem{6} A.~Shipunov. {\em Introduction to Biogegraphy and Tropical Biology}. 2017---onwards. \newblock \url{http://ashipunov.info/shipunov/school/biol_330/intr_biogeogr_trop_biol/intr_biogeogr_trop_biol.pdf}
+
+\end{thebibliography}
+
+\end{frame}
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/numerus-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/numerus-ex-ru.pdf
new file mode 100644
index 0000000000..e7ce73681a
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/numerus-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.tex b/macros/latex/contrib/shipunov/doc/numerus-ex-ru.tex
index 984d1ffb09..984d1ffb09 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/numerus-ex-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/numerus-ex-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/punct-ex-en.pdf b/macros/latex/contrib/shipunov/doc/punct-ex-en.pdf
new file mode 100644
index 0000000000..d3bca025da
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/punct-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.tex b/macros/latex/contrib/shipunov/doc/punct-ex-en.tex
index 715126f030..715126f030 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/punct-ex-en.tex
+++ b/macros/latex/contrib/shipunov/doc/punct-ex-en.tex
diff --git a/macros/latex/contrib/shipunov/doc/qqru-ex-en.pdf b/macros/latex/contrib/shipunov/doc/qqru-ex-en.pdf
new file mode 100644
index 0000000000..f64e265727
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/qqru-ex-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/qqru-ex-en.tex b/macros/latex/contrib/shipunov/doc/qqru-ex-en.tex
new file mode 100644
index 0000000000..bb75ba01e1
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/qqru-ex-en.tex
@@ -0,0 +1,36 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english,shorthands=off]{babel}
+
+\usepackage[convert,en]{qqru}
+
+\nofiles
+
+\begin{document}
+
+\sloppy
+
+"How long have you lived?" asked Button-Bright.
+
+The King coughed again and turned a bit bluer. "That is considered
+an impertinent question in Sky Island," he answered, "but I will say
+that every Boolooroo is elected to reign three hundred years, and
+I've reigned not quite---ahem!---two hundred."
+
+"Are your kings elected, then?" asked Cap'n Bill.
+
+"Yes, of course. This is a Republic, you know. The people elect all
+their officers from the King down. Every man and every woman is a
+voter. The Boolooroo tells them whom to vote for, and if they don't
+obey, they are severely punished. It's a fine system of government,
+and the only thing I object to is electing the Boolooroo for only
+three hundred years. It ought to be for life. My successor has
+already been elected, but he can't reign for a hundred years to
+come."
+
+"I think three hundred years is plenty long enough," said Trot. "It
+gives someone else a chance to rule, an' I wouldn't be s'prised if
+the next king is a better one. Seems to me you're not much of a
+Boolooroo."
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/qqru-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/qqru-ex-ru.pdf
new file mode 100644
index 0000000000..df7f7415bc
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/qqru-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/qqru-ex-ru.tex b/macros/latex/contrib/shipunov/doc/qqru-ex-ru.tex
new file mode 100644
index 0000000000..110a097b9d
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/qqru-ex-ru.tex
@@ -0,0 +1,36 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[russian]{babel}
+
+\usepackage{qqru}
+
+\nofiles
+
+\begin{document}
+
+\sloppy
+
+... Никогда Π½Π΅ знаСшь, Π³Π΄Π΅ Ρ‚Π΅Π±Π΅ ΠΏΠΎΠ²Π΅Π·Π΅Ρ‚... Π―~--- ΠΊΡ€ΡƒΠΏΠ½Ρ‹ΠΉ спСциалист Π²
+этом вопросС. ΠŸΠ΅Ρ€Π²Ρ‹Π΅ Π΄Π²Π°Π΄Ρ†Π°Ρ‚ΡŒ Π΄Π΅Π²ΡΡ‚ΡŒ Π»Π΅Ρ‚ своСй ΠΆΠΈΠ·Π½ΠΈ я Π±Ρ‹Π» классичСским
+Π½Π΅ΡƒΠ΄Π°Ρ‡Π½ΠΈΠΊΠΎΠΌ. Π›ΡŽΠ΄ΠΈ склонны ΠΈΡΠΊΠ°Ρ‚ΡŒ (ΠΈ Π½Π°Ρ…ΠΎΠ΄ΠΈΡ‚ΡŒ) самыС Ρ€Π°Π·Π½Ρ‹Π΅ оправдания
+своим Π½Π΅ΡƒΠ΄Π°Ρ‡Π°ΠΌ. МнС Π΄Π°ΠΆΠ΅ этим Π·Π°Π½ΠΈΠΌΠ°Ρ‚ΡŒΡΡ Π½Π΅ ΠΏΡ€ΠΈΡ…ΠΎΠ΄ΠΈΠ»ΠΎΡΡŒ: ΠΏΡ€ΠΈΡ‡ΠΈΠ½Π° Π±Ρ‹Π»Π° ΠΌΠ½Π΅
+извСстна ΠΈ проста, хотя вСсьма экстравагантна. Π― Π½Π΅ ΠΌΠΎΠ³ ΡΠΏΠ°Ρ‚ΡŒ ΠΏΠΎ Π½ΠΎΡ‡Π°ΠΌ, с
+дСтства Π½Π΅ ΠΌΠΎΠ³. Π—Π°Ρ‚ΠΎ прСкрасно спал ΠΏΠΎ ΡƒΡ‚Ρ€Π°ΠΌ, Π² Ρ‚ΠΎ Π·Π°ΠΌΠ΅Ρ‡Π°Ρ‚Π΅Π»ΡŒΠ½ΠΎΠ΅ врСмя
+суток, ΠΊΠΎΠ³Π΄Π°, собствСнно, ΠΈ происходит распрСдСлСниС ΡƒΠ΄Π°Ρ‡ΠΈ. На ΡƒΡ‚Ρ€Π΅Π½Π½Π΅ΠΌ
+нСбосклонС ΠΎΠ³Π½Π΅Π½Π½Ρ‹ΠΌΠΈ Π±ΡƒΠΊΠ²Π°ΠΌΠΈ Π½Π°Ρ‡Π΅Ρ€Ρ‚Π°Π½ Π΄Π΅Π²ΠΈΠ· этого Π½Π΅ΡΠΏΡ€Π°Π²Π΅Π΄Π»ΠΈΠ²Π΅ΠΉΡˆΠ΅Π³ΠΎ ΠΈΠ·
+ΠΌΠΈΡ€ΠΎΠ²: \<ΠšΡ‚ΠΎ Ρ€Π°Π½ΠΎ встаСт, Ρ‚ΠΎΠΌΡƒ Π±ΠΎΠ³ Π΄Π°Π΅Ρ‚\>, Ρ‚Π°ΠΊ вСдь?
+
+... Π·Π°ΠΊΠΎΠ½Ρ‹ ΠΏΡ€ΠΈΡ€ΠΎΠ΄Ρ‹ этого ΠœΠΈΡ€Π° Π½Π΅ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ Π΄ΠΎΠΏΡƒΡΠΊΠ°ΡŽΡ‚, Π½ΠΎ Π΄Π°ΠΆΠ΅ ΠΏΡ€ΠΎΠ²ΠΎΡ†ΠΈΡ€ΡƒΡŽΡ‚
+Ρ€Π°Π·Π²ΠΈΡ‚ΠΈΠ΅ \<ΠΏΠ°Ρ€Π°Π½ΠΎΡ€ΠΌΠ°Π»ΡŒΠ½Ρ‹Ρ…\> способностСй Ρƒ всСго насСлСния. ОсобСнно Ρƒ нас,
+Π² Π•Ρ…ΠΎ, ΠΏΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ этот Π³ΠΎΡ€ΠΎΠ΄ Π±Ρ‹Π» построСн Π² Ρ‚Π°ΠΊ Π½Π°Π·Ρ‹Π²Π°Π΅ΠΌΠΎΠΌ \<Π‘Π΅Ρ€Π΄Ρ†Π΅ ΠœΠΈΡ€Π°\>~---
+Ссли ΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒΡΡ ΠΆΠ°Ρ€Π³ΠΎΠ½ΠΎΠΌ мСстных ΠΌΠ°Π³ΠΎΠ², Π½Π΅ прибСгая ΠΊ ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠΌΡƒ, я ΠΈ
+вовсС Π½ΠΈΡ‡Π΅Π³ΠΎ Π½Π΅ смогу ΠΎΠ±ΡŠΡΡΠ½ΠΈΡ‚ΡŒ. Если Π·Π° ΠΏΡ€Π΅Π΄Π΅Π»Π°ΠΌΠΈ Π£Π³ΡƒΠ»Π°Π½Π΄Π° (ΠΏΡ€ΠΎΠ²ΠΈΠ½Ρ†ΠΈΠΈ, Π²
+Ρ†Π΅Π½Ρ‚Ρ€Π΅ ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠΉ Π²ΠΎΠ·Π²Ρ‹ΡˆΠ°Π΅Ρ‚ΡΡ Π•Ρ…ΠΎ) Π΄Π΅Π»ΠΎ Π½Π΅ Π·Π°Ρ…ΠΎΠ΄ΠΈΡ‚ дальшС ΠΊΠ°ΠΊΠΎΠΉ-Π½ΠΈΠ±ΡƒΠ΄ΡŒ
+Ρ‚Π΅Π»Π΅ΠΏΠ°Ρ‚ΠΈΠΈ ΠΈ ΠΏΡ€ΠΎΡ‡ΠΈΡ… пустяков, Ρ‚ΠΎ Ρƒ нас всС Π³ΠΎΡ€Π°Π·Π΄ΠΎ ΡΠ΅Ρ€ΡŒΠ΅Π·Π½Π΅Π΅. Π’Π°ΠΊ Ρ‡Ρ‚ΠΎ всС
+здСшнСС насСлСниС повально увлСкаСтся Ρ‚Π°ΠΊ Π½Π°Π·Ρ‹Π²Π°Π΅ΠΌΠΎΠΉ \<Π’ΠΈΠ΄ΠΈΠΌΠΎΠΉ\>, ΠΈΠ»ΠΈ
+\<ΠžΡ‡Π΅Π²ΠΈΠ΄Π½ΠΎΠΉ\>, ΠΈΠ»ΠΈ \<Π‘Ρ‹Ρ‚ΠΎΠ²ΠΎΠΉ\> ΠΌΠ°Π³ΠΈΠ΅ΠΉ. Π’Π΅Ρ€Π½Π΅Π΅, ΡƒΠ²Π»Π΅ΠΊΠ°Π»ΠΎΡΡŒ Π΄ΠΎ наступлСния
+Π­ΠΏΠΎΡ…ΠΈ КодСкса, ΠΏΡ€ΠΈΡ…ΠΎΠ΄ ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠΉ прСдварялся трагичСскими ΠΈ ΠΊΡ€ΠΎΠ²Π°Π²Ρ‹ΠΌΠΈ
+событиями. ...
+
+\end{document}
diff --git a/macros/latex/contrib/shipunov/doc/review.pdf b/macros/latex/contrib/shipunov/doc/review.pdf
new file mode 100644
index 0000000000..1f1b882ae2
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/review.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/review.tex b/macros/latex/contrib/shipunov/doc/review.tex
new file mode 100644
index 0000000000..1d860dfcb4
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/review.tex
@@ -0,0 +1,102 @@
+\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/macros/latex/contrib/shipunov/doc/rusnat-doc-ru.pdf b/macros/latex/contrib/shipunov/doc/rusnat-doc-ru.pdf
new file mode 100644
index 0000000000..930a723ae6
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/rusnat-doc-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.tex b/macros/latex/contrib/shipunov/doc/rusnat-doc-ru.tex
index 3ad60e9e52..a5304371f9 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-doc-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/rusnat-doc-ru.tex
@@ -9,6 +9,8 @@
\date{}
\begin{document}
+{\Huge \texttt{rusnat.bst} is now deprecated, use \textsf{bibtex8} / \textsf{bibtexu} with \texttt{gost} bibliography style files!}
+
\maketitle
Ρςθλό δξλζεν θροξλόηξβΰςόρ βμερςε ρ οΰκεςξμ \texttt{natbib}, οξρκξλόκσ οπεδρςΰβλες ρξαξι μξδθτθκΰφθώ \texttt{plainnat.bst}.
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex-ru.bib b/macros/latex/contrib/shipunov/doc/rusnat-ex-ru.bib
index 8853ebb5f8..8853ebb5f8 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex-ru.bib
+++ b/macros/latex/contrib/shipunov/doc/rusnat-ex-ru.bib
diff --git a/macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.pdf b/macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.pdf
new file mode 100644
index 0000000000..e215dbfa00
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.tex b/macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.tex
index 361a523d2f..361a523d2f 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex1-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/rusnat-ex1-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.pdf b/macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.pdf
new file mode 100644
index 0000000000..5b5d54bb5b
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.tex b/macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.tex
index 01e293c55e..01e293c55e 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/rusnat-ex2-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/rusnat-ex2-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/sltables-doc-en.pdf b/macros/latex/contrib/shipunov/doc/sltables-doc-en.pdf
new file mode 100644
index 0000000000..ff8ccca62e
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/sltables-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.tex b/macros/latex/contrib/shipunov/doc/sltables-doc-en.tex
index bcb0198a44..687402eef5 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/sltables-doc-en.tex
+++ b/macros/latex/contrib/shipunov/doc/sltables-doc-en.tex
@@ -1,7 +1,7 @@
\documentclass{article}
\usepackage{sltables}
-\author{A.\,Shipunov\footnote{e-mail: \texttt{plantago at herba.msu.ru}}}
+\author{A.\,Shipunov\footnote{e-mail: \texttt{dactylorhiza at gmail.com}}}
\title{\texttt{sltables},\\
the \LaTeX\ modification of R.\,Nilson\footnote{Robert Nilsson, Academic Computing Service, Texas A\&M University, ranhelp@venus.tam.edu, ranhelp@tamvenus}\\ \texttt{S-Tables} macros}
diff --git a/macros/latex/contrib/shipunov/doc/starfn-ex-ru.pdf b/macros/latex/contrib/shipunov/doc/starfn-ex-ru.pdf
new file mode 100644
index 0000000000..369b5adcdf
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/starfn-ex-ru.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.tex b/macros/latex/contrib/shipunov/doc/starfn-ex-ru.tex
index 8726caa2d6..8726caa2d6 100644
--- a/macros/latex/contrib/shipunov/doc/latex/shipunov/starfn-ex-ru.tex
+++ b/macros/latex/contrib/shipunov/doc/starfn-ex-ru.tex
diff --git a/macros/latex/contrib/shipunov/doc/textfrac-ex.pdf b/macros/latex/contrib/shipunov/doc/textfrac-ex.pdf
new file mode 100644
index 0000000000..163a608e2a
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/textfrac-ex.pdf
Binary files differ
diff --git a/macros/latex/contrib/shipunov/doc/textfrac-ex.tex b/macros/latex/contrib/shipunov/doc/textfrac-ex.tex
new file mode 100644
index 0000000000..59478968a0
--- /dev/null
+++ b/macros/latex/contrib/shipunov/doc/textfrac-ex.tex
@@ -0,0 +1,18 @@
+\documentclass{article}
+\usepackage[english]{babel}
+\usepackage{textfrac}
+
+\nofiles
+
+\begin{document}
+
+... One of the first flowers of spring on upland prairies and dry hillsides,
+spiny phlox usually occurs concurrently with pasque flowers.This compact,
+mat-forming perennial is only a few inches tall. Leaves are opposite,
+linear, up to about \textfrac1/3 inch long and \TextFrac{1}{16th} inch
+wide. Flowers are solitary and terminal. The petals are white, forming a
+short tube with 5 lobes at right angles to the tube, and with a yellow
+throat; the lobes are up to \TextFrac{1}{3} inch long and \textfrac1/6th
+inch wide. The fruit is a small oval capsule ...
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/scripts/abs2rel.pl b/macros/latex/contrib/shipunov/scripts/abs2rel.pl
new file mode 100644
index 0000000000..abbbea419a
--- /dev/null
+++ b/macros/latex/contrib/shipunov/scripts/abs2rel.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl -w
+
+# Perl script to convert LaTeX / biokey diagnistic keys from absolute to relative (automatic)
+# Usage: perl ./abs2rel.pl input.tex > output.tex
+
+# Anna Shipunova, 2000
+# Updated by Alexey Shipunov, 20150912
+# Updated by Alexey Shipunov 20150919
+
+# NOTE: multiple keys in one document possibly lead to conflicting references
+# Temporary solution: modify $prefix which is specified below.
+
+$/="";
+
+print STDERR "Converts absolute LaTeX biokey to the relative... \n";
+
+&points();
+
+print "\n";
+while(<>){
+ s/\\Z(\d+)\./\\TE{$points[$1-1]}/g;
+ s/\\T+?\s*(\d+)\./\\SS{$points[$1-1]}/sg;
+ s/\\ZZ(\d+)\((\d+)\)\./\\SE{$points[$1-1]}{$points[$2-1]}/g;
+ print;
+}
+
+# refs will be in in form $prefix[A-Z][1-3]
+sub points {
+$prefix="G"; # modify here!
+$B1 = $nom = "";
+@points = ();
+ for ($x = 0; $x < 26; $x++) {
+ for ($z = 1; $z < 9; $z++) {
+ $B1 = chr($x + 65);
+ $nom = "$prefix$B1$z";
+ @points = (@points, $nom)
+ }
+ }
+}
+#
diff --git a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.bat b/macros/latex/contrib/shipunov/scripts/biokey2html.bat
index 4953470861..4953470861 100644
--- a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.bat
+++ b/macros/latex/contrib/shipunov/scripts/biokey2html.bat
diff --git a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.sh b/macros/latex/contrib/shipunov/scripts/biokey2html.sh
index 50ee8a52ab..50ee8a52ab 100644
--- a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html.sh
+++ b/macros/latex/contrib/shipunov/scripts/biokey2html.sh
diff --git a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html1.pl b/macros/latex/contrib/shipunov/scripts/biokey2html1.pl
index e7eb44b07d..e7eb44b07d 100644
--- a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html1.pl
+++ b/macros/latex/contrib/shipunov/scripts/biokey2html1.pl
diff --git a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html2.pl b/macros/latex/contrib/shipunov/scripts/biokey2html2.pl
index 75801f4430..75801f4430 100644
--- a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html2.pl
+++ b/macros/latex/contrib/shipunov/scripts/biokey2html2.pl
diff --git a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html3.pl b/macros/latex/contrib/shipunov/scripts/biokey2html3.pl
index 296daaab6a..296daaab6a 100644
--- a/macros/latex/contrib/shipunov/scripts/shipunov/biokey2html3.pl
+++ b/macros/latex/contrib/shipunov/scripts/biokey2html3.pl
diff --git a/macros/latex/contrib/shipunov/scripts/txt2qq.pl b/macros/latex/contrib/shipunov/scripts/txt2qq.pl
new file mode 100644
index 0000000000..bcdd5a0058
--- /dev/null
+++ b/macros/latex/contrib/shipunov/scripts/txt2qq.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/perl -w
+
+# Author: Alexey Shipunov, dactylorhiza@gmail.com
+# Version 1.01, 20191002
+# Simple text to LaTeX converter, uses 'qqru' package to define "universal" (Russian or English) quotes
+# Usage: perl ./txt2qq.pl input.txt > output.tex
+
+while(<>){
+ s| "| <<|g;
+ s|^"|<<|g;
+ s|\t"|\t<<|g;
+ s|\("|\(<<|g;
+ s|\["|\[<<|g;
+ s|="|=<<|g;
+ s|"|>>|g;
+ s|``|<<|g;
+ s|''|>>|g;
+ s|`|<<|g;
+ s|'([^\w])|>>$1|g;
+ s| - | --- |g;
+ s| ---$| ---|g;
+ s|^--- |--* |g;
+ s|\\|BACKSLASH|g;
+ s|&|\\&|g;
+ s|\{|\\\{|g;
+ s|\}|\\\}|g;
+ s|\$|\\\$|g;
+ s|\#|\\\#|g;
+ s|%|\\%|g;
+ s|BACKSLASH|\$\\backslash\$|g;
+ s@\|@\$\\mid\$@g;
+ s|_(.+?)_|\\textit\{$1\}|g;
+ s|\*(.+?)\*|\\textbf\{$1\}|g;
+ s| +| |g;
+ s|<<|\\<|g;
+ s|>>|\\>|g;
+print;
+}
+
+BEGIN {
+print <<END_OF_BEGIN
+\\documentclass{article}
+% add more oprions here
+\\usepackage[ru]{qqru}
+
+\\begin{document}
+
+END_OF_BEGIN
+}
+
+END{
+print <<END_OF_END
+
+\\end{document}
+END_OF_END
+}
+
+# \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/tex/add2.sty b/macros/latex/contrib/shipunov/tex/add2.sty
new file mode 100644
index 0000000000..171efdf167
--- /dev/null
+++ b/macros/latex/contrib/shipunov/tex/add2.sty
@@ -0,0 +1,49 @@
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
+
+\ProvidesPackage{add2}%
+ [2019/10/03 v1.01 Save trees: fit as many as possible into the page]
+
+\newif\if@LND % landscape
+\DeclareOption{land}{\@LNDtrue}
+\DeclareOption{port}{\@LNDfalse}
+\newif\if@CLUB % to get rid of widow and orphan lines
+\DeclareOption{club}{\@CLUBtrue}
+\DeclareOption{noclub}{\@CLUBfalse}
+
+\ExecuteOptions{port,club}
+\ProcessOptions
+
+\if@CLUB\else
+
+\clubpenalty=10000
+\widowpenalty=10000
+\brokenpenalty=10000
+
+\fi
+
+\topmargin=-2cm
+\headheight=0cm
+\headsep=.5cm
+
+\renewcommand{\baselinestretch}{.95}
+
+\if@LND
+
+ \message{WARNING: Landscape mode!}
+ \textwidth=26cm
+ \footskip=1cm
+ \textheight=18.5cm
+ \oddsidemargin=-2.5cm
+ \evensidemargin=-2.5cm
+
+\else
+
+ \textheight=25.5cm
+ \footskip=.5cm
+ \textwidth=19cm
+ \oddsidemargin=-1.25cm
+ \evensidemargin=-1.75cm
+
+\fi
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/altverse.sty b/macros/latex/contrib/shipunov/tex/altverse.sty
index 83b6359b53..a0cbbf5348 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/altverse.sty
+++ b/macros/latex/contrib/shipunov/tex/altverse.sty
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov, plantago@herba.msu.ru
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{altverse}
[2008/02/15 v0.3 Typesetting simple verses with `xtab' package]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/autolist.sty b/macros/latex/contrib/shipunov/tex/autolist.sty
index d4f32b8a1d..e0eb2d39e1 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/autolist.sty
+++ b/macros/latex/contrib/shipunov/tex/autolist.sty
@@ -1,4 +1,4 @@
-% Authors: A. Shipunova and A. Shipunov, plantago@herba.msu.ru
+% Authors: Anna Shipunova and Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{autolist}%
[2010/10/24 v0.4 Various lists]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/biokey.sty b/macros/latex/contrib/shipunov/tex/biokey.sty
index ef88da239e..f34f79bb15 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/biokey.sty
+++ b/macros/latex/contrib/shipunov/tex/biokey.sty
@@ -1,7 +1,14 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{biokey}%
- [2008/02/11 v3.1 Typesetting biological identification keys]
+ [2019/10/02 v.3.11 Typesetting biological identification keys]
+
+% 20191002 \ZZZ updated, \DD added
+% 20150911 \Ver@T added to make keys more readable
+% 20150912 Alien stuff removed, \FK supplied with the short vertical space
+% 20150913 Antitheses aligned better now, comments' breaks adjusted
+% 20150916 Better aligment for backtrack links
+% 20150920 'biokey' environment resets theses counter (if hyperref is used, specify 'hypertexnames=false')
\newlength\TML@a
\newlength\TML@b
@@ -29,7 +36,8 @@
\penalty800\dbox@fill\penalty400%
\vadjust{}\penalty10000\dbox@fil}
\def\T#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
-% `Automatically' paragraph aligment
+\def\TT#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
+% `Automatic' paragraph aligment
\def\TTTT#1\par{{\tolerance 9999 \dot@leaders\SHRIFTN{#1}\par}\par}
% Old style reference
@@ -58,10 +66,6 @@
\def\NNN#1\par{{\nopagebreak\par%
\Indent@C\SHRIFTN{#1}\par}\par}
-% PUNCTS
-% Common punct
-\let\TT=\T
-
% Hanging punct
\def\VT{\@ifstar{\H@P}{\H@@P}}
% Leaders stopped on right margin of text
@@ -78,22 +82,24 @@
% Lengths (hang = 2em)
\settowidth{\TML@b}{\SHRIFTZ{.}}
-\TML@a=1.5em
+\TML@a=1.6em % found visually
\addtolength{\TML@a}{-\TML@b}
-\addtolength{\TML@b}{0.5em}
+\addtolength{\TML@b}{0.6em} % found visually
+\def\Ver@T{\vspace{.5\baselineskip}}
\def\Indent@T{\hangindent2em\noindent}
\def\OTSTUP{2em}
\def\Indent@C{\parindent\OTSTUP\hangindent\parindent}
% Common thesa
-\def\Z#1. {\Indent@T\makebox[1.5em][r]%
+\def\Z#1. {\Ver@T\Indent@T\makebox[1.5em][r]%
{\SHRIFTZ{#1.}}\hspace{0.5em}}
% Thesa with back reference
-\def\ZZ#1(#2).{\Indent@T\makebox[\TML@a][r]%
+\def\ZZ#1(#2).{\Ver@T\Indent@T\makebox[\TML@a][r]%
{\SHRIFTZ{#1}}\hspace{0.45em}\SHRIFTZ{(#2).}}
% Antitheses
-\def\ZZZ#1{\Indent@T\makebox[\TML@a][r]%
- {#1}\hspace{\TML@b}}
+\def\ZZZ#1{\Indent@T\makebox[1.5em][r]{#1}% older variant: \makebox[\TML@a][r]
+ \hspace{0.5em}} % to make exactly 2em box like in \TE and \SE
+
% First
\def\AN{\ZZZ{$-$}}
% You can replace it to $+$
@@ -104,21 +110,21 @@
\def\AAAN{\ZZZ{$\equiv$}}
% COMMENTS
-\def\FK#1\par{{\nopagebreak\smallskip%
+\def\FK#1\par{{\nopagebreak\vspace{.1\baselineskip}\nopagebreak%
\Indent@C%
\footnotesize#1\par\smallskip}}
% You can use it as `numberless thesa'
-\def\KOM#1\par{{\nopagebreak\smallskip%
+\def\KOM#1\par{{\nopagebreak\Ver@T%
\Indent@C#1\par\smallskip}}
-% Comment for object
-\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip
+% Comment for the object
+\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip\nopagebreak%
\hbox to \linewidth {\hfil #1}\par}}
-% AUTOMATICAL KEYS
-\def\TEZA#1{\refstepcounter{TMC@Ba}\label{#1}%
+% AUTOMATIC KEYS
+\def\TEZA#1{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
\Indent@T\makebox[1.5em][r]%
{\SHRIFTZ{\arabic{TMC@Ba}.}}\hspace{0.5em}\ignorespaces}
-\def\STEZA#1#2{\refstepcounter{TMC@Ba}\label{#1}%
+\def\STEZA#1#2{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
\Indent@T\makebox[\TML@a][r]%
{\SHRIFTZ{\arabic{TMC@Ba}}}\hspace{0.45em}\SHRIFTZ{(\ref{#2}).}}
\def\SSYLKA#1{\T\ref{#1}.}
@@ -126,8 +132,9 @@
\let\TE\TEZA
\let\SE\STEZA
\let\SS\SSYLKA
+\def\DD#1{\T\ref{#1}.} % this is fo the case when \SS does not work
-% LEVELED KEYS
+% IDENTED KEYS
\newenvironment{SDVIG}[1][1]
{\TML@c=#1em \let\TML@@c\TML@c
\def\Indent@T{\hangindent=2em\parindent=0em
@@ -140,8 +147,7 @@
\let\LE\SDVIG
\let\endLE\endSDVIG
-% KEYS WITH MARKERS ON LEFT PAGE MARGIN
-
+% KEYS WITH MARKERS ON THE LEFT PAGE MARGIN
\if@MARG
\def\Indent@C{\relax}%
\def\Z#1. {\noindent\makebox[0em][r]%
@@ -154,11 +160,10 @@
\else\relax
\fi
-% Some useful stuff
-\let\K=\textit
-\let\J=\textbf
-\def\KN#1 {\textit{#1 }}
-\def\NN#1 #2 {\textit{#1 #2 }}
-\def\IN#1.#2.{#1.\,#2.~\ignorespaces}
+% ENVIRONMENT WHICH RESETS THESES COUNTER
+% If hyperref used, requires option "hypertexnames=false"
+\newenvironment{biokey}{%
+ \setcounter{TMC@Ba}{0}%
+ \relax}
\endinput
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/biolist.sty b/macros/latex/contrib/shipunov/tex/biolist.sty
index 986bfa7356..d673ab173f 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/biolist.sty
+++ b/macros/latex/contrib/shipunov/tex/biolist.sty
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{biolist}%
[2008/02/06 v0.1 Typesetting species lists for floras (and faunas)]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/boldline.sty b/macros/latex/contrib/shipunov/tex/boldline.sty
index 28a830ebb1..dc42a039e3 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/boldline.sty
+++ b/macros/latex/contrib/shipunov/tex/boldline.sty
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{boldline}%
[2008/02/04 v0.2 Adjust line width in tables]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/cassete.cls b/macros/latex/contrib/shipunov/tex/cassete.cls
index afe5a7d9c6..1c81b08f56 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/cassete.cls
+++ b/macros/latex/contrib/shipunov/tex/cassete.cls
@@ -1,8 +1,8 @@
-% Author: A. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{cassete}
- [2008/02/05 v0.2 Labels for audiocassetes]
+ [2008/02/05 v0.2 Labels for audiocassettes]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/classif2.sty b/macros/latex/contrib/shipunov/tex/classif2.sty
index c1bd6eedac..c4313ec022 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/classif2.sty
+++ b/macros/latex/contrib/shipunov/tex/classif2.sty
@@ -1,14 +1,11 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{classif2}%
[2008/02/10 v2.2 Layout for biological classifications]
-% Todo: Detailed comments and documentation
-
-% Changes:
% 2002/04/15 \IHOOK added (for indent justification)
% 2007/06/23 Infraregnum added
-% 2007/07/26 Improved for numeric ranges
+% 2007/07/26 Improved for numeric ranges
% 2008/02/06 Abbreviations added
\newif\if@Names
diff --git a/macros/latex/contrib/shipunov/tex/dline.sty b/macros/latex/contrib/shipunov/tex/dline.sty
new file mode 100644
index 0000000000..657b8032fc
--- /dev/null
+++ b/macros/latex/contrib/shipunov/tex/dline.sty
@@ -0,0 +1,37 @@
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
+
+\ProvidesPackage{dline}
+ [2019/10/03 v1.01 Double line on the left of text, based on "lineno" and "bframe"]
+
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{lineno}}
+\ProcessOptions*
+\RequirePackage{lineno}
+
+\newbox\dlinebox
+
+% In principle, this is possible to redefiine...
+\newdimen\dlinerule \dlinerule=\fboxrule
+\newdimen\ddlinerule \ddlinerule=3\fboxrule
+\newdimen\dlinesep \dlinesep=3\fboxsep
+\newdimen\ddlinesep \ddlinesep=\fboxsep
+
+\newenvironment{dline}
+ {\par
+ \@tempdima\textwidth
+ \advance\@tempdima 2\dlinesep
+ \setbox\dlinebox\hbox to\textwidth{%
+ \hskip-\dlinesep
+ \vrule\@width\dlinerule\@height\baselineskip\@depth\ddlinesep
+ \hskip-\ddlinesep
+ \vrule\@width\ddlinerule\@height\baselineskip\@depth\ddlinesep
+ }%
+ \nobreak
+ \runninglinenumbers
+ \def\makeLineNumber{\copy\dlinebox\hss}%
+ }
+ {\par
+ \@tempdima\textwidth
+ \advance\@tempdima 2\dlinesep
+ }
+
+\endinput
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/drcaps.sty b/macros/latex/contrib/shipunov/tex/drcaps.sty
index 0c010a1967..c212717a62 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/drcaps.sty
+++ b/macros/latex/contrib/shipunov/tex/drcaps.sty
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{drcaps}%
[2008/02/05 v0.2 Various drop caps]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/etiketka.cls b/macros/latex/contrib/shipunov/tex/etiketka.cls
index fea5932fbe..f617ceaddb 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/etiketka.cls
+++ b/macros/latex/contrib/shipunov/tex/etiketka.cls
@@ -1,7 +1,7 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesClass{etiketka}%
- [2008/02/16 v2.7 Herbarium labels]
+ [2013/01/18 v2.9 Herbarium labels]
\newif\if@NOL
\newcounter{etiketka@}
@@ -17,8 +17,8 @@
\LoadClass{article}
-% SPECIFIC LAYOUT
-\topmargin-14mm
+% DEFAULT LAYOUT (TO CHANGE, USE geometry PACKAGE)
+\topmargin-9mm
\headheight0mm
\headsep0mm
\textheight254mm
@@ -101,23 +101,31 @@
\vspace*{1.2em}}
% NAMES
-% You can input something as \Name Plantago {} {}
+% One can input something as \Name Plantago {} {}
% Empty line after required!
\def\Name#1 #2 #3\par{{\NameStyle
\textit{#1 #2} #3\par}%
\vspace*{-.7\baselineskip}
\NameRule
\vspace*{.2cm}}
-% Anonimous label
+
+% Anonymous label
% Empty line after required!
\def\Without{\Name {\rule{0pt}{1ex}} {} {}}
+% Empty line after required!
+\def\NameFam#1 #2 #3|#4\par{{\NameStyle
+ \textit{#1 #2} #3 #4\par}%
+ \vspace*{-.7\baselineskip}
+ \NameRule
+ \vspace*{.2cm}}
+
% REGION, DISTRICT AND LOCAL ADDRESS
% Empty line after required!
\def\Dist#1\par{{\parindent 2em\hangindent 2em#1\par}}
\def\Loc#1\par{{\parindent 4em\hangindent 4em#1\par}}
-% COORDINATES
+% COORDINATES IN DEGREES
\def\CGrad#1#2{#1$^\circ$ \East,
#2$^\circ$ \North{}}
\def\CMin#1#2#3#4{#1$^\circ$~#2$^\prime$ \East,
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/flower.sty b/macros/latex/contrib/shipunov/tex/flower.sty
index 558f177ff7..d9dbcbb522 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/flower.sty
+++ b/macros/latex/contrib/shipunov/tex/flower.sty
@@ -1,7 +1,9 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{flower}%
- [2010/10/24 v1.3 Typesetting botanical sings]
+ [2019/10/03 v1.31 Typesetting botanical sings]
+
+% 20191002 symmetry signs are now 'mathpunct', to ensure space after them
% Fonts `wasy' required
\DeclareRobustCommand\wasyfamily
@@ -17,11 +19,11 @@
% Hermafroditic
\def\Herm{\mbox{\ensuremath{\Mal}\kern-.82em\lower.27ex\hbox{\ensuremath{\Fem}}\kern.2em}}
% Asymmetry
-\DeclareMathSymbol{\Asx}{\mathord}{WASY}{"12}
+\DeclareMathSymbol{\Asx}{\mathpunct}{WASY}{"12}
% Actinomorphy
-\DeclareMathSymbol{\Act}{\mathord}{WASY}{"42}
+\DeclareMathSymbol{\Act}{\mathpunct}{WASY}{"42}
% Zygomorphy
-\DeclareMathSymbol{\Zyg}{\mathord}{symbols}{"22}
+\DeclareMathSymbol{\Zyg}{\mathpunct}{symbols}{"22}
% NEW SYMMETRY SIGNS FROM Prenner et al., 2010
% Median monosymmetry (downwards arrow; Unicode: 2193): \downarrow
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/isyntax.sty b/macros/latex/contrib/shipunov/tex/isyntax.sty
index 3163b0d5fa..72dd7a50c8 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/isyntax.sty
+++ b/macros/latex/contrib/shipunov/tex/isyntax.sty
@@ -1,3 +1,5 @@
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
+
\ProvidesPackage{isyntax}
[2008/02/07 v0.3 Interactive syntax check]
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/numerus.sty b/macros/latex/contrib/shipunov/tex/numerus.sty
index 038ef56ba0..58d3d6b7a2 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/numerus.sty
+++ b/macros/latex/contrib/shipunov/tex/numerus.sty
@@ -1,7 +1,10 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
+% Russian encoding below: Windows-1251
\ProvidesPackage{numerus}%
- [2008/02/07 v1.2 Spell numbers in Russian words]
+ [2019/10/03 v1.21 Spell numbers in Russian words]
+
+% 20191003: "numeral" -> "numerus"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -19,6 +22,9 @@
% <Χθρλξ>: φθτπΰ < 999 δλ οξπδκξβϋυ χθρλθςελόνϋυ θ < 999999 δλ %
% κξλθχερςβεννϋυ, θλθ ρχεςχθκ, οπθνθμΰώωθι ΰνΰλξγθχνϋε %
% ηνΰχενθ %
+% ΒΝΘΜΐΝΘΕ: οΰκες νε πΰαξςΰες ρ ξγλΰβλενθμθ θ %
+% ρ αξλεε χεμ ξδνξαΰιςξβϋμθ κξδθπξβκΰμθ %
+% οξπδκξβϋε νξμεπΰ αξλόψε 999 νε οξδδεπζθβΰώςρ %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -83,19 +89,19 @@
\fi\fi\fi\fi\fi\fi}
% Ξψθακθ
-\def\Oshibka@Arg{\PackageWarning{numeral}{%
+\def\Oshibka@Arg{\PackageWarning{numerus}{%
`propis' got wrong mandatory argument!^^J%
Command did not executed}}
-\def\Oshibka@Otr{\PackageWarning{numeral}{%
+\def\Oshibka@Otr{\PackageWarning{numerus}{%
`propis' got argument < 0!^^J%
Command did not executed}}
-\def\Oshibka@Tys{\PackageWarning{numeral}{%
-Ordinal numerals > 999 not supported :(^^J%
+\def\Oshibka@Tys{\PackageWarning{numerus}{%
+Ordinal numeruss > 999 not supported :(^^J%
Command did not executed}}
-\def\Ξψθακΰ@Mill{\PackageWarning{numeral}{%
+\def\Ξψθακΰ@Mill{\PackageWarning{numerus}{%
`propis' got argument > 999 999!^^J%
Command did not executed}}
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/punct.sty b/macros/latex/contrib/shipunov/tex/punct.sty
index 84c3c2692e..f0ac8dae03 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/punct.sty
+++ b/macros/latex/contrib/shipunov/tex/punct.sty
@@ -1,9 +1,9 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{punct}%
- [2008/02/06 v0.3 Straight punctuation with italic text]
+ [2008/02/06 v0.3 Straight punctuation within italic text]
-% Catcodes redefined! May be dangerous...
+% ATTENTION! Catcodes redefined---this might be dangerous!
\def\PUNactive{%
\let\Z@P=,%
diff --git a/macros/latex/contrib/shipunov/tex/qqru.sty b/macros/latex/contrib/shipunov/tex/qqru.sty
new file mode 100644
index 0000000000..5697764dce
--- /dev/null
+++ b/macros/latex/contrib/shipunov/tex/qqru.sty
@@ -0,0 +1,56 @@
+% Author: Alexey B. Shipunov (dactylorhiza@gmail.com)
+% Companion Perl script: txt2qq.pl
+
+\ProvidesPackage{qqru}%
+ [2019/10/04 v0.32 Universal quotes for Russian and English]
+
+\newif\if@QQRU
+\DeclareOption{ru}{\@QQRUtrue}
+\DeclareOption{en}{\@QQRUfalse}
+\newif\if@CONVERT
+\DeclareOption{convert}{\@CONVERTtrue}
+\DeclareOption{noconvert}{\@CONVERTfalse}
+
+\ExecuteOptions{ru,nconvert}
+\ProcessOptions
+
+\if@QQRU
+
+ \def\<{<<}
+ \def\>{>>}
+
+\else
+
+ \def\<{``}
+ \def\>{''}
+
+\fi
+
+\if@CONVERT
+
+{%
+\catcode`\"=\active
+\catcode`\@=11
+\gdef\beginconvertquotes{%
+ \global\catcode`\"=\active
+ \global\chardef\dq=`\"
+ \global\let\dblqu@te=L
+ }
+\gdef"{%
+ \ifinner\else\ifvmode\let\dblqu@te=L\fi\fi
+ \if L\dblqu@te\<\global\let\dblqu@te=R%
+ \else
+ \let\xxx=\spacefactor
+ \>\global\let\dblqu@te=L%
+ \spacefactor\xxx
+ \fi
+ }
+}
+
+\gdef\endconvertquotes{%
+ \catcode`\"=12
+ }
+
+\AtBeginDocument{\beginconvertquotes}
+
+\else\fi
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/sltables.sty b/macros/latex/contrib/shipunov/tex/sltables.sty
index f75fdfdb15..b6238e8678 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/sltables.sty
+++ b/macros/latex/contrib/shipunov/tex/sltables.sty
@@ -1,11 +1,11 @@
-% Modified from the original sources by A. Shipunov (plantago@herba.msu.ru)
+% Modified from the original LaTeX 2.09 sources by Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{sltables}
[2008/02/07 v1.2 S-Tables LaTeX package]
-%% Some modifications to LaTeX:
-%% Add LaTeX 2.09 counter
+% Some modifications to LaTeX: aded LaTeX 2.09 counter
\newcount\mscount
+
%
% S-Tables Macro v1.0, ACS, TAMU (RANHELP@VENUS.TAMU.EDU)
%
diff --git a/macros/latex/contrib/shipunov/tex/latex/shipunov/starfn.sty b/macros/latex/contrib/shipunov/tex/starfn.sty
index e70be05614..7f703bc272 100644
--- a/macros/latex/contrib/shipunov/tex/latex/shipunov/starfn.sty
+++ b/macros/latex/contrib/shipunov/tex/starfn.sty
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
\ProvidesPackage{starfn}%
[2008/02/16 v0.4 Footnote marks as stars on each page: Russian typographic tradition]
diff --git a/macros/latex/contrib/shipunov/tex/textfrac.sty b/macros/latex/contrib/shipunov/tex/textfrac.sty
new file mode 100644
index 0000000000..6f48fc79b8
--- /dev/null
+++ b/macros/latex/contrib/shipunov/tex/textfrac.sty
@@ -0,0 +1,14 @@
+% Author: Alexey Shipunov, dactylorhiza@gmail.com
+
+\ProvidesPackage{textfrac}%
+ [2019/10/03 v1.01 Simple slanted fractions, see TeXbook, ex. 11.6]
+
+% Packages "nicefrac" and "xfrac" might be better
+
+\ProvidesPackage{textfrac}
+
+\def\textfrac#1/#2{\leavevmode\kern.1em
+\raise.5ex\hbox{\scriptsize #1}\kern-.1em
+/\kern-.15em\lower.25ex\hbox{\scriptsize #2}}
+
+\def\TextFrac#1#2{\textfrac{#1}/{#2}}
diff --git a/macros/latex/contrib/tasks/README b/macros/latex/contrib/tasks/README
index dfede84db1..f314d7c2e3 100644
--- a/macros/latex/contrib/tasks/README
+++ b/macros/latex/contrib/tasks/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the TASKS package v1.0b 2019/10/06
+the TASKS package v1.0c 2019/10/07
horizontally columned lists
diff --git a/macros/latex/contrib/tasks/tasks.sty b/macros/latex/contrib/tasks/tasks.sty
index 571d17775b..d1634835d5 100644
--- a/macros/latex/contrib/tasks/tasks.sty
+++ b/macros/latex/contrib/tasks/tasks.sty
@@ -28,10 +28,10 @@
\RequirePackage {expl3,xparse,xtemplate}
\ExplSyntaxOn
-\tl_const:Nn \c_tasks_date_tl {2019/10/06}
+\tl_const:Nn \c_tasks_date_tl {2019/10/07}
\tl_const:Nn \c_tasks_version_major_number_tl {1}
\tl_const:Nn \c_tasks_version_minor_number_tl {0}
-\tl_const:Nn \c_tasks_version_subrelease_tl {b}
+\tl_const:Nn \c_tasks_version_subrelease_tl {c}
\tl_const:Nx \c_tasks_version_number_tl
{
\c_tasks_version_major_number_tl .
@@ -527,9 +527,9 @@
{ \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl }
% check if the label width is big enough:
\hbox_set:NV \l__tasks_tmpa_box \l__tasks_label_tl
- \dim_compare:nNnF
+ \dim_compare:nNnT
{ \box_wd:N \l__tasks_tmpa_box }
- <
+ >
{ \l__tasks_label_width_dim }
{
\msg_warning:nnnx {tasks}
@@ -610,9 +610,8 @@
style .tl_set:N = \l__tasks_instance_tl ,
style .initial:n = alphabetize ,
counter-format .code:n =
- \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format}
- {label} ,
- % \keys_set:nn {tasks/list} { label = #1 } ,
+ \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format} {label}
+ \keys_set:nn {tasks/list} { label = #1 } ,
label .code:n =
\bool_set_true:N \l__tasks_custom_label_bool
\tl_set:Nn \l__tasks_custom_label_tl {#1} ,
@@ -808,3 +807,5 @@
- the option `counter-format' is deprecated
2019/10/05 v1.0a - fix small bug in deprecation message
2019/10/06 v1.0b - fix bug in `label-format' definition
+2019/10/07 v1.0c - fix bug in width warning
+ - fix bug in deprecation of `counter-format'
diff --git a/macros/latex/contrib/tasks/tasks_en.pdf b/macros/latex/contrib/tasks/tasks_en.pdf
index 2067bc4d07..d41a540073 100644
--- a/macros/latex/contrib/tasks/tasks_en.pdf
+++ b/macros/latex/contrib/tasks/tasks_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/tasks/tasks_en.tex b/macros/latex/contrib/tasks/tasks_en.tex
index 7a5123f460..14d69196da 100644
--- a/macros/latex/contrib/tasks/tasks_en.tex
+++ b/macros/latex/contrib/tasks/tasks_en.tex
@@ -98,7 +98,7 @@ better off using traditional \LaTeX{} lists and the \pkg{enumitem} package for
customization.
\subsection{Changes}
-TheΒΈsinceversion{1.0} step to version~1.0 brought some significant changes:
+The \sinceversion{1.0} step to version~1.0 brought some significant changes:
\begin{itemize}
\item the option \option{counter-format} is deprecated. Labels can now be
set quite similar to the way they are set in \pkg{enumitem}. This also
diff --git a/macros/latex/contrib/xsim/README b/macros/latex/contrib/xsim/README
index 722702fd3c..5c33f5ca6c 100644
--- a/macros/latex/contrib/xsim/README
+++ b/macros/latex/contrib/xsim/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-XSIM 2019/09/30 v0.12
+XSIM 2019/10/06 v0.13
eXercise Sheets IMproved
diff --git a/macros/latex/contrib/xsim/code/xsim.environments.code.tex b/macros/latex/contrib/xsim/code/xsim.environments.code.tex
index 49976aa53f..b9235ba555 100644
--- a/macros/latex/contrib/xsim/code/xsim.environments.code.tex
+++ b/macros/latex/contrib/xsim/code/xsim.environments.code.tex
@@ -29,6 +29,20 @@
\xsim_load_modules:n {templates,verbwrite}
+\xsim_if_write_to_files:F
+ {
+ \xsim_declare_property:nnnn
+ { \c_false_bool }
+ { \c_false_bool }
+ { \c_false_bool }
+ {solution-body}
+ \xsim_declare_property:nnnn
+ { \c_false_bool }
+ { \c_false_bool }
+ { \c_false_bool }
+ {exercise-body}
+ }
+
\tl_new:N \l__xsim_file_name_signature_tl
\tl_new:N \l__xsim_file_path_tl
\tl_new:N \l__xsim_file_path_and_name_tl
@@ -40,6 +54,9 @@
\tl_new:N \ExerciseText
\tl_set:Nn \ExerciseText { \msg_error:nn {xsim} {only-in-solution} }
+\cs_generate_variant:Nn \tl_set_rescan:Nnn {Nnx}
+\cs_generate_variant:Nn \prop_put:Nnn {Nnx}
+
% ----------------------------------------------------------------------------
\msg_new:nnn {xsim} {only-in-solution}
@@ -52,7 +69,7 @@
\keys_define:nn {xsim}
{
- path .tl_set:N = \l__xsim_file_path_tl ,
+ path .tl_set:N = \l__xsim_file_path_tl ,
file-extension .tl_set:N = \l__xsim_file_extension_tl ,
file-extension .initial:n = tex
}
@@ -139,11 +156,29 @@
\cs_generate_variant:Nn \__xsim_file_info:nnnnn {nnnVV}
% ----------------------------------------------------------------------------
+% #1: type
+% #2: id
+% #3: exercise|solution
+% #4: potential environment body
+\cs_new_protected:Npn \xsim_save_environment_body:nnnn #1#2#3#4
+ {
+ \xsim_if_write_to_files:TF
+ { \__xsim_write_environment_body:nnn {#1} {#2} {#3} }
+ { \__xsim_save_environment_body:nnnn {#1} {#2} {#3} {#4} }
+ }
+\cs_new_protected:Npn \xsim_save_environment_body_end:
+ {
+ \xsim_if_write_to_files:TF
+ { \__xsim_write_environment_body_end: }
+ { \__xsim_save_environment_body_end: }
+ }
+
+% writing to files:
% #1: type
% #2: id
% #3: exercise|solution
-\cs_new_protected:Npn \xsim_save_environment_body:nnn #1#2#3
+\cs_new_protected:Npn \__xsim_write_environment_body:nnn #1#2#3
{
\xsim_verbose:n
{ Starting~ to~ write~ #3~ environment~ type~ `#1'~ id~ `#2' }
@@ -157,9 +192,22 @@
\l__xsim_file_path_and_name_tl
}
-\cs_new_protected:Npn \xsim_save_environment_body_end:
+\cs_new_protected:Npn \__xsim_write_environment_body_end:
{ \xsim_file_write_stop: }
+% saving to property lists:
+% #1: type
+% #2: id
+% #3: exercise|solution
+% #4: environment body
+\cs_new_protected:Npn \__xsim_save_environment_body:nnnn #1#2#3#4
+ {
+ \xsim_verbose:n { Saving~ #3~ environment~ type~ `#1'~ id~ `#2' }
+ \xsim_set_property:nnnn {#1} {#2} {#3-body} {#4}
+ }
+
+\cs_new:Npn \__xsim_save_environment_body_end: { }
+
% ----------------------------------------------------------------------------
% #1: type
% #2: exercise|solution
@@ -206,9 +254,10 @@
% #1: type
% #2: id
% #3: exercise|solution
-\cs_new_protected:Npn \xsim_start_environment:nnn #1#2#3
- { \xsim_save_environment_body:nnn {#1} {#2} {#3} }
-\cs_generate_variant:Nn \xsim_start_environment:nnn {nV}
+% #4: potential enironment body
+\cs_new_protected:Npn \xsim_start_environment:nnnn #1#2#3#4
+ { \xsim_save_environment_body:nnnn {#1} {#2} {#3} {#4} }
+\cs_generate_variant:Nn \xsim_start_environment:nnnn {nV}
% #1: type
% #2: id
@@ -237,12 +286,16 @@
{begin}
{ \xsim_get_parameter:nn {#1} {#3-template} }
\xsim_use_hook:nnn {#1} {#3} {begin}
- \file_if_exist:nTF { \exp_not:V \l__xsim_file_path_and_name_tl }
- { \file_input:n { \exp_not:V \l__xsim_file_path_and_name_tl } }
+ \xsim_if_write_to_files:TF
{
- \xsim_verbose:n
- { File~ `\l__xsim_file_path_and_name_tl'~ doesn't~ exist. }
+ \file_if_exist:nTF { \exp_not:V \l__xsim_file_path_and_name_tl }
+ { \file_input:n { \exp_not:V \l__xsim_file_path_and_name_tl } }
+ {
+ \xsim_verbose:n
+ { File~ `\l__xsim_file_path_and_name_tl'~ doesn't~ exist. }
+ }
}
+ { \xsim_get_property:nnn {#1} {#2} {#3-body} }
\xsim_use_hook:nnn {#1} {#3} {end}
\xsim_use_template:nn
{end}
@@ -254,12 +307,34 @@
% #1: type
% #2: id
+% #3: exercise|solution
+\prg_new_protected_conditional:Npnn \xsim_if_exists:nnn #1#2#3 {T,F,TF}
+ {
+ \xsim_if_write_to_files:TF
+ {
+ \__xsim_set_file_signature:nnn {#1} {#2} {#3}
+ \file_if_exist:VTF \l__xsim_file_path_and_name_tl
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+ {
+ \xsim_if_property_exist:nTF {#3-body}
+ {
+ \xsim_if_property_set:nnnTF {#1} {#2} {#3-body}
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+ { \prg_return_false: }
+ }
+ }
+
+% #1: type
+% #2: id
% #3: options
% #4: exercise|solution
\cs_new_protected:Npn \xsim_insert:nnnn #1#2#3#4
{
- \__xsim_set_file_signature:nnn {#1} {#2} {#4}
- \file_if_exist:VTF \l__xsim_file_path_and_name_tl
+ \xsim_if_exists:nnnTF {#1} {#2} {#4}
{
\xsim_verbose:n
{ Inserting~ #4~ type~ `#1'~ id~ `#2'. }
@@ -294,9 +369,16 @@
}
\str_if_eq:nnT {#4} {solution}
{
- \__xsim_set_file_signature:nnn {#1} {#2} {exercise}
- \file_get:nnN {\l__xsim_file_path_and_name_tl} {} \ExerciseText
- \tl_trim_spaces:N \ExerciseText
+ \xsim_if_write_to_files:TF
+ {
+ \__xsim_set_file_signature:nnn {#1} {#2} {exercise}
+ \file_get:nnN {\l__xsim_file_path_and_name_tl} {} \ExerciseText
+ \tl_trim_spaces:N \ExerciseText
+ }
+ {
+ \tl_set:Nx \ExerciseText
+ { \xsim_get_property:nnn {#1} {#2} {exercise-body} }
+ }
}
\use:x
{
@@ -315,8 +397,11 @@
\group_end:
}
{
- \xsim_verbose:x
- { File~ `\l__xsim_file_path_and_name_tl'~ doesn't~ exist. }
+ \xsim_if_write_to_files:T
+ {
+ \xsim_verbose:x
+ { File~ `\l__xsim_file_path_and_name_tl'~ doesn't~ exist. }
+ }
}
}
\cs_generate_variant:Nn \xsim_insert:nnnn {nV,VV,nnnV}
@@ -327,8 +412,12 @@
\cs_new_protected:Npn \xsim_input:nnn #1#2#3
{
\group_begin:
- \__xsim_set_file_signature:nnn {#1} {#2} {#3}
- \file_input:n { \l__xsim_file_path_and_name_tl }
+ \xsim_if_write_to_files:TF
+ {
+ \__xsim_set_file_signature:nnn {#1} {#2} {#3}
+ \file_input:n { \l__xsim_file_path_and_name_tl }
+ }
+ { \xsim_get_property:nnn {#1} {#2} {#3-body} }
\group_end:
}
\cs_generate_variant:Nn \xsim_input:nnn {oo}
@@ -355,23 +444,46 @@
\xsim_new_hook:nnn {#1} {#2} {end}
\xsim_new_hook:nnn {#1} {#2} {post}
\xsim_new_hook:nnn {#1} {#2} {print-false}
- \NewDocumentEnvironment
- { \xsim_get_parameter:nn {#1} {#2-env} } {o}
+ \xsim_if_write_to_files:TF
{
- \IfNoValueTF {##1}
+ \NewDocumentEnvironment
+ { \xsim_get_parameter:nn {#1} {#2-env} } {!o}
{
- \bool_set_false:N \l__xsim_options_given_bool
- \use:c {xsim_start_#2:nn} {#1} {}
+ \IfNoValueTF {##1}
+ {
+ \bool_set_false:N \l__xsim_options_given_bool
+ \use:c {xsim_start_#2:nn} {#1} {}
+ }
+ {
+ \bool_set_true:N \l__xsim_options_given_bool
+ \use:c {xsim_start_#2:nn} {#1} {##1}
+ }
+ \xsim_start_environment:nVnn {#1} \g_xsim_exercise_id_tl {#2} { }
}
{
- \bool_set_true:N \l__xsim_options_given_bool
- \use:c {xsim_start_#2:nn} {#1} {##1}
+ \xsim_stop_environment:nVn {#1} \g_xsim_exercise_id_tl {#2}
+ \use:c {xsim_stop_#2:n} {#1}
}
- \xsim_start_environment:nVn {#1} \g_xsim_exercise_id_tl {#2}
}
{
- \xsim_stop_environment:nVn {#1} \g_xsim_exercise_id_tl {#2}
- \use:c {xsim_stop_#2:n} {#1}
+ \NewDocumentEnvironment
+ { \xsim_get_parameter:nn {#1} {#2-env} } {o+b}
+ {
+ \IfNoValueTF {##1}
+ {
+ \bool_set_false:N \l__xsim_options_given_bool
+ \use:c {xsim_start_#2:nn} {#1} {}
+ }
+ {
+ \bool_set_true:N \l__xsim_options_given_bool
+ \use:c {xsim_start_#2:nn} {#1} {##1}
+ }
+ \xsim_start_environment:nVnn {#1} \g_xsim_exercise_id_tl {#2} {##2}
+ }
+ {
+ \xsim_stop_environment:nVn {#1} \g_xsim_exercise_id_tl {#2}
+ \use:c {xsim_stop_#2:n} {#1}
+ }
}
}
@@ -379,3 +491,4 @@
\file_input_stop:
2019/02/17 - fix issue #43
+2019/10/03 - add possibility to save environment bodies to property list
diff --git a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex
index fda5152a50..23e48d75f4 100644
--- a/macros/latex/contrib/xsim/code/xsim.solutions.code.tex
+++ b/macros/latex/contrib/xsim/code/xsim.solutions.code.tex
@@ -82,8 +82,7 @@
% #2: id
\prg_new_protected_conditional:Npnn \xsim_if_solution_exists:nn #1#2 {T,F,TF}
{
- \__xsim_set_file_signature:nnn {#1} {#2} {solution}
- \file_if_exist:VTF \l__xsim_file_path_and_name_tl
+ \xsim_if_exists:nnnTF {#1} {#2} {solution}
{ \prg_return_true: }
{ \prg_return_false: }
}
diff --git a/macros/latex/contrib/xsim/code/xsim.sty b/macros/latex/contrib/xsim/code/xsim.sty
index 8570e7a186..01dcbd96b3 100644
--- a/macros/latex/contrib/xsim/code/xsim.sty
+++ b/macros/latex/contrib/xsim/code/xsim.sty
@@ -25,13 +25,13 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% ----------------------------------------------------------------------------
-\RequirePackage {expl3,xparse}
+\RequirePackage {expl3,xparse,l3keys2e}
\ExplSyntaxOn
-\tl_const:Nn \c_xsim_date_tl {2019/09/30}
+\tl_const:Nn \c_xsim_date_tl {2019/10/06}
\tl_const:Nn \c_xsim_version_major_number_tl {0}
-\tl_const:Nn \c_xsim_version_minor_number_tl {12}
+\tl_const:Nn \c_xsim_version_minor_number_tl {13}
\tl_const:Nn \c_xsim_version_subrelease_tl {}
\tl_const:Nx \c_xsim_version_number_tl
{
@@ -58,24 +58,25 @@
\bool_new:N \g_xsim_final_bool
\bool_new:N \g_xsim_verbose_bool
\bool_new:N \g_xsim_clear_aux_bool
+\bool_new:N \l__xsim_write_to_file_bool
-\keys_define:nn {xsim}
+\keys_define:nn {xsim/package}
{
- final .bool_gset:N = \g_xsim_final_bool ,
- verbose .bool_gset:N = \g_xsim_verbose_bool ,
- clear-aux .bool_gset:N = \g_xsim_clear_aux_bool
+ final .bool_gset:N = \g_xsim_final_bool ,
+ verbose .bool_gset:N = \g_xsim_verbose_bool ,
+ clear-aux .bool_gset:N = \g_xsim_clear_aux_bool ,
+ no-files .bool_gset_inverse:N = \g__xsim_write_to_file_bool ,
+ no-files .initial:n = false
}
-\DeclareOption {final}
- { \bool_gset_true:N \g_xsim_final_bool }
+\ProcessKeysPackageOptions {xsim/package}
-\DeclareOption {verbose}
- { \bool_gset_true:N \g_xsim_verbose_bool }
-
-\DeclareOption {clear-aux}
- { \bool_gset_true:N \g_xsim_clear_aux_bool }
-
-\ProcessOptions \scan_stop:
+\prg_new_conditional:Npnn \xsim_if_write_to_files: {p,T,F,TF}
+ {
+ \bool_if:NTF \g__xsim_write_to_file_bool
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
% --------------------------------------------------------------------------
diff --git a/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex b/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex
index a04ab8fed4..4738dc7786 100644
--- a/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex
+++ b/macros/latex/contrib/xsim/code/xsim.verbwrite.code.tex
@@ -103,10 +103,18 @@
% see http://tex.stackexchange.com/q/9035/5049 reasons
\use:nx
{ \__xsim_file_write_start:n {#2} }
- { \bool_if:nF {#1} { \c__xsim_active_eol_tl } }
+ { \bool_if:nF {#1} { \exp_not:V \c__xsim_active_eol_tl } }
}
\cs_generate_variant:Nn \xsim_file_write_start:nn {nV}
+\cs_new_protected:Npn \__xsim_set_verb_catcodes:
+ {
+ \seq_map_inline:Nn \l_char_special_seq
+ { \char_set_catcode_other:N ##1 }
+ \int_step_inline:nnnn {128} {1} {255}
+ { \char_set_catcode_letter:n {##1} }
+ }
+
\group_begin:
\char_set_catcode_active:n {13} % ^^M (carriage return, endlinechar)
\char_set_catcode_active:n {12} % ^^L (form feed)
@@ -130,10 +138,7 @@
{ \l_xsim_file_begin_tl } %
} %
} %
- \seq_map_inline:Nn \l_char_special_seq %
- { \char_set_catcode_other:N ##1 } %
- \int_step_inline:nnnn {128} {1} {255} %
- { \char_set_catcode_letter:n {##1} } %
+ \__xsim_set_verb_catcodes: %
\tl_set:Nx \l__xsim_tmpa_tl %
{ \c__xsim_backslash_char_tl end \cs_to_str:N \{ \@currenvir \cs_to_str:N \} } %
\use:x %
diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.pdf b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.pdf
index f6557530a1..4b5a09474d 100644
--- a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.pdf
+++ b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.pdf
Binary files differ
diff --git a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.tex b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.tex
index e48d8880da..a0b204f914 100644
--- a/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.tex
+++ b/macros/latex/contrib/xsim/doc/examples/xsim.texsx-338165.tex
@@ -8,9 +8,7 @@
\usepackage{xsim}
\usepackage{tcolorbox}
\tcbuselibrary{breakable, skins}
-\settasks{
- counter-format = tsk.
-}
+\settasks{ label = \arabic*. }
\DeclareExerciseEnvironmentTemplate{boxed}
{%
diff --git a/macros/latex/contrib/xsim/doc/xsim-manual.cls b/macros/latex/contrib/xsim/doc/xsim-manual.cls
index 00bab72636..8d28945262 100644
--- a/macros/latex/contrib/xsim/doc/xsim-manual.cls
+++ b/macros/latex/contrib/xsim/doc/xsim-manual.cls
@@ -263,6 +263,9 @@
}
\def\libertine@figurestyle{LF}
+\RequirePackage{amsmath}
+\undef\lvert \undef\lVert
+\undef\rvert \undef\rVert
\RequirePackage[libertine]{newtxmath}
\def\libertine@figurestyle{OsF}
@@ -587,7 +590,7 @@
\RequirePackage{bookmark}
\xsimsetup{
- clear-aux ,
+ % clear-aux ,
path = exercises
}
@@ -688,7 +691,7 @@
\cs_set:Npn \__xsim_get_texwelt_number:w texwelt- #1 \q_stop: {#1}
\cs_set:Npn \__xsim_get_golatex_number:w golatex- #1 \q_stop: {#1}
-\newcommand* \xsim@example@links [1] {
+\cs_new_protected:Npn \xsim@example@links #1 {
\href { \xsim@example@texfile@path {#1} } { \color{white} [\TeX] } ~
\href { \xsim@example@pdffile@path {#1} } { \color{white} [PDF] }
\tl_if_in:nnT {#1} {texsx}
@@ -717,13 +720,20 @@
\newcounter{examplefile}
\newcounter{examplefiles}
-\newcommand*\xsim@add@example[1]{%
+\newcommand*\xsim@add@example[2]{%
\listadd\xsim@examplefiles{#1}%
+ \csdef{xsim@example@texfile@desc@#1}{#2}%
\stepcounter{examplefiles}%
}
\newcommand*\listexamplefiles{%
\def\xsim@example@texfile@path##1{./examples/xsim.##1.tex}%
- \def\xsim@example@pdffile@path##1{./examples/{xsim.##1}.pdf}%
+ \def\xsim@example@pdffile@path{./examples/xsim}%
+ \def\xsim@example@desc##1{\csuse{xsim@example@texfile@desc@##1}}%
+ \def\xsim@example@title##1{%
+ Example~\theexamplefile: \xsim@example@desc{##1}
+ \\Links: \xsim@example@links{##1}\hfill File: \code{xsim.##1.tex}%
+ }%
+ \def\xsim@example@bookmark##1{Example~\theexamplefile\ (\xsim@example@desc{##1})}%
\def\do##1{%
\begin{cnltxcode}[
step and label={examplefile}{example:##1} ,
@@ -732,23 +742,22 @@
sidebyside gap=1em,
lower separated=false,
bottom=1mm,
- % rightlower=0pt,
- % halign lower=flush right,
- % clip lower,
- title=Example~\theexamplefile\ \enquote{\texttt{##1}}
- \xsim@example@links{##1}%
+ title=\xsim@example@title{##1}%
]
- \bookmark[level=2,dest=examplefile.\arabic{examplefile}]{Example~\theexamplefile\ (##1)}%
- \lstinputlisting[style=cnltx,firstline=7,lastline=16]{\xsim@example@texfile@path{##1}}
+ \bookmark[level=2,dest=examplefile.\arabic{examplefile}]{\xsim@example@bookmark{##1}}%
+ \lstinputlisting[style=cnltx,firstline=7,lastline=15,firstnumber=7]{\xsim@example@texfile@path{##1}}
\tcblower
\fbox{%
\href
- {\xsim@example@pdffile@path{##1}}
+ {\xsim@example@pdffile@path.##1.pdf}
{%
\includegraphics[
+ type=pdf,
+ ext=.##1.pdf,
+ read=.##1.pdf,
pagebox=cropbox,
- viewport=4.5cm 18cm 8.7cm 23.3cm,
- clip]{\xsim@example@pdffile@path{##1}}%
+ viewport=4.5cm 18.6cm 8.7cm 23cm,
+ clip]{\xsim@example@pdffile@path}%
}%
}%
\end{cnltxcode}
@@ -756,41 +765,41 @@
\dolistloop\xsim@examplefiles
}
-\xsim@add@example{blanks}
-\xsim@add@example{boxed-headings}
-\xsim@add@example{code-and-output}
-\xsim@add@example{collections}
-\xsim@add@example{crossref}
-\xsim@add@example{description-list}
-\xsim@add@example{different-point-types}
-\xsim@add@example{difficulties}
-\xsim@add@example{hints}
-\xsim@add@example{floating}
-\xsim@add@example{grade-distribution}
-\xsim@add@example{listings}
-\xsim@add@example{multiplechoice}
-\xsim@add@example{listofexercises}
-\xsim@add@example{pointsums}
-\xsim@add@example{randomexercises}
-\xsim@add@example{various}
-\xsim@add@example{texsx-13635}
-\xsim@add@example{texsx-155630}
-\xsim@add@example{texsx-199360}
-\xsim@add@example{texsx-299534}
-\xsim@add@example{texsx-305110}
-\xsim@add@example{texsx-308883}
-\xsim@add@example{texsx-338165}
-\xsim@add@example{texsx-350028}
-\xsim@add@example{texsx-369065}
-\xsim@add@example{texsx-369636}
-\xsim@add@example{texsx-369803}
-\xsim@add@example{texsx-370642}
-\xsim@add@example{texsx-391530}
-\xsim@add@example{texsx-395273}
-\xsim@add@example{texwelt-6698}
-\xsim@add@example{texwelt-15093}
-\xsim@add@example{golatex-80640}
-\xsim@add@example{golatex-91339}
+\xsim@add@example{blanks}{Create blank lines}
+\xsim@add@example{boxed-headings}{Put headings in a box}
+\xsim@add@example{code-and-output}{Create code examples}
+\xsim@add@example{collections}{How to use collections}
+\xsim@add@example{crossref}{Crossreferencing between problems and answers}
+\xsim@add@example{description-list}{Exercises as a \code{description} list}
+\xsim@add@example{different-point-types}{A custom point scheme}
+\xsim@add@example{difficulties}{Difficulty levels}
+\xsim@add@example{floating}{Floating exercises and a list of exercises}
+\xsim@add@example{grade-distribution}{Using the grade distribution macros}
+\xsim@add@example{hints}{Give hints}
+\xsim@add@example{listings}{Use listings in exercises}
+\xsim@add@example{listofexercises}{A custom list of exercises}
+\xsim@add@example{multiplechoice}{Multiplechoice exercises}
+\xsim@add@example{pointsums}{Sum of points}
+\xsim@add@example{randomexercises}{Random exercises from a collection}
+\xsim@add@example{various}{Various aspects of \xsim}
+\xsim@add@example{texsx-13635}{Exercises like theorems}
+\xsim@add@example{texsx-155630}{Random/custom order of exercises}
+\xsim@add@example{texsx-199360}{Exercises and solutions in a \pkg*{tcolorbox}}
+\xsim@add@example{texsx-299534}{Using \pkg*{pythontex}}
+\xsim@add@example{texsx-305110}{Print solutions per chapter/section}
+\xsim@add@example{texsx-308883}{Adapt how points are printed}
+\xsim@add@example{texsx-338165}{Another \pkg*{tcolorbox} example}
+\xsim@add@example{texsx-350028}{Fancy \pkg*{tcolorbox} and crossreferencing}
+\xsim@add@example{texsx-369065}{Custom layout}
+\xsim@add@example{texsx-369636}{An empty box for points}
+\xsim@add@example{texsx-369803}{Layout adjustments}
+\xsim@add@example{texsx-370642}{Minimalistic layout}
+\xsim@add@example{texsx-391530}{Exercises and sub-exercises}
+\xsim@add@example{texsx-395273}{Different aspects of exercises. Highlighted solutions}
+\xsim@add@example{texwelt-6698}{Custom list of exercises}
+\xsim@add@example{texwelt-15093}{Indicate difficulty level}
+\xsim@add@example{golatex-80640}{Different versions for students and teachers}
+\xsim@add@example{golatex-91339}{Another custom layout with rules}
% ----------------------------------------------------------------------------
@@ -827,6 +836,7 @@
\xsim@add@version{0.10a} {2017-10-04}
\xsim@add@version{0.11} {2018-02-12}
\xsim@add@version{0.12} {2019-09-26}
+\xsim@add@version{0.13} {2019-10-06}
% ----------------------------------------------------------------------------
\endinput
diff --git a/macros/latex/contrib/xsim/doc/xsim.history b/macros/latex/contrib/xsim/doc/xsim.history
index a22d42ad03..c16a4ef7ec 100644
--- a/macros/latex/contrib/xsim/doc/xsim.history
+++ b/macros/latex/contrib/xsim/doc/xsim.history
@@ -114,3 +114,4 @@ HISTORY:
v0.12 2019/09/30 - add parameter versions for the plural forms of exercise
and solution names
- bug fixes (issues 37, 39, 43, 47)
+ v0.13 2019/10/06 - experimental package option `no-files'
diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.pdf b/macros/latex/contrib/xsim/doc/xsim_manual.pdf
index bfd2c31641..b6fb1d329c 100644
--- a/macros/latex/contrib/xsim/doc/xsim_manual.pdf
+++ b/macros/latex/contrib/xsim/doc/xsim_manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/xsim/doc/xsim_manual.tex b/macros/latex/contrib/xsim/doc/xsim_manual.tex
index afc17fd68a..9bf643e1ca 100644
--- a/macros/latex/contrib/xsim/doc/xsim_manual.tex
+++ b/macros/latex/contrib/xsim/doc/xsim_manual.tex
@@ -128,6 +128,12 @@ meaning in this manual.
probability of possibly faulty exercises after changes to the document.}
The \option{final} option automatically disables this option. See also
sections~\vref{sec:how-exerc-envir} and~\vref{sec:resolve-getting}.
+ \opt{no-files}
+ \sinceversion{0.13}This option prevents \xsim\ from writing the exercises
+ and solutions to external files. This will keep your working folder
+ ``clean'' but will also prevent using verbatim material in exercises and
+ solutions and will possibly slow processing further down. \emph{This
+ option is considered experimental. Feedback is very welcome.}
\end{options}
Those options are used the usual way as package option
@@ -299,6 +305,19 @@ order to deal with this somehow \xsim\ offers the following option:
\end{exercise}
\end{sourcecode}
+If\sinceversion{0.13} you don't like all the external files and the problems
+which come with them \emph{and} if you don't need any verbatim or similar
+material inside the exercises and solutions then you can use the following
+package option:
+\begin{options}
+ \opt{no-files}
+ This option prevents \xsim\ from writing the exercises and solutions to
+ external files. This will keep your working folder ``clean'' but will
+ also prevent using verbatim material in exercises and solutions and will
+ possibly slow processing further down. \emph{This option is considered
+ experimental. Feedback is very welcome.}
+\end{options}
+
\begin{bewareofthedog}
\xsim\ writes a lot of stuff to the auxfile for re-using information on
subsequent compilations. If you add exercises, change properties \etc\ it
@@ -557,8 +576,9 @@ others can be set using the optional argument of the exercise environment.
This is better demonstrated with an example:
\begin{example}
+ % \lipsum is provided by package `lipsum'
\begin{exercise}
- \lipsum[4] % from package `lipsum'
+ \lipsum[4]
\verb+\GetExerciseProperty{id}+: \GetExerciseProperty{id} \par
\verb+\GetExerciseAliasProperty{ID}+: \GetExerciseAliasProperty{ID} \par
\verb+\GetExerciseProperty{ID}+: \GetExerciseProperty{ID}
diff --git a/macros/xetex/latex/xecyr/README b/macros/xetex/latex/xecyr/README
index 98ef8eb71b..cd922b5994 100644
--- a/macros/xetex/latex/xecyr/README
+++ b/macros/xetex/latex/xecyr/README
@@ -1,3 +1,46 @@
-This is the 'xecyr' package which is intended to help
-with Russian and other Cyrillic-based languages in Babel and XeLaTeX.
+This is the version 1.2 of 'xecyr' package which is intended to help with
+Russian and other Cyrillic-based languages in Babel / polyglossia and
+XeLaTeX / LuaLaTeX.
+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.
+
+Now with a great pleasure I must announce that recent development of two
+most used Unicode-aware TeX engines (XeTeX and LuaTeX) came to the point
+where xecyr is not needed anymore. As you will see, all xecyr examples
+work now without xecyr (only slight modifification was typically
+required). All these examples work with XeLaTeX and almost all (except
+"xecyr-ex7-ru-x.tex") with LuaLaTeX. It is now possible to replace xecyr
+with dummy package or even remove it, but I still prefer to keep xecyr.
+There are many documents which depend on it. Old and new examples are
+also quite useful, especially for Russian typesetting.
+
+=== FILES ===
+
+NEWS changelog
+README This file
+xecyr.sty Cyrillic definitions for XeLaTeX, depends on XeLaTeX, "xunicode" package, and, optionally, "misccorr" and highly recommended "xltxtra" package
+
+combined_hyphenation Examples of how to establish combined (Russian + English) hyphenation in TeXLive
+inputs Input files with different Russian encodings
+old Old documentation files
+
+grafika_v_tex.tex Graphics in TeX (in Russian)
+howto-tex-ru-x.tex How to work in TeX (in Russian)
+listings-utf8-ex.tex Example for listings package (not quite successfull)
+pict2e-ex.tex Example for pict2e package
+rubibtex-ex.bib Examble BibTeX database (codepage 1251)
+rubibtex-ex-x.sh Shell script for BiBTeX
+rubibtex-ex-x.tex Example for BibTeX
+rumakeindex-ex-x.sh Shell script for makeindex
+rumakeindex-ex-x.tex Example for makeindex
+sample2e-ru-x.tex Russian translation lf L. Lamport's "sample2e"
+xecyr-doc-ru.tex Package documentation
+xecyr-ex3-ru-x.tex Example 3 (Xy-Pic)
+xecyr-ex4-ru-x.tex Example 4 (Pgf, works only with recent version of Pgf)
+xecyr-ex5-ru-x.tex Example 5 (txfonts, works only with recent version of "fontspec" package)
+xecyr-ex6-ru-x.tex Example 6 (see Babel shortcuts working)
+xecyr-ex7-ru-x.tex Example 7 (handling Russian 8-bit codepages + polyglossia)
diff --git a/macros/xetex/latex/xecyr/bin/xecyr/rubibtexx.bat b/macros/xetex/latex/xecyr/bin/xecyr/rubibtexx.bat
deleted file mode 100644
index 9ec3b7db3c..0000000000
--- a/macros/xetex/latex/xecyr/bin/xecyr/rubibtexx.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-bibtex8 -B -c cp1251.csf %1.aux
-iconv -f CP1251 -t UTF-8 %1.bbl > tmp.tmp
-copy /b tmp.tmp %1.bbl
-del tmp.tmp
-
-
-
-
diff --git a/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx.bat b/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx.bat
deleted file mode 100644
index 230f9f97e4..0000000000
--- a/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-iconv -f UTF-8 -t CP1251 %1.idx > tmp.tmp
-copy /b tmp.tmp %1.idx
-del tmp.tmp
-makeindex %1.idx -t %1.ilg -o %1.ind
-iconv -f CP1251 -t UTF-8 %1.ind > tmp.tmp
-copy /b tmp.tmp %1.ind
-del tmp.tmp
diff --git a/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx2.bat b/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx2.bat
deleted file mode 100644
index a1b302fb07..0000000000
--- a/macros/xetex/latex/xecyr/bin/xecyr/rumakeindexx2.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-iconv -f UTF-8 -t CP1251 %1.idx > tmp.tmp
-copy /b tmp.tmp %1.idx
-del tmp.tmp
-makeindex %1.idx -t %1.ilg -s %2.ist -o %1.ind
-iconv -f CP1251 -t UTF-8 %1.ind > tmp.tmp
-copy /b tmp.tmp %1.ind
-del tmp.tmp
diff --git a/macros/xetex/latex/xecyr/doc/NEWS b/macros/xetex/latex/xecyr/doc/NEWS
new file mode 100644
index 0000000000..765209ee87
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/NEWS
@@ -0,0 +1,8 @@
+xecyr 1.1:
+ Ukrainian letters corrected (thanks to Alexey Bondarchuk);
+ works with polyglossia;
+ two examples added
+
+xecyr 1.2:
+ code updated;
+ added examples
diff --git a/macros/xetex/latex/xecyr/doc/README b/macros/xetex/latex/xecyr/doc/README
new file mode 100644
index 0000000000..cf244a1338
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/README
@@ -0,0 +1,2 @@
+xecyr package contains helper tools for using Cyrillic languages with XeLaTeX / LuaLaTeX and babel / polyglossia.
+
diff --git a/macros/xetex/latex/xecyr/doc/combined_hyphenation/README b/macros/xetex/latex/xecyr/doc/combined_hyphenation/README
new file mode 100644
index 0000000000..98077e85e6
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/combined_hyphenation/README
@@ -0,0 +1,4 @@
+Combined Russian-English hyphenation is now made simple: just combine
+together hyphenation patterns (both types), then change
+'loadhyph-ru.tex'. Please see examples to understand it better. Then, as
+usual, re-compile format files. \ No newline at end of file
diff --git a/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.pdf b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.pdf
new file mode 100644
index 0000000000..26b692b868
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.tex b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.tex
new file mode 100644
index 0000000000..fc19c1f7cb
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen-x.tex
@@ -0,0 +1,19 @@
+\documentclass{article}
+\usepackage[russian]{babel} % only "russian" because it is actually combined!
+
+\usepackage{boxedminipage}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\begin{document}
+
+\begin{boxedminipage}{1.2cm}
+Some long tedious Englishtext to show if combined (Russian and English together) hyphenation actually works
+\end{boxedminipage}
+
+\begin{boxedminipage}{1.2cm}
+Π”ΠΎΠ²ΠΎΠ»ΡŒΠ½ΠΎ Π΄Π»ΠΈΠ½Π½Ρ‹ΠΉ тСкст, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ позволяСт Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, Ρ€Π°Π±ΠΎΡ‚Π°ΡŽΡ‚ Π»ΠΈ ΠΊΠΎΠΌΠ±ΠΈΠ½ΠΈΡ€ΠΎΠ²Π°Π½Π½Ρ‹Π΅ (ΠΎΠ΄Π½ΠΎΠ²Ρ€Π΅ΠΌΠ΅Π½Π½ΠΎ русскиС ΠΈ английскиС) пСрСносы
+\end{boxedminipage}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.pdf b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.pdf
new file mode 100644
index 0000000000..c4bde21eb1
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.tex b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.tex
new file mode 100644
index 0000000000..24d55e1933
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/combined_hyphenation/combined_hyphenation_ruen.tex
@@ -0,0 +1,18 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[T2A]{fontenc}
+\usepackage[russian]{babel} % only "russian" because it is actually combined!
+
+\usepackage{boxedminipage}
+
+\begin{document}
+
+\begin{boxedminipage}{1.2cm}
+Some long tedious Englishtext to show if combined (Russian and English together) hyphenation actually works
+\end{boxedminipage}
+
+\begin{boxedminipage}{1.2cm}
+Π”ΠΎΠ²ΠΎΠ»ΡŒΠ½ΠΎ Π΄Π»ΠΈΠ½Π½Ρ‹ΠΉ тСкст, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ позволяСт Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, Ρ€Π°Π±ΠΎΡ‚Π°ΡŽΡ‚ Π»ΠΈ ΠΊΠΎΠΌΠ±ΠΈΠ½ΠΈΡ€ΠΎΠ²Π°Π½Π½Ρ‹Π΅ (ΠΎΠ΄Π½ΠΎΠ²Ρ€Π΅ΠΌΠ΅Π½Π½ΠΎ русскиС ΠΈ английскиС) пСрСносы
+\end{boxedminipage}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/grafika_v_tex.pdf b/macros/xetex/latex/xecyr/doc/grafika_v_tex.pdf
new file mode 100644
index 0000000000..a08f1a605d
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/grafika_v_tex.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/grafika_v_tex.tex b/macros/xetex/latex/xecyr/doc/grafika_v_tex.tex
new file mode 100644
index 0000000000..bcc6c0ea18
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/grafika_v_tex.tex
@@ -0,0 +1,101 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[russian]{babel}
+\usepackage{a4wide,onepagem,qqru}
+
+\font\manual=logo10
+\def\PiCTeX{{\rm P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC\kern-.11em\TeX}}
+\def\MF{{\manual META}\-{\manual FONT}}
+\def\MP{{\scshape Meta\-post}}
+\def\Xy{\leavevmode\hbox{\kern-.1em X\kern-.3em\lower.4ex\hbox{Y\kern-.15em}}}
+
+% russification of 'enumerate'
+\makeatletter
+\def\labelenumi{\theenumi)}
+\def\theenumii{\asbuk{enumii}}
+\def\labelenumii{\theenumii)}
+\def\p@enumii{\theenumi}
+\def\labelenumiii{{\bf--}}
+\let\theenumiii\relax
+\def\p@enumiii{\theenumi\theenumii}
+\makeatother
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\author{А. Π¨ΠΈΠΏΡƒΠ½ΠΎΠ²}
+\title{Π“Ρ€Π°Ρ„ΠΈΠΊΠ° Π² \TeX/\LaTeX}
+\date{19.10.1999}
+\begin{document}
+\maketitle
+
+\begin{enumerate}
+
+\item Π Π°Π±ΠΎΡ‚Π° с внСшними ΠΎΠ±ΡŠΠ΅ΠΊΡ‚Π°ΠΌΠΈ
+
+ \begin{enumerate}
+
+ \item ГрафичСский ΠΊΠΎΠ΄ (\<Π²Π΅ΠΊΡ‚ΠΎΡ€Π½Ρ‹ΠΉ\>), ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅ΠΌΡ‹ΠΉ для
+ прСпроцСссинга ΠΈΠ»ΠΈ ΠΏΠΎΠ»ΡƒΡ‡Π°Π΅ΠΌΡ‹ΠΉ Π² Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚Π΅ компиляции
+ \TeX-Ρ„Π°ΠΉΠ»Π°, Π° Π·Π°Ρ‚Π΅ΠΌ встраиваСмый Π² \texttt{dvi}-Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΈ
+ ΠΏΠΎΠΌΠΎΡ‰ΠΈ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ \verb|\special|.
+
+ \begin{itemize}
+
+ \item \MF\ (ΠΈ Π΅Π³ΠΎ Π²Π°Ρ€ΠΈΠ°Π½Ρ‚ \MP)~--- ΠΏΠ°ΠΊΠ΅Ρ‚Ρ‹ \MP\ ΠΈ
+ \texttt{mfpic}. ΠŸΠ΅Ρ€Π΅Π΄ встраиваниСм Π² \texttt{dvi}-Ρ„Π°ΠΉΠ»
+ трСбуСтся компиляция ΠΊΠΎΠ΄Π°.
+
+ \item PostScript~--- ΠΏΠ°ΠΊΠ΅Ρ‚Ρ‹ ΠΈΠ· Π½Π°Π±ΠΎΡ€Π°
+ \<\texttt{graphics}\>, PSTricks, \TeX{}\-Draw,
+ \Xy-pic, \texttt{pspicture}, \texttt{psfrag} ΠΈ~Ρ‚.Π΄.
+
+ \item TPIC~--- \Xy-pic, \texttt{eepic}.
+
+ \item Em\TeX~--- \texttt{curvesls}, \texttt{stree}, ΠΊΠΎΠ΄,
+ ΠΏΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΠΌΡ‹ΠΉ ΠΏΠ°ΠΊΠ΅Ρ‚ΠΎΠΌ \TeX{}cad ΠΈ~Ρ‚.Π΄.
+
+ \item Π Π°Π·Π»ΠΈΡ‡Π½Ρ‹Π΅ языки для прСпроцСссоров,
+ пСрСводящих внСшний ΠΊΠΎΠ΄ Π²ΠΎ Π²Π½ΡƒΡ‚Ρ€Π΅Π½Π½ΠΈΠΉ: mathsPIC
+ ($\rightarrow$ \PiCTeX), Flow ($\rightarrow$
+ \LaTeX) ΠΈ~Ρ‚.Π΄.
+
+ \end{itemize}
+
+ \item Π“ΠΎΡ‚ΠΎΠ²Ρ‹Π΅ рисунки: растровыС (\texttt{BMP}, \texttt{PCX} ΠΈ~Ρ‚.Π΄.)
+ ΠΈ Π²Π΅ΠΊΡ‚ΠΎΡ€Π½Ρ‹Π΅ (\texttt{WMF}, \texttt{FIG}, \texttt{EPS}).
+
+ \begin{itemize}
+
+ \item ВстраиваниС Π·Π° счСт ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹
+ \verb|\special| Π² \texttt{dvi}-Ρ„Π°ΠΉΠ»~--- ΠΏΠ°ΠΊΠ΅Ρ‚Ρ‹ ΠΈΠ·
+ Π½Π°Π±ΠΎΡ€Π° \<\texttt{graphics}\> ΠΈ~Ρ‚.Π΄.
+
+ \item ΠŸΡ€Π΅ΠΏΡ€ΠΎΡ†Π΅ΡΡΠΈΠ½Π³ для прСобразования Π² Π»ΠΈΠ½Π΅ΠΉΠΊΠΈ
+ (\texttt{bm2latex}), Π² ΡˆΡ€ΠΈΡ„Ρ‚Ρ‹ (\texttt{bm2font}) ΠΈΠ»ΠΈ Π²
+ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ внСшниС графичСскиС Ρ„ΠΎΡ€ΠΌΠ°Ρ‚Ρ‹
+ (\texttt{transfig}).
+
+ \end{itemize}
+
+ \item \<Π§ΡƒΠΆΠΈΠ΅\> ΡˆΡ€ΠΈΡ„Ρ‚Ρ‹: \texttt{tfm} + \texttt{vf} + Type1 ΠΈΠ»ΠΈ
+ TrueType
+
+ \end{enumerate}
+
+\item Π Π°Π±ΠΎΡ‚Π° с Π²Π½ΡƒΡ‚Ρ€Π΅Π½Π½ΠΈΠΌΠΈ ΠΎΠ±ΡŠΠ΅ΠΊΡ‚Π°ΠΌΠΈ
+
+ \begin{enumerate}
+
+ \item Π›ΠΈΠ½Π΅ΠΉΠΊΠΈ (rules)~--- \<\LaTeX\ picture
+ environment\> ΠΈ Π΅Π³ΠΎ Ρ€Π°ΡΡˆΠΈΡ€Π΅Π½ΠΈΡ (ΠΏΠ°ΠΊΠ΅Ρ‚Ρ‹ \texttt{bar},
+ \texttt{bez123}, \texttt{epic}, \texttt{pmgraph} ΠΈ~Ρ‚.Π΄.), \PiCTeX,
+ \Xy-pic, Dra\TeX.
+
+ \item Π¨Ρ€ΠΈΡ„Ρ‚Ρ‹ (\texttt{tfm} + \texttt{pk})~--- \LaTeX\ picture с
+ Ρ€Π°ΡΡˆΠΈΡ€Π΅Π½ΠΈΡΠΌΠΈ (см. Π²Ρ‹ΡˆΠ΅), \Xy-pic ΠΈ~Ρ‚.Π΄.
+
+ \end{enumerate}
+
+\end{enumerate}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.pdf b/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.pdf
new file mode 100644
index 0000000000..9a1c44137c
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.tex b/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.tex
new file mode 100644
index 0000000000..29fb386020
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/howto-tex-ru-x.tex
@@ -0,0 +1,152 @@
+\documentclass{article}
+\usepackage[russian]{babel}
+\usepackage{fontspec}
+
+\setmainfont{CMU Serif}
+\setmonofont{CMU Typewriter Text}
+
+\begin{document}
+
+\section{Как Ρ€Π°Π±ΠΎΡ‚Π°Ρ‚ΡŒ Π² систСмС \TeX}
+
+\begin{itemize}
+
+\item[1.] Π‘ \TeX{}ΠΎΠΌ нСльзя Ρ€Π°Π±ΠΎΡ‚Π°Ρ‚ΡŒ ΠΈΠ½Ρ‚Π΅Ρ€Π°ΠΊΡ‚ΠΈΠ²Π½ΠΎ, ΠΊΠ°ΠΊ, скаТСм с Word'ΠΎΠΌ,
+поэтому запуск любого исполняСмого Ρ„Π°ΠΉΠ»Π° ΠΈΠ· Π΄ΠΈΡ€Π΅ΠΊΡ‚ΠΎΡ€ΠΈΠΈ, Π³Π΄Π΅ установлСн \TeX, Π½Π΅
+ΠΏΡ€ΠΈΠ²Π΅Π΄Π΅Ρ‚ Π½ΠΈ ΠΊ ΠΊΠ°ΠΊΠΎΠΌΡƒ Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚Ρƒ.
+
+\item[2.] ΠŸΡ€Π°Π²ΠΈΠ»ΡŒΠ½Π°Ρ ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΠ½ΠΎΡΡ‚ΡŒ дСйствий такая:
+
+\begin{itemize}
+
+\item Π‘Π½Π°Ρ‡Π°Π»Π° Π½ΡƒΠΆΠ½ΠΎ Π½Π°Π±Ρ€Π°Ρ‚ΡŒ тСкст Π² ΠΊΠ°ΠΊΠΎΠΌ-Π½ΠΈΠ±ΡƒΠ΄ΡŒ тСкстовом Ρ€Π΅Π΄Π°ΠΊΡ‚ΠΎΡ€Π΅, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ
+ΡƒΠΌΠ΅Π΅Ρ‚ ΡΠΎΡ…Ρ€Π°Π½ΡΡ‚ΡŒ тСкст Π² ΠΊΠΎΠ΄ΠΈΡ€ΠΎΠ²ΠΊΠ΅ Unicode (UTF-8), Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, \textsf{Notepad++},
+\textsf{Vim}, \textsf{AkelPad} (Π½ΠΎ Π½Π΅ \textsf{Word}). Π‘Π»Π΅Π΄ΠΈΡ‚Π΅ Π·Π° Ρ‚Π΅ΠΌ, Ρ‡Ρ‚ΠΎΠ±Ρ‹
+тСкст {\bf Π½Π΅ содСрТал} пСрСносов, Π½ΠΎΠΌΠ΅Ρ€ΠΎΠ² страниц ΠΈ ΡˆΡ€ΠΈΡ„Ρ‚ΠΎΠ²Ρ‹Ρ… Π²Ρ‹Π΄Π΅Π»Π΅Π½ΠΈΠΉ.
+
+\item Π—Π°Ρ‚Π΅ΠΌ слСдуСт Ρ€Π°Π·Π΄Π΅Π»ΠΈΡ‚ΡŒ всС Π°Π±Π·Π°Ρ†Ρ‹ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹ΠΌΠΈ пустыми строками
+(Π°Π±Π·Π°Ρ†Π½Ρ‹Π΅ отступы для \TeX{}Π° Π½ΠΈΡ‡Π΅Π³ΠΎ Π½Π΅ Π·Π½Π°Ρ‡Π°Ρ‚, ΠΊΠ°ΠΊ ΠΈ Π²ΠΎΠΎΠ±Ρ‰Π΅ всС лишниС ΠΏΡ€ΠΎΠ±Π΅Π»Ρ‹)
+
+\item Π”ΠΎ Π½Π°Ρ‡Π°Π»Π° тСкста Π½ΡƒΠΆΠ½ΠΎ Π½Π°ΠΏΠΈΡΠ°Ρ‚ΡŒ ΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅Π΅:
+
+\begin{verbatim} \documentclass{article} \usepackage[russian]{babel}
+\usepackage{fontspec} \setmainfont{CMU Serif} \begin{document} \end{verbatim}
+
+ΠŸΡ€ΠΈ этом Π²Π°ΠΆΠ½ΠΎ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Ρƒ Вас Π±Ρ‹Π»ΠΈ установлСны ΡˆΡ€ΠΈΡ„Ρ‚Ρ‹ CM-Unicode.
+
+\item Π’ ΠΊΠΎΠ½Ρ†Π΅ тСкста Π½ΡƒΠΆΠ½ΠΎ Π½Π°ΠΏΠΈΡΠ°Ρ‚ΡŒ ΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅Π΅:
+
+\verb|\end{document}|
+
+\item ΠŸΡ€ΠΎΠ²Π΅Ρ€ΡŒΡ‚Π΅, Π½Π΅Ρ‚ Π»ΠΈ Π² тСкстС ΡΠ»Π΅Π΄ΡƒΡŽΡ‰ΠΈΡ… ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹Ρ… символов:
+\begin{verbatim} { } $ & # % _ ^ ~ \ \end{verbatim} %$
+
+Π˜Ρ… Π½Π°Π΄ΠΎ Π»ΠΈΠ±ΠΎ ΡƒΠ±Ρ€Π°Ρ‚ΡŒ, Π»ΠΈΠ±ΠΎ Π·Π°ΠΌΠ΅Π½ΠΈΡ‚ΡŒ (Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, вмСсто <<\verb|%|>> ΠΏΠΎΡΡ‚Π°Π²ΠΈΡ‚ΡŒ
+\verb|\%|, Π° вмСсто <<\verb|&|>> "--- \verb|\&|).
+
+\item Π‘ΠΎΡ…Ρ€Π°Π½ΠΈΡ‚Π΅ тСкст с Ρ€Π°ΡΡˆΠΈΡ€Π΅Π½ΠΈΠ΅ΠΌ \verb|tex|, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, \verb|myfile.tex|.
+Π’Π΅ΠΏΠ΅Ρ€ΡŒ Π’Π°Ρˆ Ρ„Π°ΠΉΠ» Π³ΠΎΡ‚ΠΎΠ² для ΠΎΠ±Ρ€Π°Π±ΠΎΡ‚ΠΊΠΈ \TeX{}ΠΎΠΌ.
+
+\end{itemize}
+
+\item[3.] Π’Ρ‹Π·ΠΎΠ²ΠΈΡ‚Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΡƒΡŽ строку Ρ‚Π°ΠΊ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΎΠ½Π° ΠΎΡ‚ΠΊΡ€Ρ‹Π»Π°ΡΡŒ Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅ΠΉ ΠΏΠ°ΠΏΠΊΠ΅.
+ΠΠ°ΠΏΠΈΡˆΠΈΡ‚Π΅ Π² ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ строкС ΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅Π΅:
+
+\verb|xelatex myfile.tex|
+
+Π’ ΠΎΡ‚Π²Π΅Ρ‚ запустится ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΠ°--транслятор. Она Π½Π°Ρ‡Π½Π΅Ρ‚ Π²Ρ‹Π΄Π°Π²Π°Ρ‚ΡŒ Π½Π° экран сообщСния
+ΠΎ своСй Ρ€Π°Π±ΠΎΡ‚Π΅, ΠΎ Π²ΡΡ‚Ρ€Π΅Ρ‚ΠΈΠ²ΡˆΠΈΡ…ΡΡ трудностях ΠΈ ΠΎΡˆΠΈΠ±ΠΊΠ°Ρ…. Π’ послСднСм случаС
+трансляция остановится, Π½Π΅ дойдя Π΄ΠΎ ΠΊΠΎΠ½Ρ†Π°. Π’ΠΎΠ³Π΄Π° ΠΏΠΎΠΏΡ€ΠΎΠ±ΡƒΠΉΡ‚Π΅ Π½Π°ΠΆΠ°Ρ‚ΡŒ ΠΊΠ»Π°Π²ΠΈΡˆΡƒ
+\verb|<ENTER>| ΠΈΠ»ΠΈ \verb|s| (это ΠΏΠΎΠΌΠΎΠ³Π°Π΅Ρ‚ Π² Π±ΠΎΠ»ΡŒΡˆΠΈΠ½ΡΡ‚Π²Π΅ случаСв, Π° Ссли Π½Π΅
+ΠΏΠΎΠΌΠΎΠ³Π»ΠΎ "--- ΠΎΠ±Ρ€Π°Ρ‚ΠΈΡ‚Π΅ΡΡŒ ΠΊ спСциалисту-\TeX{}Π½ΠΈΠΊΡƒ).
+
+Π’ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Ρ… случаях Π½Π΅ всю Π²Ρ‹Π²ΠΎΠ΄ΠΈΠΌΡƒΡŽ ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΡŽ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡ‡ΠΈΡ‚Π°Ρ‚ΡŒ с экрана. Π­Ρ‚ΠΎ
+происходит ΠΈΠ·-Π·Π° ΠΏΡ€ΠΎΠ±Π»Π΅ΠΌ с ΠΊΠΎΠ΄ΠΈΡ€ΠΎΠ²ΠΊΠ°ΠΌΠΈ русского языка. Но, ΠΏΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ эти
+сообщСния Π·Π°ΠΏΠΈΡΡ‹Π²Π°ΡŽΡ‚ΡΡ Π΅Ρ‰Π΅ ΠΈ Π² ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹ΠΉ Ρ„Π°ΠΉΠ» (Π² нашСм случаС ΠΎΠ½ Π±ΡƒΠ΄Π΅Ρ‚
+Π½Π°Π·Ρ‹Π²Π°Ρ‚ΡŒΡΡ \verb|myfile.log|), Ρ‚ΠΎ ΠΊ Π½ΠΈΠΌ всСгда ΠΌΠΎΠΆΠ½ΠΎ Π²Π΅Ρ€Π½ΡƒΡ‚ΡŒΡΡ ΠΏΠΎ ΠΎΠΊΠΎΠ½Ρ‡Π°Π½ΠΈΠΈ
+трансляции.
+
+\item[4.] Как Ρ‚ΠΎΠ»ΡŒΠΊΠΎ трансляция Π·Π°Π²Π΅Ρ€ΡˆΠΈΡ‚ΡΡ, Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅ΠΉ Π΄ΠΈΡ€Π΅ΠΊΡ‚ΠΎΡ€ΠΈΠΈ появится срСди
+ΠΏΡ€ΠΎΡ‡ΠΈΡ… Ρ„Π°ΠΉΠ» с Ρ€Π°ΡΡˆΠΈΡ€Π΅Π½ΠΈΠ΅ΠΌ \verb|pdf|. ИмСнно этот Ρ„Π°ΠΉΠ» ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ, Π° Ссли
+Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚ Вас ΡƒΠ΄ΠΎΠ²Π»Π΅Ρ‚Π²ΠΎΡ€ΠΈΡ‚, Ρ‚ΠΎ ΠΈ Ρ€Π°ΡΠΏΠ΅Ρ‡Π°Ρ‚Π°Ρ‚ΡŒ.
+
+Если ΠΆΠ΅ Ρ‚ΠΎ, Ρ‡Ρ‚ΠΎ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΠ»ΠΎΡΡŒ, Π’Π°ΠΌ Π½Π΅ ΠΏΠΎΠ΄Ρ…ΠΎΠ΄ΠΈΡ‚ "--- Π½ΡƒΠΆΠ½ΠΎ Π²Π΅Ρ€Π½ΡƒΡ‚ΡŒΡΡ ΠΊ
+ΠΏΠ΅Ρ€Π²ΠΎΠ½Π°Ρ‡Π°Π»ΡŒΠ½ΠΎΠΌΡƒ Ρ„Π°ΠΉΠ»Ρƒ (Π² нашСм ΠΏΡ€ΠΈΠΌΠ΅Ρ€Π΅ это \verb|myfile.tex|), ΠΈΡΠΏΡ€Π°Π²ΠΈΡ‚ΡŒ ошибки,
+ввСсти Π½ΠΎΠ²Ρ‹Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ форматирования ΠΈ Ρ‚.~ΠΏ. ΠΈ ΠΎΠΏΡΡ‚ΡŒ ΠΏΠΎΠΏΡ‹Ρ‚Π°Ρ‚ΡŒΡΡ Π΅Π³ΠΎ
+ΠΎΡ‚Ρ‚Ρ€Π°Π½ΡΠ»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ (см.~ΠΏΡƒΠ½ΠΊΡ‚ 3).
+
+\item[5.] Π’Ρ‹ΡˆΠ΅ΠΏΡ€ΠΈΠ²Π΅Π΄Π΅Π½Π½Ρ‹Π΅ Ρ€Π΅ΠΊΠΎΠΌΠ΅Π½Π΄Π°Ρ†ΠΈΠΈ годятся, ΠΊΠΎΠ½Π΅Ρ‡Π½ΠΎ, лишь для ΠΎΡ‡Π΅Π½ΡŒ простых
+случаСв (хотя, слСдуя ΠΈΠΌ, ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΡ€ΠΎΠΉ Π΄ΠΎΡΡ‚ΠΈΡ‡ΡŒ ΠΏΡ€Π΅ΠΊΡ€Π°ΡΠ½Ρ‹Ρ…Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚ΠΎΠ²). Если Π’Ρ‹
+Ρ…ΠΎΡ‚ΠΈΡ‚Π΅ Π³ΠΎΡ‚ΠΎΠ²ΠΈΡ‚ΡŒ тСксты ΠΏΡ€ΠΈΠ΅ΠΌΠ»Π΅ΠΌΠΎΠΉ слоТности, стоит ΠΎΠ±Ρ€Π°Ρ‚ΠΈΡ‚ΡŒΡΡ Π»ΠΈΠ±ΠΎ ΠΊ
+элСктронному справочнику ΠΏΠΎ \TeX{}Ρƒ, Π»ΠΈΠ±ΠΎ ΠΊ Π»ΠΈΡ‚Π΅Ρ€Π°Ρ‚ΡƒΡ€Π΅. ОсобСнно Ρ…ΠΎΡ€ΠΎΡˆΠ° Π² этом
+ΠΏΠ»Π°Π½Π΅ ΠΊΠ½ΠΈΠ³Π° Π‘.\,М.\,Π›ΡŒΠ²ΠΎΠ²ΡΠΊΠΎΠ³ΠΎ <<Набор ΠΈ вСрстка Π² ΠΏΠ°ΠΊΠ΅Ρ‚Π΅ \LaTeX>>. ЕдинствСнный
+Π΅Π΅ нСдостаток "--- Ρ‚ΠΎ, Ρ‡Ρ‚ΠΎ ΠΎΠ½Π° ΡƒΠΆΠ΅ нСсколько устарСла.
+
+\end{itemize}
+
+\section{ΠžΡΠΎΠ±Π΅Π½Π½ΠΎΡΡ‚ΠΈ ΠΏΠΎΠ΄Π³ΠΎΡ‚ΠΎΠ²ΠΊΠΈ тСкста для ΠΏΠΎΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅ΠΉ вСрстки Π²\TeX}
+
+Когда тСкст готовится для ΠΏΠΎΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅ΠΉ вСрстки, всСгда Π²Ρ‹Π³ΠΎΠ΄Π½Π΅Π΅ Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒ Π΅Π³ΠΎ ΠΊΠ°ΠΊ
+<<чистый тСкст>> (Π±Π΅Π· ΡˆΡ€ΠΈΡ„Ρ‚ΠΎΠ²Ρ‹Ρ… Π²Ρ‹Π΄Π΅Π»Π΅Π½ΠΈΠΉ, пСрСносов, ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½ΠΎ ΠΎΡ„ΠΎΡ€ΠΌΠ»Π΅Π½Π½Ρ‹Ρ…
+Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΊΠΎΠ² ΠΈ Ρ‚.ΠΏ.), ΠΏΠΎΡ‚ΠΎΠΌΡƒ Ρ‡Ρ‚ΠΎ любая элСктронная типографская систСма (Π±ΡƒΠ΄ΡŒ Ρ‚ΠΎ
+\textsf{Adobe InDesign}, ΠΈΠ»ΠΈ \textsf{Scribus}, ΠΈΠ»ΠΈ Ρ‡Ρ‚ΠΎ-Ρ‚ΠΎ Π΅Ρ‰Π΅) всС Ρ€Π°Π²Π½ΠΎ Π±ΡƒΠ΄Π΅Ρ‚
+Ρ„ΠΎΡ€ΠΌΠ°Ρ‚ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ тСкст ΡΠ°ΠΌΠΎΡΡ‚ΠΎΡΡ‚Π΅Π»ΡŒΠ½ΠΎ.
+
+Однако Π°Π²Ρ‚ΠΎΡ€Ρƒ часто хочСтся, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Π΅Π³ΠΎ тСкст Π±Ρ‹Π» Ρ„ΠΎΡ€ΠΌΠ°Ρ‚ΠΈΡ€ΠΎΠ²Π°Π½ Ρ‚Π°ΠΊ, ΠΊΠ°ΠΊ Π½Π°Π΄ΠΎ Π΅ΠΌΡƒ,
+Π° Π½Π΅ Ρ€Π΅Π΄Π°ΠΊΡ†ΠΈΠΈ. Π•ΡΡ‚ΡŒ нСсколько способов этого Π΄ΠΎΠ±ΠΈΡ‚ΡŒΡΡ: ΠΌΠΎΠΆΠ½ΠΎ самому Π½Π°ΡƒΡ‡ΠΈΡ‚ΡŒΡΡ
+Π²Π΅Ρ€ΡΡ‚Π°Ρ‚ΡŒ свои тСксты (это Π»ΡƒΡ‡ΡˆΠΈΠΉ способ), ΠΌΠΎΠΆΠ½ΠΎ Π΄Π΅Π»Π°Ρ‚ΡŒ ΠΏΠΎΠΌΠ΅Ρ‚ΠΊΠΈ Π½Π° распСчаткС,
+прСдставляСмой Π² Ρ€Π΅Π΄Π°ΠΊΡ†ΠΈΡŽ (Ρ‚Π°ΠΊ принято Π²ΠΎ ΠΌΠ½ΠΎΠ³ΠΈΡ… ΠΆΡƒΡ€Π½Π°Π»Π°Ρ…), ΠΌΠΎΠΆΠ½ΠΎ, Π½Π°ΠΊΠΎΠ½Π΅Ρ†, Π½Π΅
+вникая Π² вСрстку досконально, Ρ€Π°ΡΡΡ‚Π°Π²Π»ΡΡ‚ΡŒ Π½Π΅ΠΊΠΈΠ΅ ΠΏΠΎΠΌΠ΅Ρ‚ΠΊΠΈ прямо Π² Ρ„Π°ΠΉΠ»Π΅, надСясь,
+Ρ‡Ρ‚ΠΎ систСма вСрстки ΠΈΡ… ΠΏΠΎΠΉΠΌΠ΅Ρ‚. ПослСдний Π²Π°Ρ€ΠΈΠ°Π½Ρ‚ ΠΏΡ€ΠΎΡ…ΠΎΠ΄ΠΈΡ‚ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ с \TeX{}ΠΎΠΌ. Π’ΠΎΡ‚
+нСсколько Ρ€Π΅ΠΊΠΎΠΌΠ΅Π½Π΄Π°Ρ†ΠΈΠΉ для Ρ‚Π΅Ρ…, ΠΊΡ‚ΠΎ Π½Π°Π±ΠΈΡ€Π°Π΅Ρ‚ <<чистый тСкст для ΠΏΠΎΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅ΠΉ
+вСрстки Π² \TeX>>:
+
+\begin{enumerate}
+
+\item Π’ тСкстС ΠΌΠΎΠΆΠ½ΠΎ Π΄Π΅Π»Π°Ρ‚ΡŒ пространныС ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΈ ΠΎ Ρ‚ΠΎΠΌ, ΠΊΠ°ΠΊ Π½Π°Π΄ΠΎ Π²Π΅Ρ€ΡΡ‚Π°Ρ‚ΡŒ Ρ‚Π΅
+ΠΈΠ»ΠΈ ΠΈΠ½Ρ‹Π΅ куски тСкста, просто помСчая Π½Π°Ρ‡Π°Π»ΠΎ ΠΊΠ°ΠΆΠ΄ΠΎΠΉ строчки символом \verb|%|,
+Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€:
+
+\verb|% ΠžΡ‚ΡΡŽΠ΄Π° ΠΈ Π΄ΠΎ ΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅ΠΉ ΠΏΠΎΠΌΠ΅Ρ‚ΠΊΠΈ "--- ΠΆΠΈΡ€Π½Ρ‹ΠΉ курсив!|
+
+\item Π”Ρ€ΡƒΠ³ΠΎΠΉ способ "--- просто ΡƒΡΠ²ΠΎΠΈΡ‚ΡŒ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ \TeX{}овскиС ΠΌΠ°ΠΊΡ€ΠΎΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ для
+ΠΏΠ΅Ρ€Π΅ΠΊΠ»ΡŽΡ‡Π΅Π½ΠΈΡ ΡˆΡ€ΠΈΡ„Ρ‚ΠΎΠ² (Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Π½Π° курсивный --- \verb|\itshape|, Π° ΠΎΠ±Ρ€Π°Ρ‚Π½ΠΎ "---
+\verb|\normalfont|; ΠΏΡ€ΠΎΡ‡ΠΈΠ΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ см. Π² ΠΊΠ½ΠΈΠ³Π΅ Π›ΡŒΠ²ΠΎΠ²ΡΠΊΠΎΠ³ΠΎ).
+
+\item Π’ \TeX{}Π΅ нСсколько Π²ΠΈΠ΄ΠΎΠ² Ρ‚ΠΈΡ€Π΅. ΠžΠ±Ρ‹Ρ‡Π½ΠΎΠ΅ (Π΄Π»ΠΈΠ½Π½ΠΎΠ΅) Ρ‚ΠΈΡ€Π΅ (em-dash) задаСтся
+трСмя Π·Π½Π°ΠΊΠ°ΠΌΠΈ <<\verb|-|>>: \verb|---|; срСднСС Ρ‚ΠΈΡ€Π΅ (en-dash) "--- двумя
+Π·Π½Π°ΠΊΠ°ΠΌΠΈ (\verb|--|, это Ρ‚ΠΈΡ€Π΅ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ Π² основном ΠΌΠ΅ΠΆΠ΄Ρƒ Ρ†ΠΈΡ„Ρ€Π°ΠΌΠΈ, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€,
+22--34); малСнькоС Ρ‚ΠΈΡ€Π΅, ΠΈΠ»ΠΈ дСфис "--- ΠΎΠ΄Π½ΠΈΠΌ Π·Π½Π°ΠΊΠΎΠΌ \verb|-|. Π­Ρ‚ΠΈ Ρ‚ΠΈΡ€Π΅ Π»ΡƒΡ‡ΡˆΠ΅
+всСго Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒ сразу (ΠΊ Ρ‚ΠΎΠΌΡƒ ΠΆΠ΅ ΠΈ тСкст выглядит <<Ρ‡ΠΈΡ‚Π°Π±Π΅Π»ΡŒΠ½Π΅Π΅>>).
+
+\item Π•ΡΡ‚ΡŒ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎΡΡ‚ΡŒ сразу ΠΏΡ€ΠΎΡΡ‚Π°Π²ΠΈΡ‚ΡŒ ударСния Π² словах (это Π²Π°ΠΆΠ½ΠΎ, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€,
+для различСния слов Π±\'ольшая ΠΈ больш\'ая). Дляэтого ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Π°
+\verb|\'|, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Ρ‚Π²\'ΠΎΡ€\'ΠΎΠ³. Π’Π°ΠΊ ΠΆΠ΅ Π»Π΅Π³ΠΊΠΎ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡ€ΠΎΡΡ‚Π°Π²ΠΈΡ‚ΡŒ ΠΈ Π΄Ρ€ΡƒΠ³ΠΈΠ΅
+диакритичСскиС (Π½Π°Π΄Π±ΡƒΠΊΠ²Π΅Π½Π½Ρ‹Π΅)Π·Π½Π°ΠΊΠΈ (ΠΏΠ΅Ρ€Π΅Ρ‡Π΅Π½ΡŒ "--- Π² ΠΊΠ½ΠΈΠ³Π΅ Π›ΡŒΠ²ΠΎΠ²ΡΠΊΠΎΠ³ΠΎ).
+
+\item Часто Π² тСкстС сразу Π½ΡƒΠΆΠ½ΠΎ ΠΎΡ‚ΠΌΠ΅Ρ‚ΠΈΡ‚ΡŒ сноски. Для этого слуТит ΠΊΠΎΠΌΠ°Π½Π΄Π°
+\verb|\footnote{тСкст сноски}|.
+
+\item Если Π½ΡƒΠΆΠ½Ρ‹ подстрочныС ΠΈΠ»ΠΈ надстрочныС символы, Π½Π°Π±ΠΈΡ€Π°ΠΉΡ‚Π΅ ΠΈΡ… Ρ‚Π°ΠΊ:
+\verb|$^{надстрочный тСкст}$| ΠΈ \verb|$_{подстрочный тСкст}$|, Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€
+\verb|Ρ‡Ρ‚ΠΎ-Ρ‚ΠΎ$^{Π³Π΄Π΅-Ρ‚ΠΎ}_{ΠΊΠ°ΠΊ-Ρ‚ΠΎ}$| Π΄Π°Π΅Ρ‚ Ρ‡Ρ‚ΠΎ-Ρ‚ΠΎ$^\textnormal{\scriptsize
+Π³Π΄Π΅-Ρ‚ΠΎ}_\textnormal{\scriptsize ΠΊΠ°ΠΊ-Ρ‚ΠΎ}$.
+
+\item Π”Π²Π° Π·Π½Π°Ρ‡ΠΊΠ° часто ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΡŽΡ‚ΡΡ Π² биологичСских тСкстах. Этоградус$^\circ$
+(набираСтся \verb|$^\circ$|) ΠΈ Π·Π½Π°ΠΊ умноТСния $\times$ (набираСтся
+\verb|$\times$|. Π—Π²Π΅Π·Π΄ΠΎΡ‡ΠΊΠ° (*) набираСтся нСпосрСдствСнно.
+
+\item Π—Π½Π°Ρ‡ΠΊΠΈ ΠΏΠ°Ρ€Π°Π³Ρ€Π°Ρ„Π° (\S), ΠΊΠ°Π²Ρ‹Ρ‡Π΅ΠΊ (<<ΠΎΠΊΠ°Π²Ρ‹Ρ‡Π΅Π½Π½Ρ‹ΠΉ тСкст>>) ΠΈ Π½\'ΠΎΠΌΠ΅Ρ€Π° (β„–)
+ст\'ΠΎΠΈΡ‚ Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒ соотвСствСнно ΠΊΠ°ΠΊ \verb|\S|, \verb|<<ΠΎΠΊΠ°Π²Ρ‹Ρ‡Π΅Π½Π½Ρ‹ΠΉ тСкст>>| ΠΈ
+просто ΠΊΠ°ΠΊ \texttt{β„–}.
+
+\item \underline{ΠŸΠΎΠ΄Ρ‡Π΅Ρ€ΠΊΠ½ΡƒΡ‚ΡŒ} тСкст ΠΌΠΎΠΆΠ½ΠΎ ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ
+\verb|\underline{|\texttt{тСкст, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π½Π°Π΄ΠΎ ΠΏΠΎΠ΄Ρ‡Π΅Ρ€ΠΊΠ½ΡƒΡ‚ΡŒ}\verb|}|.
+
+\item Π‘Ρ‚Π°Ρ€Π°ΠΉΡ‚Π΅ΡΡŒ Π½Π΅ ΠΎΡΡ‚Π°Π²Π»ΡΡ‚ΡŒ Π»ΠΈΡˆΠ½ΠΈΡ… ΠΏΡ€ΠΎΠ±Π΅Π»ΠΎΠ² ΠΈ Π΄Π²ΠΎΠΉΠ½Ρ‹Ρ… пустых строк Π²
+Π½Π°Π±ΠΈΡ€Π°Π΅ΠΌΠΎΠΌ Ρ„Π°ΠΉΠ»Π΅ "--- хотя \TeX{} ΠΈΡ… Π½Π΅ Π·Π°ΠΌΠ΅Ρ‡Π°Π΅Ρ‚, ΠΎΠ½ΠΈ сильно ΡƒΡ…ΡƒΠ΄ΡˆΠ°ΡŽΡ‚ внСшний
+Π²ΠΈΠ΄ ΠΈ <<Ρ‡ΠΈΡ‚Π°Π±Π΅Π»ΡŒΠ½ΠΎΡΡ‚ΡŒ>>~Ρ„Π°ΠΉΠ»Π°.
+
+\end{enumerate}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/1251.tex b/macros/xetex/latex/xecyr/doc/inputs/1251.tex
index 3b639df8f8..3b639df8f8 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/1251.tex
+++ b/macros/xetex/latex/xecyr/doc/inputs/1251.tex
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/866.tex b/macros/xetex/latex/xecyr/doc/inputs/866.tex
index 627948f8b4..627948f8b4 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/866.tex
+++ b/macros/xetex/latex/xecyr/doc/inputs/866.tex
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/iso.tex b/macros/xetex/latex/xecyr/doc/inputs/iso.tex
index 2c0728cfe2..2c0728cfe2 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/iso.tex
+++ b/macros/xetex/latex/xecyr/doc/inputs/iso.tex
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/koi8-r.tex b/macros/xetex/latex/xecyr/doc/inputs/koi8-r.tex
index 1ddf898e6e..1ddf898e6e 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/koi8-r.tex
+++ b/macros/xetex/latex/xecyr/doc/inputs/koi8-r.tex
diff --git a/macros/xetex/latex/xecyr/doc/listings-utf8-ex.pdf b/macros/xetex/latex/xecyr/doc/listings-utf8-ex.pdf
new file mode 100644
index 0000000000..48e9c244c8
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/listings-utf8-ex.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/listings-utf8-ex.tex b/macros/xetex/latex/xecyr/doc/listings-utf8-ex.tex
new file mode 100644
index 0000000000..6c0937af8b
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/listings-utf8-ex.tex
@@ -0,0 +1,18 @@
+\documentclass[a4paper,10pt]{article}
+\usepackage{fontspec}
+
+\setromanfont{Times New Roman}
+
+\usepackage{listings}
+\lstset{%
+language=[AlLaTeX]TEX,%
+extendedchars=true,%
+}
+
+\begin{document}
+
+\begin{lstlisting}
+ΠšΠΎΡ€ΠΎΠ²Π° пошла Π³ΡƒΠ»ΡΡ‚ΡŒ.
+\end{lstlisting}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/old/1251.tex b/macros/xetex/latex/xecyr/doc/old/1251.tex
new file mode 100644
index 0000000000..3b639df8f8
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/old/1251.tex
@@ -0,0 +1,19 @@
+\section{Κξδθπξβκΰ windows-1251}
+
+Windows-1251 "--- νΰαξπ ρθμβξλξβ θ κξδθπξβκΰ, βλώωΰρ ρςΰνδΰπςνξι 8-αθςνξι κξδθπξβκξι δλ βρευ πσρρκθυ βεπρθι Microsoft Windows. Οξλόησεςρ δξβξλόνξ αξλόψξι οξοσλπνξρςόώ. Αϋλΰ ρξηδΰνΰ νΰ αΰηε κξδθπξβξκ, θροξλόηξβΰβψθυρ β πΰννθυ <<ρΰμξοΰλόνϋυ>> πσρθτθκΰςξπΰυ Windows β 1990--1991 γγ. ρξβμερςνξ οπεδρςΰβθςελμθ <<Οΰπΰγπΰτΰ>>, <<Δθΰλξγΰ>> θ πξρρθιρκξγξ ξςδελενθ Microsoft. Οεπβξνΰχΰλόνϋι βΰπθΰνς κξδθπξβκθ ρθλόνξ ξςλθχΰλρ ξς οπεδρςΰβλεννξγξ β ςΰαλθφε νΰ Βθκθοεδθθ (β χΰρςνξρςθ, ςΰμ αϋλξ ηνΰχθςελόνξε χθρλξ <<αελϋυ οςεν>>).
+
+Windows-1251 βϋγξδνξ ξςλθχΰεςρ ξς δπσγθυ 8-αθςνϋυ κθπθλλθχερκθυ κξδθπξβξκ (ςΰκθυ κΰκ CP866, KOI8-R θ ISO-8859-5) νΰλθχθεμ οπΰκςθχερκθ βρευ ρθμβξλξβ, θροξλόησώωθυρ β πσρρκξι ςθοξγπΰτθκε δλ ξαϋχνξγξ ςεκρςΰ (ξςρσςρςβσες ςξλόκξ ηνΰχξκ σδΰπενθ); ξνΰ ςΰκζε ρξδεπζθς βρε ρθμβξλϋ δλ αλθηκθυ κ πσρρκξμσ ηϋκσ ηϋκξβ: σκπΰθνρκξγξ, αελξπσρρκξγξ, ρεπαρκξγξ θ αξλγΰπρκξγξ.
+
+Ερλθ κ κθπθλλθχερκξμσ ςεκρςσ β κξδθπξβκε Windows-1251 20 πΰη οξδπδ οπθμενθςό οεπεκξδθπξβΰνθε KOI8-R $\longrightarrow$ Windows-1251, β θςξγε ασδες οξλσχεν θρυξδνϋι ςεκρς.
+
+\bigskip
+
+Θμεες δβΰ νεδξρςΰςκΰ:
+
+\begin{itemize}
+
+\item ρςπξχνΰ ασκβΰ <<>> θμεες κξδ 0xFF (255 β δερςθχνξι ρθρςεμε). Ξνΰ βλεςρ <<βθνξβνθφει>> πδΰ νεξζθδΰννϋυ οπξαλεμ β οπξγπΰμμΰυ αεη οξδδεπζκθ χθρςξγξ 8-γξ αθςΰ, ΰ ςΰκζε (γξπΰηδξ αξλεε χΰρςϋι ρλσχΰι) θροξλόησώωθυ ύςξς κξδ κΰκ ρλσζεανϋι (β CP437 ξν ξαξηνΰχΰες <<νεπΰηπϋβνϋι οπξαελ>>, β Windows-1252 — \"y, ξαΰ βΰπθΰνςΰ οπΰκςθχερκθ νε θροξλόησώςρ; χθρλξ ζε -1, β αΰιςξβξμ οπεδρςΰβλενθθ ΰνΰλξγθχνξε 255, χΰρςξ θροξλόησεςρ β οπξγπΰμμθπξβΰνθθ κΰκ <<οσρςξε ηνΰχενθε>>);
+
+\item ξςρσςρςβσώς ρθμβξλϋ ορεβδξγπΰτθκθ, θμεώωθερ β CP866 θ KOI8 (υξς δλ ρΰμθυ Windows, δλ κξςξπϋυ ξνΰ οπεδνΰηνΰχενΰ, β νθυ νε αϋλξ νσζδϋ, ύςξ δελΰλξ νερξβμερςθμξρςό δβσυ θροξλόηξβΰβψθυρ β νθυ κξδθπξβξκ ηΰμεςνεε).
+
+\end{itemize}
diff --git a/macros/xetex/latex/xecyr/doc/old/866.tex b/macros/xetex/latex/xecyr/doc/old/866.tex
new file mode 100644
index 0000000000..627948f8b4
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/old/866.tex
@@ -0,0 +1,5 @@
+\section{IBM866, ¨«¨ << «μβ₯ΰ­ β¨’­ ο ͺ€¨ΰ’ͺ >>}
+
+<<€«μβ₯ΰ­ β¨’­ ο ͺ€¨ΰ’ͺ >> "--- α­’ ­­ ο ­  CP437 ͺ€’ ο αβΰ ­¨ζ , £€₯ ’α₯ α―₯ζ¨δ¨η₯αͺ¨₯ ₯’ΰ―₯©αͺ¨₯ ᨬ’«λ ’ ’βΰ© ―«’¨­₯ § ¬₯­₯­λ ­  ͺ¨ΰ¨««¨ζγ, αβ ’«οο ―α₯’€£ΰ δ¨η₯αͺ¨₯ ᨬ’«λ ­₯βΰ­γβ묨. ‘«₯€’ β₯«μ­, νβ ­₯ ―ΰβ¨β ’¨€ ―ΰ£ΰ ¬¬, ¨α―«μ§γξι¨ε €«ο ΰ ‘βλ β₯ͺαβ’λ₯ ͺ­ ,   β ͺ¦₯ ‘₯α―₯η¨’ ₯β ¨α―«μ§’ ­¨₯ ’ ­¨ε ᨬ’«’ ͺ¨ΰ¨««¨ζλ.
+
+ˆαβΰ¨η₯αͺ¨ αγι₯αβ’’ « ¬­£ ’ ΰ¨ ­β’  «μβ₯ΰ­ β¨’­© ͺ€¨ΰ’ͺ¨, ­ ’α₯ ΰ §«¨η¨ο ͺ α ξβαο β«μͺ ‘« αβ¨ 0xF0--0xFF (240--255). Žͺ­η β₯«μ­λ¬ αβ ­€ ΰβ¬ αβ «  ͺ€¨ΰ’ͺ  IBM CP866, ―€€₯ΰ¦ͺ  ͺβΰ© ‘λ«  €‘ ’«₯­  ’ MS-DOS ’₯ΰᨨ 6.22 (€ νβ£ ¨α―«μ§’ «¨αμ ’α₯’§¬¦­λ₯ <<α ¬― «μ­λ₯>> ΰγα¨δ¨ͺ βΰλ). €«μβ₯ΰ­ β¨’­ ο ͺ€¨ΰ’ͺ  ’αρ ₯ιρ ¦¨’  ¨ ηΰ₯§’λη ©­ ――γ«οΰ­  ’ αΰ₯€₯ DOS ¨ OS/2. Šΰ¬₯ β£, ’ νβ© ͺ€¨ΰ’ͺ₯ § ―¨αλ’ ξβαο ¨¬₯­  ’ δ ©«’© α¨αβ₯¬₯ FAT (¨ ͺΰβͺ¨₯ ¨¬₯­  ’ VFAT). CP866 € α¨ε ―ΰ ¨α―«μ§γ₯βαο ’ ͺ­α«¨ ΰγα¨δ¨ζ¨ΰ’ ­­λε α¨αβ₯¬ α₯¬₯©αβ’  Windows NT.
diff --git a/macros/xetex/latex/xecyr/doc/old/iso.tex b/macros/xetex/latex/xecyr/doc/old/iso.tex
new file mode 100644
index 0000000000..2c0728cfe2
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/old/iso.tex
@@ -0,0 +1,11 @@
+\section{ΊήΤΨΰήΪΠ ISO-8859-5}
+
+ISO 8859-5 "--- 8-ΡΨβέΠο ΪήΤήΠο αβΰΠέΨζΠ ΨΧ αΥΰΨΨ ISO-8859 ΤΫο ίΰΥΤαβΠΫΥέΨο ΪΨΰΨΫΫΨζλ. ² ΐήααΨΨ ίήηβΨ έΥ γίήβΰΥΡΫοΥβαο.
+
+ISO 8859-5 ΡλΫΠ αήΧΤΠέΠ έΠ ΡΠΧΥ <<ήαέήέήΩ ΪήΤΨΰήΪΨ>> (αΥ ΰγααΪΨΥ ΡγΪλ αήεΰΠέΨΫΨ αήρ ΰΠαίήΫήΦΥέΨΥ, ΧΠ ΨαΪΫξηΥέΨΥά ΧΠΣΫΠέήΩ ‘).
+
+ΈάΥξβαο ΡγΪλ άέήΣΨε οΧλΪή, ΨαίήΫμΧγξιΨε ΪΨΰΨΫΫΨζγ, ήΤέΠΪή ζΥΫήά ISO 8859-5 "--- έΥ ήηΥέμ γΤήΡέΠο ΪήΤΨΰήΪΠ, ίήαΪήΫμΪγ έΥΩ ήβαγβαβγξβ άέήΣΨΥ έγΦέλΥ αΨάήΫλ, βΠΪΨΥ ΪΠΪ βΨΰΥ, ΪΠληΪΨ-ρΫήηΪΨ, ΣΰΠΤγα Ψ Τΰ. ½Υβ βΠΪΦΥ ΡγΪλ <<CYRILLIC LETTER GHE WITH UPTURN>>, ΨαίήΫμΧγΥάήΩ ΨέήΣΤΠ γΪΰΠΨέαΪήΩ ίΨαμάΥέέήαβΨ.
+
+ΏήΰοΤήΪ αΨάήΫή νβήΩ ΪήΤήήΩ αβΰΠέΨζλ ΨαίήΫμΧήΠΫαο ίΰΨ ΰΠΧάΥιΥέΨΨ ΡγΪ ΪΨΰΨΫΫΨζλ έΠΡήΰΥ αΨάήΫή Unicode (αή αΤΨΣήά Υΰε έΠ 864 ίήΧΨζΨΨ).
+
+\endinput
diff --git a/macros/xetex/latex/xecyr/doc/old/koi8-r.tex b/macros/xetex/latex/xecyr/doc/old/koi8-r.tex
new file mode 100644
index 0000000000..1ddf898e6e
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/old/koi8-r.tex
@@ -0,0 +1,16 @@
+\section{λΟΔΙΟΧΛΑ KOI8-R}
+
+λοι-8 (ΛΟΔ ΟΒΝΕΞΑ ΙΞΖΟΝΑΓΙΕΚ, 8 ΒΙΤΟΧ), KOI8 "--- ΧΟΣΨΝΙΒΙΤΟΧΑΡ ASCII-ΣΟΧΝΕΣΤΙΝΑΡ ΛΟΔΟΧΑΡ ΣΤΑΞΙΓΑ, ΑΪΑΒΟΤΑΞΞΑΡ ΔΜΡ ΛΟΔΙΟΧΑΞΙΡ ΒΥΛΧ ΛΙΙΜΜΙήΕΣΛΙΘ ΑΜΖΑΧΙΤΟΧ.
+
+σΥέΕΣΤΧΥΕΤ ΤΑΛΦΕ ΣΕΝΙΒΙΤΟΧΑΡ ΧΕΣΙΡ ΛΟΔΙΟΧΛΙ, ΞΕ ΠΟΜΞΟΣΤΨΐ ΣΟΧΝΕΣΤΙΝΑΡ Σ ASCII "--- λοι-7. λοι-7 Ι λοι-8 ΟΠΙΣΑΞΩ Χ ηοστ 19768-74 (ΣΕΚήΑΣ ΞΕΔΕΚΣΤΧΙΤΕΜΕΞ).
+
+ςΑΪΑΒΟΤήΙΛΙ λοι-8 ΠΟΝΕΣΤΙΜΙ ΣΙΝΧΟΜΩ ΥΣΣΛΟΗΟ ΑΜΖΑΧΙΤΑ Χ ΧΕΘΞΕΚ ήΑΣΤΙ ΛΟΔΟΧΟΚ ΤΑΒΜΙΓΩ ΤΑΛΙΝ ΟΒΑΪΟΝ, ήΤΟ ΠΟΪΙΓΙΙ ΛΙΙΜΜΙήΕΣΛΙΘ ΣΙΝΧΟΜΟΧ ΣΟΟΤΧΕΤΣΤΧΥΐΤ ΙΘ ΖΟΞΕΤΙήΕΣΛΙΝ ΑΞΑΜΟΗΑΝ Χ ΑΞΗΜΙΚΣΛΟΝ ΑΜΖΑΧΙΤΕ Χ ΞΙΦΞΕΚ ήΑΣΤΙ ΤΑΒΜΙΓΩ. όΤΟ ΟΪΞΑήΑΕΤ, ήΤΟ ΕΣΜΙ Χ ΤΕΛΣΤΕ, ΞΑΠΙΣΑΞΞΟΝ Χ λοι-8, ΥΒΙΑΤΨ ΧΟΣΨΝΟΚ ΒΙΤ ΛΑΦΔΟΗΟ ΣΙΝΧΟΜΑ, ΤΟ ΠΟΜΥήΑΕΤΣΡ <<ήΙΤΑΒΕΜΨΞΩΚ>> ΤΕΛΣΤ, ΘΟΤΡ ΟΞ Ι ΞΑΠΙΣΑΞ ΜΑΤΙΞΣΛΙΝΙ ΣΙΝΧΟΜΑΝΙ. ξΑΠΙΝΕ, ΣΜΟΧΑ <<ςΥΣΣΛΙΚ τΕΛΣΤ>> ΠΕΧΑΤΙΜΙΣΨ ΒΩ Χ <<rUSSKIJ tEKST>>. λΑΛ ΠΟΒΟήΞΟΕ ΣΜΕΔΣΤΧΙΕ, ΣΙΝΧΟΜΩ ΛΙΙΜΜΙΓΩ ΟΛΑΪΑΜΙΣΨ ΑΣΠΟΜΟΦΕΞΩ ΞΕ Χ ΑΜΖΑΧΙΤΞΟΝ ΠΟΡΔΛΕ.
+
+σΥέΕΣΤΧΥΕΤ ΞΕΣΛΟΜΨΛΟ ΧΑΙΑΞΤΟΧ ΛΟΔΙΟΧΛΙ λοι-8 ΔΜΡ ΑΪΜΙήΞΩΘ ΛΙΙΜΜΙήΕΣΛΙΘ ΑΜΖΑΧΙΤΟΧ. ςΥΣΣΛΙΚ ΑΜΖΑΧΙΤ ΟΠΙΣΩΧΑΕΤΣΡ Χ ΛΟΔΙΟΧΛΕ KOI8-R, ΥΛΑΙΞΣΛΙΚ "--- Χ KOI8-U.
+
+KOI8-R ΣΤΑΜ ΖΑΛΤΙήΕΣΛΙ ΣΤΑΞΔΑΤΟΝ ΔΜΡ ΥΣΣΛΟΚ ΛΙΙΜΜΙΓΩ Χ ΐΞΙΛΣ-ΠΟΔΟΒΞΩΘ ΟΠΕΑΓΙΟΞΞΩΘ ΣΙΣΤΕΝΑΘ Ι άΜΕΛΤΟΞΞΟΚ ΠΟήΤΕ.
+
+αΞΔΕΚ ώΕΞΟΧ ΣΟΪΔΑΜ ΔΟΛΥΝΕΞΤ RFC 1489 (<<Registration of a Cyrillic Character Set>>), ΛΟΤΟΩΚ, ΟΔΞΑΛΟ, ΞΕ ΟΤΞΟΣΙΤΣΡ Λ ΛΑΤΕΗΟΙΙ RFC-ΣΤΑΞΔΑΤΟΧ. σΥέΕΣΤΧΥΕΤ RFC 2319 ΞΑ KOI8-U.
+
+πΟ ΞΑΒΟΥ ΣΙΝΧΟΜΟΧ KOI8-R ΣΟΟΤΧΕΤΣΤΧΥΕΤ ΟΔΞΟΝΥ ΙΪ ΧΑΙΑΞΤΟΧ ΑΜΨΤΕΞΑΤΙΧΞΟΚ ΛΟΔΙΟΧΛΙ. σΤΑΞΔΑΤ RFC 1489 ΤΑΛΦΕ ΠΕΔΠΙΣΩΧΑΕΤ ΞΑΜΙήΙΕ ΗΑΖΙήΕΣΛΙΘ ΣΙΝΧΟΜΟΧ <<ΑΝΟΛ>> (ΠΣΕΧΔΟΗΑΖΙΛΙ), ΟΔΞΑΛΟ άΤΟ ΤΕΒΟΧΑΞΙΕ ΧΩΠΟΜΞΡΕΤΣΡ ΔΟΧΟΜΨΞΟ ΕΔΛΟ.
+
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.pdf b/macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.pdf
index 3c9cb87db5..3c9cb87db5 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.tex b/macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.tex
index 7d6bb9e3b1..005a7ae8a8 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/listings-utf8-ex.tex
+++ b/macros/xetex/latex/xecyr/doc/old/listings-utf8-ex.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass[a4paper,10pt]{article}
+\documentclass[a4paper,10pt]{article}
\usepackage{xecyr}
\setromanfont{Times New Roman}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.pdf b/macros/xetex/latex/xecyr/doc/old/pict2e-ex.pdf
index f71720b1e0..f71720b1e0 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/pict2e-ex.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.tex b/macros/xetex/latex/xecyr/doc/old/pict2e-ex.tex
index ef90e4b26e..3e404a57e2 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/pict2e-ex.tex
+++ b/macros/xetex/latex/xecyr/doc/old/pict2e-ex.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass[12pt]{article}
+\documentclass[12pt]{article}
\usepackage{geometry}
\geometry{a4paper}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.pdf b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.pdf
index 27868de2fa..27868de2fa 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.tex b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.tex
index d7c055bc1f..6c69d869f0 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[cp1251]{inputenc}
\usepackage[T2A]{fontenc}
\usepackage[russian]{babel}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex.bib b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex.bib
index f6d396a55f..f6d396a55f 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rubibtex-ex.bib
+++ b/macros/xetex/latex/xecyr/doc/old/rubibtex-ex.bib
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.pdf b/macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.pdf
index c6c327eb50..c6c327eb50 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.tex b/macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.tex
index e4b612e8be..3e40d22f10 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/rumakeindex-ex-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/rumakeindex-ex-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[xe]{shipunov2}
\usepackage{multicol}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.pdf
index 45f590267f..45f590267f 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.tex
index a7fa7e55eb..6bec033550 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-doc-ru.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-doc-ru.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[mis]{xecyr}
\usepackage{url}
\usepackage[russian]{babel}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.pdf
index 365689fc5b..365689fc5b 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.tex
index 5f5269533b..7eaa5b2f12 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex1-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex1-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ% Π­Ρ‚ΠΎ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ Π²Ρ…ΠΎΠ΄Π½ΠΎΠ³ΠΎ Ρ„Π°ΠΉΠ»Π° LaTeX (ВСрсия ΠΎΡ‚ 11 апрСля 1994 Π³ΠΎΠ΄Π°.)
+% Π­Ρ‚ΠΎ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ Π²Ρ…ΠΎΠ΄Π½ΠΎΠ³ΠΎ Ρ„Π°ΠΉΠ»Π° LaTeX (ВСрсия ΠΎΡ‚ 11 апрСля 1994 Π³ΠΎΠ΄Π°.)
%
% Π—Π½Π°ΠΊ '%' Π³ΠΎΠ²ΠΎΡ€ΠΈΡ‚ TeX'Ρƒ, Ρ‡Ρ‚ΠΎ вСсь ΡΠ»Π΅Π΄ΡƒΡŽΡ‰ΠΈΠΉ Π·Π° Π½ΠΈΠΌ Π½Π° Π΄Π°Π½Π½ΠΎΠΉ строкС тСкст
% Π±ΡƒΠ΄Π΅Ρ‚ ΠΏΡ€ΠΎΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½, ΠΈ поэтому этот Π·Π½Π°ΠΊ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ для ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠ΅Π²
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.pdf
index a37c5997d9..a37c5997d9 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.tex
index 8a315af3c7..caa83d43bc 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex2-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex2-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[russian]{babel}
\usepackage[mis]{xecyr}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.pdf
index 16f6888b3b..16f6888b3b 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.tex
index 334ef4e60d..173749679a 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex3-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex3-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[russian]{babel}
\usepackage{xecyr}
\usepackage[arrow,graph]{xy}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.pdf
index 473d9932ac..473d9932ac 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.tex
index b921fae637..4c19b53dca 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex4-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex4-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[russian]{babel}
\usepackage{xecyr}
\usepackage{pgf}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.pdf
index 41aa6d760b..41aa6d760b 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.tex
index 9705e44b0a..b5f1376348 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex5-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex5-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[varg]{txfonts}
\usepackage[no-math]{fontspec}
\usepackage[russian]{babel}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.pdf
index 57f155936f..57f155936f 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.tex
index c800332df1..8acbf05418 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex6-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex6-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage[russian]{babel}
\usepackage{xecyr}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf b/macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.pdf
index 03a98fd8db..03a98fd8db 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex b/macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.tex
index c21331cfba..544b47c26f 100644
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex
+++ b/macros/xetex/latex/xecyr/doc/old/xecyr-ex7-ru-x.tex
@@ -1,4 +1,4 @@
-ο»Ώ\documentclass{article}
+\documentclass{article}
\usepackage{polyglossia}
\usepackage{xecyr}
diff --git a/macros/xetex/latex/xecyr/doc/pict2e-ex.pdf b/macros/xetex/latex/xecyr/doc/pict2e-ex.pdf
new file mode 100644
index 0000000000..4d5ad9d4ef
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/pict2e-ex.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/pict2e-ex.tex b/macros/xetex/latex/xecyr/doc/pict2e-ex.tex
new file mode 100644
index 0000000000..6dd6c0242c
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/pict2e-ex.tex
@@ -0,0 +1,21 @@
+\documentclass[12pt]{article}
+
+\usepackage{geometry}
+\geometry{a4paper}
+
+\usepackage{fontspec}
+
+\usepackage{pict2e}
+
+\setromanfont{Times New Roman}
+\defaultfontfeatures{Mapping=tex-text}
+
+\begin{document}
+
+ΠŸΡ€ΠΈΠ²Π΅Ρ‚!
+
+\begin{picture}(125,122)(-13,-3)
+ \cbezier(100,0)(100,55)(55,100)(0,100)
+\end{picture}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.pdf b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.pdf
new file mode 100644
index 0000000000..bd97b7e8ad
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.sh b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.sh
new file mode 100644
index 0000000000..b119f75b17
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# bibtex8 and bibtexu work but make errors, bibtex is the best
+# the only problem it does not place Russian references first
+# so please do it manually in *.bbl file (it is done here)
+bibtex rubibtex-ex-x.aux
diff --git a/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.tex b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.tex
new file mode 100644
index 0000000000..44670087b4
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rubibtex-ex-x.tex
@@ -0,0 +1,94 @@
+\documentclass{article}
+
+\usepackage{polyglossia}
+\setdefaultlanguage{russian}
+
+\usepackage{fontspec}
+\usepackage{natbib}
+
+\setmainfont[Mapping=tex-text]{CMU Serif}
+
+\let\K=\textit
+\let\J=\textbf
+\def\NN#1 {\textit{#1 }}
+\def\NN#1 #2 {\textit{#1 #2 }}
+
+\begin{document}
+
+\section*{ΠŸΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΈ: ТизнСнная Ρ„ΠΎΡ€ΠΌΠ°}
+
+ΠŸΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΈ~--- прСимущСствСнно Ρ€ΠΎΠ·Π΅Ρ‚ΠΎΡ‡Π½Ρ‹Π΅ растСния, Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ
+ос\-Π½ΠΎΠ²\-ная ΠΎΡΠΎΠ±Π΅Π½Π½ΠΎΡΡ‚ΡŒ ΠΈΡ… ΠΏΠΎΠ±Π΅Π³ΠΎΠ²ΠΎΠΉ систСмы~--- ΡƒΠΊΠΎΡ€ΠΎΡ‡Π΅Π½Π½Ρ‹Π΅
+мСТдоузлия Π²Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½Ρ‹Ρ… ΠΏΠΎΠ±Π΅Π³ΠΎΠ². Π”Π°ΠΆΠ΅ Ρƒ растСний, относящихся ΠΊ
+Ρ€ΠΎΠ΄Ρƒ \K{Psyllium}, Π² ΠΏΠ°Π·ΡƒΡ…Π°Ρ… Π»ΠΈΡΡ‚ΡŒΠ΅Π² Ρ€Π°Π·Π²ΠΈΠ²Π°ΡŽΡ‚ΡΡ Π±ΠΎΠΊΠΎΠ²Ρ‹Π΅
+ΡƒΠΊΠΎΡ€ΠΎΡ‡Π΅Π½Π½Ρ‹Π΅ Π²Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½Ρ‹Π΅ ΠΈ ΡƒΠ΄Π»ΠΈΠ½Π΅Π½Π½Ρ‹Π΅ Π³Π΅Π½Π΅Ρ€Π°Ρ‚ΠΈΠ²Π½Ρ‹Π΅ ΠΏΠΎΠ±Π΅Π³ΠΈ. Π£
+растСний ΠΈΠ· Ρ€ΠΎΠ΄Π° \K{Plantago} ΡΡ‚Π΅Π±Π΅Π»ΡŒ с ΡƒΠ΄Π»ΠΈΠ½Π΅Π½Π½Ρ‹ΠΌΠΈ мСТдоузлиями
+ΠΈ ΠΎΡ‡Π΅Ρ€Π΅Π΄Π½Ρ‹ΠΌ (Π² ΠΎΡ‚Π»ΠΈΡ‡ΠΈΠ΅ ΠΎΡ‚ \K{Psyllium}) листорасполоТСниСм
+формируСтся достаточно Ρ€Π΅Π΄ΠΊΠΎ: Ρƒ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Ρ… тихоокСанских
+Π΄Ρ€Π΅Π²ΠΎΠ²ΠΈΠ΄Π½Ρ‹Ρ… Π²ΠΈΠ΄ΠΎΠ² сСкции \K{Palaeopsyllium}, Ρƒ срСдизСмноморских
+\NN P. lagopus L. ΠΈ \NN P. amplexicaulis Cav., Π° Ρ‚Π°ΠΊΠΆΠ΅ Ρƒ
+блиТнСвосточных ΠΈ амСриканских прСдставитСлСй сСкций
+\K{Albicans} Barn. ΠΈ \K{Gnaphaloides} Barn. На нашСй Ρ‚Π΅Ρ€Ρ€ΠΈΡ‚ΠΎΡ€ΠΈΠΈ
+эти Π²ΠΈΠ΄Ρ‹ Π½Π΅ Π²ΡΡ‚Ρ€Π΅Ρ‡Π°ΡŽΡ‚ΡΡ. Π£ Π±ΠΎΠ»ΡŒΡˆΠΈΠ½ΡΡ‚Π²Π° растСний ΠΈΠ· Ρ€ΠΎΠ΄Π°
+\K{Plantago} ось ΠΏΠ΅Ρ€Π²ΠΎΠ³ΠΎ порядка Π΄Π»ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎΠ΅ врСмя растСт
+моноподиально, образуя (ΠΏΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ ΠΊΠΎΠ½Ρ‚Ρ€Π°ΠΊΡ‚ΠΈΠ»ΡŒΠ½ΠΎΠΉ Π΄Π΅ΡΡ‚Π΅Π»ΡŒΠ½ΠΎΡΡ‚ΠΈ
+Π±ΠΎΠΊΠΎΠ²Ρ‹Ρ… ΠΊΠΎΡ€Π½Π΅ΠΉ~--- \cite{pl:59}) нСспСциализированноС
+эпигСогСнноС ΠΊΠΎΡ€Π½Π΅Π²ΠΈΡ‰Π΅, Π² состав ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ³ΠΎ Ρƒ ΠΌΠ½ΠΎΠ³ΠΈΡ… ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΎΠ²
+Π²Ρ…ΠΎΠ΄ΠΈΡ‚ вСрхняя Ρ‡Π°ΡΡ‚ΡŒ Π³Π»Π°Π²Π½ΠΎΠ³ΠΎ корня, Π³ΠΈΠΏΠΎΠΊΠΎΡ‚ΠΈΠ»ΡŒ ΠΈ Π½ΠΈΠΆΠ½ΠΈΠ΅
+мСТдоузлия ΠΏΠΎΠ±Π΅Π³Π°, Π° Π³Π΅Π½Π΅Ρ€Π°Ρ‚ΠΈΠ²Π½Ρ‹Π΅ ΠΏΠΎΡ‡ΠΊΠΈ Π·Π°ΠΊΠ»Π°Π΄Ρ‹Π²Π°ΡŽΡ‚ΡΡ Π² ΠΏΠ°Π·ΡƒΡ…Π°Ρ…
+ΠΎΡ‚ΠΌΠ΅Ρ€ΡˆΠΈΡ… ΠΏΡ€ΠΎΡˆΠ»ΠΎΠ³ΠΎΠ΄Π½ΠΈΡ… Π»ΠΈΡΡ‚ΡŒΠ΅Π² ΠΈΠ»ΠΈ самых ΠΏΠ΅Ρ€Π²Ρ‹Ρ… Π»ΠΈΡΡ‚ΡŒΠ΅Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅Π³ΠΎ
+Π³ΠΎΠ΄Π° \cite{pl:30}. Π’ Π½Π°ΡˆΠΈΡ… условиях Ρ€ΠΎΠ·Π΅Ρ‚ΠΎΡ‡Π½Ρ‹Π΅ ΠΏΠΎΠ±Π΅Π³ΠΈ
+Π±ΠΎΠ»ΡŒΡˆΠΈΠ½ΡΡ‚Π²Π° ΠΌΠ½ΠΎΠ³ΠΎΠ»Π΅Ρ‚Π½ΠΈΡ… Π²ΠΈΠ΄ΠΎΠ² Π·ΠΈΠΌΡƒΡŽΡ‚ с Π·Π΅Π»Π΅Π½Ρ‹ΠΌΠΈ Π»ΠΈΡΡ‚ΡŒΡΠΌΠΈ.
+
+Π’ΠΈΠ΄Ρ‹ ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠ° Ρ€Π°Π·Π»ΠΈΡ‡Π°ΡŽΡ‚ΡΡ ΡΡ‚Π΅ΠΏΠ΅Π½ΡŒΡŽ вСтвлСния Π²Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½Ρ‹Ρ…
+ΠΏΠΎΠ±Π΅Π³ΠΎΠ². Π’Π°ΠΊ, Ρƒ \NN P. major Π²Π΅Ρ‚Π²Π»Π΅Π½ΠΈΠ΅ ΠΊΠΎΡ€Π½Π΅Π²ΠΈΡ‰Π° Π½Π°Π±Π»ΡŽΠ΄Π°Π΅Ρ‚ΡΡ
+ΠΊΡ€Π°ΠΉΠ½Π΅ Ρ€Π΅Π΄ΠΊΠΎ, ΠΏΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ, ΠΊΠ°ΠΊ ΠΏΡ€Π°Π²ΠΈΠ»ΠΎ, вслСд Π·Π° этим происходит
+распадСниС растСния Π½Π° ΠΎΡ‚Π΄Π΅Π»ΡŒΠ½Ρ‹Π΅ ΠΏΠ°Ρ€Ρ‚ΠΈΠΊΡƒΠ»Ρ‹ \cite{pl:18}. ΠœΡ‹
+наблюдали растСния \NN P. uliginosa с вСтвящимся ΠΊΠΎΡ€Π½Π΅Π²ΠΈΡ‰Π΅ΠΌ Π²
+сборах с Ρ‚Π΅Ρ€Ρ€ΠΈΡ‚ΠΎΡ€ΠΈΠΈ ЛСнинградской области ΠΈ РСспублики Коми
+(LEU), ΠΏΡ€ΠΈΡ‡Π΅ΠΌ ΠΈΡΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ с ΠΎΠΊΡƒΠ»ΡŒΡ‚ΡƒΡ€Π΅Π½Π½Ρ‹Ρ… мСстообитаний.
+\NN P. media ΠΈ Π² особСнности \NN P. lanceolata вСтвятся
+Π·Π½Π°Ρ‡ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ сильнСС, Π° \NN P. maritima subsp. \K{maritima} ΠΈ
+subsp. \K{subpolaris} (Andreev) Tzvel. (Π² ΠΎΡ‚Π»ΠΈΡ‡ΠΈΠ΅ ΠΎΡ‚ \NN P.
+schrenkii C. Koch) часто ΠΎΠ±Ρ€Π°Π·ΡƒΠ΅Ρ‚ Π³Ρ€ΠΎΠΌΠ°Π΄Π½Ρ‹Π΅ (ΠΏΠ»ΠΎΡ‰Π°Π΄ΡŒΡŽ Π΄ΠΎ 2
+ΠΌ$^2$) ΠΊΠ»ΠΎΠ½Ρ‹, возникшиС, ΠΏΠΎ-Π²ΠΈΠ΄ΠΈΠΌΠΎΠΌΡƒ, Π·Π° счСт вСтвлСния ΠΈ
+ΠΏΠΎΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅Π³ΠΎ распада ΠΎΠ΄Π½ΠΎΠΉ особи. ΠžΠ΄Π½ΠΎΠ»Π΅Ρ‚Π½ΠΈΠ΅ ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΈ (\K{P.
+tenuiflora, P. minuta}) практичСски Π½Π΅ вСтвятся.
+
+АнатомичСскиС ΠΏΡ€ΠΈΠ·Π½Π°ΠΊΠΈ строСния дрСвСсины Ρƒ ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΎΠ² с
+ΠΎΠ΄Ρ€Π΅Π²Π΅ΡΠ½Π΅Π²Π°ΡŽΡ‰ΠΈΠΌΠΈ стСблями довольно ΠΎΠ΄Π½ΠΎΠΎΠ±Ρ€Π°Π·Π½Ρ‹
+\cite{pl:197,pl:124} ΠΈ ΠΌΠΎΠ³ΡƒΡ‚ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒΡΡ, ΠΏΠΎ-Π²ΠΈΠ΄ΠΈΠΌΠΎΠΌΡƒ, лишь
+для уточнСния полоТСния всСго сСмСйства Π² систСмС Ρ†Π²Π΅Ρ‚ΠΊΠΎΠ²Ρ‹Ρ…
+растСний.
+
+Π£ прСдставитСлСй Ρ€ΠΎΠ΄Π° \K{Psyllium} листорасполоТСниС
+пСрСкрСстнопарноС. Π”Ρ€ΡƒΠ³ΠΈΠ΅ Π²ΠΈΠ΄Ρ‹ ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΎΠ², ΠΏΠΎ нашим Π΄Π°Π½Π½Ρ‹ΠΌ,
+Ρ‚Π°ΠΊΠΆΠ΅ ΠΌΠΎΠ³ΡƒΡ‚ ΠΎΡ‚Π»ΠΈΡ‡Π°Ρ‚ΡŒΡΡ ΠΏΡ€ΠΈΠ·Π½Π°ΠΊΠ°ΠΌΠΈ располоТСния Π»ΠΈΡΡ‚ΡŒΠ΅Π² Π½Π°
+ΠΏΠΎΠ±Π΅Π³Π΅, Π² частности, числом Ρ€Π°Π·Π²ΠΈΡ‚Ρ‹Ρ… Π·Π΅Π»Π΅Π½Ρ‹Ρ… Π»ΠΈΡΡ‚ΡŒΠ΅Π² ΠΈ Ρ„ΠΎΡ€ΠΌΡƒΠ»ΠΎΠΉ
+листорасполоТСния (2/5 Ρƒ \K{P. major}; 1/3 Ρƒ \K{P.
+media}\footnote{Иногда Ρ‚Π°ΠΊΠΆΠ΅ 3/8 \cite{pl:254}.}, \K{P.
+maritima} ΠΈ \K{P. lanceolata}).
+
+ΠžΡ‚ΠΌΠΈΡ€Π°ΡŽΡ‰ΠΈΠ΅ Π² Ρ‚Π΅Ρ‡Π΅Π½ΠΈΠ΅ сСзона Π½ΠΈΠΆΠ½ΠΈΠ΅ Π»ΠΈΡΡ‚ΡŒΡ Ρƒ стСпных ΠΌΠ½ΠΎΠ³ΠΎΠ»Π΅Ρ‚Π½ΠΈΡ…
+Π²ΠΈΠ΄ΠΎΠ² (Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Ρƒ \NN P. maxima Juss. ex Jacq. ΠΈ Ρƒ
+Ρ‚Π΅Ρ‚Ρ€Π°ΠΏΠ»ΠΎΠΈΠ΄Π½Ρ‹Ρ… растСний \K{P. media}) Π½Π΅ ΠΏΠ΅Ρ€Π΅Π³Π½ΠΈΠ²Π°ΡŽΡ‚ ΠΏΠΎΠ»Π½ΠΎΡΡ‚ΡŒΡŽ, Π°
+ΠΎΠ±Ρ€Π°Π·ΡƒΡŽΡ‚ своими основаниями ΡΠ²ΠΎΠ΅ΠΎΠ±Ρ€Π°Π·Π½ΡƒΡŽ <<ΠΌΡƒΡ„Ρ‚Ρƒ>>, которая, ΠΏΠΎ
+нашим наблюдСниям Π² ΠžΡ€Π΅Π½Π±ΡƒΡ€Π³ΡΠΊΠΎΠΉ области, ΠΌΠΎΠΆΠ΅Ρ‚ ΠΏΡ€Π΅ΠΏΡΡ‚ΡΡ‚Π²ΠΎΠ²Π°Ρ‚ΡŒ
+ΡΠ΅Ρ€ΡŒΠ΅Π·Π½ΠΎΠΌΡƒ ΠΏΠΎΠ²Ρ€Π΅ΠΆΠ΄Π΅Π½ΠΈΡŽ Ρ‚ΠΎΡ‡ΠΊΠΈ роста Π²ΠΎ врСмя стСпных ΠΏΠΎΠΆΠ°Ρ€ΠΎΠ².
+
+Π’Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½ΠΎΠ΅ Ρ€Π°Π·ΠΌΠ½ΠΎΠΆΠ΅Π½ΠΈΠ΅ Π½Π΅ отличаСтся срСди ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠΎΠ²
+большим Ρ€Π°Π·Π½ΠΎΠΎΠ±Ρ€Π°Π·ΠΈΠ΅ΠΌ. Как ΠΏΡ€Π°Π²ΠΈΠ»ΠΎ, ΠΎΠ½ΠΎ происходит ΠΏΡƒΡ‚Π΅ΠΌ
+партикуляции старых особСй \cite{pl:17}. Π’ этой связи ст\'ΠΎΠΈΡ‚
+ΠΎΡ‚ΠΌΠ΅Ρ‚ΠΈΡ‚ΡŒ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ \NN P. lanceolata, способный ΠΊ ΠΎΠ±Ρ€Π°Π·ΠΎΠ²Π°Π½ΠΈΡŽ
+ΠΏΡ€ΠΈΠ΄Π°Ρ‚ΠΎΡ‡Π½Ρ‹Ρ… ΠΏΠΎΡ‡Π΅ΠΊ Π½Π° корнях \cite{pl:241} ΠΈ \K{Littorella
+uniflora}, которая, ΠΊΠ°ΠΊ ΠΈ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π΄Ρ€ΡƒΠ³ΠΈΠ΅ Π²ΠΎΠ΄Π½Ρ‹Π΅ растСния,
+ΠΎΠ±Ρ€Π°Π·ΡƒΠ΅Ρ‚ ΠΏΠΎΠ»Π·ΡƒΡ‡ΠΈΠ΅ ΡƒΠΊΠΎΡ€Π΅Π½ΡΡŽΡ‰ΠΈΠ΅ΡΡ Π±ΠΎΠΊΠΎΠ²Ρ‹Π΅ ΠΏΠΎΠ±Π΅Π³ΠΈ-<<усы>> --- Π±Π΅Π·
+сомнСния, Ρ…ΠΎΡ€ΠΎΡˆΠ°Ρ адаптация ΠΊ Π²ΠΎΠ΄Π½ΠΎΠΌΡƒ ΠΎΠ±Ρ€Π°Π·Ρƒ ΠΆΠΈΠ·Π½ΠΈ. Π’ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Ρ…
+мСстообитаниях (Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, Π½Π° ΠΎΠ·. ВысокинскоС ΠšΠ°Ρ€Π΅Π»ΡŒΡΠΊΠΎΠ³ΠΎ
+ΠΏΠ΅Ρ€Π΅ΡˆΠ΅ΠΉΠΊΠ°), ΠΌΡ‹ наблюдали ΠΈΡΠΊΠ»ΡŽΡ‡ΠΈΡ‚Π΅Π»ΡŒΠ½ΠΎ Π²Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½ΠΎΠ΅ Ρ€Π°Π·ΠΌΠ½ΠΎΠΆΠ΅Π½ΠΈΠ΅
+\K{Littorella}.
+
+\bibliography{rubibtex-ex}
+\bibliographystyle{ugost2008ns}
+
+\end{document} \ No newline at end of file
diff --git a/macros/xetex/latex/xecyr/doc/rubibtex-ex.bib b/macros/xetex/latex/xecyr/doc/rubibtex-ex.bib
new file mode 100644
index 0000000000..bc4d9764fe
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rubibtex-ex.bib
@@ -0,0 +1,75 @@
+@ARTICLE{pl:17,
+ author = "Π›. А. Π–ΡƒΠΊΠΎΠ²Π°",
+ title = "Π ΠΎΠ΄ ΠŸΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊ",
+ journal = "БиологичСская Ρ„Π»ΠΎΡ€Π° Московской области",
+ volume = "7",
+ pages = "188--209",
+ address = "М.",
+ language = "russian",
+ year = 1983
+}
+@INCOLLECTION{pl:18,
+ author = "Π›. А. Π–ΡƒΠΊΠΎΠ²Π°",
+ title = "ΠŸΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊ большой ({\em Plantago major} L.)",
+ booktitle = "Диагностика ΠΈ ΠΊΠ»ΡŽΡ‡ΠΈ возрастных состояний Π»ΡƒΠ³ΠΎΠ²Ρ‹Ρ… растСний",
+ pages = "39--42",
+ address = "М.",
+ language = "russian",
+ year = 1986
+}
+@ARTICLE{pl:30,
+ author = "Π›. А. Π–ΡƒΠΊΠΎΠ²Π°",
+ title = "О Ρ€Π°Π·Π²ΠΈΡ‚ΠΈΠΈ Ρ€ΠΎΠ·Π΅Ρ‚ΠΎΡ‡Π½Ρ‹Ρ… ΠΏΠΎΠ±Π΅Π³ΠΎΠ² ΠΏΠΎΠ΄ΠΎΡ€ΠΎΠΆΠ½ΠΈΠΊΠ° большого ({\em Plantago
+ major} L.)",
+ journal = "Π‘ΡŽΠ». МОИП, ΠΎΡ‚Π΄. Π±ΠΈΠΎΠ».",
+ volume = "92",
+ number = "Π²Ρ‹ΠΏ. 1",
+ pages = "97",
+ language = "russian",
+ year = 1987
+}
+@BOOK{pl:59,
+ author = "И. Π“. БСрСбряков",
+ title = "ΠœΠΎΡ€Ρ„ΠΎΠ»ΠΎΠ³ΠΈΡ Π²Π΅Π³Π΅Ρ‚Π°Ρ‚ΠΈΠ²Π½Ρ‹Ρ… ΠΎΡ€Π³Π°Π½ΠΎΠ² Π²Ρ‹ΡΡˆΠΈΡ… растСний",
+ pages = "390",
+ address = "М.",
+ language = "russian",
+ year = 1952
+}
+@ARTICLE{pl:124,
+ author = "S.~Carlquist",
+ title = "Wood anatomy of insular species of {\em Plantago} and the problem
+ of raylessness",
+ journal = "Bull. Torr. Bot. Club",
+ volume = "97",
+ number = "6",
+ pages = "353--361",
+ year = 1970
+}
+@INBOOK{pl:197,
+ author = "C. R. Metcalfe and L. Chalk",
+ title = "{\em Plantaginaceae}",
+ booktitle = "Anatomy of dicotyledons",
+ volume = "2",
+ pages = "1053--1059",
+ address = "Oxford",
+ year = 1950
+}
+@ARTICLE{pl:241,
+ author = "G. R. Sagar and J. H. Harper",
+ title = "{\em Plantago major} L., {\em P. media} L. and {\em
+ P.~lanceolata} L.",
+ journal = "J. Ecol.",
+ volume = "52",
+ number = "1",
+ pages = "12--21",
+ year = 1964
+}
+@BOOK{pl:254,
+ author = "W. Troll",
+ title = "Praktishe Einfuhrung in die Pflanzenmorphologie",
+ volume = "1",
+ pages = "258",
+ address = "Jena",
+ year = 1954
+}
diff --git a/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.pdf b/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.pdf
new file mode 100644
index 0000000000..d9c0335948
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.tex b/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.tex
new file mode 100644
index 0000000000..61dcd76f40
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rumakeindex-ex-x.tex
@@ -0,0 +1,66 @@
+\documentclass{article}
+
+\usepackage{polyglossia}
+\setdefaultlanguage{russian}
+
+\usepackage{multicol}
+\usepackage{biokey}
+\usepackage{makeidx}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\def\NN#1 {\textit{#1 }}
+\def\NN#1 #2 {\textit{#1 #2 }}
+
+\makeindex
+
+\AtBeginDocument{\renewcommand\indexname{Π£ΠΊΠ°Π·Π°Ρ‚Π΅Π»ΡŒ русских Π½Π°Π·Π²Π°Π½ΠΈΠΉ Ρ€ΠΎΠ΄ΠΎΠ²}}
+
+\begin{document}
+
+\subsection*{БСмСйство Π›ΡŽΡ‚ΠΈΠΊΠΎΠ²Ρ‹Π΅ --- Ranunculaceae\label{Ran}}
+
+Π’Ρ€Π°Π²Ρ‹ с ΠΎΡ‡Π΅Ρ€Π΅Π΄Π½Ρ‹ΠΌΠΈ, часто расчлСнСнными Π»ΠΈΡΡ‚ΡŒΡΠΌΠΈ Π±Π΅Π·
+прилистников; Ρ†Π²Π΅Ρ‚ΠΊΠΈ ΠΎΠ±Ρ‹Ρ‡Π½ΠΎ ΠΎΠ±ΠΎΠ΅ΠΏΠΎΠ»Ρ‹Π΅, ΠΎΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊ простой,
+лСпСстковидный ΠΈΠ»ΠΈ расчлСнСн Π½Π° Ρ‡Π°ΡˆΠ΅Ρ‡ΠΊΡƒ ΠΈ Π²Π΅Π½Ρ‡ΠΈΠΊ, Ρ‚Ρ‹Ρ‡ΠΈΠ½ΠΊΠΈ ΠΈ
+пСстики Π² Π½Π΅ΠΎΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠΌ числС, ΠΏΠ»ΠΎΠ΄ --- многолистовка ΠΈΠ»ΠΈ
+ΠΌΠ½ΠΎΠ³ΠΎΠΎΡ€Π΅ΡˆΠ΅ΠΊ.
+
+\Z1. Листочки ΠΎΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊΠ° Π±Π΅Π»Ρ‹Π΅ ΠΈΠ»ΠΈ Π±Π»Π΅Π΄Π½ΠΎ-Π·Π΅Π»Π΅Π½Ρ‹Π΅, Π½Π΅
+ΠΎΠΏΠ°Π΄Π°ΡŽΡ‰ΠΈΠ΅. Π›ΠΈΡΡ‚ΡŒΡ ΠΏΠ°Π»ΡŒΡ‡Π°Ρ‚ΠΎΡ€Π°ΡΡΠ΅Ρ‡Π΅Π½Π½Ρ‹Π΅, коТистыС, Π·ΠΈΠΌΡƒΡŽΡ‰ΠΈΠ΅. Плод
+--- многолистовка \TT ΠœΠΎΡ€ΠΎΠ·Π½ΠΈΠΊ\index{ΠœΠΎΡ€ΠΎΠ·Π½ΠΈΠΊ} кавказский (\NN Helleborus
+caucasicus A. Br.)
+
+\AN ΠŸΡ€ΠΈΠ·Π½Π°ΠΊΠΈ ΠΈΠ½Ρ‹Π΅ \T 2.
+
+\Z2. ΠžΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊ простой, Π²Π΅Π½Ρ‡ΠΈΠΊΠΎΠ²ΠΈΠ΄Π½Ρ‹ΠΉ \T 3.
+
+\AN ΠžΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊ Π΄Π²ΠΎΠΉΠ½ΠΎΠΉ \T 4.
+
+\newpage
+
+\Z3. Листочков ΠΎΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊΠ° 5, ΠΆΠ΅Π»Ρ‚Ρ‹Ρ… \TT
+Π’Π΅Ρ‚Ρ€Π΅Π½ΠΈΡ†Π°\index{Π’Π΅Ρ‚Ρ€Π΅Π½ΠΈΡ†Π°} Π»ΡŽΡ‚ΠΈΡ‡Π½Π°Ρ (\NN Anemone ranunculoides
+L.)
+
+\AN Листочков ΠΎΠΊΠΎΠ»ΠΎΡ†Π²Π΅Ρ‚Π½ΠΈΠΊΠ° большС 5, Π³ΠΎΠ»ΡƒΠ±Ρ‹Ρ… ΠΈΠ»ΠΈ синих \TT
+Π’Π΅Ρ‚\-Ρ€Π΅\-Π½ΠΈ\-Ρ†Π° нСТная (\NN Anemone blanda Schott \& Kotschy)
+
+\ZZ4(2). Π›ΠΈΡΡ‚ΡŒΡ Ρ†Π΅Π»ΡŒΠ½Ρ‹Π΅, Ρ‡Π°ΡˆΠ΅Π»ΠΈΡΡ‚ΠΈΠΊΠΎΠ² 3. РастСниС Π³ΠΎΠ»ΠΎΠ΅ \TT
+Чистяк\index{Чистяк} калуТницСлистный (\NN Ficaria calthifolia
+Reichenb.)
+
+\AN Π›ΠΈΡΡ‚ΡŒΡ рассСчСнныС. Π§Π°ΡˆΠ΅Π»ΠΈΡΡ‚ΠΈΠΊΠΎΠ² 5 (ΠΈΠ½ΠΎΠ³Π΄Π° ΠΎΠΏΠ°Π΄Π°ΡŽΡ‚ послС
+Ρ‚ΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ Ρ†Π²Π΅Ρ‚ΠΎΠΊ раскрылся) \T 5.
+
+\Z5. РастСниС густо ΠΎΠΏΡƒΡˆΠ΅Π½ΠΎ мягкими, ΡˆΠ΅Π»ΠΊΠΎΠ²ΠΈΡΡ‚Ρ‹ΠΌΠΈ волосками.
+Π¦Π²Π΅Ρ‚ΠΎΠ»ΠΎΠΆΠ΅ Π³ΠΎΠ»ΠΎΠ΅ \TT Π›ΡŽΡ‚ΠΈΠΊ\index{Π›ΡŽΡ‚ΠΈΠΊ} ΠΊΡ€ΡƒΠΏΠ½ΠΎΡ†Π²Π΅Ρ‚ΠΊΠΎΠ²Ρ‹ΠΉ (\NN
+Ranunculus grandiflorus C.A.~Mey.)
+
+\AN РастСниС ΡΠ»Π°Π±ΠΎΠΎΠΏΡƒΡˆΠ΅Π½Π½ΠΎΠ΅. Π¦Π²Π΅Ρ‚ΠΎΠ»ΠΎΠΆΠ΅ ΠΏΠΎΠΊΡ€Ρ‹Ρ‚ΠΎ волосками \TT
+Π›ΡŽΡ‚ΠΈΠΊ каппадокийский (\NN Ranunculus cappadocicus Willd.)
+
+\printindex
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/rumakeindex.sh b/macros/xetex/latex/xecyr/doc/rumakeindex.sh
new file mode 100644
index 0000000000..56663a2f76
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/rumakeindex.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# this is how to run in case if style file interfers with alphabetical sorting:
+# iconv -f UTF-8 -t CP1251 rumakeindex-ex-x.idx | makeindex -i -s shipunov2i.ist | iconv -f CP1251 -t UTF-8 > rumakeindex-ex-x.ind
+# however, without style file, everything is much simpler:
+makeindex rumakeindex-ex-x.idx
diff --git a/macros/xetex/latex/xecyr/doc/sample2e-ru-x.pdf b/macros/xetex/latex/xecyr/doc/sample2e-ru-x.pdf
new file mode 100644
index 0000000000..b2afad21e0
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/sample2e-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/sample2e-ru-x.tex b/macros/xetex/latex/xecyr/doc/sample2e-ru-x.tex
new file mode 100644
index 0000000000..ae74521d23
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/sample2e-ru-x.tex
@@ -0,0 +1,207 @@
+% Π­Ρ‚ΠΎ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ Π²Ρ…ΠΎΠ΄Π½ΠΎΠ³ΠΎ Ρ„Π°ΠΉΠ»Π° LaTeX (ВСрсия ΠΎΡ‚ 11 апрСля 1994 Π³ΠΎΠ΄Π°.)
+%
+% Π—Π½Π°ΠΊ '%' Π³ΠΎΠ²ΠΎΡ€ΠΈΡ‚ TeX'Ρƒ, Ρ‡Ρ‚ΠΎ вСсь ΡΠ»Π΅Π΄ΡƒΡŽΡ‰ΠΈΠΉ Π·Π° Π½ΠΈΠΌ Π½Π° Π΄Π°Π½Π½ΠΎΠΉ строкС тСкст
+% Π±ΡƒΠ΄Π΅Ρ‚ ΠΏΡ€ΠΎΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½, ΠΈ поэтому этот Π·Π½Π°ΠΊ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚ΡΡ для ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠ΅Π²
+% (как здСсь).
+
+\documentclass{article} % ΠžΠΏΡ€Π΅Π΄Π΅Π»ΡΠ΅ΠΌ класс (Ρ‚ΠΈΠΏ) Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°
+\usepackage[russian]{babel}
+\usepackage[colorlinks=true]{hyperref}
+
+ % Π—Π΄Π΅ΡΡŒ начинаСтся ΠΏΡ€Π΅Π°ΠΌΠ±ΡƒΠ»Π°
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\nonfrenchspacing % Π Π°Π·Ρ€Π΅ΡˆΠ°Π΅ΠΌ ΡƒΠ²Π΅Π»ΠΈΡ‡ΠΈΠ²Π°Ρ‚ΡŒ ΠΏΡ€ΠΎΠ±Π΅Π»
+ % послС ΠΊΠΎΠ½Ρ†Π° прСдлоТСния
+
+\title{ΠŸΡ€ΠΈΠΌΠ΅Ρ€ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°} % ΠžΠΏΡ€Π΅Π΄Π΅Π»ΡΠ΅ΠΌ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ
+\author{ЛСсли Лэмпорт} % ΠžΠΏΡ€Π΅Π΄Π΅Π»ΡΠ΅ΠΌ имя Π°Π²Ρ‚ΠΎΡ€Π°
+\date{21 января 1994 Π³.} % Если ΡƒΠ±Ρ€Π°Ρ‚ΡŒ эту ΠΊΠΎΠΌΠ°Π½Π΄Ρƒ, Π±ΡƒΠ΄Π΅Ρ‚ Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Π½Π°
+ % тСкущая Π΄Π°Ρ‚Π°
+
+\newcommand{\ip}[2]{(#1, #2)}% ΠžΠΏΡ€Π΅Π΄Π΅Π»ΡΠ΅ΠΌ Π½ΠΎΠ²ΡƒΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Ρƒ \ip{arg1}{arg2},
+ % которая раскрываСтся Π² (arg1, arg2).
+
+%\newcommand{\ip}[2]{\langle #1 | #2\rangle}
+ % Π­Ρ‚ΠΎ Π΄Ρ€ΡƒΠ³ΠΎΠ΅ ΠΎΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½ΠΈΠ΅ \ip (Π·Π°ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚ΠΈΡ€ΠΎΠ²Π°Π½ΠΎ).
+
+\begin{document} % ΠšΠΎΠ½Π΅Ρ† ΠΏΡ€Π΅Π°ΠΌΠ±ΡƒΠ»Ρ‹ ΠΈ Π½Π°Ρ‡Π°Π»ΠΎ тСкста
+
+\maketitle % Π’Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ
+
+Π­Ρ‚ΠΎ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ Π²Ρ…ΠΎΠ΄Π½ΠΎΠ³ΠΎ Ρ„Π°ΠΉΠ»Π°. Бравнивая Π΅Π³ΠΎ с Π²Ρ‹Ρ…ΠΎΠ΄Π½Ρ‹ΠΌ (PDF)
+Ρ„Π°ΠΉΠ»ΠΎΠΌ, Π’Ρ‹ ΠΌΠΎΠΆΠ΅Ρ‚Π΅ ΠΏΠΎΠ½ΡΡ‚ΡŒ, ΠΊΠ°ΠΊ
+ΡΠ΄Π΅Π»Π°Ρ‚ΡŒ простой Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚ ΡΠ°ΠΌΠΎΡΡ‚ΠΎΡΡ‚Π΅Π»ΡŒΠ½ΠΎ.
+
+\tableofcontents
+
+\section{ΠŸΡ€ΠΎΡΡ‚ΠΎΠΉ тСкст} % ΠŸΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡ‚ Π·Π°Π³ΠΎΠ»ΠΎΠ²ΠΎΠΊ Ρ€Π°Π·Π΄Π΅Π»Π°. Π Π°Π·Π΄Π΅Π»Ρ‹ Π½ΠΈΠΆΠ½ΠΈΡ…
+ % ΡƒΡ€ΠΎΠ²Π½Π΅ΠΉ Π½Π°Ρ‡ΠΈΠ½Π°ΡŽΡ‚ΡΡ с ΠΏΠΎΡ…ΠΎΠΆΠΈΡ… ΠΊΠΎΠΌΠ°Π½Π΄:
+ % \subsection ΠΈ \subsubsection.
+
+ΠžΠΊΠΎΠ½Ρ‡Π°Π½ΠΈΠ΅ ΠΊΠ°ΠΆΠ΄ΠΎΠ³ΠΎ слова ΠΈ прСдлоТСния опрСдСляСтся
+ ΠΏΡ€ΠΎΠ±Π΅Π»Π°ΠΌΠΈ. НС ΠΈΠΌΠ΅Π΅Ρ‚ значСния, сколько ΠΏΡ€ΠΎΠ±Π΅Π»ΠΎΠ² Π’Ρ‹
+Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Π΅Ρ‚Π΅; ΠΎΠ΄ΠΈΠ½ ΠΏΡ€ΠΎΠ±Π΅Π»~--- Ρ‚ΠΎ ΠΆΠ΅, Ρ‡Ρ‚ΠΎ 100. ΠšΠΎΠ½Π΅Ρ†
+строки считаСтся ΠΏΡ€ΠΎΠ±Π΅Π»ΠΎΠΌ.
+
+Одна ΠΈΠ»ΠΈ нСсколько пустых строк ΠΎΠΏΡ€Π΅Π΄Π΅Π»ΡΡŽΡ‚ ΠΊΠΎΠ½Π΅Ρ†
+Π°Π±Π·Π°Ρ†Π°.
+
+ΠŸΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ любоС количСство ΠΏΠΎΡΠ»Π΅Π΄ΠΎΠ²Π°Ρ‚Π΅Π»ΡŒΠ½Ρ‹Ρ… ΠΏΡ€ΠΎΠ±Π΅Π»ΠΎΠ² ΠΎΡ‚Π²Π΅Ρ‡Π°Π΅Ρ‚ ΠΎΠ΄Π½ΠΎΠΌΡƒ
+ΠΏΡ€ΠΎΠ±Π΅Π»Ρƒ, Ρ„ΠΎΡ€ΠΌΠ°Ρ‚ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ исходного Ρ„Π°ΠΉΠ»Π° Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ‚ значСния
+для
+ \LaTeX, % Команда \LaTeX Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ Π»ΠΎΠ³ΠΎΡ‚ΠΈΠΏ LaTeX'Π°.
+Π½ΠΎ ΠΌΠΎΠΆΠ΅Ρ‚ ΠΈΠΌΠ΅Ρ‚ΡŒ Π·Π½Π°Ρ‡Π΅Π½ΠΈΠ΅ для Вас. Когда Π’Ρ‹ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΡƒΠ΅Ρ‚Π΅ \LaTeX, Π΄Π΅Π»Π°ΠΉΡ‚Π΅
+свой Π²Ρ…ΠΎΠ΄Π½ΠΎΠΉ Ρ„Π°ΠΉΠ», насколько это Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ, Π»Π΅Π³ΠΊΠΈΠΌ для чтСния~---
+это ΠΏΠΎΠΌΠΎΠΆΠ΅Ρ‚ Π’Π°ΠΌ ΠΏΠ΅Ρ€Π΅ΠΏΠΈΡΠ°Ρ‚ΡŒ Π’Π°Ρˆ Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚, ΠΊΠΎΠ³Π΄Π° Π’Ρ‹ Π·Π°Ρ…ΠΎΡ‚ΠΈΡ‚Π΅ Π΅Π³ΠΎ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡ‚ΡŒ.
+Π­Ρ‚ΠΎΡ‚ Ρ„Π°ΠΉΠ» ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚, ΠΊΠ°ΠΊ ΠΌΠΎΠΆΠ½ΠΎ Π΄ΠΎΠ±Π°Π²Π»ΡΡ‚ΡŒ ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΈ ΠΊΠΎ Π²Ρ…ΠΎΠ΄Π½ΠΎΠΌΡƒ Ρ„Π°ΠΉΠ»Ρƒ.
+
+ΠŸΠ΅Ρ‡Π°Ρ‚ΡŒ ΠΈ Π½Π°Π±ΠΎΡ€~--- Ρ€Π°Π·Π½Ρ‹Π΅ Π²Π΅Ρ‰ΠΈ, поэтому Π΅ΡΡ‚ΡŒ мноТСство случаСв,
+ΠΊΠΎΠ³Π΄Π° Ρ‚ΠΎ, Ρ‡Ρ‚ΠΎ Π’Ρ‹ Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Π»ΠΈ Π²ΠΎ Π²Ρ…ΠΎΠ΄Π½ΠΎΠΌ Ρ„Π°ΠΉΠ»Π΅, отличаСтся ΠΎΡ‚ Ρ‚ΠΎΠ³ΠΎ, Ρ‡Ρ‚ΠΎ
+Π’Ρ‹ Ρ…ΠΎΡ‚ΠΈΡ‚Π΅ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ Π² Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π΅. ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ Ρ‚ΠΈΠΏΠ°
+ <<Ρ‚Π°ΠΊΠΈΡ…>>
+Π½ΡƒΠΆΠ½ΠΎ ΠΏΠΎΠ»ΡƒΡ‡Π°Ρ‚ΡŒ ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½ΠΎ, Ρ‚Π°ΠΊΠΆΠ΅ ΠΊΠ°ΠΊ ΠΈ ΠΊΠ°Π²Ρ‹Ρ‡ΠΊΠΈ Π²Π½ΡƒΡ‚Ρ€ΠΈ ΠΊΠ°Π²Ρ‹Ρ‡Π΅ΠΊ:
+ <<\,``эти'', % \, отдСляСт внСшниС ΠΈ Π²Π½ΡƒΡ‚Ρ€Π΅Π½Π½ΠΈΠ΅ ΠΊΠ°Π²Ρ‹Ρ‡ΠΊΠΈ
+ ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ я сСйчас
+ Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Π»,
+ Π½Π΅ "`Ρ‚Π°ΠΊΠΈΠ΅"'\,>>.
+
+Π’ΠΈΡ€Π΅ Π±Ρ‹Π²Π°ΡŽΡ‚ Ρ‚Ρ€Π΅Ρ… Ρ€Π°Π·ΠΌΠ΅Ρ€ΠΎΠ²:
+ Π²Π½ΡƒΡ‚Ρ€ΠΈ-слова
+(дСфис), срСднСС Ρ‚ΠΈΡ€Π΅ для соСдинСния Ρ†ΠΈΡ„Ρ€ Ρ‚ΠΈΠΏΠ°
+ 1--2,
+ΠΈ Ρ‚ΠΈΡ€Π΅ ΠΊΠ°ΠΊ Π·Π½Π°ΠΊ прСпинания
+ --- ΠΊΠ°ΠΊ
+это.
+
+ΠŸΡ€ΠΎΠ±Π΅Π» Π² ΠΊΠΎΠ½Ρ†Π΅ прСдлоТСния Π΄ΠΎΠ»ΠΆΠ΅Π½ Π±Ρ‹Ρ‚ΡŒ Π½Π΅ΠΌΠ½ΠΎΠ³ΠΎ большС, Ρ‡Π΅ΠΌ
+ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹ΠΉ ΠΏΡ€ΠΎΠ±Π΅Π». Иногда Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ вмСстС со Π·Π½Π°ΠΊΠ°ΠΌΠΈ ΠΏΡƒΠ½ΠΊΡ‚ΡƒΠ°Ρ†ΠΈΠΈ
+Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Ρ‚ΡŒ ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ ΠΏΡ€Π°Π²ΠΈΠ»ΡŒΠ½Ρ‹Π΅
+ΠΏΡ€ΠΎΠ±Π΅Π»Ρ‹, ΠΊΠ°ΠΊ Π² ΡΠ»Π΅Π΄ΡƒΡŽΡ‰Π΅ΠΌ ΠΏΡ€Π΅Π΄Π»ΠΎΠΆΠ΅Π½ΠΈΠΈ.
+ ΠšΠΎΠΌΠ°Ρ€Ρ‹, ΠΊΠΎΠ·Π»Ρ‹ ΠΈ % `\ ' ΠΏΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡ‚ `Π½ΠΎΡ€ΠΌΠ°Π»ΡŒΠ½Ρ‹ΠΉ' ΠΏΡ€ΠΎΠ±Π΅Π»
+ ΠΏΡ€.\ Π½Π°Ρ‡ΠΈΠ½Π°ΡŽΡ‚ΡΡ
+ с К\@. % \@ опрСдСляСт, Π³Π΄Π΅ ΠΊΠΎΠ½Π΅Ρ† прСдлоТСния.
+НуТно ΠΏΡ€ΠΎΠ²Π΅Ρ€ΡΡ‚ΡŒ Ρ€Π°Π·ΠΌΠ΅Ρ€ ΠΏΡ€ΠΎΠ±Π΅Π»ΠΎΠ² послС Π·Π½Π°ΠΊΠΎΠ² ΠΏΡƒΠ½ΠΊΡ‚ΡƒΠ°Ρ†ΠΈΠΈ, ΠΊΠΎΠ³Π΄Π°
+Π’Ρ‹ просматриваСтС Π²Ρ‹Ρ…ΠΎΠ΄Π½ΠΎΠΉ Ρ„Π°ΠΉΠ», Ρ‡Ρ‚ΠΎΠ±Ρ‹ Π±Ρ‹Ρ‚ΡŒ ΡƒΠ²Π΅Ρ€Π΅Π½Π½Ρ‹ΠΌ Π² Ρ‚ΠΎΠΌ, Ρ‡Ρ‚ΠΎ Π’Ρ‹
+Π½Π΅ пропустили Π½ΠΈ ΠΎΠ΄ΠΈΠ½ ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹ΠΉ случай.
+ΠœΠ½ΠΎΠ³ΠΎΡ‚ΠΎΡ‡ΠΈΠ΅ производится ΠΊΠΎΠΌΠ°Π½Π΄ΠΎΠΉ
+ \ldots\ % `\ ' Π½ΡƒΠΆΠ½ΠΎ ΠΏΠΎΡΡ‚Π°Π²ΠΈΡ‚ΡŒ послС `\ldots', Ρ‚.ΠΊ. TeX
+ % пропускаСт всС ΠΏΡ€ΠΎΠ±Π΅Π»Ρ‹ послС ΠΊΠΎΠΌΠ°Π½Π΄, состоящих
+ % ΠΈΠ· \ ΠΈ Π±ΡƒΠΊΠ²
+ %
+ % ΠžΠ±Ρ€Π°Ρ‚ΠΈΡ‚Π΅ Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅ Π½Π° Ρ‚ΠΎ, Ρ‡Ρ‚ΠΎ Π·Π½Π°ΠΊ `%' ΠΏΡ€ΠΈΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚ TeX'Ρƒ
+ % ΠΏΡ€ΠΎΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ ΠΊΠΎΠ½Π΅Ρ† Π²Ρ…ΠΎΠ΄Π½ΠΎΠΉ строки, ΠΈ поэтому Ρ‚Π°ΠΊΠΈΠ΅
+ % строки Π½Π΅ производят Π½ΠΎΠ²Ρ‹ΠΉ Π°Π±Π·Π°Ρ†.
+ %
+(ΠΏΡ€Π°Π²ΠΈΠ»ΡŒΠ½Ρ‹ΠΉ ΠΏΡ€ΠΎΠ±Π΅Π» послС Ρ‚ΠΎΡ‡Π΅ΠΊ Ρ‚Ρ€Π΅Π±ΡƒΠ΅Ρ‚ ввСдСния ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½ΠΎΠΉ
+ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹).
+
+\LaTeX\ считаСт нСсколько ΠΎΠ±Ρ‹Ρ‡Π½Ρ‹Ρ… символов ΠΊΠΎΠΌΠ°Π½Π΄Π°ΠΌΠΈ,
+поэтому, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Π½Π°ΠΏΠ΅Ρ‡Π°Ρ‚Π°Ρ‚ΡŒ Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ ΠΈΠ· Π½ΠΈΡ…, Π½ΡƒΠΆΠ½Ρ‹
+ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹. Π’ΠΎΡ‚ эти символы:
+ \$ \& \% \# \{ ΠΈ \}.
+%$
+
+Для ΠΏΠ΅Ρ‡Π°Ρ‚ΠΈ тСкст Π»ΡƒΡ‡ΡˆΠ΅ высСго Π²Ρ‹Π΄Π΅Π»ΡΡ‚ΡŒ \emph{курсивом}.
+
+\begin{em}
+ Π”Π»ΠΈΠ½Π½Ρ‹ΠΉ ΠΎΡ‚Ρ€Ρ‹Π²ΠΎΠΊ тСкста Ρ‚Π°ΠΊΠΆΠ΅ ΠΌΠΎΠΆΠ΅Ρ‚ Π±Ρ‹Ρ‚ΡŒ Π²Ρ‹Π΄Π΅Π»Π΅Π½
+ Ρ‚Π°ΠΊΠΈΠΌ способом. ВСкст Π²Π½ΡƒΡ‚Ρ€ΠΈ ΠΎΡ‚Ρ€Ρ‹Π²ΠΊΠ° ΠΌΠΎΠΆΠ΅Ρ‚
+ ΠΈΠΌΠ΅Ρ‚ΡŒ \emph{Π΄ΠΎΠ±Π°Π²ΠΎΡ‡Π½ΠΎΠ΅} Π²Ρ‹Π΄Π΅Π»Π΅Π½ΠΈΠ΅.
+\end{em}
+
+Иногда Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΠΎ ΠΏΡ€Π΅Π΄ΠΎΡ…Ρ€Π°Π½ΠΈΡ‚ΡŒ ΠΊΠ°ΠΊΡƒΡŽ-Π»ΠΈΠ±ΠΎ Ρ„Ρ€Π°Π·Ρƒ ΠΎΡ‚ Ρ€Π°Π·Ρ€Ρ‹Π²Π°
+ΠΌΠ΅ΠΆΠ΄Ρƒ строками Π² нСподходящСм мСстС. Π’Π°ΠΊΠΈΠΌ мСстом ΠΌΠΎΠΆΠ΅Ρ‚
+Π±Ρ‹Ρ‚ΡŒ ΠΏΡ€ΠΎΠ±Π΅Π», Π½Π°ΠΏΡ€ΠΈΠΌΠ΅Ρ€, ΠΌΠ΅ΠΆΠ΄Ρƒ <<Π“-Π½>> ΠΈ <<ДТонс>> Π²
+ <<Π“-Π½ ДТонс>>, % ~ Π΄Π°Π΅Ρ‚ Π½Π΅Ρ€Π°Π·Ρ€Ρ‹Π²Π½Ρ‹ΠΉ мСТдусловный ΠΏΡ€ΠΎΠ±Π΅Π».
+ΠΈΠ»ΠΈ Π²Π½ΡƒΡ‚Ρ€ΠΈ слова~--- особСнно Ссли это Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Ρ‚Π΅Ρ€ΠΌΠΈΠ½ Ρ‚ΠΈΠΏΠ°
+ \mbox{\emph{Π²Ρ…ΠΎΠΆΠ΄Π΅Π½ΠΈΠ΅}},
+Ρ‚Π°ΠΊ Ρ‡Ρ‚ΠΎ Π½Π΅ ΠΈΠΌΠ΅Π΅Ρ‚ особого смыла Ρ€Π°Π·Π±ΠΈΠ²Π°Ρ‚ΡŒ Π΅Π³ΠΎ ΠΌΠ΅ΠΆΠ΄Ρƒ строками.
+
+Бноски\footnote{Π­Ρ‚ΠΎ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ сноски.} Π½Π΅ ΡΠΎΠ·Π΄Π°ΡŽΡ‚ Π½ΠΈΠΊΠ°ΠΊΠΈΡ… ΠΏΡ€ΠΎΠ±Π»Π΅ΠΌ.
+
+\LaTeX\ Ρ…ΠΎΡ€ΠΎΡˆ для Ρ‚ΠΎΠ³ΠΎ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒ матСматичСскиС Ρ„ΠΎΡ€ΠΌΡƒΠ»Ρ‹
+Ρ‚ΠΈΠΏΠ°
+ \( x-3y + z = 7 \)
+ΠΈΠ»ΠΈ
+ \( a_{1} > x^{2n} + y^{2n} > x' \)
+ΠΈΠ»ΠΈ
+ \( \ip{A}{B} = \sum_{i} a_{i} b_{i} \).
+ΠŸΡ€ΠΎΠ±Π΅Π»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π’Ρ‹ ΠΏΠ΅Ρ‡Π°Ρ‚Π°Π΅Ρ‚Π΅ Π²Π½ΡƒΡ‚Ρ€ΠΈ Ρ„ΠΎΡ€ΠΌΡƒΠ»Ρ‹, Π±ΡƒΠ΄ΡƒΡ‚
+ΠΏΡ€ΠΎΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½Ρ‹. Π—Π°ΠΏΠΎΠΌΠ½ΠΈΡ‚Π΅, Ρ‡Ρ‚ΠΎ Π±ΡƒΠΊΠ²Ρ‹ Ρ‚ΠΈΠΏΠ°
+ $x$ % $ ... $ ΠΈ \( ... \) эквивалСтнты
+ΡΠ²Π»ΡΡŽΡ‚ΡΡ Ρ„ΠΎΡ€ΠΌΡƒΠ»ΠΎΠΉ, ΠΏΠΎΡΠΊΠΎΠ»ΡŒΠΊΡƒ ΠΎΠ½ΠΈ ΠΈΠ·ΠΎΠ±Ρ€Π°ΠΆΠ°ΡŽΡ‚ матСматичСский символ,
+ΠΈ Π΄ΠΎΠ»ΠΆΠ½Ρ‹ Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒΡΡ ΠΊΠ°ΠΊ Ρ„ΠΎΡ€ΠΌΡƒΠ»Π°.
+
+\section{Π’Ρ‹Π΄Π΅Π»Π΅Π½Π½Ρ‹ΠΉ тСкст}
+
+ВСкст выдСляСтся ΠΏΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ отступа ΠΎΡ‚ Π»Π΅Π²ΠΎΠ³ΠΎ края. Π’Π°ΠΊ ΠΎΠ±Ρ‹Ρ‡Π½ΠΎ
+Π²Ρ‹Π΄Π΅Π»ΡΡŽΡ‚ΡΡ Ρ†ΠΈΡ‚Π°Ρ‚Ρ‹. Π’ΠΎΡ‚ короткая Ρ†ΠΈΡ‚Π°Ρ‚Π°:
+\begin{quote}
+ Π­Ρ‚ΠΎ~--- короткая Ρ†ΠΈΡ‚Π°Ρ‚Π° (quote). Она содСрТит ΠΎΠ΄ΠΈΡ‚ Π°Π±Π·Π°Ρ†
+ тСкста. ΠŸΠΎΡΠΌΠΎΡ‚Ρ€ΠΈΡ‚Π΅, ΠΊΠ°ΠΊ ΠΎΠ½Π° выглядит.
+\end{quote}
+и болСС длинная:
+\begin{quotation}
+ Π­Ρ‚ΠΎ~--- длинная Ρ†ΠΈΡ‚Π°Ρ‚Π° (quotation). Она содСрТит
+ Π΄Π²Π° Π°Π±Π·Π°Ρ†Π° тСкста, Π½ΠΈ ΠΎΠ΄ΠΈΠ½ ΠΈΠ· ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Ρ… Π½Π΅ прСдставляСт
+ для Вас Π½ΠΈΠΊΠ°ΠΊΠΎΠ³ΠΎ интСрСса.
+
+ Π­Ρ‚ΠΎ~--- Π²Ρ‚ΠΎΡ€ΠΎΠΉ Π°Π±Π·Π°Ρ† Π΄Π»ΠΈΠ½Π½ΠΎΠΉ Ρ†ΠΈΡ‚Π°Ρ‚Ρ‹. Он Ρ‚Π°ΠΊΠΎΠΉ ΠΆΠ΅ Π΄ΡƒΡ€Π°Ρ†ΠΊΠΈΠΉ,
+ ΠΊΠ°ΠΊ ΠΈ ΠΏΠ΅Ρ€Π²Ρ‹ΠΉ.
+\end{quotation}
+Π”Ρ€ΡƒΠ³ΠΎΠΉ Ρ‚ΠΈΠΏ Π²Ρ‹Π΄Π΅Π»Π΅Π½Π½ΠΎΠ³ΠΎ тСкста~--- это список. Π‘Π»Π΅Π΄ΡƒΡŽΡ‰ΠΈΠ΅ строки
+ΠΏΡ€Π΅Π΄ΡΡ‚Π°Π²Π»ΡΡŽΡ‚ ΠΏΡ€ΠΈΠΌΠ΅Ρ€ \emph{ΠΌΠ°Ρ€ΠΊΠΈΡ€ΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ} списка:
+\begin{itemize}
+ \item Π­Ρ‚ΠΎ~--- ΠΏΠ΅Ρ€Π²Ρ‹ΠΉ ΠΏΡƒΠ½ΠΊΡ‚ ΠΌΠ°Ρ€ΠΊΠΈΡ€ΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ списка.
+ ΠšΠ°ΠΆΠ΄Ρ‹ΠΉ ΠΏΡƒΠ½ΠΊΡ‚ списка ΠΌΠ°Ρ€ΠΊΠΈΡ€ΠΎΠ²Π°Π½ ΠΊΡ€ΡƒΠΆΠΊΠΎΠΌ. Π’Ρ‹ Π½Π΅
+ Π΄ΠΎΠ»ΠΆΠ½Ρ‹ Π·Π°Π±ΠΎΡ‚ΠΈΡ‚ΡŒΡΡ ΠΎ Ρ‚ΠΎΠΌ, ΠΊΠ°ΠΊΠΎΠΉ Π·Π½Π°Ρ‡ΠΎΠΊ Π²Ρ‹Π±Ρ€Π°Ρ‚ΡŒ.
+
+ \item Π­Ρ‚ΠΎ~--- Π²Ρ‚ΠΎΡ€ΠΎΠΉ ΠΏΡƒΠ½ΠΊΡ‚ списка. Он содСрТит Π΄Ρ€ΡƒΠ³ΠΎΠΉ,
+ Π²Π»ΠΎΠΆΠ΅Π½Π½Ρ‹ΠΉ список. Π’Π»ΠΎΠΆΠ΅Π½Π½Ρ‹ΠΉ список~--- ΠΏΡ€ΠΈΠΌΠ΅Ρ€
+ \emph{Π½ΡƒΠΌΠ΅Ρ€ΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ} списка.
+ \begin{enumerate}
+ \item Π­Ρ‚ΠΎ~--- ΠΏΠ΅Ρ€Π²Ρ‹ΠΉ ΠΏΡƒΠ½ΠΊΡ‚ Π½ΡƒΠΌΠ΅Ρ€ΠΎΠ²Π°Π½Π½ΠΎΠ³ΠΎ спика, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ
+ Π²Π»ΠΎΠΆΠ΅Π½ Π² ΠΌΠ°Ρ€ΠΊΠΈΡ€ΠΎΠ²Π°Π½Π½Ρ‹ΠΉ список.
+
+ \item Π­Ρ‚ΠΎ~--- Π²Ρ‚ΠΎΡ€ΠΎΠΉ ΠΏΡƒΠ½ΠΊΡ‚ Π²Π»ΠΎΠΆΠ΅Π½Π½ΠΎΠ³ΠΎ списка.
+ \LaTeX\ Ρ€Π°Π·Ρ€Π΅ΡˆΠ°Π΅Ρ‚ Π²ΠΊΠ»Π°Π΄Ρ‹Π²Π°Ρ‚ΡŒ Ρ€Π°Π·Π½Ρ‹Π΅ списки Π΄Ρ€ΡƒΠ³
+ Π² Π΄Ρ€ΡƒΠ³Π°, ΠΏΠΎΠΊΠ° это занятиС Π’Π°ΠΌ Π½Π΅ надоСст.
+ \end{enumerate}
+ Π­Ρ‚ΠΎ~--- ΠΊΠΎΠ½Π΅Ρ† Π²Ρ‚ΠΎΡ€ΠΎΠ³ΠΎ ΠΏΡƒΠ½ΠΊΡ‚Π° внСшнСго списка. Он Π½Π΅
+ интСрСснСС любой Π΄Ρ€ΡƒΠ³ΠΎΠΉ Π΅Π³ΠΎ части.
+ \item Π­Ρ‚ΠΎ~--- Ρ‚Ρ€Π΅Ρ‚ΠΈΠΉ ΠΏΡƒΠ½ΠΊΡ‚ списка.
+\end{itemize}
+МоТно Π΄Π°ΠΆΠ΅ Π½Π°Π±ΠΈΡ€Π°Ρ‚ΡŒ стихи:
+\begin{verse}
+ НСт Ρ…ΡƒΠΆΠ΅ сСго окруТСния,\\ % \\ раздСляСт строки Π² строфС
+ Когда Ρ…ΠΎΡ‡Π΅ΡˆΡŒ ΡΠΎΡ‡ΠΈΠ½ΠΈΡ‚ΡŒ
+ стихотворСниС.
+
+ % Одна ΠΈΠ»ΠΈ большС пустых строчСк
+ % раздСляСт строфы.
+
+ Π’Ρ‹ ΠΊΠΎΠ½Ρ†Ρ‹ всСх строчСк Ρ€Π°ΡΡΡ‚Π°Π²Π»ΡΠ΅ΡˆΡŒ,\\
+ Π’Π΄ΠΎΡ…Π½ΠΎΠ²Π΅Π½ΡŒΠ΅ ΠΏΡ€ΠΈ этом Ρ‚Π΅Ρ€ΡΠ΅ΡˆΡŒ.
+
+ \emph{Бколько Ρ…ΠΎΡ‡Π΅ΡˆΡŒ} слов Π½Π° строчку здСсь Π²Π»Π΅Π·Π°Π΅Ρ‚~--- это
+ лаконичности вСсьма ΠΌΠ΅ΡˆΠ°Π΅Ρ‚.
+\end{verse}
+
+ΠœΠ°Ρ‚Π΅ΠΌΠ°Ρ‚ΠΈΡ‡Π΅ΡΠΊΠΈΠ΅ Ρ„ΠΎΡ€ΠΌΡƒΠ»Ρ‹ Ρ‚Π°ΠΊΠΆΠ΅ ΠΌΠΎΠ³ΡƒΡ‚ Π±Ρ‹Ρ‚ΡŒ Π²Ρ‹Π΄Π΅Π»Π΅Π½Π½Ρ‹ΠΌΠΈ.
+ВыдСлСнная Ρ„ΠΎΡ€ΠΌΡƒΠ»Π° Π΄ΠΎΠ»ΠΆΠ½Π° Π±Ρ‹Ρ‚ΡŒ Π΄Π»ΠΈΠ½ΠΎΠΉ Π² ΠΎΠ΄Π½Ρƒ строку;
+многострочныС Ρ„ΠΎΡ€ΠΌΡƒΠ»Ρ‹ Ρ‚Ρ€Π΅Π±ΡƒΡŽΡ‚ ΡΠΏΠ΅Ρ†ΠΈΠ°Π»ΡŒΠ½Ρ‹Ρ… инструкций
+для форматирования.
+ \[ \ip{\Gamma}{\psi'} = x'' + y^{2} + z_{i}^{n}\]
+НС Π½Π°Ρ‡ΠΈΠ½Π°ΠΉΡ‚Π΅ Π°Π±Π·Π°Ρ† с Π²Ρ‹Π΄Π΅Π»Π΅Π½Π½ΠΎΠΉ Ρ„ΠΎΡ€ΠΌΡƒΠ»Ρ‹, ΠΈ Π½Π΅ Π΄Π΅Π»Π°ΠΉΡ‚Π΅ ΠΈΠ·
+Π½Π΅Π΅ ΠΎΡ‚Π΄Π΅Π»ΡŒΠ½Ρ‹ΠΉ Π°Π±Π·Π°Ρ†.
+
+\end{document} % ΠšΠΎΠ½Π΅Ρ† Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π°
+
+Π”Π°Π»ΡŒΡˆΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅Ρ‡Π°Ρ‚Π°Ρ‚ΡŒ Ρ‡Ρ‚ΠΎ ΡƒΠ³ΠΎΠ΄Π½ΠΎ~--- ΠΎΠ½ΠΎ всС Ρ€Π°Π²Π½ΠΎ Π½Π΅ Π±ΡƒΠ΄Π΅Ρ‚
+Ρ‚Ρ€Π°Π½ΡΠ»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒΡΡ:
+
+"sample2e.tex" ΠΏΠ΅Ρ€Π΅Π²Π΅Π» Π½Π° русский (с Π½Π΅ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΌΠΈ измСнСниями)
+А. Π¨ΠΈΠΏΡƒΠ½ΠΎΠ² (plantago@herba.msu.ru)
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.pdf b/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.pdf
new file mode 100644
index 0000000000..fb6e857559
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.tex b/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.tex
new file mode 100644
index 0000000000..82511d660e
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-doc-ru.tex
@@ -0,0 +1,38 @@
+\documentclass{article}
+\usepackage[russian]{babel}
+
+\usepackage{url}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\author{А.\,Π‘.\,Π¨ΠΈΠΏΡƒΠ½ΠΎΠ²\footnote{e-mail: \texttt{plantago at
+herba.msu.ru}}}
+
+\title{\texttt{xecyr.sty},\\ русский ΡΡ‚ΠΈΠ»ΡŒ для \texttt{XeLaTeX}}
+
+\date{}
+
+\begin{document}
+
+\maketitle
+
+Π‘Ρ‚ΠΈΠ»ΡŒ основан Π½Π° Ρ„Π°ΠΉΠ»Π΅ А.\,ΠšΡ€ΡŽΠΊΠΎΠ²Π° <<\texttt{xecyr.tex}>>.
+
+Доступны Π΄Π²Π΅ ΠΏΠ°Ρ€Ρ‹ ΠΎΠΏΡ†ΠΈΠΉ: \texttt{ext/noext} ΠΈ \texttt{nomis/mis}
+(ΡƒΠΌΠ°Π»Ρ‡ΠΈΠ²Π°Π΅ΠΌΡ‹Π΅ ΠΎΠΏΡ†ΠΈΠΈ ΠΏΠ΅Ρ€Π²Ρ‹Π΅). ΠŸΠ΅Ρ€Π²Π°Ρ Π³Ρ€ΡƒΠ·ΠΈΡ‚ ΠΏΠ°ΠΊΠ΅Ρ‚ \texttt{xltxtra} (ΠΈ
+Π·Π°ΠΎΠ΄Π½ΠΎ \texttt{fontspec}, Π±Π΅Π· ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ³ΠΎ Тизнь Π² \texttt{XeLaTeX} ослоТняСтся),
+вторая Π³Ρ€ΡƒΠ·ΠΈΡ‚ (Ссли Π΅Π΅ Π·Π°Π΄Π°Ρ‚ΡŒ явно) ΠΏΠ°ΠΊΠ΅Ρ‚ \texttt{misccorr}, для Π·Π°Π³Ρ€ΡƒΠ·ΠΊΠΈ
+ΠΊΠΎΡ‚ΠΎΡ€ΠΎΠ³ΠΎ Π½ΡƒΠΆΠ΅Π½ Π½Π΅ΠΊΠΈΠΉ Ρ‚Ρ€ΡŽΠΊ с ΠΊΠΎΠ΄ΠΈΡ€ΠΎΠ²ΠΊΠ°ΠΌΠΈ.
+
+ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ Π½Π°Π±ΠΈΡ€Π°ΡŽΡ‚ΡΡ "<ΠΏΠΎ-бабСлСвски">, ΠΏΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ \verb|"< "> "` "'|,
+Π»ΠΈΠ³Π°Ρ‚ΡƒΡ€Ρ‹ \verb|<< >>| Π±ΡƒΠ΄ΡƒΡ‚ Ρ€Π°Π±ΠΎΡ‚Π°Ρ‚ΡŒ Ρ‚ΠΎΠ»ΡŒΠΊΠΎ Ссли Π² поставкС ΠΈΠΌΠ΅ΡŽΡ‚ΡΡ
+послСдниС вСрсии Ρ„Π°ΠΉΠ»ΠΎΠ² \texttt{tex-text.map} ΠΈ \texttt{tex-text.tec},
+скачанныС с \url{http://scripts.sil.org/svn-view/xetex/TRUNK}. Π’ Π±ΡƒΠ΄ΡƒΡ‰Π΅ΠΌ
+эта ситуация, скорСС всСго, измСнится.
+
+Π’ систСмС Π΄ΠΎΠ»ΠΆΠ½Ρ‹ Π±Ρ‹Ρ‚ΡŒ
+установлСны ΡˆΡ€ΠΈΡ„Ρ‚Ρ‹ Computer Modern Unicode
+(\url{http://sourceforge.net/projects/cm-unicode}).
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.pdf b/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.pdf
new file mode 100644
index 0000000000..e9d5a54572
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.tex b/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.tex
new file mode 100644
index 0000000000..8b53de230b
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex3-ru-x.tex
@@ -0,0 +1,60 @@
+\RequirePackage{luatex85} % old definitions of PDF primitives, need for lualatex, xelatex ignores it
+\documentclass{article}
+\usepackage[russian]{babel}
+\usepackage[arrow,graph]{xy}
+\usepackage[margin=2cm]{geometry}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\nofiles
+\everymath={\rm}
+\let\ΠΊ=\textit
+\let\ΠΆ=\textbf
+\let\ΠΌΠΆ=\mathbf
+
+\newdimen\sH
+\def\tsH#1{\setbox0=\txt{#1}\global\sH=\wd0\POS *!L{\copy0}}
+
+\title{ΠšΠ»Π°ΡΡΠΈΡ„ΠΈΠΊΠ°Ρ†ΠΈΡ ΠΆΠΈΠ·Π½Π΅Π½Π½Ρ‹Ρ… Ρ„ΠΎΡ€ΠΌ}
+\author{}
+\date{}
+
+\begin{document}
+\maketitle
+\thispagestyle{empty}
+
+\begin{center}
+\shorthandoff{"}
+\xygraph{%
+*!R\txt{ΠžΡ€Π³Π°Π½ΠΈΠ·ΠΌΡ‹}="A"
+ (:[rr]*!L\txt{Π­Π½Π΄ΠΎΡ‚Ρ€ΠΎΡ„Π½Ρ‹Π΅, E})
+ :[uurr]!{\tsH{ΠžΠΌΠ½ΠΈΡ‚Ρ€ΠΎΡ„Π½Ρ‹Π΅}}[r/.8\sH/]
+ (:[urrr(.5)]*!L\txt{Π”Π²ΡƒΠΌΠ΅Ρ€Π½ΠΎ, O$_2$})
+ :[drrr(.5)]*!L\txt{Π’Ρ€Π΅Ρ…ΠΌΠ΅Ρ€Π½ΠΎ, O$_3$}
+"A"
+ :[drr]!{\tsH{Π­ΠΊΠ·ΠΎΡ‚Ρ€ΠΎΡ„Π½Ρ‹Π΅}}[r/.8\sH/]="B"
+ ((:[urr]!{\tsH{АктивныС}}[r/.7\sH/]
+ (:[urrr(.5)]*!L\txt{ΠΠ°ΠΏΠ°Π΄Π°ΡŽΡ‰ΠΈΠ΅, A$_n$})
+ (:[drrr(.5)]*!L\txt{ΠžΡ…ΠΎΡ‚ΡΡ‰ΠΈΠ΅ΡΡ, A$_o$}))
+ (:[rr]*!L\txt{РастущиС, R}))
+"B"
+ (:[drr]*!L\txt{Π‘Π΅Π΄Π°Ρ‚ΠΈΠ²Π½Ρ‹Π΅, S})
+ :[ddrr]!{\tsH{ΠŸΡ€ΠΎΠΏΡƒΡΠΊΠ°ΡŽΡ‰ΠΈΠ΅}}[r/.8\sH/]
+ (:[urrr(.7)]*+!L\txt{НСподвиТно\\ Ρ„ΠΈΠ»ΡŒΡ‚Ρ€ΡƒΡŽΡ‰ΠΈΠ΅,\\ F$_n$})
+ :[drrr(.7)]*+!L\txt{ПодвиТно\\ Ρ„ΠΈΠ»ΡŒΡ‚Ρ€ΡƒΡŽΡ‰ΠΈΠ΅,\\ F$_p$}
+}
+\shorthandon{"}
+\end{center}
+
+{\parindent0pt\obeylines
+ΠŸΡ€ΠΈΠΌΠ΅Ρ€Ρ‹:
+\ΠΊ{Centroheliozoa} --- A$_n$, R, \ΠΆ{F$_\ΠΌΠΆ{p}$}
+\ΠΊ{Echinodermata} --- S, \ΠΆ{A$_\ΠΌΠΆ{n}$}, F$_p$
+\ΠΊ{Spermatophyta} --- \ΠΆ{O$_\ΠΌΠΆ{2}$}, R, E, S
+\ΠΊ{Eumycota} --- \ΠΆ{R}, E, S
+\ΠΊ{Chlorophyta} --- F$_n$, A$_o$, \ΠΆ{O$_\ΠΌΠΆ{1}$}, O$_2$
+\ΠΊ{Scolecida} --- E, M$_2$, \ΠΆ{A$_\ΠΌΠΆ{n}$}, F$_n$
+}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.pdf b/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.pdf
new file mode 100644
index 0000000000..1f8b9c479a
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.tex b/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.tex
new file mode 100644
index 0000000000..5b35b7fef7
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex4-ru-x.tex
@@ -0,0 +1,26 @@
+\documentclass{article}
+\usepackage[russian]{babel}
+\usepackage{pgf}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\nofiles
+\begin{document}
+
+\begin{pgfpicture}{27.93mm}{47.91mm}{111.30mm}{86.07mm}
+\pgfsetxvec{\pgfpoint{1.00mm}{0mm}}
+\pgfsetyvec{\pgfpoint{0mm}{1.00mm}}
+\color[rgb]{0,0,0}\pgfsetlinewidth{0.30mm}\pgfsetdash{}{0mm}
+\pgfputat{\pgfxy(60.20,80.15)}{\pgfbox[bottom,left]{\fontsize{14.23}{17.07}\selectfont ΠžΡ€Π³Π°Π½ΠΈΠ·ΠΌΡ‹}}
+\pgfputat{\pgfxy(29.93,50.99)}{\pgfbox[bottom,left]{\fontsize{14.23}{17.07}\selectfont Π–ΠΈΠ²ΠΎΡ‚Π½Ρ‹Π΅}}
+\pgfputat{\pgfxy(90.02,50.99)}{\pgfbox[bottom,left]{\fontsize{14.23}{17.07}\selectfont РастСния}}
+\pgfmoveto{\pgfxy(72.26,79.50)}\pgflineto{\pgfxy(41.12,55.15)}\pgfstroke
+\pgfmoveto{\pgfxy(41.12,55.15)}\pgflineto{\pgfxy(43.76,56.33)}\pgflineto{\pgfxy(42.77,56.45)}\pgflineto{\pgfxy(42.89,57.43)}\pgflineto{\pgfxy(41.12,55.15)}\pgfclosepath\pgffill
+\pgfmoveto{\pgfxy(41.12,55.15)}\pgflineto{\pgfxy(43.76,56.33)}\pgflineto{\pgfxy(42.77,56.45)}\pgflineto{\pgfxy(42.89,57.43)}\pgflineto{\pgfxy(41.12,55.15)}\pgfclosepath\pgfstroke
+\pgfmoveto{\pgfxy(72.04,79.50)}\pgflineto{\pgfxy(99.67,56.25)}\pgfstroke
+\pgfmoveto{\pgfxy(99.67,56.25)}\pgflineto{\pgfxy(97.98,58.59)}\pgflineto{\pgfxy(98.06,57.60)}\pgflineto{\pgfxy(97.08,57.52)}\pgflineto{\pgfxy(99.67,56.25)}\pgfclosepath\pgffill
+\pgfmoveto{\pgfxy(99.67,56.25)}\pgflineto{\pgfxy(97.98,58.59)}\pgflineto{\pgfxy(98.06,57.60)}\pgflineto{\pgfxy(97.08,57.52)}\pgflineto{\pgfxy(99.67,56.25)}\pgfclosepath\pgfstroke
+\end{pgfpicture}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.pdf b/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.pdf
new file mode 100644
index 0000000000..bf5c3f5a84
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.tex b/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.tex
new file mode 100644
index 0000000000..62e08f7472
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex5-ru-x.tex
@@ -0,0 +1,18 @@
+\documentclass{article}
+\usepackage[varg]{txfonts}
+\usepackage[no-math]{fontspec}
+\usepackage[russian]{babel}
+
+\setmainfont{Times New Roman}
+\setsansfont{Arial}
+\setmonofont{Courier New}
+
+\begin{document}
+
+Π—Π΄Π΅ΡΡŒ ΠΈΠ΄Π΅Ρ‚ русский тСкст. Β«ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈΒ» β€” Ρ‚ΠΈΡ€Π΅.
+\textsf{Π—Π΄Π΅ΡΡŒ Ρ‚ΠΎΠΆΠ΅ ΠΈΠ΄Π΅Ρ‚ русский}. ΠŸΠ΅Ρ€Π΅Π½ΠΎΡ.
+Π‘ΠΈΠΌΠ²ΠΎΠ»Ρ‹ βˆ«β™€. Π€ΠΎΡ€ΠΌΡƒΠ»Π° с использованиСм \texttt{txfonts}:
+
+\[ \gamma = \frac{1}{\sqrt{1 - v^2/c^2}} \].
+
+\end{document} \ No newline at end of file
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.pdf b/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.pdf
new file mode 100644
index 0000000000..e941d7eb58
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.tex b/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.tex
new file mode 100644
index 0000000000..e7ab046b89
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex6-ru-x.tex
@@ -0,0 +1,59 @@
+\documentclass{article}
+\usepackage[russian]{babel}
+
+\usepackage{boxedminipage,xcolor}
+\usepackage[grid,gridcolor=gray!25,subgridcolor=gray!12.5]{eso-pic}
+
+\usepackage{fontspec}
+\setmainfont{CMU Serif}
+
+\gridSetup[mm]{1mm}{1}{1}{10}{1}
+\makeatletter\def\ESO@griddeltaY{1}\makeatother
+
+\begin{document}
+
+\begin{boxedminipage}{1.8cm}
+ΠΈΠ½ΠΆΠ΅Π½Π΅Ρ€Π½ΠΎ-ΡΡ‚Ρ€ΠΎΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹ΠΉ\\
+ΠΈΠ½ΠΆΠ΅Π½Π΅Ρ€Π½ΠΎ"-ΡΡ‚Ρ€ΠΎΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹ΠΉ\\
+ΠΈΠ½ΠΆΠ΅Π½Π΅Ρ€Π½ΠΎ"~ΡΡ‚Ρ€ΠΎΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹ΠΉ\\
+ΠΈΠ½ΠΆΠ΅Π½Π΅Ρ€Π½ΠΎ"=ΡΡ‚Ρ€ΠΎΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹ΠΉ
+\end{boxedminipage}
+
+\begin{boxedminipage}{2.2cm}
+Всё лишнСС --- дСтям\\
+Всё лишнСС "--- дСтям
+\end{boxedminipage}
+
+\begin{boxedminipage}{2cm}
+МСндСлССва---ΠšΠ»Π°ΠΏΠ΅ΠΉΡ€ΠΎΠ½Π°\\
+МСндСлССва"--~ΠšΠ»Π°ΠΏΠ΅ΠΉΡ€ΠΎΠ½Π°
+\end{boxedminipage}
+
+\begin{boxedminipage}{2.2cm}
+--- Π§Ρ‚ΠΎ ΡΠ»ΡƒΡ‡ΠΈΠ»ΠΎΡΡŒ?
+"--*НичСго ΡΡ‚Ρ€Π°ΡˆΠ½ΠΎΠ³ΠΎ.
+\end{boxedminipage}
+
+\begin{boxedminipage}{2.2cm}
+ΠΈΠ½ΡΡ‚Π°Π»Π»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ/Π΄Π΅ΠΈΠ½ΡΡ‚Π°Π»Π»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ\\
+""ΠΈΠ½ΡΡ‚Π°Π»Π»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ/""Π΄Π΅ΠΈΠ½ΡΡ‚Π°Π»Π»ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ
+\end{boxedminipage}
+
+\begin{boxedminipage}{2cm}
+М.Π’.Ломоносов\\
+М. Π’. Ломоносов\\
+М.\,Π’.\,Ломоносов\\
+М.",Π’.",Ломоносов
+\end{boxedminipage}
+
+\begin{boxedminipage}{3cm}
+"ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ"\\
+``ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ''\\
+`ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ'\\
+"<ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ">\\
+<<ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ>>\\
+<"|<ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ>"|>\\
+"`ΠšΠ°Π²Ρ‹Ρ‡ΠΊΠΈ"'
+\end{boxedminipage}
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.pdf b/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.pdf
new file mode 100644
index 0000000000..60e11eb435
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.pdf
Binary files differ
diff --git a/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.tex b/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.tex
new file mode 100644
index 0000000000..9b8b0aba83
--- /dev/null
+++ b/macros/xetex/latex/xecyr/doc/xecyr-ex7-ru-x.tex
@@ -0,0 +1,38 @@
+\documentclass{article}
+\usepackage{polyglossia}
+
+\setmainlanguage{russian}
+
+\setmainfont{CMU Serif}
+
+\title{РаспространСнныС русскиС ΠΊΠΎΠ΄ΠΈΡ€ΠΎΠ²ΠΊΠΈ}
+\author{Из русской <<Π’ΠΈΠΊΠΈΠΏΠ΅Π΄ΠΈΠΈ>>}
+\date{}
+
+\begin{document}
+\maketitle
+
+\tableofcontents
+
+% Does not work with LuaLaTeX!
+% ΠžΠ±Ρ€Π°Ρ‚ΠΈΡ‚Π΅ Π²Π½ΠΈΠΌΠ°Π½ΠΈΠ΅ Π½Π° названия ΠΊΠΎΠ΄ΠΈΡ€ΠΎΠ²ΠΎΠΊ! Они бСрутся ΠΎΡ‚ΡΡŽΠ΄Π°: http://www.iana.org/assignments/character-sets
+
+\XeTeXdefaultencoding "IBM866"
+\input inputs/866
+
+\XeTeXdefaultencoding "KOI8-R"
+\input inputs/koi8-r
+
+\XeTeXdefaultencoding "windows-1251"
+\input inputs/1251
+
+\XeTeXdefaultencoding "ISO-8859-5"
+\input inputs/iso
+
+\XeTeXdefaultencoding "UTF-8"
+
+\vspace{\stretch{1}}
+
+ΠšΠΎΠ½Π΅Ρ† Π΄ΠΎΠΊΡƒΠΌΠ΅Π½Ρ‚Π° :)
+
+\end{document}
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/NEWS b/macros/xetex/latex/xecyr/doc/xelatex/xecyr/NEWS
deleted file mode 100644
index 498f2de126..0000000000
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-1.1 Ukrainian letters corrected (thanks to Alexey Bondarchuk); works with polyglossia; two examples added \ No newline at end of file
diff --git a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/README b/macros/xetex/latex/xecyr/doc/xelatex/xecyr/README
deleted file mode 100644
index 86fdc3275d..0000000000
--- a/macros/xetex/latex/xecyr/doc/xelatex/xecyr/README
+++ /dev/null
@@ -1,46 +0,0 @@
-This is the version 1.1 of 'xecyr' package which is intended to help
-with Russian and other Cyrillic-based languages in Babel and XeLaTeX.
-
-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.
-
-Be sure that you use the latest versions of "tex-text.map" and "tex-text.tec"
-available in XeTeX source tree (http://scripts.sil.org/svn-view/xetex).
-
-=== FILES ===
-
-README This file
-
-language.dat.add Addition to "language.dat" to use "xu-ruenhyph.tex" as russian
- hyphenation
-rubibtexx.bat Windows command file for BibTeX + XeTeX
-rumakeindexx2.bat Windows command file for makeindex + XeTeX (2 args)
-rumakeindexx.bat Windows command file for makeindex + XeTeX (1 arg)
-
-xecyr.sty Cyrillic definitions for XeLaTeX, depends on XeLaTeX, "xunicode" package,
- and, optionally, "misccorr" and highly recommended "xltxtra" package
-
-xecyr-doc-ru.tex Package documentation
-
-xecyr-ex1-ru-x.tex Example 1 (see how hyperref working)
-xecyr-ex2-ru-x.tex Example 2 (CM Unicode fonts)
-xecyr-ex3-ru-x.tex Example 3 (Xy-Pic)
-xecyr-ex4-ru-x.tex Example 4 (Pgf, works only with recent version of Pgf)
-xecyr-ex5-ru-x.tex Example 5 (txfonts, works only with recent version of "fontspec" package)
-xecyr-ex6-ru-x.tex Example 6 (see Babel shortcuts working)
-xecyr-ex7-ru-x.tex Example 7 (handling Russian 8-bit codepages + polyglossia)
-866.tex Input file for example 7
-1251.tex Input file for example 7
-iso.tex Input file for example 7
-koi8-r.tex Input file for example 7
-rubibtex-ex.bib Examble BibTeX database (codepage 1251)
-rubibtex-ex-x.tex Example for BibTeX
-rumakeindex-ex-x.tex Example for makeindex
-listings-utf8-ex.tex Example for listings package (not quite successfull)
-pict2e-ex.tex Example for pict2e package
-
-xu-ruenhyph.tex Wrapper for XeTeX to read combined Russian/English hyphenation patterns
-
diff --git a/macros/xetex/latex/xecyr/tex/generic/xecyr/language.dat.add b/macros/xetex/latex/xecyr/tex/generic/xecyr/language.dat.add
deleted file mode 100644
index ebd584c966..0000000000
--- a/macros/xetex/latex/xecyr/tex/generic/xecyr/language.dat.add
+++ /dev/null
@@ -1 +0,0 @@
-russian xu-ruenhyph.tex
diff --git a/macros/xetex/latex/xecyr/tex/generic/xecyr/xu-ruenhyph.tex b/macros/xetex/latex/xecyr/tex/generic/xecyr/xu-ruenhyph.tex
deleted file mode 100644
index 363814c686..0000000000
--- a/macros/xetex/latex/xecyr/tex/generic/xecyr/xu-ruenhyph.tex
+++ /dev/null
@@ -1,59 +0,0 @@
-% xu-ruenhyph.tex
-% Wrapper for XeTeX to read combined Russian/English hyphenation patterns
-% Alexey Shipunov, 2008/02/16-08-19
-% Public domain
-
-\begingroup
-
-% Please uncomment the pattern value you need before creating a new
-% format file containing Russian hyphenation patterns:
-
-\ifx\Pattern\undefined
-\def\Pattern{al}
-%\def\Pattern{as}
-%\def\Pattern{ct}
-%\def\Pattern{dv}
-%\def\Pattern{mg}
-%\def\Pattern{vl}
-%\def\Pattern{zn}
-\fi
-
-% For non-XeTeX use, also check the encoding options in ruhyphen.tex
-
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
-
- \input hyphen
- \input enrhm2
- \input ruhyphen
-
-\else
-
- \let\PATTERNS=\patterns
- \def\patterns{%
- \XeTeXinputencoding "KOI8-R"
- \PATTERNS
- }
-
- \input hyphen
- \input enrhm2
- \input ruhyph\Pattern
- \input cyryo\Pattern
-
- % additional patterns from ruhyphen.tex, converted to Unicode
- \PATTERNS{.^^^^043d^^^^04358 8^^^^043d^^^^0435.}
- \PATTERNS{8^^^^0431^^^^044a. 8^^^^0432^^^^044a. 8^^^^0433^^^^044a.
- 8^^^^0434^^^^044a. 8^^^^0436^^^^044a. 8^^^^0437^^^^044a.
- 8^^^^043a^^^^044a. 8^^^^043b^^^^044a. 8^^^^043c^^^^044a.
- 8^^^^043d^^^^044a. 8^^^^043f^^^^044a. 8^^^^0440^^^^044a.
- 8^^^^0441^^^^044a. 8^^^^0442^^^^044a. 8^^^^0444^^^^044a.
- 8^^^^0445^^^^044a. 8^^^^0446^^^^044a. 8^^^^0447^^^^044a.
- 8^^^^0448^^^^044a. 8^^^^0449^^^^044a.}
-
-\fi
-
-\endgroup
-
-\lefthyphenmin2 % settings copied from ruhyphen.tex
-\righthyphenmin2
-
-\endinput
diff --git a/macros/xetex/latex/xecyr/tex/xelatex/xecyr/xecyr.sty b/macros/xetex/latex/xecyr/tex/xecyr.sty
index 43c082b775..fde8e2a316 100644
--- a/macros/xetex/latex/xecyr/tex/xelatex/xecyr/xecyr.sty
+++ b/macros/xetex/latex/xecyr/tex/xecyr.sty
@@ -1,7 +1,8 @@
-ο»Ώ% Modified from Evgenie Medvedev <medvedev at project7.ru> by A. Shipunov (plantago@herba.msu.ru)
-
\ProvidesPackage{xecyr}%
- [2008/03/08 v1.0 Definitions for Cyrillic Babel/XeLaTeX compatibility]
+ [2019/10/04 v1.2 Definitions for Cyrillic Babel and XeLaTeX/LuaTeX compatibility]
+
+\RequirePackage{ifluatex}
+\RequirePackage{ifxetex}
\newif\if@EXT
\DeclareOption{ext}{\@EXTtrue}
@@ -14,18 +15,32 @@
\ProcessOptions
\if@MIS
- \RequirePackage{misccorr}
- \XeTeXinputencoding "KOI8-R"
+ \RequirePackage{misccorr}
\fi
-\if@EXT
- \PassOptionsToPackage{cm-default}{fontspec}
- \RequirePackage{xltxtra}
+\ifluatex
+ \if@EXT
+ \RequirePackage{luatextra}
+ \defaultfontfeatures{Mapping=tex-text}
+ \fi
+\else
+ \ifxetex
+ \if@EXT
+ \RequirePackage{xltxtra}
+ \defaultfontfeatures{Mapping=tex-text}
+ \fi
+ \else % pdflatex/inputenc hack
+ \RequirePackage[utf8]{inputenc}
+ \def\setmainfont#1{}
+ \def\setsansfont#1{}
+ \def\setmonofont#1{}
+ \endinput
+ \fi
\fi
-\RequirePackage{xunicode}
+\@ifpackageloaded{xunicode}{}{\RequirePackage{xunicode}}
-%%% Cyrillic letter TeX definitions for XeTeX
+%%% Cyrillic letter TeX definitions for XeTeX/LuaTeX
% This definition set is complete for all Slavic Cyrillic
% languages (Russian, Ukrainian, Belorussian,
% Rusyn, Serbian, Macedonian and Bulgarian alphabets).