diff options
| author | Karl Berry <karl@freefriends.org> | 2019-10-10 21:58:46 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-10-10 21:58:46 +0000 |
| commit | dd0d081462a3fa63368e0f0ec875e097c883c361 (patch) | |
| tree | fdf37dda7428d68a58db673422734a708eae3643 /Master | |
| parent | 2d0e78c3e9d6118b73f0a80f3b8d84b99cc3dd60 (diff) | |
shipunov with -shipunov postfix for new .sty (8oct19)
git-svn-id: svn://tug.org/texlive/trunk@52334 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
87 files changed, 3118 insertions, 688 deletions
diff --git a/Master/texmf-dist/doc/latex/shipunov/NEWS b/Master/texmf-dist/doc/latex/shipunov/NEWS index c05f20c08b5..fb0bdf131b0 100644 --- a/Master/texmf-dist/doc/latex/shipunov/NEWS +++ b/Master/texmf-dist/doc/latex/shipunov/NEWS @@ -1 +1,13 @@ -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 +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/Master/texmf-dist/doc/latex/shipunov/README b/Master/texmf-dist/doc/latex/shipunov/README index d799a815192..2cce1e0f430 100644 --- a/Master/texmf-dist/doc/latex/shipunov/README +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/shipunov/README.doc b/Master/texmf-dist/doc/latex/shipunov/README.doc new file mode 100644 index 00000000000..80a009b7177 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/README.doc @@ -0,0 +1,151 @@ +shipunov 2019/10/03 version 1.2 + +Alexey Shipunov <dactylorhiza(at)gmail.com>, 2019 + +************************************************************ + +Contents of README + 1. Description + 2. Installation + 3. Usage notes + 4. History + 5. Acknowledgements + 6. License + 7. Files + +1. Description +---------------------- + +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 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. + +The Russian mini-review can be found in the "review.tex" file, written by Eugene Baldin, with minor corrections of bundle author. + +2. Installation +--------------- + +Extract the zip archive to the $LOCALTEXMF directory of your system. Refresh your filename database. Please see the documentation of your LaTeX distribution for further details. + +If someone would like to use this package under MikTex, this is the/a way to install: + +a. The "shipunov" directory, with the style files directly under it, should be copied to "[MiKTeX DIR]\tex\latex\" directory. + +b. Then in the "Settings" GUI program of MikTex the "Refresh FNDB" button should be pressed (located under the "General" tab of the GUI window). + +3. Usage notes +-------------- + +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/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 and Anna Shipunova. + +6. Licence +---------- + +This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. + +7. Files +-------- + +This work consists of the following files: + +* 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 +cassete-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: + +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 +autolist.sty Various lists, depends on "calc" package +biokey2html-doc-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.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, 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 + +* Some other examples (e.g., field forms): + +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/Master/texmf-dist/doc/latex/shipunov/add2-ex.pdf b/Master/texmf-dist/doc/latex/shipunov/add2-ex.pdf Binary files differnew file mode 100644 index 00000000000..ced30afac80 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/add2-ex.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/add2-ex.tex b/Master/texmf-dist/doc/latex/shipunov/add2-ex.tex new file mode 100644 index 00000000000..c5db7f91f2d --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/altverse-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/altverse-ex-en.pdf Binary files differindex 2df7a4d50a8..743b06c382b 100644 --- a/Master/texmf-dist/doc/latex/shipunov/altverse-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/altverse-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/altverse-ex1-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/altverse-ex1-ru.pdf Binary files differindex e76a0441e27..e7946a9fe93 100644 --- a/Master/texmf-dist/doc/latex/shipunov/altverse-ex1-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/altverse-ex1-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/altverse-ex2-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/altverse-ex2-ru.pdf Binary files differindex 8828efa165e..585c33b1e8a 100644 --- a/Master/texmf-dist/doc/latex/shipunov/altverse-ex2-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/altverse-ex2-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/altverse-ex3-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/altverse-ex3-ru.pdf Binary files differnew file mode 100644 index 00000000000..109488ff062 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/altverse-ex3-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/altverse-ex3-ru.tex b/Master/texmf-dist/doc/latex/shipunov/altverse-ex3-ru.tex new file mode 100644 index 00000000000..e408a2ccb21 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf Binary files differindex 9db2f082de7..ef620ac8fd5 100644 --- a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf Binary files differindex 8d9f9b5d505..861ed657b2b 100644 --- a/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/autolist-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.pdf b/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.pdf Binary files differindex 686c9dfccbb..ddeeb28df12 100644 --- a/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.tex b/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.tex index 17b3009475b..26dd3625d76 100644 --- a/Master/texmf-dist/doc/latex/shipunov/biokey-doc-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/biokey-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/biokey-ex-en.pdf Binary files differnew file mode 100644 index 00000000000..9a96c780533 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/biokey-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/biokey-ex-en.tex b/Master/texmf-dist/doc/latex/shipunov/biokey-ex-en.tex new file mode 100644 index 00000000000..c88fb734bbd --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.pdf b/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.pdf Binary files differindex 4b06034f80e..f7dea62e4d2 100644 --- a/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.tex b/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.tex index 03a417497d1..34a6a5942c6 100644 --- a/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/biokey2html-doc-en.tex @@ -1,67 +1,64 @@ -\documentclass[a4paper,12pt]{article} -\usepackage{biokey} +\documentclass[a4paper,12pt]{article} \usepackage{biokey} -\author{\IN A.V.Shipunova, \IN A.B.Shipunov} +\author{Anna Shipunova, Alexey Shipunov} -\title{``\texttt{biokey2html}'',\\ the primer of hypertext web/typography identification key} +\title{``\texttt{biokey2html}'',\\ the primer of hypertext web/typography +identification key} -\date{} -\begin{document} -\maketitle +\date{} \begin{document} \maketitle \subsection*{Example A} This is the plain text source: -\bigskip\hrule -\begin{verbatim} +\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. +2. Plants perennial, leaves dissected to numerous lanceolate lobes +... Polemonium L.---Jacob's ladder. --- Annual plants, leaves with narrow lobes ... -Gilia L.---Gilia. +-- Annual plants, leaves with narrow lobes ... Gilia L.---Gilia. -3(1). The compact inflorescence is surrounded by leaflike -bracts ... Collomia Nutt.---Collomia. +3(1). The compact inflorescence is surrounded by leaflike bracts +... Collomia Nutt.---Collomia. --- The sparse inflorescence without specialised bracts ... -Plox L.---Phlox, Sweet-william. +-- 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: +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} +\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. +\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. +\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. +\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. +-- 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}: +This is the typorgaphic PDF output. To produce this, you need special +style file, \texttt{biokey.sty}: \bigskip\hrule\bigskip @@ -69,38 +66,40 @@ This is the typorgaphic PDF output. To produce this, you need special style file \AN Leaves entire \T 3. -\Z2. Plants perennial, leaves dissected to numerous lanceolate -lobes \T Polem\'onium L.---Jacob's ladder. +\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. +\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. +\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): +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} +\bigskip\hrule \begin{verbatim} \TEZA{AA} Leaves pinnatifid \SSYLKA{AB} \AN Leaves entire \SSYLKA{AC} -\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate +\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. +\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. +\AN The sparse inflorescence without specialised bracts \T Plox +L.---Phlox, Sweet-william. \end{verbatim} @@ -112,62 +111,65 @@ And output: \AN Leaves entire \SSYLKA{AC} -\TEZA{AB} Plants perennial, leaves dissected to numerous lanceolate +\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. +\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. +\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: +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... +\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}). +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} +\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"><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">-- 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. +<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>--> +<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: +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: +\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: +\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} diff --git a/Master/texmf-dist/doc/latex/shipunov/biolist-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/biolist-ex-en.pdf Binary files differindex 108cbaf0374..fd6dd620067 100644 --- a/Master/texmf-dist/doc/latex/shipunov/biolist-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/biolist-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/boldline-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/boldline-ex-en.pdf Binary files differindex 22bf88ca8dc..973c80f505d 100644 --- a/Master/texmf-dist/doc/latex/shipunov/boldline-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/boldline-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/cassete-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/cassete-ex-ru.pdf Binary files differindex 36c6acc6617..cce8159b19a 100644 --- a/Master/texmf-dist/doc/latex/shipunov/cassete-ex-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/cassete-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.pdf Binary files differindex 09dc3c52ce1..04cbe101bdc 100644 --- a/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.tex b/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.tex index 6531ab332c6..85edb057e4c 100644 --- a/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/classif2-ex-en.tex @@ -1,596 +1,596 @@ -\documentclass{article} - +\documentclass[12pt]{article} \usepackage{classif2} +\usepackage[vmargin=2.5cm]{geometry} +\nofiles -\begin{document} +\def\SYN #1 {=~\textit{#1} } -\begin{classif}{1.0} \LevelName{1.0}{\EmptyName{Species}} \LevelName{1.5}{Sectio\Reset{Level}} +\LevelName{1.2}{Series\Reset{Level}} +\Globaltrue -/*3.0 Plantaginaceae Juss. +\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} -/2.0 PLANTAGO L. +\begin{document} +\maketitle + +\begin{classif}{1.0} -/1.8 PLANTAGO +/*2.0 Plantago L. + +/1.8 Plantago /1.5 Plantago - /1.0 {P. africana} Verdc. + /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 {P. densiflora} J. Z. Liu + /1.0 {Plantago taquetii} Lev. - /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 {Plantago coreana} Lev. - /1.0 {P. uliginosa} F. W. Schmidt \footnote{Incl. \KURN - P. winteri Wirtg.} + /1.0 {Plantago hasskarlii} Decne. -/1.5 Palaeopsyllium Pilger + /1.0 {Plantago schneideri} Pilg. - /1.0 {P. alata} Nakai? + /1.0 {Plantago centralis} Pilg. - /1.0 {P. cavaleriei} Leveille? + /1.0 {Plantago cavaleriei} Lev. - /1.0 {P. formosana} Tateishi et Masamune? + /1.0 {Plantago alata} Nakai - /1.0 {P. sawadai} Yamamoto? + /1.0 {Plantago himalaica} Pilg. - /1.0 {P. aitchinsonii} Pilger + /1.0 {Plantago aitchisonii} Pilg. - /1.0 {P. anatolica} Tutel et Mill. + /1.0 {Plantago sawadai} Yamam. - /1.0 {P. asiatica} L. \footnote{Incl. \KURN P. popovii - Tzvel., \KURN P. taquettii Leveille, \KURN P. yezoensis - Pilger} + /1.0 {Plantago formosana} Tateishi \& Masam. - /1.0 {P. aucklandica} Hook. fil. + /1.0 {Plantago japonica} Franch. \& Sav. - /1.0 {P. cordata} Lam. + /1.0 {Plantago yezoensis} Pilg. - /1.0 {P. coreana} Leveille + /1.0 {Plantago hakusanensis} Koidz. - /1.0 {P. cornuti} Gouan + \medskip - /1.0 {P. dielsiana} Pilger + /1.0 {Plantago gentianoides} Sibth. \& Sm. - /1.0 {P. eriopoda} Torrey + /1.0 {Plantago reniformis} Beck - /1.0 {P. erosa} Wall. \footnote{Incl. \KURN P. centralis - Pilger?} + /1.0 {Plantago cornuti} Gouan - /1.0 {P. fernandezia} Bertero ex Barn. + /1.0 {Plantago palmata} Hook.f. - /1.0 {P. fisheri} Engler + /1.0 {Plantago africana} Verde. - /1.0 {P. gentianoides} Sibth. et Smith \footnote{Incl. - \KURN P. griffithii Decne.} + \medskip - /1.0 {P. hakusanensis} Koidzumi + /1.0 {Plantago tanalensis} Baker - /1.0 {P. hasskarlii} Decne. + /1.0 {Plantago longissima} Decne. - /1.0 {P. hawaiinensis} (Gray) Pilger + /1.0 {Plantago sparsiflora} Michx. - /1.0 {P. hedleyi} Maiden + /1.0 {Plantago fischeri} Engl. - /1.0 {P. incisa} Hassk. + /1.0 {Plantago remota} Lam. - /1.0 {P. laxiflora} Decne. + \medskip - /1.0 {P. longissima} Decne. + /1.0 {Plantago aucklandica} Hook.f. - /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 {Plantago rapensis} Pilg. - /1.0 {P. palmata} Hook.f. + /1.0 {Plantago fernandezia} Barneoud - /1.0 {P. princeps} Cham. et Schlecht. + /1.0 {Plantago rupicola} Pilg. - /1.0 {P. rapensis} F. Brown + \medskip - /1.0 {P. remota} Lam. + /1.0 {Plantago robusta} Roxb. - /1.0 {P. robusta} Roxb. + \medskip - /1.0 {P. rugellii} Decne. + /1.0 {Plantago eriopoda} Torr. - /1.0 {P. rupicola} Pilger + /1.0 {Plantago tweedyi} A. Gray - /1.0 {P. schneideri} Pilger + \medskip - /1.0 {P. shastensis} Greene + /1.0 {Plantago cordata} Lam. - /1.0 {P. sparsiflora} Michx. + \medskip - /1.0 {P. tanalensis} Baker + /1.0 {Plantago hedleyi} Maiden - /1.0 {P. tweedyi} A. Gray + \medskip -/1.5 Virginica Barn. + /1.0 {Plantago media} L. - /1.0 {P. alismatifolia} Pilger + /1.0 {Plantago maxima} Jacq. - /1.0 {P. argentina} Pilger + /1.0 {Plantago canescens} Adams - /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 {Plantago macrocarpa} Cham. \& Schltdl. - /1.0 {P. berroi} Pilger + /1.0 {Plantago princeps} Cham. \& Schltdl. - /1.0 {P. buchtienii} Pilger + /1.0 {Plantago hawaiensis} (Gray) Pilg. - /1.0 {P. catharinea} Decne. + /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 {P. commersoniana} Decne. ex Barn. + /1.0 {Plantago laxiflora} Decne - /1.0 {P. dielsiana} Pilg. +/1.5 Micropsyllium Decne - /1.0 {P. firma} Kunze ex Walp. + /1.0 {Plantago bigelovii} A. Gray - /1.0 {P. floccosa} Decne. + /1.0 {Plantago elongata} Pursh - /1.0 {P. galapagensis} Rahn + /1.0 {Plantago heterophylla} Nutt. - /1.0 {P. guilleminiana} Decne. + /1.0 {Plantago pusilla} Nutt. - /1.0 {P. jujuensis} Rahn + \medskip - /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 {Plantago polysperma} Kar. \& Kir. - /1.0 {P. orbignyana} Steinh. ex Decne. \footnote{Incl. - \KURN P. hartwegii Decne. \Pp, \KURN P. niederleinii - Pilger} + /1.0 {Plantago tenuiflora} Waldst. \& Kit. - /1.0 {P. pachyneura} Steud. +/1.5 Mesembrynia (Decne.) Rahn - /1.0 {P. penantha} Griseb. + /1.0 {Plantago montisdicksonii} P. Royen - /1.0 {P. rhodosperma} Decne. + /1.0 {Plantago papuana} P. Royen - /1.0 {P. subnuda} Pilger + /1.0 {Plantago trichophora} Merr. \& Perry - /1.0 {P. tenuipala} (Rahn) Rahn + /1.0 {Plantago cladarophylla} Briggs et al. - /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 {Plantago alpestris} Briggs et al. - /1.0 {P. trinitatis} Rahn + /1.0 {Plantago euryphylla} Briggs et al. - /1.0 {P. truncata} Cham. et Schlecht. + /1.0 {Plantago daltonii} Decne. - /1.0 {P. turficola} Rahn + /1.0 {Plantago tasmanica} Hook.f. - /1.0 {P. ventanensis} Pilger + /1.0 {Plantago raoulii} Decne. - /1.0 {P. venturii} Pilger + \medskip - /1.0 {P. virginica} L. + /1.0 {Plantago cunninghamii} Decne. - /1.0 {P. weddeliana} Decne. + /1.0 {Plantago turrifera} Briggs et al. -/1.5 Holopsyllium Pilger + /1.0 {Plantago multiscapa} Briggs - /1.0 {P. macrocarpa} Cham. ex Schlecht. + /1.0 {Plantago debilis} R.Br -/1.5 Carpophorae Rahn + /1.0 {Plantago euana} Huerlimann - /1.0 {P. rigida} Kunth. + \medskip - /1.0 {P. tubulosa} Decne. + /1.0 {Plantago drummondii} Decne. -/1.5 Microcalyx Pilger + /1.0 {Plantago pentasperma} Hemsl. - /1.0 {P. aundensis} Royen + \medskip - /1.0 {P. depauperata} Merr. et Perry + /1.0 {Plantago exilis} Decne. - /1.0 {P. glacialis} B. G. Briggs et al. + /1.0 {Plantago gaudichaudii} Barneoud - /1.0 {P. gunnii} J. D. Hooker + /1.0 {Plantago bellidioides} Decne. - /1.0 {P. lanigera} J. D. Hooker + /1.0 {Plantago varia} R.Br. - /1.0 {P. muelleri} Pilger + /1.0 {Plantago glabrata} Hook.f. - /1.0 {P. novae-zelandiae} L. B. Moore + /1.0 {Plantago hispida} R.Br - /1.0 {P. obconica} W. R. Sykes + /1.0 {Plantago spathulata} Hook.f. - /1.0 {P. palustris} Fraser et Vickery + /1.0 {Plantago stauntonii} Reichardt - /1.0 {P. paradoxa} J. D. Hooker + \medskip - /1.0 {P. polita} Craven + /1.0 {Plantago antarctica} Decne. - /1.0 {P. stenophylla} Merr. et Perry + /1.0 {Plantago picta} Colenso - /1.0 {P. triandra} Bergg \sl \footnote{Incl. \KURN P. - masonae Cheesem.} + /1.0 {Plantago schwarzenbergiana} Schur - /1.0 {P. unibracteata} Rahn + /1.0 {Plantago depressa} Willd. -/1.5 Oliganthos Barn. + /1.0 {Plantago camtschatica} Link - /1.0 {P. barbata} Forst. + \medskip - /1.0 {P. correae} Rahn + /1.0 {Plantago komarovii} Pavl. - /1.0 {P. moorei} Rahn + /1.0 {Plantago perssonii} Pilg. - /1.0 {P. pulvinata} Spegazz. + /1.0 {Plantago arachnoidea} Schrenk - /1.0 {P. sempervivoides} Dusen +/1.5 Virginica Barneoud - /1.0 {P. techuelcha} Spegazz. - /1.0 {P. triantha} Spreng. + /1.0 {Plantago galapagensis} Rahn - /1.0 {P. uniglumis} Wallr. + /1.0 {Plantago virginica} L. -/1.5 Mesembrynia Decne. + /1.0 {Plantago rhodosperma} Decne. - /1.0 {P. alpestris} B. G. Briggs et al. + /1.0 {Plantago firma} Walp. \INCL{ + \SYN {Plantago skottsbergii} Pilg.} - /1.0 {P. antarctica} Decne. + \medskip - /1.0 {P. arachnoidea} Schrenk + /1.0 {Plantago tenuipala} Rahn - /1.0 {P. bellidoides} Decne. + /1.0 {Plantago myosuros} Lam. - /1.0 {P. camtschatica} Link + \medskip - /1.0 {P. cladarophylla} B. G. Briggs et al. + /1.0 {Plantago penantha} Griseb. - /1.0 {P. cunninghamii} Decne. \footnote{Incl. \KURN P. - mitchellii Decne.} + /1.0 {Plantago pachyneura} Steud. - /1.0 {P. daltonii} Decne. + /1.0 {Plantago orbignyana} Decne. - /1.0 {P. debilis} R. Br. + /1.0 {Plantago dielsiana} Pilg. - /1.0 {P. depressa} Willd. + /1.0 {Plantago jujuyensis} Rahn - /1.0 {P. drummondii} Decne. \footnote{Incl. \KURN P. - pritzelii Pilger} + /1.0 {Plantago venturii} Pilg. - /1.0 {P. euana} Hurlim + /1.0 {Plantago buchtienii} Pilg. - /1.0 {P. euryphylla} B. G. Briggs et al. + /1.0 {Plantago truncata} Cham. \& Schltdl. - /1.0 {P. exilis} Decne. + /1.0 {Plantago berroi} Pilg. - /1.0 {P. gaudichaudii} Barn. \footnote{Incl. \KURN P. - bakeri Pilger, \KURN P. sericophylla Decne.} + /1.0 {Plantago subnuda} Pilg. - /1.0 {P. glabrata} J. D. Hooker + /1.0 {Plantago alismatifolia} Pilg. - /1.0 {P. hispida} R. Br. \footnote{Incl. \KURN P. - tildeniae Pilger} + /1.0 {Plantago australis} Lam. - /1.0 {P. komarovii} Pavl. + /1.0 {Plantago turficola} Rahn - /1.0 {P. montisdicksonii} van Royen + \medskip - /1.0 {P. multiscapa} B. G. Briggs + /1.0 {Plantago catharinea} Decne. - /1.0 {P. papuana} van Royen + /1.0 {Plantago argentina} Pilg. - /1.0 {P. pentasperma} Hemsley + /1.0 {Plantago ventanensis} Pilg. - /1.0 {P. perssonii} Pilger + \medskip - /1.0 {P. picta} Colenso + /1.0 {Plantago floccosa} Decne. - /1.0 {P. rauolii} Decne. + /1.0 {Plantago guilleminiana} Decne. - /1.0 {P. schwarzenbergiana} Schur + /1.0 {Plantago weddelliana} Decne. - /1.0 {P. spathulata} J. D. Hooker + /1.0 {Plantago tomentosa} Lam. - /1.0 {P. stauntonii} Reich. + /1.0 {Plantago commersoniana} Barneoud - /1.0 {P. tasmanica} J. D. Hooker + /1.0 {Plantago trinitatis} Rahn - /1.0 {P. trichophora} Merr. et Perry +/1.5 Oliganthos Barneoud - /1.0 {P. turrifera} B. G. Briggs et al. +/1.2 Oliganthos Rahn - /1.0 {P. varia} R. Br. \footnote{Incl. \KURN P. - acutiloba Pilger, \KURN P. sthruthionis Cunnungh. ex - Decne.} + /1.0 {Plantago barbata} G. Forst -/1.5 Lamprosantha Decne. + /1.0 {Plantago moorei} Rahn - /1.0 {P. canescens} Adams. + /1.0 {Plantago tehuelcha} Speg. - /1.0 {P. jurtzevii} Tzvel. + /1.0 {Plantago correae} Rahn - /1.0 {P. maxima} Juss. ex Jacq. + /1.0 {Plantago uniglumis} Walp - /1.0 {P. media} L. \footnote{Incl. \KURN P. urvillei - Opiz} + /1.0 {Plantago sempervivoides} Dusen - /*0.8 {Subsp.} media + /1.0 {Plantago pulvinata} Speg. - /*0.8 {Subsp.} stepposa (Kuprian.) So\'o + /1.0 {Plantago triantha} Spreng. - /1.0 {P. reniformis} G. Beck +/1.2 Microcalyx (Pilg.) Rahn -/1.5 Micropsyllium Decne. - /1.0 {P. bigelovii} A. Gray + /1.0 {Plantago novae-zelandiae} L.B. Moore - /1.0 {P. elongata} Pursh + /1.0 {Plantago muelleri} Pilg. - /1.0 {P. heterophylla} Nutt. + /1.0 {Plantago palustris} Fraser et al. - /1.0 {P. polysperma} Kar. et Kir. + /1.0 {Plantago glacialis} Briggs et al. - /1.0 {P. pusilla} Nutt. + \medskip - /1.0 {P. tenuiflora} Waldst. et Kit. + /1.0 {Plantago aundensis} P. Royen -/1.8 CORONOPUS (Lam. et DC.) Rahn + /1.0 {Plantago stenophylla} Merr. \& Perry -/1.5 Uralensae Shipunov + /1.0 {Plantago polita} Craven - /1.0 {P. krascheninnikovii} Ye. V. Serg. + /1.0 {Plantago depauperata} Merr. \& Perry -/1.5 Maritima Dietrich + \medskip - /1.0 {P. alpina} L. + /1.0 {Plantago unibracteata} Rahn \INCL{ + \SYN {Plantago uniflora} Hook.f., non L.} - /1.0 {P. atlantica} Battandier + /1.0 {Plantago triandra} Berggr. - /1.0 {P. eocoronopus} Pilger + /1.0 {Plantago gunnii} Hook.f. - /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.} + /1.0 {Plantago obconica} Sykes - /*0.8 {Subsp.} maritima +/1.5 Carpophorae (Rahn) Rahn - /*0.8 {Subsp.} subpolaris (Andrejev) Tzvel. + /1.0 {Plantago rigida} Kunth - /1.0 {P. rhizoxylon} Emberg. + /1.0 {Plantago tubulosa} Decne. - /1.0 {P. schrenkii} C. Koch. +/1.8 Coronopus (Lam. \& DC.) Rahn - /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 Maritima H.Dietr -/1.5 Coronopus Lam. et DC. + /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 {P. asphodeloides} Svent. + /1.0 {Plantago maritima} L. \INCL{ + \SYN {Plantago serpentina} All., + \SYN {Plantago oliganthos} Roem. \& Schult., + \SYN {Plantago atlantica} Batt.} - /1.0 {P. coronopus} L. \footnote{Incl. \KURN P. - ashersonii Bolle, \KURN P. maxonnoi Senn.} + /1.0 {Plantago alpina} L. - /1.0 {P. crassifolia} Forsk. + /1.0 {Plantago rhizoxylon} Emb. - /1.0 {P. crypsoides} Boiss. +/1.5 Coronopus - /1.0 {P. macrorhiza} Poir. + /1.0 {Plantago asphodeloides} Svent - /1.0 {P. serraria} L. \footnote{Incl. \KURN P. - peloritana Lojac.} + /1.0 {Plantago crassifolia} Forssk. - /1.0 {P. subspathulata} Pilger + /1.0 {Plantago serraria} L. \INCL{ + \SYN {Plantago peloritana} Lojac} -/1.8 ALBICANS Rahn + /1.0 {Plantago coronopus} L. \INCL{ + \SYN {Plantago aschersonii} Bolle} -/1.5 Lanceifolia Barn. + /1.0 {Plantago crypsoides} Boiss. - /1.0 {P. altissima} L. + /1.0 {Plantago macrorhiza} Poir. - /1.0 {P. argentea} Chaix \footnote{Incl. \KURN P. - serpentinicola Reich.} + /1.0 {Plantago subspathulata} Pilg. - /1.0 {P. lacustris} Maire +/1.8 Littorella (P.J. Bergius) Rahn - /1.0 {P. lagopus} L. + /1.0 {Plantago araucana} Rahn - /1.0 {P. lanceolata} L. \sl \footnote{Incl. \KURN P. - dubia L.} + /1.0 {Plantago americana} (Fernald) Rahn - /1.0 {P. leiopetala} Lowe \footnote{Incl. \KURN P. - malato-belizii Lawalree} + /1.0 {Plantago uniflora} L. -/1.5 Montanae Barn. +/1.8 Psyllium Juss. - /1.0 {P. atrata} Hoppe \sl \footnote{Incl. \KURN P. - discolor Gand., \KURN P. monosperma Pourr., \KURN P. - saxatilis Bieb.} + /1.0 {Plantago euphratica} Barneoud - /1.0 {P. nivalis} Boiss. + /1.0 {Plantago sinaica} Barneoud. -/1.5 Albicans Barn. + /1.0 {Plantago mauritanica} Boiss. \& Reut. - /1.0 {P. baltistanica} Hartmann? + /1.0 {Plantago asperrima} Hervier - /1.0 {P. akkensis} Cosson + /1.0 {Plantago sempervirens} Crantz \INCL{ + \SYN {Plantago cynops} L. 1762, nom. illeg.; + \SYN {Plantago suffruticosa} Lam.} - /1.0 {P. albicans} L. \footnote{Incl. \KURN P. - albicantiformis Senn.} + /1.0 {Plantago famarae} Svent + + /1.0 {Plantago webbii} Barn. - /1.0 {P. amplexicaulis} Cav. \sl \footnote{Incl. \KURN - P. bauphula Edgew.} + /1.0 {Plantago arborescens} Poir. \INCL{ + \SYN {Plantago costae} Menezes, + \SYN {Plantago maderensis} Decne.} - /1.0 {P. annua} Ryding + \medskip - /1.0 {P. boissierii} Hausskn. + /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 {P. cafra} Decne. + /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 {P. ciliata} Desf. + /1.0 {Plantago exigua} Murray - /1.0 {P. cylindrica} Forsk. + /1.0 {Plantago maris-mortui} Eig - /1.0 {P. lachnantha} Bunge \sl \footnote{Incl. \KURN P. - evacina Boiss.} + /1.0 {Plantago phaeostoma} Boiss. \& Heldr. - /1.0 {P. lagocephala} Bunge + \medskip - /1.0 {P. loeflingii} L. \footnote{Incl. \KURN P. - scabrifolia Thieb.?} + /1.0 {Plantago squarrosa} Murray - /1.0 {P. minuta} Pall. \sl \footnote{Incl. \KURN P. - lessingii Fisch. et Mey.} + /1.0 {Plantago sarcophylla} Boiss. ex Decne. - /1.0 {P. notata} Lagasca + /1.0 {Plantago chamaepsyllium} Zohary - /1.0 {P. ovata} Forsk. \sl \footnote{Incl. \KURN P. - fastigiata Morris, \KURN P. mauritii Senn.} +/1.8 Bougueria (Decne.) Rahn - /1.0 {P. psammophila} Agnew et Chalabi-Ka'bi + /1.0 {Plantago nubicola} (Decne.) Rahn - /1.0 {P. sharifii} Rechinger +/1.8 Albicans Rahn - /1.0 {P. stocksii} Boiss. +/1.5 Montana Barneoud - /1.0 {P. tunetana} Murbeck + /1.0 {Plantago notata} Lag. -/1.5 Gnaphaloides Barn. + /1.0 {Plantago loeflingii} L. - /1.0 {P. argyrea} Morris + /1.0 {Plantago cafra} Decne. - /1.0 {P. aristata} Michx. + /1.0 {Plantago monosperma} Pourr. - /1.0 {P. bismarckii} Niederl. + /1.0 {Plantago nivalis} Boiss - /1.0 {P. brasiliensis} Sims \sl \footnote{Incl. \KURN P. - linearis Kunth \Pp} + /1.0 {Plantago atrata} Hoppe - /1.0 {P. densa} (Pilger) Rahn +/1.5 Lanceifolia Barneoud - /1.0 {P. erecta} Morris \sl \footnote{Incl. \KURN P. - dura Morris, \KURN P. speciosa Morris} + /1.0 {Plantago argentea} Chaix - /1.0 {P. grandiflora} Meyen + /1.0 {Plantago altissima} L. - /1.0 {P. helleri} Small + /1.0 {Plantago lagopus} L. - /1.0 {P. hispidula} Ruiz. et Pav. + /1.0 {Plantago lacustris} Maire - /1.0 {P. hookeriana} Decne. + /1.0 {Plantago leiopetala} Lowe \INCL{ + \SYN {Plantago malato-belizii} Lawalree} - /1.0 {P. johnstoni} Pilger + /1.0 {Plantago lanceolata} L. - /1.0 {P. lamprophylla} Pilger \sl \footnote{Incl. \KURN - P. godeti Beauv., \KURN P. weberbaueri Pilger} +/1.5 Bauphula Decne. - /1.0 {P. limensis} Pers. \sl \footnote{Incl. \KURN P. - tacnensis Pilger} + /1.0 {Plantago amplexicaulis} Cav. - /1.0 {P. linearis} H. B. K. \sl \footnote{Incl. \KURN P. - amblyacme Pilger} +/1.5 Hymenopsyllium Pilg. - /1.0 {P. litorea} Phil. + /1.0 {Plantago cretica} L. - /1.0 {P. lundborgii} Sparre + /1.0 {Plantago cyrenaica} Durand \& Barratte - /1.0 {P. nivea} H. B. K. \footnote{Incl. \KURN P. - linearis Kunth \Pp} + /1.0 {Plantago bellardi} All. - /1.0 {P. patagonica} Jacq. \sl \footnote{Incl. \KURN P. - purshii Roem. ex Schult., \KURN P. spinulosa Decne.} +/1.5 Albicans Barneoud - /1.0 {P. rancagua} Steud. +/1.2 Ovatae Rahn - /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 {Plantago ovata} Forssk. - /1.0 {P. tandilensis} (Pilger) Rahn +/1.2 Minutae Rahn \INCL{ += Lachnanthae Rahn} - /1.0 {P. tolucensis} Pilger + /1.0 {Plantago lachnantha} Bunge \INCL{ + \SYN {Plantago evacina} Boiss.} - /1.0 {P. wrightiana} Decne. + /1.0 {Plantago minuta} Pall. \INCL{ + \SYN {Plantago lessingii} Fisch. \& C.A. Mey.} -/1.5 Hymenopsyllium Pilger + /1.0 {Plantago stocksii} Boiss. - /1.0 {P. bellardi} All. +/1.2 Albicantes Rahn - /1.0 {P. cretica} L. + /1.0 {Plantago albicans} L. - /1.0 {P. cyrenaica} Durand. et Barratte + /1.0 {Plantago cylindrica} Forssk. -/2.0 PSYLLIUM Mill. + /1.0 {Plantago boissieri} Hausskn. \& Bornm. - /1.0 {Ps. arborescens} (Poir.) Mirb. +/1.2 Ciliatae Rahn - /1.0 {Ps. arenarium} (Waldst. et Kit.) Mirb. - \footnote{Incl. \KURN Ps. scabrum (Moench.) Holub} + /1.0 {Plantago ciliata} Desf. - /*0.8 {Subsp.} arenarium + /1.0 {Plantago psammophila} Agnew \& Chal.-Kabi - /*0.8 {Subsp.} orientalis (So\'o) Soj\'ak + /1.0 {Plantago tunetana} Murb. - /1.0 {Ps. asperrimum} (Gand.) Holub \footnote{Incl. - \KURN P. assoana Senn.} + /1.0 {Plantago akkensis} Coss. - /1.0 {Ps. chamaepsyllium} (Zoh.) Holub + /1.0 {Plantago lagocephala} Bunge - /1.0 {Ps. euphraticum} (Decne. ex Barn.) Soj\'ak +/1.5 Gnaphaloides Barneoud - /1.0 {Ps. exiguum} (Murr.) Soj\'ak +/1.2 Hispidulae Rahn - /1.0 {Ps. famarae} (Svent.) C. Kunkel + /1.0 {Plantago limensis} Pers. - /1.0 {Ps. maris-mortui} (Eig) Holub + /1.0 {Plantago litorea} Phil. - /1.0 {Ps. mauritanicum} (Boiss. et Reut.) Soj\'ak + /1.0 {Plantago rancaguae} Steud. - /1.0 {Ps. phaeostomum} (Boiss. ex Heldr.) Soj\'ak + /1.0 {Plantago hispidula} Ruiz \& Pav. - /1.0 {Ps. sarcophyllum} (Zoh.) Holub + /1.0 {Plantago lundborgii} Sparre. - /1.0 {Ps. sempervirens} (Crantz) Soj\'ak +/1.2 Sericeae Rahn - /1.0 {Ps. sinaicum} (Barn. ex Decne.) Holub + /1.0 {Plantago linearis} Kunth - /1.0 {Ps. squalidum} (Salisb.) Soj\'ak + /1.0 {Plantago nivea} Kunth - /1.0 {Ps. squarrosum} (Murr.) Dum. + /1.0 {Plantago tolucensis} Pilg. - /1.0 {Ps. webbii} (Barn.) Soj\'ak + /1.0 {Plantago sericea} Ruiz \& Pav. -/2.0 LITTORELLA Bergius + /1.0 {Plantago lamprophylla} Pilg. - /1.0 {L. americana} Fernald + /1.0 {Plantago bismarckii} Niederl. - /1.0 {L. australis} Griseb. + /1.0 {Plantago grandiflora} Meyen - /1.0 {L. uniflora} (L.) Ashers. + /1.0 {Plantago johnstonii} Pilg. -/2.0 BOUGUERIA Decne. +/1.2 Brasilienses Rahn - /1.0 {B. nubicola} Decne. + /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/Master/texmf-dist/doc/latex/shipunov/dline-ex.pdf b/Master/texmf-dist/doc/latex/shipunov/dline-ex.pdf Binary files differnew file mode 100644 index 00000000000..9df0ebf63da --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/dline-ex.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/dline-ex.tex b/Master/texmf-dist/doc/latex/shipunov/dline-ex.tex new file mode 100644 index 00000000000..8e3ed27155d --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/drcaps-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/drcaps-ex-en.pdf Binary files differindex 1332843cea1..8172aa8c21f 100644 --- a/Master/texmf-dist/doc/latex/shipunov/drcaps-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/drcaps-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex-ru.pdf Binary files differindex c367006ebf2..a5922126841 100644 --- a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.pdf b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.pdf Binary files differindex ac878e63f78..fb8daf81016 100644 --- a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.tex b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.tex index d7a17e5f7fb..35eea9a5a41 100644 --- a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex1-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/etiketka-ex2-en.pdf b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex2-en.pdf Binary files differindex 9d1933b1044..d0989ea5802 100644 --- a/Master/texmf-dist/doc/latex/shipunov/etiketka-ex2-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/etiketka-ex2-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/exam-ex.pdf b/Master/texmf-dist/doc/latex/shipunov/exam-ex.pdf Binary files differnew file mode 100644 index 00000000000..bf340142ba5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/exam-ex.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/exam-ex.tex b/Master/texmf-dist/doc/latex/shipunov/exam-ex.tex new file mode 100644 index 00000000000..9cc7b186d8a --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.pdf Binary files differindex 18324f4bf40..e2dfe0ec0f7 100644 --- a/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.tex b/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.tex index e0028305d73..ac2bdc3f094 100644 --- a/Master/texmf-dist/doc/latex/shipunov/field-form-ex1-ru.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.pdf Binary files differindex 418c687591c..5c0d5692377 100644 --- a/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.tex b/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.tex index be25ee2e39f..180721155b7 100644 --- a/Master/texmf-dist/doc/latex/shipunov/field-form-ex2-ru.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf Binary files differdeleted file mode 100644 index e6ff6a5a0de..00000000000 --- a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.tex b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en-x.tex deleted file mode 100644 index 9367d7bbef7..00000000000 --- a/Master/texmf-dist/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/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf Binary files differindex 03cc743704d..b547c44580b 100644 --- a/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/flower-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/isyntax-ex-en.tex b/Master/texmf-dist/doc/latex/shipunov/isyntax-ex-en.tex index 2f19399fa2e..960f8920583 100644 --- a/Master/texmf-dist/doc/latex/shipunov/isyntax-ex-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/lecture-slides-ex.pdf b/Master/texmf-dist/doc/latex/shipunov/lecture-slides-ex.pdf Binary files differnew file mode 100644 index 00000000000..29d6f947968 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/lecture-slides-ex.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/lecture-slides-ex.tex b/Master/texmf-dist/doc/latex/shipunov/lecture-slides-ex.tex new file mode 100644 index 00000000000..6594b03cbf3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/numerus-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/numerus-ex-ru.pdf Binary files differindex 945a72e9e5d..e7ce73681a7 100644 --- a/Master/texmf-dist/doc/latex/shipunov/numerus-ex-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/numerus-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/punct-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/punct-ex-en.pdf Binary files differindex 6ba709bbb8c..d3bca025da0 100644 --- a/Master/texmf-dist/doc/latex/shipunov/punct-ex-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/punct-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/qqru-ex-en.pdf b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-en.pdf Binary files differnew file mode 100644 index 00000000000..f64e2657274 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/qqru-ex-en.tex b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-en.tex new file mode 100644 index 00000000000..bb75ba01e1a --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/qqru-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-ru.pdf Binary files differnew file mode 100644 index 00000000000..df7f7415bc2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/qqru-ex-ru.tex b/Master/texmf-dist/doc/latex/shipunov/qqru-ex-ru.tex new file mode 100644 index 00000000000..110a097b9da --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/review.pdf b/Master/texmf-dist/doc/latex/shipunov/review.pdf Binary files differnew file mode 100644 index 00000000000..1f1b882ae21 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/review.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/review.tex b/Master/texmf-dist/doc/latex/shipunov/review.tex new file mode 100644 index 00000000000..1d860dfcb48 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.pdf Binary files differindex ecd2b57f451..930a723ae68 100644 --- a/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.tex b/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.tex index 3ad60e9e52d..a5304371f99 100644 --- a/Master/texmf-dist/doc/latex/shipunov/rusnat-doc-ru.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/rusnat-ex1-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/rusnat-ex1-ru.pdf Binary files differindex 9e8ba1d668b..e215dbfa005 100644 --- a/Master/texmf-dist/doc/latex/shipunov/rusnat-ex1-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/rusnat-ex1-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/rusnat-ex2-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/rusnat-ex2-ru.pdf Binary files differindex 5c4c82d5f83..5b5d54bb5b9 100644 --- a/Master/texmf-dist/doc/latex/shipunov/rusnat-ex2-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/rusnat-ex2-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/rusnat_bst.readme b/Master/texmf-dist/doc/latex/shipunov/rusnat_bst.readme new file mode 100644 index 00000000000..40642f2a240 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/scripts/abs2rel.pl b/Master/texmf-dist/doc/latex/shipunov/scripts/abs2rel.pl new file mode 100755 index 00000000000..abbbea419a8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/scripts/shipunov/biokey2html.bat b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html.bat index 49534708611..49534708611 100755 --- a/Master/texmf-dist/scripts/shipunov/biokey2html.bat +++ b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html.bat diff --git a/Master/texmf-dist/scripts/shipunov/biokey2html.sh b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh index 50ee8a52ab2..50ee8a52ab2 100755 --- a/Master/texmf-dist/scripts/shipunov/biokey2html.sh +++ b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh diff --git a/Master/texmf-dist/scripts/shipunov/biokey2html1.pl b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html1.pl index e7eb44b07d2..e7eb44b07d2 100644..100755 --- a/Master/texmf-dist/scripts/shipunov/biokey2html1.pl +++ b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html1.pl diff --git a/Master/texmf-dist/scripts/shipunov/biokey2html2.pl b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html2.pl index 75801f4430a..75801f4430a 100644..100755 --- a/Master/texmf-dist/scripts/shipunov/biokey2html2.pl +++ b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html2.pl diff --git a/Master/texmf-dist/scripts/shipunov/biokey2html3.pl b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html3.pl index 296daaab6af..296daaab6af 100644..100755 --- a/Master/texmf-dist/scripts/shipunov/biokey2html3.pl +++ b/Master/texmf-dist/doc/latex/shipunov/scripts/biokey2html3.pl diff --git a/Master/texmf-dist/doc/latex/shipunov/scripts/txt2qq.pl b/Master/texmf-dist/doc/latex/shipunov/scripts/txt2qq.pl new file mode 100755 index 00000000000..bcdd5a00589 --- /dev/null +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.pdf b/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.pdf Binary files differindex 40d5fbf3558..ff8ccca62e1 100644 --- a/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.tex b/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.tex index bcb0198a44a..687402eef57 100644 --- a/Master/texmf-dist/doc/latex/shipunov/sltables-doc-en.tex +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/doc/latex/shipunov/starfn-ex-ru.pdf b/Master/texmf-dist/doc/latex/shipunov/starfn-ex-ru.pdf Binary files differindex 5d9af7f3083..369b5adcdf1 100644 --- a/Master/texmf-dist/doc/latex/shipunov/starfn-ex-ru.pdf +++ b/Master/texmf-dist/doc/latex/shipunov/starfn-ex-ru.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/textfrac-ex.pdf b/Master/texmf-dist/doc/latex/shipunov/textfrac-ex.pdf Binary files differnew file mode 100644 index 00000000000..163a608e2a3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/textfrac-ex.pdf diff --git a/Master/texmf-dist/doc/latex/shipunov/textfrac-ex.tex b/Master/texmf-dist/doc/latex/shipunov/textfrac-ex.tex new file mode 100644 index 00000000000..59478968a01 --- /dev/null +++ b/Master/texmf-dist/doc/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/add2-shipunov.sty b/Master/texmf-dist/tex/latex/shipunov/add2-shipunov.sty new file mode 100644 index 00000000000..171efdf1671 --- /dev/null +++ b/Master/texmf-dist/tex/latex/shipunov/add2-shipunov.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/Master/texmf-dist/tex/latex/shipunov/altverse.sty b/Master/texmf-dist/tex/latex/shipunov/altverse.sty index 83b6359b53a..a0cbbf53487 100644 --- a/Master/texmf-dist/tex/latex/shipunov/altverse.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/autolist.sty b/Master/texmf-dist/tex/latex/shipunov/autolist.sty index d4f32b8a1dc..e0eb2d39e14 100644 --- a/Master/texmf-dist/tex/latex/shipunov/autolist.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/biokey.sty b/Master/texmf-dist/tex/latex/shipunov/biokey.sty index ef88da239e2..f34f79bb152 100644 --- a/Master/texmf-dist/tex/latex/shipunov/biokey.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/biolist.sty b/Master/texmf-dist/tex/latex/shipunov/biolist.sty index 986bfa73569..d673ab173fe 100644 --- a/Master/texmf-dist/tex/latex/shipunov/biolist.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/boldline.sty b/Master/texmf-dist/tex/latex/shipunov/boldline.sty index 28a830ebb18..dc42a039e32 100644 --- a/Master/texmf-dist/tex/latex/shipunov/boldline.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/cassete.cls b/Master/texmf-dist/tex/latex/shipunov/cassete.cls index afe5a7d9c6b..1c81b08f56b 100644 --- a/Master/texmf-dist/tex/latex/shipunov/cassete.cls +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/classif2.sty b/Master/texmf-dist/tex/latex/shipunov/classif2.sty index c1bd6eedac9..c4313ec0222 100644 --- a/Master/texmf-dist/tex/latex/shipunov/classif2.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/dline-shipunov.sty b/Master/texmf-dist/tex/latex/shipunov/dline-shipunov.sty new file mode 100644 index 00000000000..657b8032fcd --- /dev/null +++ b/Master/texmf-dist/tex/latex/shipunov/dline-shipunov.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/Master/texmf-dist/tex/latex/shipunov/drcaps.sty b/Master/texmf-dist/tex/latex/shipunov/drcaps.sty index 0c010a19674..c212717a62c 100644 --- a/Master/texmf-dist/tex/latex/shipunov/drcaps.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/etiketka.cls b/Master/texmf-dist/tex/latex/shipunov/etiketka.cls index fea5932fbef..f617ceaddb0 100644 --- a/Master/texmf-dist/tex/latex/shipunov/etiketka.cls +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/flower.sty b/Master/texmf-dist/tex/latex/shipunov/flower.sty index 558f177ff70..d9dbcbb522d 100644 --- a/Master/texmf-dist/tex/latex/shipunov/flower.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/isyntax.sty b/Master/texmf-dist/tex/latex/shipunov/isyntax.sty index 3163b0d5fa1..72dd7a50c86 100644 --- a/Master/texmf-dist/tex/latex/shipunov/isyntax.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/numerus.sty b/Master/texmf-dist/tex/latex/shipunov/numerus.sty index 038ef56ba0f..58d3d6b7a20 100644 --- a/Master/texmf-dist/tex/latex/shipunov/numerus.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/punct.sty b/Master/texmf-dist/tex/latex/shipunov/punct.sty index 84c3c2692e9..f0ac8dae03d 100644 --- a/Master/texmf-dist/tex/latex/shipunov/punct.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/qqru-shipunov.sty b/Master/texmf-dist/tex/latex/shipunov/qqru-shipunov.sty new file mode 100644 index 00000000000..5697764dce3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/shipunov/qqru-shipunov.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/Master/texmf-dist/tex/latex/shipunov/sltables.sty b/Master/texmf-dist/tex/latex/shipunov/sltables.sty index f75fdfdb15f..b6238e86785 100644 --- a/Master/texmf-dist/tex/latex/shipunov/sltables.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/starfn.sty b/Master/texmf-dist/tex/latex/shipunov/starfn.sty index e70be056141..7f703bc272a 100644 --- a/Master/texmf-dist/tex/latex/shipunov/starfn.sty +++ b/Master/texmf-dist/tex/latex/shipunov/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/Master/texmf-dist/tex/latex/shipunov/textfrac-shipunov.sty b/Master/texmf-dist/tex/latex/shipunov/textfrac-shipunov.sty new file mode 100644 index 00000000000..6f48fc79b82 --- /dev/null +++ b/Master/texmf-dist/tex/latex/shipunov/textfrac-shipunov.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/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index e21c42a6d6a..1ecb5150691 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1516,7 +1516,8 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'pxbase' => '&POSTpxbase', 'pxchfon' => '&POSTpxchfon', 'recipebook' => '&POST_rmsymlink', - 'schule', => '&POSTschule', + 'schule' => '&POSTschule', + 'shipunov' => '&POSTshipunov', 'simple-resume-cv' => '&POST_simple_rmFonts', 'simple-thesis-dissertation' => '&POST_simple_rmFonts', 'splitindex' => '&POST_do_man', @@ -2536,6 +2537,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)' 'rcs', 'rcs.el|src|' . $standardsource, 'ruhyphen', '^[^.]*$|README.ru|hyphen.rules', 'selnolig', 'NULL', # not .fea + 'shipunov', 'NULL', # .bat in scripts 'texdraw', 'NULL', 'texosquery', 'java|\.batch$|' . $standardsource, 'thailatex', 'NULL', # no gain in splitting up @@ -3023,6 +3025,7 @@ $standardttf = '\.ttf|\.TTC'; 'placeat' => '\.lua$', 'pst-pdf' => '\.bat(.w95)?$', 'pythontex' => '([23]|_.*)\.py$', + 'shipunov' => '\.(bat|sh|pl)$', 'songs' => '\.lua$', 'spelling' => '\.lua$', 'texdoc', => '[^c]\.tlu$', # luckily that's enough @@ -6613,6 +6616,29 @@ sub POSTschule { &SYSTEM ("$MV doc/* . && rmdir doc"); } +sub POSTshipunov { + print "POST$package - rename new style files per agreement with author\n"; + # + # Discussion with package author, Alexey Shipunov, as of 10oct19: I + # (Karl) noticed the new style file names (the four below) were + # completely generic, and asked him to rename. Alexey said that + # although they had only been uploaded to CTAN recently, they were in + # use for many years by him and other users, via downloads from his + # web site. We agreed to compromise by renaming them with -shipunov + # postfix for TeX Live only, the convention he will follow from now + # on. The previous .sty names (ca. 2010) are also completely generic, + # and I shouldn't have accepted them, but have to grandfather them in + # at this point. + # + my $pkgdir = "$DEST/tex/latex/$package"; + for my $sty (qw(add2 dline qqru textfrac)) { + &SYSTEM ("$MV $pkgdir/$sty.sty $pkgdir/$sty-shipunov.sty"); + } + # + # the scripts dir is ok in doc/, avoid possible clash. + &SYSTEM ("$MV $DEST/scripts/$package scripts"); +} + sub POST_simple_rmFonts { print "POST$package - rm Fonts dir\n"; &SYSTEM ("$RM -r Fonts"); |