summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bst/disser/gost705.bst264
-rw-r--r--Master/texmf-dist/bibtex/bst/disser/gost705s.bst280
-rw-r--r--Master/texmf-dist/doc/latex/disser/ChangeLog17
-rw-r--r--Master/texmf-dist/doc/latex/disser/README35
-rw-r--r--Master/texmf-dist/doc/latex/disser/README.ru31
-rw-r--r--Master/texmf-dist/doc/latex/disser/manual.tex114
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex1
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib89
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex21
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex8
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex3
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib125
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex20
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex6
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex4
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib126
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex20
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib92
-rw-r--r--Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex31
-rw-r--r--Master/texmf-dist/source/latex/disser/autoref.dtx31
-rw-r--r--Master/texmf-dist/source/latex/disser/bachelor.dtx28
-rw-r--r--Master/texmf-dist/source/latex/disser/candidate.dtx62
-rw-r--r--Master/texmf-dist/source/latex/disser/chapter.dtx23
-rw-r--r--Master/texmf-dist/source/latex/disser/custom.dtx26
-rw-r--r--Master/texmf-dist/source/latex/disser/disser.dtx142
-rw-r--r--Master/texmf-dist/source/latex/disser/doctor.dtx61
-rw-r--r--Master/texmf-dist/source/latex/disser/env.dtx2
-rw-r--r--Master/texmf-dist/source/latex/disser/gost705.dtx402
-rw-r--r--Master/texmf-dist/source/latex/disser/gost732.dtx50
-rw-r--r--Master/texmf-dist/source/latex/disser/master.dtx28
-rw-r--r--Master/texmf-dist/source/latex/disser/page.dtx13
-rw-r--r--Master/texmf-dist/source/latex/disser/sections.dtx5
-rw-r--r--Master/texmf-dist/source/latex/disser/titledefs.dtx75
-rw-r--r--Master/texmf-dist/source/latex/disser/titlepage.dtx48
-rw-r--r--Master/texmf-dist/source/latex/disser/toc.dtx5
-rw-r--r--Master/texmf-dist/tex/latex/disser/autoref.rtx15
-rw-r--r--Master/texmf-dist/tex/latex/disser/bachelor.rtx22
-rw-r--r--Master/texmf-dist/tex/latex/disser/candidate.rtx43
-rw-r--r--Master/texmf-dist/tex/latex/disser/disser.cls147
-rw-r--r--Master/texmf-dist/tex/latex/disser/doctor.rtx42
-rw-r--r--Master/texmf-dist/tex/latex/disser/gost732.cls2
-rw-r--r--Master/texmf-dist/tex/latex/disser/master.rtx19
-rw-r--r--Master/texmf-dist/tex/latex/disser/titledefs.rtx50
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds3
44 files changed, 1683 insertions, 948 deletions
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705.bst b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
index 5f732e239fb..e5ec00223c9 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705.bst
@@ -66,6 +66,8 @@ ENTRY
booklanguage
url
urldate
+ isbn
+ doi
}
{}
{ label }
@@ -304,7 +306,8 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
{ "Ed. by " }
{ curlanguage "russian" =
{ "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
- { "language is not defined: " language "edited by" * * warning$ "edited by" }
+ { "language is not defined: " language "edited by" * *
+ warning$ "edited by" }
if$
}
if$
@@ -373,7 +376,7 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
FUNCTION {bbl.iiss} % { "\bblIss{}" }
{
curlanguage "english" =
- {"Iss."}
+ { "Iss." }
{ curlanguage "russian" =
{ "{\cyr\CYRV\cyrery\cyrp.}" }
{ "language is not defined: " language * warning$ "Issue" }
@@ -385,7 +388,7 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
FUNCTION {bbl.of} % { "\bblof{}" }
{
curlanguage "english" =
- {"of"}
+ { "of" }
{ curlanguage "russian" =
{ "{\cyr\cyri\cyrz}" }
{ "language is not defined: " language "of" * * warning$ "of" }
@@ -493,7 +496,7 @@ FUNCTION {bbl.pages} % { "\bblpp." }
FUNCTION {bbl.page} % { "\bblp." }
{
curlanguage "english" =
- {"p."}
+ { "p." }
{ curlanguage "russian" =
{ "{\cyr\cyrs.}"}
{ "language is not defined: " language "p." * * warning$ "p." }
@@ -543,7 +546,8 @@ FUNCTION {bbl.mthesis}
curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Master's thesis" * * warning$ "P." }
if$
}
@@ -555,7 +559,8 @@ FUNCTION {bbl.phdthesis}
curlanguage "english" =
{ "Ph.D. thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Ph.D. thesis" * * warning$ "P." }
if$
}
@@ -574,8 +579,7 @@ FUNCTION {format.names}
{ s nameptr
"{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -583,8 +587,7 @@ FUNCTION {format.names}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
+ { t "others" =
t "~others" =
or
{ " " * bbl.etal * }
@@ -611,8 +614,7 @@ FUNCTION {format.names.rev}
{ s nameptr
"{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -620,10 +622,9 @@ FUNCTION {format.names.rev}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
- t "~others" =
- or
+ { t "others" =
+ t "~others" =
+ or
{ " " * bbl.etal * }
{ ", " * t * }
if$
@@ -699,9 +700,7 @@ FUNCTION {format.date}
year empty$
{ month empty$
{ "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "there's a month but no year in " cite$ * warning$ month }
if$
}
{ month empty$
@@ -927,8 +926,7 @@ FUNCTION {format.vol.num.pages}
volume field.or.null
number empty$
'skip$
- {
- ", no." number tie.or.space.connect *
+ { ", no." number tie.or.space.connect *
volume empty$
{ "there's a number but no volume in " cite$ * warning$ }
'skip$
@@ -998,8 +996,7 @@ FUNCTION {author.before}
{
author empty$
'skip$
- {
- format.authors output
+ { format.authors output
new.sentence
}
if$
@@ -1009,8 +1006,7 @@ FUNCTION {bookauthor.before}
{
bookauthor empty$
'skip$
- {
- format.bookauthors output
+ { format.bookauthors output
new.sentence
}
if$
@@ -1104,13 +1100,32 @@ FUNCTION {format.annote}
if$
}
+FUNCTION {format.isbn}
+{
+ isbn empty$
+ { "" }
+ { "ISBN~" isbn * }
+ if$
+}
+
+FUNCTION {add.doi}
+{ duplicate$ empty$
+ 'skip$
+ { doi empty$
+ 'skip$
+ { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+ if$
+ }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
format.title "title" output.check
new.dblslash
- journal emphasize "journal" output.check
+ journal emphasize add.doi "journal" output.check
new.block
format.date output
new.block
@@ -1130,7 +1145,7 @@ FUNCTION {book}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
editor.organization.after
new.sentence
format.number.series output
@@ -1143,6 +1158,8 @@ FUNCTION {book}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1172,7 +1189,7 @@ FUNCTION {inbook}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.dblslash
bookauthor.before
booktitle "booktitle" output.check
@@ -1188,6 +1205,8 @@ FUNCTION {inbook}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1200,7 +1219,7 @@ FUNCTION {incollection}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1225,7 +1244,7 @@ FUNCTION {inproceedings}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1279,8 +1298,7 @@ FUNCTION {manual}
'skip$
if$
}
- {
- organization address new.block.checkb
+ { organization address new.block.checkb
organization output
address output
}
@@ -1300,7 +1318,7 @@ FUNCTION {mastersthesis}
output.bibitem
format.authors "author" output.check
new.block
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.block
bbl.mthesis format.thesis.type output.nonnull
school "school" output.check
@@ -1337,7 +1355,7 @@ FUNCTION {phdthesis}
output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.column
bbl.phdthesis format.thesis.type output.nonnull
new.slash
@@ -1356,7 +1374,7 @@ FUNCTION {phdthesis}
FUNCTION {proceedings}
{
output.bibitem
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.slash
editor.organization.after
new.block
@@ -1385,7 +1403,7 @@ FUNCTION {techreport}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.column
format.tr.number output.nonnull
editor.organization.after
@@ -1419,69 +1437,141 @@ FUNCTION {unpublished}
FUNCTION {default.type} { misc }
MACRO {jan} {"\bbljan{}"}
-
MACRO {feb} {"\bblfeb{}"}
-
MACRO {mar} {"\bblmar{}"}
-
MACRO {apr} {"\bblapr{}"}
-
MACRO {may} {"\bblmay{}"}
-
MACRO {jun} {"\bbljun{}"}
-
MACRO {jul} {"\bbljul{}"}
-
MACRO {aug} {"\bblaug{}"}
-
MACRO {sep} {"\bblsep{}"}
-
MACRO {oct} {"\bbloct{}"}
-
MACRO {nov} {"\bblnov{}"}
-
MACRO {dec} {"\bbldec{}"}
-MACRO {acmcs} {"ACM Computing Surveys"}
-
-MACRO {acta} {"Acta Informatica"}
-
-MACRO {cacm} {"Communications of the ACM"}
-
-MACRO {ibmjrd} {"IBM Journal of Research and Development"}
-
-MACRO {ibmsj} {"IBM Systems Journal"}
-
-MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
-
-MACRO {ieeetc} {"IEEE Transactions on Computers"}
-
-MACRO {ieeetcad}
- {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
-
-MACRO {ipl} {"Information Processing Letters"}
-
-MACRO {jacm} {"Journal of the ACM"}
-
-MACRO {jcss} {"Journal of Computer and System Sciences"}
-
-MACRO {scp} {"Science of Computer Programming"}
-
-MACRO {sicomp} {"SIAM Journal on Computing"}
-
-MACRO {tocs} {"ACM Transactions on Computer Systems"}
-
-MACRO {tods} {"ACM Transactions on Database Systems"}
-
-MACRO {tog} {"ACM Transactions on Graphics"}
-
-MACRO {toms} {"ACM Transactions on Mathematical Software"}
-
-MACRO {toois} {"ACM Transactions on Office Information Systems"}
-
-MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
-
-MACRO {tcs} {"Theoretical Computer Science"}
+MACRO {aa}{"Astron. \& Astrophys."}
+MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
+MACRO {aj} {"Astron. J."}
+MACRO {aph} {"Acta Phys."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Amer. J. Phys."}
+MACRO {ajm} {"Amer. J. Math."}
+MACRO {amsci} {"Amer. Sci."}
+MACRO {anofd} {"Ann. Fluid Dyn."}
+MACRO {am} {"Ann. Math."}
+MACRO {ap} {"Ann. Phys. (NY)"}
+MACRO {adp} {"Ann. Phys. (Leipzig)"}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {app} {"Astroparticle Phys."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apjsup} {"Astrophys. J. Suppl."}
+MACRO {apss} {"Astrophys. Space Sci."}
+MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
+MACRO {baas} {"Bull. Amer. Astron. Soc."}
+MACRO {baps} {"Bull. Amer. Phys. Soc."}
+MACRO {cmp} {"Comm. Math. Phys."}
+MACRO {cpam} {"Commun. Pure Appl. Math."}
+MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
+MACRO {cpc} {"Comp. Phys. Comm."}
+MACRO {cqg} {"Class. Quant. Grav."}
+MACRO {cra} {"C. R. Acad. Sci. A"}
+MACRO {fed} {"Fusion Eng. \& Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {grg} {"Gen. Relativ. Gravit."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {irp} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jasa} {"J. Acoust. Soc. America"}
+MACRO {jcp} {"J. Comp. Phys."}
+MACRO {jetp} {"Sov. Phys.--JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
+MACRO {jnm} {"J. Nucl. Mat."}
+MACRO {jpc} {"J. Phys. Chem."}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Japan"}
+MACRO {jsi} {"J. Sci. Instrum."}
+MACRO {jvst} {"J. Vac. Sci. \& Tech."}
+MACRO {nat} {"Nature"}
+MACRO {nature} {"Nature"}
+MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Inst. \& Meth."}
+MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys. B"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {inc} {"Nuovo Cimento"}
+MACRO {nc} {"Nuovo Cimento"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
+MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
+MACRO {pl} {"Phys. Lett."}
+MACRO {pla} {"Phys. Lett. A"}
+MACRO {plb} {"Phys. Lett. B"}
+MACRO {prep} {"Phys. Rep."}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Phys. Plasmas"}
+MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
+MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pra} {"Phys. Rev. A"}
+MACRO {prb} {"Phys. Rev. B"}
+MACRO {prc} {"Phys. Rev. C"}
+MACRO {prd} {"Phys. Rev. D"}
+MACRO {pre} {"Phys. Rev. E"}
+MACRO {ps} {"Phys. Scripta"}
+MACRO {procrsl} {"Proc. Roy. Soc. London"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Inst."}
+MACRO {science} {"Science"}
+MACRO {sciam} {"Sci. Am."}
+MACRO {sam} {"Stud. Appl. Math."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspeki"}
+MACRO {st} {"Sky and Telesc."}
+
+MACRO {appopt} {"Appl. Opt."}
+MACRO {bell} {"Bell Syst. Tech. J."}
+MACRO {ell} {"Electron. Lett."}
+MACRO {jasp} {"J. Appl. Spectr."}
+MACRO {jqe} {"IEEE J. Quantum Electron."}
+MACRO {jlwt} {"J. Lightwave Technol."}
+MACRO {jmo} {"J. Mod. Opt."}
+MACRO {josa} {"J. Opt. Soc. America"}
+MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
+MACRO {josab} {"J. Opt. Soc. Amer.~B"}
+MACRO {jdp} {"J. Phys. (Paris)"}
+MACRO {oc} {"Opt. Commun."}
+MACRO {ol} {"Opt. Lett."}
+MACRO {os} {"Opt. Spectrosc."}
+MACRO {phtl} {"IEEE Photon. Technol. Lett."}
+MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
+MACRO {sjot} {"Sov. J. Opt. Technol."}
+MACRO {sjqe} {"Sov. J. Quantum Electron."}
+MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
+MACRO {stph} {"Sov. Phys.--Techn. Phys."}
+MACRO {stphl} {"Sov. Techn. Phys. Lett."}
+MACRO {vr} {"Vision Res."}
+MACRO {zph} {"Z. f. Physik"}
+MACRO {zphb} {"Z. f. Physik~B"}
+MACRO {zphd} {"Z. f. Physik~D"}
+
+MACRO {sse} {"Solid-State Electron."}
+MACRO {pss} {"Phys. Sol. State"}
+MACRO {sst} {"Semicond. Sci. Tech."}
READ
diff --git a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
index 335783ba0a4..7e087d4bdd2 100644
--- a/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
+++ b/Master/texmf-dist/bibtex/bst/disser/gost705s.bst
@@ -66,6 +66,8 @@ ENTRY
booklanguage
url
urldate
+ isbn
+ doi
}
{}
{ label }
@@ -304,7 +306,8 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
{ "Ed. by " }
{ curlanguage "russian" =
{ "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
- { "language is not defined: " language "edited by" * * warning$ "edited by" }
+ { "language is not defined: " language "edited by" * *
+ warning$ "edited by" }
if$
}
if$
@@ -373,7 +376,7 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
FUNCTION {bbl.iiss} % { "\bblIss{}" }
{
curlanguage "english" =
- {"Iss."}
+ { "Iss." }
{ curlanguage "russian" =
{ "{\cyr\CYRV\cyrery\cyrp.}" }
{ "language is not defined: " language * warning$ "Issue" }
@@ -385,7 +388,7 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
FUNCTION {bbl.of} % { "\bblof{}" }
{
curlanguage "english" =
- {"of"}
+ { "of" }
{ curlanguage "russian" =
{ "{\cyr\cyri\cyrz}" }
{ "language is not defined: " language "of" * * warning$ "of" }
@@ -493,7 +496,7 @@ FUNCTION {bbl.pages} % { "\bblpp." }
FUNCTION {bbl.page} % { "\bblp." }
{
curlanguage "english" =
- {"p."}
+ { "p." }
{ curlanguage "russian" =
{ "{\cyr\cyrs.}"}
{ "language is not defined: " language "p." * * warning$ "p." }
@@ -543,7 +546,8 @@ FUNCTION {bbl.mthesis}
curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Master's thesis" * * warning$ "P." }
if$
}
@@ -555,7 +559,8 @@ FUNCTION {bbl.phdthesis}
curlanguage "english" =
{ "Ph.D. thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Ph.D. thesis" * * warning$ "P." }
if$
}
@@ -574,8 +579,7 @@ FUNCTION {format.names}
{ s nameptr
"{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -583,8 +587,7 @@ FUNCTION {format.names}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
+ { t "others" =
t "~others" =
or
{ " " * bbl.etal * }
@@ -611,8 +614,7 @@ FUNCTION {format.names.rev}
{ s nameptr
"{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -620,10 +622,9 @@ FUNCTION {format.names.rev}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
- t "~others" =
- or
+ { t "others" =
+ t "~others" =
+ or
{ " " * bbl.etal * }
{ ", " * t * }
if$
@@ -699,9 +700,7 @@ FUNCTION {format.date}
year empty$
{ month empty$
{ "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "there's a month but no year in " cite$ * warning$ month }
if$
}
{ month empty$
@@ -927,8 +926,7 @@ FUNCTION {format.vol.num.pages}
volume field.or.null
number empty$
'skip$
- {
- ", no." number tie.or.space.connect *
+ { ", no." number tie.or.space.connect *
volume empty$
{ "there's a number but no volume in " cite$ * warning$ }
'skip$
@@ -998,8 +996,7 @@ FUNCTION {author.before}
{
author empty$
'skip$
- {
- format.authors output
+ { format.authors output
new.sentence
}
if$
@@ -1009,8 +1006,7 @@ FUNCTION {bookauthor.before}
{
bookauthor empty$
'skip$
- {
- format.bookauthors output
+ { format.bookauthors output
new.sentence
}
if$
@@ -1104,13 +1100,32 @@ FUNCTION {format.annote}
if$
}
+FUNCTION {format.isbn}
+{
+ isbn empty$
+ { "" }
+ { "ISBN~" isbn * }
+ if$
+}
+
+FUNCTION {add.doi}
+{ duplicate$ empty$
+ 'skip$
+ { doi empty$
+ 'skip$
+ { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+ if$
+ }
+ if$
+}
+
FUNCTION {article}
{
output.bibitem
author.before
format.title "title" output.check
new.dblslash
- journal emphasize "journal" output.check
+ journal emphasize add.doi "journal" output.check
new.block
format.date output
new.block
@@ -1130,7 +1145,7 @@ FUNCTION {book}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
editor.organization.after
new.sentence
format.number.series output
@@ -1143,6 +1158,8 @@ FUNCTION {book}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1172,7 +1189,7 @@ FUNCTION {inbook}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.dblslash
bookauthor.before
booktitle "booktitle" output.check
@@ -1188,6 +1205,8 @@ FUNCTION {inbook}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1200,7 +1219,7 @@ FUNCTION {incollection}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1225,7 +1244,7 @@ FUNCTION {inproceedings}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1279,8 +1298,7 @@ FUNCTION {manual}
'skip$
if$
}
- {
- organization address new.block.checkb
+ { organization address new.block.checkb
organization output
address output
}
@@ -1300,7 +1318,7 @@ FUNCTION {mastersthesis}
output.bibitem
format.authors "author" output.check
new.block
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.block
bbl.mthesis format.thesis.type output.nonnull
school "school" output.check
@@ -1337,7 +1355,7 @@ FUNCTION {phdthesis}
output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.column
bbl.phdthesis format.thesis.type output.nonnull
new.slash
@@ -1356,7 +1374,7 @@ FUNCTION {phdthesis}
FUNCTION {proceedings}
{
output.bibitem
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.slash
editor.organization.after
new.block
@@ -1385,7 +1403,7 @@ FUNCTION {techreport}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.column
format.tr.number output.nonnull
editor.organization.after
@@ -1419,69 +1437,141 @@ FUNCTION {unpublished}
FUNCTION {default.type} { misc }
MACRO {jan} {"\bbljan{}"}
-
MACRO {feb} {"\bblfeb{}"}
-
MACRO {mar} {"\bblmar{}"}
-
MACRO {apr} {"\bblapr{}"}
-
MACRO {may} {"\bblmay{}"}
-
MACRO {jun} {"\bbljun{}"}
-
MACRO {jul} {"\bbljul{}"}
-
MACRO {aug} {"\bblaug{}"}
-
MACRO {sep} {"\bblsep{}"}
-
MACRO {oct} {"\bbloct{}"}
-
MACRO {nov} {"\bblnov{}"}
-
MACRO {dec} {"\bbldec{}"}
-MACRO {acmcs} {"ACM Computing Surveys"}
-
-MACRO {acta} {"Acta Informatica"}
-
-MACRO {cacm} {"Communications of the ACM"}
-
-MACRO {ibmjrd} {"IBM Journal of Research and Development"}
-
-MACRO {ibmsj} {"IBM Systems Journal"}
-
-MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
-
-MACRO {ieeetc} {"IEEE Transactions on Computers"}
-
-MACRO {ieeetcad}
- {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
-
-MACRO {ipl} {"Information Processing Letters"}
-
-MACRO {jacm} {"Journal of the ACM"}
-
-MACRO {jcss} {"Journal of Computer and System Sciences"}
-
-MACRO {scp} {"Science of Computer Programming"}
-
-MACRO {sicomp} {"SIAM Journal on Computing"}
-
-MACRO {tocs} {"ACM Transactions on Computer Systems"}
-
-MACRO {tods} {"ACM Transactions on Database Systems"}
-
-MACRO {tog} {"ACM Transactions on Graphics"}
-
-MACRO {toms} {"ACM Transactions on Mathematical Software"}
-
-MACRO {toois} {"ACM Transactions on Office Information Systems"}
-
-MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
-
-MACRO {tcs} {"Theoretical Computer Science"}
+MACRO {aa}{"Astron. \& Astrophys."}
+MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
+MACRO {aj} {"Astron. J."}
+MACRO {aph} {"Acta Phys."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Amer. J. Phys."}
+MACRO {ajm} {"Amer. J. Math."}
+MACRO {amsci} {"Amer. Sci."}
+MACRO {anofd} {"Ann. Fluid Dyn."}
+MACRO {am} {"Ann. Math."}
+MACRO {ap} {"Ann. Phys. (NY)"}
+MACRO {adp} {"Ann. Phys. (Leipzig)"}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {app} {"Astroparticle Phys."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apjsup} {"Astrophys. J. Suppl."}
+MACRO {apss} {"Astrophys. Space Sci."}
+MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
+MACRO {baas} {"Bull. Amer. Astron. Soc."}
+MACRO {baps} {"Bull. Amer. Phys. Soc."}
+MACRO {cmp} {"Comm. Math. Phys."}
+MACRO {cpam} {"Commun. Pure Appl. Math."}
+MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
+MACRO {cpc} {"Comp. Phys. Comm."}
+MACRO {cqg} {"Class. Quant. Grav."}
+MACRO {cra} {"C. R. Acad. Sci. A"}
+MACRO {fed} {"Fusion Eng. \& Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {grg} {"Gen. Relativ. Gravit."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {irp} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jasa} {"J. Acoust. Soc. America"}
+MACRO {jcp} {"J. Comp. Phys."}
+MACRO {jetp} {"Sov. Phys.--JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
+MACRO {jnm} {"J. Nucl. Mat."}
+MACRO {jpc} {"J. Phys. Chem."}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Japan"}
+MACRO {jsi} {"J. Sci. Instrum."}
+MACRO {jvst} {"J. Vac. Sci. \& Tech."}
+MACRO {nat} {"Nature"}
+MACRO {nature} {"Nature"}
+MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Inst. \& Meth."}
+MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys. B"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {inc} {"Nuovo Cimento"}
+MACRO {nc} {"Nuovo Cimento"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
+MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
+MACRO {pl} {"Phys. Lett."}
+MACRO {pla} {"Phys. Lett. A"}
+MACRO {plb} {"Phys. Lett. B"}
+MACRO {prep} {"Phys. Rep."}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Phys. Plasmas"}
+MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
+MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pra} {"Phys. Rev. A"}
+MACRO {prb} {"Phys. Rev. B"}
+MACRO {prc} {"Phys. Rev. C"}
+MACRO {prd} {"Phys. Rev. D"}
+MACRO {pre} {"Phys. Rev. E"}
+MACRO {ps} {"Phys. Scripta"}
+MACRO {procrsl} {"Proc. Roy. Soc. London"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Inst."}
+MACRO {science} {"Science"}
+MACRO {sciam} {"Sci. Am."}
+MACRO {sam} {"Stud. Appl. Math."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspeki"}
+MACRO {st} {"Sky and Telesc."}
+
+MACRO {appopt} {"Appl. Opt."}
+MACRO {bell} {"Bell Syst. Tech. J."}
+MACRO {ell} {"Electron. Lett."}
+MACRO {jasp} {"J. Appl. Spectr."}
+MACRO {jqe} {"IEEE J. Quantum Electron."}
+MACRO {jlwt} {"J. Lightwave Technol."}
+MACRO {jmo} {"J. Mod. Opt."}
+MACRO {josa} {"J. Opt. Soc. America"}
+MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
+MACRO {josab} {"J. Opt. Soc. Amer.~B"}
+MACRO {jdp} {"J. Phys. (Paris)"}
+MACRO {oc} {"Opt. Commun."}
+MACRO {ol} {"Opt. Lett."}
+MACRO {os} {"Opt. Spectrosc."}
+MACRO {phtl} {"IEEE Photon. Technol. Lett."}
+MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
+MACRO {sjot} {"Sov. J. Opt. Technol."}
+MACRO {sjqe} {"Sov. J. Quantum Electron."}
+MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
+MACRO {stph} {"Sov. Phys.--Techn. Phys."}
+MACRO {stphl} {"Sov. Techn. Phys. Lett."}
+MACRO {vr} {"Vision Res."}
+MACRO {zph} {"Z. f. Physik"}
+MACRO {zphb} {"Z. f. Physik~B"}
+MACRO {zphd} {"Z. f. Physik~D"}
+
+MACRO {sse} {"Solid-State Electron."}
+MACRO {pss} {"Phys. Sol. State"}
+MACRO {sst} {"Semicond. Sci. Tech."}
READ
@@ -1544,15 +1634,11 @@ FUNCTION {author.sort}
{
author empty$
{ key empty$
- { "to sort, need author or key in " cite$ * warning$
- ""
- }
+ { "to sort, need author or key in " cite$ * warning$ "" }
{ key sortify }
if$
}
- {
- author sort.format.names
- }
+ { author sort.format.names }
if$
}
@@ -1561,18 +1647,14 @@ FUNCTION {author.title.sort}
author empty$
{ title empty$
{ key empty$
- { "to sort, need author, title, or key in " cite$ * warning$
- ""
- }
+ { "to sort, need author, title, or key in " cite$ * warning$ "" }
{ key sortify }
if$
}
{ title sort.format.title }
if$
}
- {
- author sort.format.names
- }
+ { author sort.format.names }
if$
}
diff --git a/Master/texmf-dist/doc/latex/disser/ChangeLog b/Master/texmf-dist/doc/latex/disser/ChangeLog
index ec87878c944..f4c51a14415 100644
--- a/Master/texmf-dist/doc/latex/disser/ChangeLog
+++ b/Master/texmf-dist/doc/latex/disser/ChangeLog
@@ -1,7 +1,22 @@
disser changelog
-Copyright (C) 2004-2009 Stanislav Kruchinin
+Copyright (C) 2004-2010 Stanislav Kruchinin
-------------------------------------------
+Summary of changes in version 1.1.5 (2010-03-23):
+
+Classes and styles:
++ Add support for classified dissertations.
++ Add support for ISBN and DOI to gost705 style.
++ Add "colorlinks" option.
++ Add scientific consultant field.
+* Fix compatibility with latest versions of "hyperref" and "oberdiek"
+ packages.
+
+Templates:
++ Enable "colorlinks" option by default.
++ Add examples of "isbn" and "doi" fields.
+
+
Summary of changes in version 1.1.4 (2009-11-20):
Classes and styles:
diff --git a/Master/texmf-dist/doc/latex/disser/README b/Master/texmf-dist/doc/latex/disser/README
index 98cdad0d40b..6cabff88b48 100644
--- a/Master/texmf-dist/doc/latex/disser/README
+++ b/Master/texmf-dist/doc/latex/disser/README
@@ -3,20 +3,22 @@ Overview
The "disser" package provides LaTeX classes, bibliography styles and document
templates for typesetting dissertations and author's abstracts that would
-satisfy requirements of dissertation councils and High Certification
+satisfy the requirements of a dissertation councils and High Certification
Commission of Russian Federation.
-Recommended packages and programs
----------------------------------
+Required packages and programs
+------------------------------
-It is recommended to install the following third party LaTeX packages:
-amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, natbib,
-oberdiek, hyperref, hypernat, subfig, wrapfig, and packages for russian
-language support in LaTeX.
+For installation and working with documents you will need the following
+third-party packages:
+amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions, natbib,
+hyperref, hypernat, subfig, wrapfig, and packages for russian language support
+in LaTeX.
-For typesetting documents using Times font family you should install
-pscyr or cyrtimes (text fonts), txfonts or mtpro (math fonts).
+For typesetting documents using Times font family you should install the
+following packages: pscyr or cyrtimes (text fonts), txfonts or mtpro (math
+fonts).
For automated processing of figures you should install the following programs:
Ghostscript, epstool and sam2p.
@@ -55,18 +57,25 @@ Installation
1. Installation from sources
-In Unix-like environment:
+Enter the following commands in the command prompt
+
+in a Unix-like environment:
env DESTDIR=/path/to/texmf make install
-In Windows:
+in Windows:
set DESTDIR=disk:\path\to\texmf
nomake install
-Here /path/to/texmf is the path to TeX directory tree.
-
+Here /path/to/texmf and disk:\path\to\texmf are the paths to TeX directory tree.
After installation you should update the filename database with the command
mktexlsr
+Example of commands for MiKTeX version 2.8:
+ set DESTDIR=C:\Documents and Settings\All Users\Application Data\MiKTeX\2.8
+ nomake install
+ mktexlsr
+
+
2. Installation from ZIP archive in TDS format
The ZIP file disser.tds.zip contains files sorted in a TDS tree. This means
diff --git a/Master/texmf-dist/doc/latex/disser/README.ru b/Master/texmf-dist/doc/latex/disser/README.ru
index 72147812e44..291390b8c01 100644
--- a/Master/texmf-dist/doc/latex/disser/README.ru
+++ b/Master/texmf-dist/doc/latex/disser/README.ru
@@ -10,8 +10,8 @@
Для корректной сборки документов в вашем дистрибутиве LaTeX должны быть
установлены следующие пакеты:
-amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, natbib,
-oberdiek, hyperref, hypernat, subfig, wrapfig, а также пакеты для поддержки
+amsfonts, amsmath, amssymb, caption, cmap, graphicx, ifpdf, kvoptions,
+natbib, hyperref, subfig, wrapfig, а также пакеты для поддержки
русского языка.
Для использования шрифта Times в текстовом режиме следует установить
@@ -54,25 +54,38 @@ ZIP-архив с готовыми файлами и документацией, которые размещены в
1. Из исходных текстов
-В Unix-like ОС:
+Для установки необходимо перейти в каталог с распакованными исходными
+текстами и выполнить следующие команды
+
+в Unix-подобных окружениях:
env DESTDIR=/путь/к/texmf make install
-В Windows:
+в Windows:
set DESTDIR=диск:\путь\к\texmf
nomake install
-Здесь /путь/к/texmf -- путь к дереву каталогов TeX.
-
+Здесь /путь/к/texmf и диск:\путь\к\texmf -- пути к дереву каталогов TeX.
После установки следует обновить базу имен файлов с помощью команды
mktexlsr
+Пример команд для дистрибутива MiKTeX версии 2.8:
+ set DESTDIR=%ALLUSERSPROFILE%\Application Data\MiKTeX\2.8
+ nomake install
+ mktexlsr
+
2. Из ZIP-архива со скомпилированными файлами
-Файл disser.tds.zip содержит собранные файлы классов и документации,
-поэтому его можно просто распаковать в каталог TeX.
+Файл disser-<version>.tds.zip содержит собранные файлы классов и
+документации, поэтому его можно просто распаковать в каталог TeX.
+Пример для Unix-подобных окружений:
cd /путь/к/texmf
- unzip /путь/к/файлу/disser.tds.zip
+ unzip /путь/к/файлу/disser-<version>.tds.zip
+ mktexlsr
+
+Пример для Windows:
+ cd диск:\путь\к\texmf
+ unzip диск:\путь\к\файлу\disser-<version>.tds.zip
mktexlsr
diff --git a/Master/texmf-dist/doc/latex/disser/manual.tex b/Master/texmf-dist/doc/latex/disser/manual.tex
index 1f9480a235c..6531a321885 100644
--- a/Master/texmf-dist/doc/latex/disser/manual.tex
+++ b/Master/texmf-dist/doc/latex/disser/manual.tex
@@ -5,29 +5,25 @@
\definecolor{darkblue}{rgb}{0,0,.6}
\ifpdf
- \usepackage[%
- pdftex,
- colorlinks,
- plainpages = false,
- pdftitle = {User manual for disser package},
- pdfauthor = {Stanislav Kruchinin},
- pdfsubject = {disser},
- pdfstartview = {FitH},
- pdfborder = {0 0 0},
- bookmarksopen,
- bookmarksnumbered,
- bookmarksopenlevel = 2,
- pdfusetitle,unicode]{hyperref}
+ \usepackage[pdftex,hyperindex,unicode]{hyperref}
\usepackage{cmap}
\else
\usepackage[hypertex]{hyperref}
\fi
\hypersetup{
- colorlinks = true,
- linkcolor = darkblue, citecolor = darkblue,
- filecolor = darkblue, menucolor = darkblue,
- urlcolor = darkblue
+ pdfusetitle,
+ pdftitle = {User manual for disser package},
+ pdfauthor = {Stanislav Kruchinin},
+ pdfsubject = {disser},
+ pdfstartview = {FitH},
+ pdfborder = {0 0 0},
+ bookmarksopen = true,
+ bookmarksnumbered = true,
+ bookmarksopenlevel = 2,
+ colorlinks = true, linkcolor = darkblue,
+ citecolor = darkblue, filecolor = darkblue,
+ menucolor = darkblue, urlcolor = darkblue
}
\IfFileExists{pscyr.sty}{%
@@ -60,7 +56,7 @@
\let\makelabel\deflabel}
}{\end{list}}
-\def\fileversion{1.1.4}
+\def\fileversion{1.1.5}
\begin{document}
\sloppy
@@ -86,11 +82,11 @@
\section{Введение}
Пакет \pkg{disser} предназначен для верстки диссертаций и авторефератов в соответствии с требованиями диссертационных советов и ВАК.
-В состав пакета входят классы \file{disser.cls} и \file{gost732.cls}, стили оформления библиографии \file{gost705.bst}, \file{gost705s.bst}, а также скрипты для сборки пакета и документов (\file{Makefile}, \file{nomake.cmd}, файлы с расширением \file{mk} и \file{cmd}).
+В состав пакета входят классы \file{disser.cls} и \file{gost732.cls}, стили оформления библиографии \file{gost705.bst}, \file{gost705s.bst}, а также скрипты для сборки пакета и документов (\file{Makefile}, \file{nomake.cmd}, файлы с расширениями \file{mk} и \file{cmd} в каталоге \file{include}).
Поскольку дипломы и диссертации имеют фиксированную структуру, в пакет также включены их шаблоны (каталог \file{templates}), которые рекомендуется использовать для создания своих документов.
Одной из основных целей создания \pkg{disser} являлось устранение общего недостатка стандартных классов: отсутствия возможности настройки формата элементов титульного листа, заголовков и записей в автоматически генерируемых списках.
-Для достижения этой цели была переопределена значительная часть команд, входящих в ядро \LaTeX{}, и введен ряд глобальных переменных, которые описаны в комментариях к исходным текстам.
+Для достижения этой цели была переопределена значительная часть команд, входящих в ядро \LaTeX{}, и введен ряд новых переменных, которые описаны в комментариях к исходным текстам.
Это позволило значительно упростить разработку пользовательских классов, которые удовлетворяют специфическим требованиями учебных заведений и диссертационных советов.
Примером реализации этого подхода является класс \pkg{gost732}.
@@ -104,12 +100,14 @@
\newcolumntype{L}{>{\raggedright}p{4.5cm}}
\begin{tabularx}{\textwidth}{L|X}
\hline\hline
- \textbf{a4paper}, a5paper, b5paper &
- Размеры листов.
-\\\hline
+\multicolumn{2}{c}{\textbf{Стандартные опции}}\\
+\hline
8pt, 9pt, 10pt, 11pt, 12pt, \textbf{14pt}, 16pt, 18pt, 20pt &
Размер шрифта основного текста.
\\\hline
+ \textbf{a4paper}, a5paper, b5paper &
+ Размеры листов.
+\\\hline
landscape &
Альбомная ориентация.
\\\hline
@@ -117,18 +115,7 @@
Односторонняя или двухсторонняя печать.
\\\hline
draft, \textbf{final} &
- Выводить (draft) или нет (final) пометки, фиксирующие переполнение |\hbox|
- для данной строки.
-\\\hline
- \textbf{titlepage}, notitlepage &
- Печатать титульный лист или нет.
-\\\hline
- openright, \textbf{openany} &
- Главы всегда будут начинаться только с нечетных страниц (т.е. справа, если
- смотреть на разворот) или c любых.
-\\\hline
- \textbf{onecolumn}, twocolumn &
- Верстка в один или в два столбца.
+ Выводить (draft) или нет (final) пометки, фиксирующие переполнение горизонтального блока для данной строки.
\\\hline
fleqn &
Выключные формулы будут выравнены по левому краю, а не по центру.
@@ -136,25 +123,34 @@
leqno &
Номера будут размещены слева, а не справа от формул.
\\\hline
+ \textbf{openany}, openright &
+ Главы всегда будут начинаться только с нечетных страниц (т.\,е. справа, если смотреть на разворот) или c любых.
+\\\hline
+ \textbf{onecolumn}, twocolumn &
+ Верстка в один или в два столбца.
+\\\hline
openbib &
Блоки текста в списке литературы будут печататься на новых строках и с
отступом.
\\\hline
- noams &
- Не подключать пакеты \pkg{amsmath}, \pkg{amssymb} и \pkg{amsfonts} из класса.
+ \textbf{titlepage}, notitlepage &
+ Печатать титульный лист или нет.
\\\hline
- subf &
- Подключение пакета \pkg{subfig} для ведения вложенной нумерации рисунков.
+\multicolumn{2}{c}{\textbf{Специфические настройки класса}}
\\\hline
- href &
- Подключение пакета \pkg{hyperref} для создания гиперссылок.
+ autoref, bachelor, master, \textbf{candidate}, doctor &
+ Тип документа: автореферат, бакалаврский диплом, магистерская, кандидатская или докторская диссертация.
\\\hline
- times &
- Включает использование гарнитуры Times в тексте и формулах.
- Для использования опции необходимо установить пакеты \pkg{pscyr} (или \pkg{cyrtimes}) и \pkg{txfonts} (или \pkg{mtpro}).
+ classified &
+ Включает вывод грифа секретности на титульном листе.
\\\hline
- autoref, bachelor, master, \textbf{candidate}, doctor &
- Тип документа.
+ colorlinks = \{true$\,\vert\,$\textbf{false}\} &
+ Создание цветных гиперссылок.
+ Цвета определяются соответствующими параметрами пакета \pkg{hyperref}.
+\\\hline
+ facsimile &
+ Включает отображение подписей диссертанта и ученого секретаря на титульных листах автореферата и диссертации (только для кандидатских и докторских).
+ По умолчанию включена только в шаблоне автореферата.
\\\hline
fixint = \{\textbf{true}$\,\vert\,$false\} &
Замена стандартных знаков интегралов на прямые (из математического шрифта
@@ -163,13 +159,28 @@
libcat &
Включает вывод номера УДК на титульном листе.
\\\hline
- facsimile &
- Включает отображение подписей диссертанта и ученого секретаря на титульных листах автореферата и диссертации (только для кандидатских и докторских).
- По умолчанию включена только в шаблоне автореферата.
+ titlepagefile = filename.rtx &
+ Файл с описанием разметки титульного листа.
+ По умолчанию имя файла определяется типом документа.
+\\\hline
+\multicolumn{2}{c}{\textbf{Опции для подключения и настройки сторонних пакетов}}
+\\\hline
+ href &
+ Подключение пакета \pkg{hyperref} для создания гиперссылок.
+\\\hline
+ noams &
+ Не подключать пакеты \pkg{amsmath}, \pkg{amssymb} и \pkg{amsfonts} из класса.
+\\\hline
+ subf &
+ Подключение пакета \pkg{subfig} для ведения вложенной нумерации рисунков.
+\\\hline
+ times &
+ Использование гарнитуры Times в тексте и формулах.
+ Необходимо установить пакеты \pkg{pscyr} или \pkg{cyrtimes} (для текста), \pkg{txfonts} или \pkg{mtpro} (для формул).
\\\hline
mtpro &
Использование математических шрифтов MathTime Pro.
- При наличии опции times вместо пакета \pkg{txfonts} подключается пакет \pkg{mtpro}.
+ При наличии опции \cmd{times} вместо пакета \pkg{txfonts} подключается пакет \pkg{mtpro}.
\\\hline\hline
\end{tabularx}
@@ -196,7 +207,7 @@ nomake <target1> <target2> ...
\item[all]
Сборка классов и шаблонов.
\item[clean]
- Цель |clean| в каталогах \cmd{src} и \cmd{templates}.
+ Цель \cmd{clean} в каталогах \file{src} и \file{templates}.
\item[doc]
Сборка DVI- и PDF-версий документации.
\item[help]
@@ -352,6 +363,7 @@ nomake <target1> <target2> ...
Стиль колонтитулов обычных страниц документа задается в преамбуле командой |\pagestyle{<style>}|, а стиль страниц, с которых начинается новая глава "--- командой |\chapterpagestyle{<style>}|.
Здесь |<style>| может принимать следующие значения:
\begin{deflist}{headcenter }
+\item[empty] Страница без номера.
\item[footleft] Номер внизу и слева.
\item[footcenter] Номер внизу и по середине.
\item[footright] Номер внизу и справа.
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
index a2d5cb84f29..1d21813106c 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/1.tex
@@ -35,7 +35,6 @@ Anselm_1978,Segall_1968,Agranovich_1983,InP}. Ссылка на формулу~\eqref{eq:e}
\begin{table}[!ht]
\centering
\caption{Пример таблицы}\label{tab:t1}
- \vskip1.em
\begin{tabular}{l|ccc}
\hline\hline
& \quad$\lambda \times 10^{-11}$,~$\text{дин}\times\text{см}^{-2}$\quad &
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
index 19f2cd1c771..bdbf9e416e8 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.bib
@@ -1,60 +1,65 @@
@ARTICLE{Yoffe_1993_AP_42_173,
- author = {A. D. Yoffe},
- title = {Low-dimensional systems: quantum size effects and electronic
- properties of semiconductor microcrystallites (zero-dimensional
- systems) and some quasi-two-dimensional systems},
- journal = {Adv. Phys.},
- pages = {173--266},
- volume = {42},
- year = {1993}
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
}
@ARTICLE{Efros_1982_FTP_16_7_1209,
- author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
- title = {Межзонное поглощение света в полупроводниковом шаре},
- journal = {Физика и техника полупроводников},
- year = {1982},
- volume = {16},
- number = {7},
- pages = {1209--1214},
- language = {russian},
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
}
@BOOK{Anselm_1978,
- author = {А. И. Ансельм},
- title = {Введение в теорию полупроводников},
- publisher = {Наука},
- address = {Москва},
- year = {1978},
- language = {russian}
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
}
@INPROCEEDINGS{Segall_1968,
- author = {B. Segall},
- year = {1968},
- editor = {S. M. Ryvkin},
- booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
- pages = {425},
- address = {Leningrad},
- publisher = {Nauka}
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
}
@INBOOK{Agranovich_1983,
- editor = {V. M. Agranovich and R. M. Hochstrasser},
- title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems},
- chapter = {6},
- publisher = {North-Holland},
- year = {1983},
- series = {Modern Problems in Condensed Matter Sciences},
- address = {Amsterdam}
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {978-0444863133},
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
- booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+ title = {InP Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
- address = {St. Petersburg},
- year = {2001},
- url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
- urldate = {01.11.2009}
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
index 49b851a4015..96e36e32161 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/bachelor/thesis.tex
@@ -1,4 +1,4 @@
-\documentclass[bachelor,subf,href
+\documentclass[bachelor,subf,href,colorlinks=true
%,fixint=false
%,times
]{disser}
@@ -15,7 +15,7 @@
% Номера страниц сверху и по центру
%\def\headfont{\small}
%\pagestyle{headcenter}
-%\chapterpagestyle{headcenter}
+%\chapterpagestyle{empty}
% Использовать полужирное начертание для векторов
\let\vec=\mathbf
@@ -24,16 +24,16 @@
\setcounter{tocdepth}{2}
\graphicspath{{fig/}}
-% ----------------------------------------------------------------
+
\begin{document}
-% Название организации
-\institution{%
-Название организации
-}
+
+\institution{Название организации}
+
% Имя лица, допускающего к защите (зав. кафедрой)
\apname{ФИО зав. кафедрой}
+
\title{ВЫПУСКНАЯ РАБОТА\\БАКАЛАВРА}
-% Тема
+
\topic{Тема работы}
% Автор
@@ -51,14 +51,11 @@
\date{\number\year}
\maketitle
-% ----------------------------------------------------------------
\tableofcontents
-% ----------------------------------------------------------------
\input{intro}
\input{1}
\input{concl}
-% ----------------------------------------------------------------
+
\bibliography{thesis}
\bibliographystyle{gost705}
\end{document}
-% ----------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
index 90e388bf73b..def8c4cfd2d 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/autoref.tex
@@ -1,6 +1,7 @@
-\documentclass[14pt,autoref,href,facsimile
+\documentclass[autoref,subf,href,facsimile
%,fixint=false
%,times
+%,classified
]{disser}
\usepackage[a4paper,nohead,includefoot,mag=1000,
@@ -25,6 +26,11 @@
% (текст титульного листа и характеристика работы).
\input{common}
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
\title{АВТОРЕФЕРАТ\\
диссертации на соискание ученой степени\\
кандидата физико-математических наук}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex
index 5512a5d6031..34108dc8233 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/common.tex
@@ -11,6 +11,9 @@
\sa{ФИО руководителя}
\sastatus{д.~ф.-м.~н., проф.}
+%\scon{ФИО консультанта}
+%\sconstatus{д.~ф.-м.~н., проф.}
+
\city{Санкт-Петербург}
\date{\number\year}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
index 2a326a07a1f..dfe9fbfdb33 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.bib
@@ -1,79 +1,94 @@
@ARTICLE{Ivanov_1999_Journal_17_173,
- author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
- title = {Название статьи},
- journal = {Название журнала},
- volume = {17},
- pages = {173--180},
- year = {1999},
- language = {russian}
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
- author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
- title = {Название статьи},
- journal = {Название журнала},
- volume = {23},
- pages = {12321--12328},
- year = {2001},
- language = {russian}
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
- author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
- title = {Article Title},
- journal = {Journal Name},
- volume = {32},
- pages = {1531--1540},
- year = {2002}
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
}
@ARTICLE{Yoffe_1993_AP_42_173,
- author = {A. D. Yoffe},
- title = {Low-dimensional systems: quantum size effects and electronic
- properties of semiconductor microcrystallites (zero-dimensional
- systems) and some quasi-two-dimensional systems},
- journal = {Adv. Phys.},
- pages = {173--266},
- volume = {42},
- year = {1993},
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
}
@ARTICLE{Efros_1982_FTP_16_7_1209,
- author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
- title = {Межзонное поглощение света в полупроводниковом шаре},
- journal = {Физика и техника полупроводников},
- year = {1982},
- volume = {16},
- number = {7},
- pages = {1209--1214},
- language = {russian},
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
}
@BOOK{Anselm_1978,
- author = {А. И. Ансельм},
- title = {Введение в теорию полупроводников},
- publisher = {Наука},
- address = {Москва},
- year = {1978},
- language = {russian}
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
}
@INPROCEEDINGS{Segall_1968,
- author = {B. Segall},
- year = {1968},
- editor = {S. M. Ryvkin},
- booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
- pages = {425},
- address = {Leningrad},
- publisher = {Nauka},
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+@INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {978-0444863133},
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
- booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+ title = {InP Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
- address = {St. Petersburg},
- year = {2001},
- url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
- urldate = {01.11.2009}
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
index 3c9e1264c2a..5c9c5237b25 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/candidate/thesis.tex
@@ -1,7 +1,8 @@
-\documentclass[candidate,subf,href
+\documentclass[candidate,subf,href,colorlinks=true
%,fixint=false
-%,facsimile
%,times
+%,facsimile
+%,classified
]{disser}
\usepackage[
@@ -16,7 +17,7 @@
% Номера страниц сверху и по центру
%\def\headfont{\small}
%\pagestyle{headcenter}
-%\chapterpagestyle{headcenter}
+%\chapterpagestyle{empty}
% Ссылки на работы соискателя включаются в общий список литературы
\let\citemy=\cite
@@ -32,22 +33,27 @@
% (текст титульного листа и характеристика работы).
\input{common}
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
\title{ДИССЕРТАЦИЯ\\
на соискание ученой степени\\
кандидата физико-математических наук}
\maketitle
-% ----------------------------------------------------------------
+
\tableofcontents
-% ----------------------------------------------------------------
+
\input{intro}
\input{review}
\input{1}
\input{concl}
-% ----------------------------------------------------------------
+
\bibliography{thesis}
\bibliographystyle{gost705}
-% ----------------------------------------------------------------
+
\appendix
\input{app-a}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
index afe43989319..28cda484a7b 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/autoref.tex
@@ -1,6 +1,7 @@
\documentclass[14pt,autoref,href,facsimile
%,fixint=false
%,times
+%,classified
]{disser}
\usepackage[a4paper,nohead,includefoot,mag=1000,
@@ -25,6 +26,11 @@
% (текст титульного листа и характеристика работы).
\input{common}
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
\title{АВТОРЕФЕРАТ\\
диссертации на соискание ученой степени\\
доктора физико-математических наук}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex
index f7d99501b36..ff7c5dacf13 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/common.tex
@@ -4,10 +4,12 @@
\topic{Тема диссертации}
\author{ФИО автора}
-
\specnum{11.11.11}
\spec{Специальность}
+\scon{ФИО консультанта}
+\sconstatus{д.~ф.-м.~н., проф.}
+
\city{Санкт-Петербург}
\date{\number\year}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
index 2a326a07a1f..772598038ca 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
@@ -1,79 +1,95 @@
@ARTICLE{Ivanov_1999_Journal_17_173,
- author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
- title = {Название статьи},
- journal = {Название журнала},
- volume = {17},
- pages = {173--180},
- year = {1999},
- language = {russian}
+ author = {И. И. Иванов and П. П. Петров and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {17},
+ pages = {173--180},
+ year = {1999},
+ language = {russian},
}
@ARTICLE{Petrov_2001_Journal_23_12321,
- author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
- title = {Название статьи},
- journal = {Название журнала},
- volume = {23},
- pages = {12321--12328},
- year = {2001},
- language = {russian}
+ author = {П. П. Петров and И. И. Иванов and С. С. Сидоров},
+ title = {Название статьи},
+ journal = {Название журнала},
+ volume = {23},
+ pages = {12321--12328},
+ year = {2001},
+ language = {russian},
}
@ARTICLE{Sidorov_2002_Journal_32_1531,
- author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
- title = {Article Title},
- journal = {Journal Name},
- volume = {32},
- pages = {1531--1540},
- year = {2002}
+ author = {S. S. Sidorov and P. P. Petrov and I. I. Ivanov},
+ title = {Article Title},
+ journal = {Journal Name},
+ volume = {32},
+ pages = {1531--1540},
+ year = {2002},
}
@ARTICLE{Yoffe_1993_AP_42_173,
- author = {A. D. Yoffe},
- title = {Low-dimensional systems: quantum size effects and electronic
- properties of semiconductor microcrystallites (zero-dimensional
- systems) and some quasi-two-dimensional systems},
- journal = {Adv. Phys.},
- pages = {173--266},
- volume = {42},
- year = {1993},
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
}
@ARTICLE{Efros_1982_FTP_16_7_1209,
- author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
- title = {Межзонное поглощение света в полупроводниковом шаре},
- journal = {Физика и техника полупроводников},
- year = {1982},
- volume = {16},
- number = {7},
- pages = {1209--1214},
- language = {russian},
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
}
@BOOK{Anselm_1978,
- author = {А. И. Ансельм},
- title = {Введение в теорию полупроводников},
- publisher = {Наука},
- address = {Москва},
- year = {1978},
- language = {russian}
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
}
@INPROCEEDINGS{Segall_1968,
- author = {B. Segall},
- year = {1968},
- editor = {S. M. Ryvkin},
- booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
- pages = {425},
- address = {Leningrad},
- publisher = {Nauka},
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
+}
+
+@INBOOK{Agranovich_1983,
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {978-0444863133},
}
@INCOLLECTION{InP,
- title = {InP Basic Parameters at 300 K},
- booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+ title = {InP Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
- address = {St. Petersburg},
- year = {2001},
- url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
- urldate = {01.11.2009}
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
}
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
index a681a6e0e26..230faea0217 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.tex
@@ -1,7 +1,8 @@
-\documentclass[doctor,subf,href
+\documentclass[doctor,subf,href,colorlinks=true
%,fixint=false
-%,facsimile
%,times
+%,facsimile
+%,classified
]{disser}
\usepackage[
@@ -16,7 +17,7 @@
% Номера страниц сверху и по центру
%\def\headfont{\small}
%\pagestyle{headcenter}
-%\chapterpagestyle{headcenter}
+%\chapterpagestyle{empty}
% Ссылки на работы соискателя включаются в общий список литературы
\let\citemy=\cite
@@ -32,22 +33,27 @@
% (текст титульного листа и характеристика работы).
\input{common}
+% номер копии для грифа секретности
+%\copynum{1}
+% класс доступа
+%\classlabel{Для служебного пользования}
+
\title{ДИССЕРТАЦИЯ\\
на соискание ученой степени\\
доктора физико-математических наук}
\maketitle
-% ----------------------------------------------------------------
+
\tableofcontents
-% ----------------------------------------------------------------
+
\input{intro}
\input{review}
\input{1}
\input{concl}
-% ----------------------------------------------------------------
+
\bibliography{thesis}
\bibliographystyle{gost705}
-% ----------------------------------------------------------------
+
\appendix
\input{app-a}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
index 87dee2d3828..ca96fb9e885 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.bib
@@ -1,60 +1,66 @@
@ARTICLE{Yoffe_1993_AP_42_173,
- author = {A. D. Yoffe},
- title = {Low-dimensional systems: quantum size effects and electronic
- properties of semiconductor microcrystallites (zero-dimensional
- systems) and some quasi-two-dimensional systems},
- journal = {Adv. Phys.},
- pages = {173--266},
- volume = {42},
- year = {1993}
+ author = {A. D. Yoffe},
+ title = {Low-dimensional systems: quantum size effects and electronic
+ properties of semiconductor microcrystallites (zero-dimensional
+ systems) and some quasi-two-dimensional systems},
+ journal = {Adv. Phys.},
+ pages = {173--266},
+ volume = {42},
+ year = {1993},
+ doi = {10.1080/00018739300101484},
}
@ARTICLE{Efros_1982_FTP_16_7_1209,
- author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
- title = {Межзонное поглощение света в полупроводниковом шаре},
- journal = {Физика и техника полупроводников},
- year = {1982},
- volume = {16},
- number = {7},
- pages = {1209--1214},
- language = {russian},
+ author = {{\relax Ал}. Л. Эфрос and А. Л. Эфрос},
+ title = {Межзонное поглощение света в полупроводниковом шаре},
+ journal = {Физика и техника полупроводников},
+ year = {1982},
+ volume = {16},
+ number = {7},
+ pages = {1209--1214},
+ language = {russian},
}
@BOOK{Anselm_1978,
- author = {А. И. Ансельм},
- title = {Введение в теорию полупроводников},
- publisher = {Наука},
- address = {Москва},
- year = {1978},
- language = {russian}
+ author = {А. И. Ансельм},
+ title = {Введение в теорию полупроводников},
+ publisher = {Наука},
+ address = {Москва},
+ year = {1978},
+ language = {russian},
}
@INPROCEEDINGS{Segall_1968,
- author = {B. Segall},
- year = {1968},
- editor = {S. M. Ryvkin},
- booktitle = {Proceedings of IXth Conference on the Physics of Semiconductors, Moscow, 1968},
- pages = {425},
- address = {Leningrad},
- publisher = {Nauka}
+ author = {B. Segall},
+ year = {1968},
+ editor = {S. M. Ryvkin},
+ booktitle = {Proceedings of IXth Conference on the Physics of
+ Semiconductors, Moscow, 1968},
+ pages = {425},
+ address = {Leningrad},
+ publisher = {Nauka},
}
@INBOOK{Agranovich_1983,
- editor = {V. M. Agranovich and R. M. Hochstrasser},
- title = {Spectroscopy and Excitation Dynamics of Condensed Molecular Systems},
- chapter = {6},
- publisher = {North-Holland},
- year = {1983},
- series = {Modern Problems in Condensed Matter Sciences},
- address = {Amsterdam}
+ editor = {V. M. Agranovich and R. M. Hochstrasser},
+ title = {Spectroscopy and Excitation Dynamics of Condensed Molecular
+ Systems},
+ chapter = {6},
+ publisher = {North-Holland},
+ year = {1983},
+ series = {Modern Problems in Condensed Matter Sciences},
+ address = {Amsterdam},
+ isbn = {978-0444863133},
}
-@incollection{InP,
- title = {InP Basic Parameters at 300 K},
- booktitle = {Electronic archive New Semiconductor Materials. Characteristics and Properties},
+@INCOLLECTION{InP,
+ title = {InP Basic Parameters at 300 K},
+ booktitle = {Electronic archive New Semiconductor Materials.
+ Characteristics and Properties},
organization = {Ioffe Physico-Technical Institute},
- address = {St. Petersburg},
- year = {2001},
- url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
- urldate = {01.11.2009}
+ address = {St. Petersburg},
+ year = {2001},
+ url = {http://www.ioffe.rssi.ru/SVA/NSM/Semicond/InP/basic.html},
+ urldate = {01.11.2009},
}
+
diff --git a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
index 6a726e04cd0..0f72b327ecb 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
+++ b/Master/texmf-dist/doc/latex/disser/templates/master/thesis.tex
@@ -1,4 +1,4 @@
-\documentclass[master,subf,href
+\documentclass[master,subf,href,colorlinks=true
%,fixint=false
%,times
]{disser}
@@ -15,22 +15,25 @@
% Номера страниц сверху и по центру
%\def\headfont{\small}
%\pagestyle{headcenter}
-%\chapterpagestyle{headcenter}
+%\chapterpagestyle{empty}
% Использовать полужирное начертание для векторов
\let\vec=\mathbf
+% Включать подсекции в оглавление
+\setcounter{tocdepth}{2}
+
\graphicspath{{fig/}}
-% --------------------------------------------------------------------------
+
\begin{document}
-% Название организации
-\institution{%
-Название организации
-}
+
+\institution{Название организации}
+
% Имя лица, допускающего к защите (зав. кафедрой)
\apname{ФИО зав. кафедрой}
+
\title{ДИССЕРТАЦИЯ\\[-14pt]на соискание ученой степени\\МАГИСТРА}
-% Тема
+
\topic{Тема диссертации}
% Автор
@@ -59,15 +62,17 @@
\date{\number\year}
\maketitle
-%---------------------------------------------------------------------------
+
\tableofcontents
-%---------------------------------------------------------------------------
+
\input{intro}
\input{1}
\input{concl}
-\appendix
-\input{app-a}
-%---------------------------------------------------------------------------
+
\bibliography{thesis}
\bibliographystyle{gost705}
+
+\appendix
+\input{app-a}
+
\end{document}
diff --git a/Master/texmf-dist/source/latex/disser/autoref.dtx b/Master/texmf-dist/source/latex/disser/autoref.dtx
index b8957d8cd8a..da00aba6590 100644
--- a/Master/texmf-dist/source/latex/disser/autoref.dtx
+++ b/Master/texmf-dist/source/latex/disser/autoref.dtx
@@ -14,18 +14,40 @@
\deflength\fourthskip{1cm}
\deflength\fifthskip{1cm}
+% \end{macrocode}
+% Шрифты элементов титульного листа.
+% \DescribeMacro{\titlefont}\index{Макросы!\verb*+\titlefont+}
+% \DescribeMacro{\topicfont}\index{Макросы!\verb*+\topicfont+}
+% \DescribeMacro{\authorfont}\index{Макросы!\verb*+\authorfont+}
+% \DescribeMacro{\specfont}\index{Макросы!\verb*+\specfont+}
+% \begin{macrocode}
\def\titlefont{\normalsize}
\def\topicfont{\Large\bfseries}
\def\authorfont{\large}
\def\specfont{\normalsize}
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+% \end{macrocode}
+% \paragraph{Название организации}
+% \begin{macrocode}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
+\vskip\firstskip
\normalfont
+
\begin{flushright}
% \end{macrocode}
+% Гриф секретности
+% \begin{macrocode}
+ \ifDis@classified\classify\fi
+% \end{macrocode}
% На правах рукописи
% \begin{macrocode}
- \vskip\firstskip
- \asmanuscriptname\\
+ \asmanuscript
\ifDis@facsimile\facsimile\fi
\end{flushright}
\begin{center}
@@ -49,6 +71,11 @@
% \begin{macrocode}
\vskip\fifthskip
{\titlefont\@title}
+% \end{macrocode}
+% \paragraph{Город и год}
+% \begin{macrocode}
+ \vfill
+ {\@city\cdsep\@date}
\end{center}
%</autoref>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/bachelor.dtx b/Master/texmf-dist/source/latex/disser/bachelor.dtx
index 5e8a6d21e3d..0c96c01273c 100644
--- a/Master/texmf-dist/source/latex/disser/bachelor.dtx
+++ b/Master/texmf-dist/source/latex/disser/bachelor.dtx
@@ -13,7 +13,6 @@
% \DescribeMacro{\fourthskip}\index{Расстояния!\verb*+\fourthskip+}
% \DescribeMacro{\fifthskip}\index{Расстояния!\verb*+\fifthskip+}
% \begin{macrocode}
-
\deflength\firstskip{1.5cm}
\deflength\secondskip{1.5cm}
\deflength\thirdskip{1ex}
@@ -36,27 +35,39 @@
% \begin{macrocode}
\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra}
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+% \end{macrocode}
+% \paragraph{Название организации}
+% \begin{macrocode}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
% \end{macrocode}
% Диссертация допущена к защите
% \begin{macrocode}
-\vskip\firstskip
+\vskip\firstskip\normalfont
\@approved
\vskip\secondskip
+
% \end{macrocode}
% Заголовок, тема.
% \begin{macrocode}
\begin{center}
{\titlefont\@title\par}
- \vskip\thirdskip
- {\topiclabelfont\topiclabel\;}
+ \vskip\thirdskip\normalfont
+ {\topiclabelfont\topiclabel\ }%
{\topicfont\@topic\par}
\vskip\fourthskip\normalfont
\courselabel\ \@coursenum~--\ \@course
\end{center}
+
% \end{macrocode}
% Специальность, автор, руководитель.
% \begin{macrocode}
-\vskip\fifthskip
+\vskip\fifthskip\normalfont
\begin{tabbing}
\studentlabel\ \groupname\ \@group\hspace{2cm}\=
\makebox[8.5cm][l]{\hrulefill\ \@author}
@@ -66,5 +77,12 @@
% \begin{macrocode}
\field{sa}
\end{tabbing}
+% \end{macrocode}
+% \paragraph{Город и год}
+% \begin{macrocode}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
%</bachelor>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/candidate.dtx b/Master/texmf-dist/source/latex/disser/candidate.dtx
index 0f9e04ac509..ceb6e6573cc 100644
--- a/Master/texmf-dist/source/latex/disser/candidate.dtx
+++ b/Master/texmf-dist/source/latex/disser/candidate.dtx
@@ -24,8 +24,13 @@
\deflength\thirdskip{1cm}
\deflength\fourthskip{1cm}
\deflength\fifthskip{1cm}
-\deflength\sixthskip{0pt}
+\deflength\sixthskip{0cm}
+\deflength\seventhskip{0cm}
+% \end{macrocode}
+% Горизонтальный отступ перед описанием научного руководителя и консультанта.
+% \DescribeMacro{\@sahshift}\index{Расстояния!\verb*+"\"@sahshift+}
+% \begin{macrocode}
\deflength\@sahshift{8cm}
% \end{macrocode}
@@ -40,51 +45,84 @@
\def\authorfont{\large}
\def\specfont{\normalsize}
-\vskip\firstskip
-\normalfont
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+
+% \end{macrocode}
+% \paragraph{Название организации}
+% \begin{macrocode}
+\begin{center}
+ \instfont\@institution\par
+\end{center}
+
+\vskip\firstskip\normalfont
\begin{flushright}
% \end{macrocode}
+% Гриф секретности
+% \begin{macrocode}
+ \ifDis@classified\classify\fi
+% \end{macrocode}
% На правах рукописи
% \begin{macrocode}
- \asmanuscriptname\\
+ \asmanuscript
+% \end{macrocode}
+% Факсимиле
+% \begin{macrocode}
\ifDis@facsimile\facsimile\fi
% \end{macrocode}
% Номер УДК
% \begin{macrocode}
- \ifDis@libcat
- {\libcatname\ \@libcatnum}
- \fi
+ \ifDis@libcat\libcatname\ \@libcatnum\fi
\end{flushright}
\begin{center}
% \end{macrocode}
% Автор
% \begin{macrocode}
- \vskip\secondskip
+ \vskip\secondskip\normalfont
{\authorfont\@author}
% \end{macrocode}
% Название диссертации
% \begin{macrocode}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
{\topicfont\@topic\par}
% \end{macrocode}
% Шифр и наименование специальности
% \begin{macrocode}
- \vskip\fourthskip
+ \vskip\fourthskip\normalfont
{\specfont\@specnum~--\ \@spec}
% \end{macrocode}
% Диссертация на соискание ученой степени...
% \begin{macrocode}
- \vskip\fifthskip
+ \vskip\fifthskip\normalfont
{\titlefont\@title}
\end{center}
% \end{macrocode}
% Научный руководитель
% \begin{macrocode}
-\vskip\sixthskip
+\vskip\sixthskip\normalfont
\begin{tabbing}
\hspace{\@sahshift}\={\saname}\\
\>\@sastatus\\
\>\@sa
\end{tabbing}
+% \end{macrocode}
+% Научный консультант
+% \begin{macrocode}
+\ifx\@scon\empty\else
+ \vskip\seventhskip\normalfont
+ \begin{tabbing}
+ \hspace{\@sahshift}\={\sconname}\\
+ \>\@sconstatus\\
+ \>\@scon
+ \end{tabbing}
+\fi
+% \end{macrocode}
+% \paragraph{Город и год}
+% \begin{macrocode}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
%</candidate>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/chapter.dtx b/Master/texmf-dist/source/latex/disser/chapter.dtx
index c29e0df9eb6..f78b06f0b0c 100644
--- a/Master/texmf-dist/source/latex/disser/chapter.dtx
+++ b/Master/texmf-dist/source/latex/disser/chapter.dtx
@@ -49,20 +49,20 @@
\providecommand\chapterfont{\Large\bfseries}
\providecommand\beforechapter{}
\providecommand\afterchapter{\par\nobreak\vskip 20\p@}
-\providecommand\chapterindent{0pt}
+\providecommand\chapterindent{0\p@}
% \end{macrocode}
%
% \subsubsection{Низкоуровневые команды}
%
-% \DescribeMacro{\chaptermark}\index{Макросы!\verb*+\chaptermark+}
% Пустое определение колонтитула главы.
+% \DescribeMacro{\chaptermark}\index{Макросы!\verb*+\chaptermark+}
% \begin{macrocode}
\newcommand*\chaptermark[1]{}
% \end{macrocode}
-% \DescribeMacro{\chapter}\index{Макросы!\verb*+"\chapter+}
% Интерфейс.
+% \DescribeMacro{\chapter}\index{Макросы!\verb*+"\chapter+}
% \begin{macrocode}
\newcommand\chapter{%
\if@openright
@@ -77,9 +77,8 @@
}
% \end{macrocode}
-%
-% \DescribeMacro{\@chapter}\index{Макросы!\verb+"\"@chapter+}
% Команда, формирующая нумеруемый заголовок |\chapter|.
+% \DescribeMacro{\@chapter}\index{Макросы!\verb+"\"@chapter+}
% \begin{macrocode}
\def\@chapter[#1]#2{
\ifnum \c@secnumdepth >\m@ne
@@ -98,10 +97,10 @@
\@afterheading
\fi
}
+
% \end{macrocode}
-%
-% \DescribeMacro{\@makechapterhead}\index{Макросы!\verb+"\"@makechapterhead+}
% Формат нумеруемого заголовка.
+% \DescribeMacro{\@makechapterhead}\index{Макросы!\verb+"\"@makechapterhead+}
% \begin{macrocode}
\def\@makechapterhead#1{{%
\parindent\z@
@@ -114,9 +113,8 @@
}}
% \end{macrocode}
-%
-% \DescribeMacro{\@schapter}\index{Макросы!\verb+"\"@schapter+}
% Команда, формирующая ненумеруемый заголовок |\chapter*|.
+% \DescribeMacro{\@schapter}\index{Макросы!\verb+"\"@schapter+}
% \begin{macrocode}
\def\@schapter#1{
\if@twocolumn
@@ -138,6 +136,7 @@
\interlinepenalty\@M
\chapteralign\chapterfont\beforechapter #1\afterchapter
}}
+
% \end{macrocode}
%
% \DescribeMacro{\l@chapter}\index{Макросы!\verb+"\l"@chapter+}
@@ -206,13 +205,13 @@
\providecommand\appendixfont{\Large\bfseries}
\providecommand\beforeappendix{}
\providecommand\afterappendix{\par\nobreak\vskip 20\p@}
-\providecommand\appendixindent{0pt}
+\providecommand\appendixindent{0\p@}
% \end{macrocode}
%
-% \DescribeMacro{\appendix}\index{Макросы!\verb*+\appendix+}
% Команда для создания глав приложений. Сохранение и восстановление
% значений параметров формата глав делаются для случая, когда
% приложения идут до списка литературы.
+% \DescribeMacro{\appendix}\index{Макросы!\verb*+\appendix+}
% \begin{macrocode}
\newcommand\appendix{
\setcounter{chapter}{0}
@@ -267,8 +266,8 @@
}
% \end{macrocode}
-% \DescribeMacro{\noappendix}\index{Макросы!\verb*+\noappendix+}
% Восстановление исходных параметров формата заголовков глав.
+% \DescribeMacro{\noappendix}\index{Макросы!\verb*+\noappendix+}
% \begin{macrocode}
\newcommand\noappendix{
\let\tocprethechapter=\oldtocprethechapter
diff --git a/Master/texmf-dist/source/latex/disser/custom.dtx b/Master/texmf-dist/source/latex/disser/custom.dtx
index 85e07e68f1c..bb25f3f8d15 100644
--- a/Master/texmf-dist/source/latex/disser/custom.dtx
+++ b/Master/texmf-dist/source/latex/disser/custom.dtx
@@ -7,7 +7,7 @@
%<*custom>
% \end{macrocode}
-% \subsection{Подключение и настройка сторонних пакетов}
+% \subsection{Подключение и настройка часто используемых пакетов}
%
% \DescribePackage{amsmath}\index{Пакеты!\verb*+amsmath+}
% \DescribePackage{amssymb}\index{Пакеты!\verb*+amssymb+}
@@ -159,8 +159,8 @@
% \end{macrocode}
% \subsubsection{Плавающие объекты}
%
-% \DescribePackage{wrapfig}\index{Пакеты!\verb*+wrapfig+}
% Плавающие рисунки <<в оборку>>.
+% \DescribePackage{wrapfig}\index{Пакеты!\verb*+wrapfig+}
% \begin{macrocode}
\usepackage{wrapfig}
% \end{macrocode}
@@ -178,7 +178,6 @@
% \end{macrocode}
% Формат ссылки через |\ref|.
% \DescribeMacro{\thefigsubsep}\index{Макросы!\verb*+\thefigsubsep+}
-% Разделитель между номером и буквой.
% \begin{macrocode}
\providecommand\thefigsubsep{,~}
\def\p@subfigure{\@nameuse{thefigure}\thefigsubsep}
@@ -221,21 +220,26 @@
% \begin{macrocode}
\usepackage{graphicx}
\fi
+\ifDis@href
% \end{macrocode}
-% Пакеты для исправления ошибок \pkg{hyperref}.
-% \DescribePackage{hypernat}\index{Пакеты!\verb*+hypernat+}
-% \DescribePackage{hypcap}\index{Пакеты!\verb*+hypcap+}
+% Включение и настройка цветных ссылок.
% \begin{macrocode}
-\ifDis@href
- \usepackage{hypernat}
- \usepackage[all]{hypcap}
+ \ifDis@colorlinks
+ \usepackage{color}
+ \definecolor{darkblue}{rgb}{0,0,.6}
+ \hypersetup{
+ colorlinks = true, linkcolor = darkblue,
+ citecolor = darkblue, filecolor = darkblue,
+ menucolor = darkblue, urlcolor = darkblue
+ }
+ \fi
\fi
% \end{macrocode}
-% \DescribeMacro{\metaphantom}\index{Макросы!\verb*+\metaphantom+}
% Команда, создающая цель для гиперссылок над заголовками ненумеруемых разделов.
+% \DescribeMacro{\metaphantom}\index{Макросы!\verb*+\metaphantom+}
% \begin{macrocode}
-\def\metaphantom#1{%
+\providecommand\metaphantom[1]{%
\ifDis@href
\Hy@GlobalStepCount\Hy@linkcounter
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
diff --git a/Master/texmf-dist/source/latex/disser/disser.dtx b/Master/texmf-dist/source/latex/disser/disser.dtx
index 38ff7592474..30d6d2581ff 100644
--- a/Master/texmf-dist/source/latex/disser/disser.dtx
+++ b/Master/texmf-dist/source/latex/disser/disser.dtx
@@ -19,13 +19,12 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{disser.drv}[2009/11/20 1.1.4 Document class for dissertations]
+\ProvidesFile{disser.drv}[2009/03/23 1.1.5 Document class for dissertations]
\documentclass{ltxdoc}
-\usepackage[a4paper, includeheadfoot, nohead, mag=1000,
- left=5cm, right=1cm, top=1.5cm, bottom=1.5cm]{geometry}
-\usepackage{ifpdf,indentfirst,tabularx,doc}
-\usepackage{makeidx,longtable,color}
+\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
+ left=5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry}
+\usepackage{ifpdf,indentfirst,tabularx,doc,makeidx,longtable,color}
\definecolor{darkblue}{rgb}{0,0,.6}
@@ -37,6 +36,7 @@
\fi
\hypersetup{
+ pdfusetitle,
pdftitle = {Documented source code of the disser package},
pdfauthor = {Stanislav Kruchinin},
pdfsubject = {disser},
@@ -109,9 +109,9 @@
\makeindex
+\GetFileInfo{disser.drv}
\begin{document}
-\sloppy
- \PrintChanges
+ \sloppy
\DocInput{disser.dtx}
\DocInput{counters.dtx}
\DocInput{part.dtx}
@@ -135,7 +135,6 @@
\end{document}
%</driver>
% \fi
-% \GetFileInfo{disser.drv}
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -181,12 +180,14 @@
%<*disser>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2009/11/20 1.1.4 Document class for dissertations]
+\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations]
% \end{macrocode}
-% Расширение файлов, включаемых в |disser.cls|.
+% Подключение пакета \pkg{kvoptions} для обработки опций в формате
+% <<ключ = значение>>.
+% \DescribePackage{kvoptions}\index{Пакеты!\verb*+kvoptions+}
% \begin{macrocode}
-\def\substyle@ext{.rtx}
+\RequirePackage{kvoptions}
% \end{macrocode}
% Определение операторов условного выполнения.
@@ -221,6 +222,10 @@
% \begin{macrocode}
\newif\ifDis@libcat\Dis@libcatfalse
% \end{macrocode}
+% \item Отображение грифа секретности на титульном листе (отключено).
+% \begin{macrocode}
+\newif\ifDis@classified\Dis@classifiedfalse
+% \end{macrocode}
% \item Отображение подписей диссертанта и ученого секретаря (отключено).
% \begin{macrocode}
\newif\ifDis@facsimile\Dis@facsimilefalse
@@ -251,13 +256,6 @@
%
% \subsection{Опции класса}
%
-% Подключение пакета \pkg{kvoptions} для обработки опций в формате
-% <<ключ = значение>>.
-% \DescribePackage{kvoptions}\index{Пакеты!\verb*+kvoptions+}
-% \begin{macrocode}
-\RequirePackage{kvoptions}[2006/08/17]
-
-% \end{macrocode}
% Подключение пакета \pkg{hyperref} и необходимых настроек.
% \begin{macrocode}
\DeclareOption{href}{\Dis@hreftrue}
@@ -270,6 +268,10 @@
% \begin{macrocode}
\DeclareOption{libcat}{\Dis@libcattrue}
% \end{macrocode}
+% Отображение грифа секретности.
+% \begin{macrocode}
+\DeclareOption{classified}{\Dis@classifiedtrue}
+% \end{macrocode}
% Отображение подписей диссертанта и ученого секретаря.
% \begin{macrocode}
\DeclareOption{facsimile}{\Dis@facsimiletrue}
@@ -277,23 +279,7 @@
% Не подключать пакеты \pkg{amsmath}, \pkg{amsfonts}, \pkg{amssymb}.
% \begin{macrocode}
\DeclareOption{noams}{\Dis@amsfalse}
-
-% \end{macrocode}
-% Настройка опций.
-% \begin{macrocode}
-\SetupKeyvalOptions{
- family=Dis,
- prefix=Dis@
-}
-
-% \end{macrocode}
-% Исправление знаков интегралов и пределов интегрирования на более
-% привычные.
-% \begin{macrocode}
-\DeclareBoolOption[true]{fixint}
-
% \end{macrocode}
-%
% Размеры листов.
% \begin{macrocode}
\DeclareOption{a4paper}{%
@@ -435,6 +421,22 @@
\Dis@autoreftrue
}
+\SetupKeyvalOptions{
+ family=Dis,
+ prefix=Dis@
+}
+
+% \end{macrocode}
+% Исправление знаков интегралов и пределов интегрирования на более
+% привычные.
+% \begin{macrocode}
+\DeclareBoolOption[true]{fixint}
+% \end{macrocode}
+% Создание цветных ссылок.
+% \begin{macrocode}
+\DeclareBoolOption[false]{colorlinks}
+\DeclareStringOption{titlepagefile}
+
% \end{macrocode}
% Выполнение опций по умолчанию.
% \begin{macrocode}
@@ -446,7 +448,18 @@
\ProcessOptions
% \end{macrocode}
-% Команды изменения регистра. Им самое место в ядре.
+% Файл с описанием разметки титульного листа по умолчанию.
+% \begin{macrocode}
+\ifx\Dis@titlepagefile\@empty
+ \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi
+ \ifDis@master \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi
+ \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi
+ \ifDis@doctor \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi
+ \ifDis@autoref \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi
+\fi
+
+% \end{macrocode}
+% Команды изменения регистра.
% \DescribeMacro{\MakeTextUppercase}\index{Макросы!\verb*+\MakeTextUppercase+}
% \begin{macrocode}
\DeclareRobustCommand\MakeTextUppercase{%
@@ -471,6 +484,7 @@
\DeclareFontShape{#1}{#2}{#3}{#4}%
{<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74>%
<24.88><29.86><35.83><42.99><51.59>genb*#5}{}}
+
\EC@family{T1}{cmr}{m}{n}{ecrm}
\EC@family{T1}{cmr}{m}{sl}{ecsl}
\EC@family{T1}{cmr}{m}{it}{ecti}
@@ -481,45 +495,49 @@
\EC@family{T1}{cmr}{bx}{sl}{ecbl}
\EC@family{T1}{cmr}{bx}{sc}{ecxc}
\EC@family{T1}{cmr}{m}{ui}{ecui}
-\DeclareFontShape{OT1}{cmr}{m}{n}%
- {<5><6><7><8><9><10><12>gen*cmr%
- <10.95>cmr10%
- <14.4>cmr12%
- <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17}{}
-\DeclareFontShape{OT1}{cmr}{m}{sl}%
- {<5><6><7>cmsl8%
- <8><9>gen*cmsl%
- <10><10.95>cmsl10%
- <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{it}%
- {<5><6><7>cmti7%
- <8>cmti8%
- <9>cmti9%
- <10><10.95>cmti10%
- <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{sc}%
- {<5><6><7><8><9><10><10.95><12>%
- <14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmcsc10%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{ui}{
+
+\DeclareFontShape{OT1}{cmr}{m}{n}{%
+ <5><6><7><8><9><10><12>gen*cmr%
+ <10.95>cmr10%
+ <14.4>cmr12%
+ <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{sl}{%
+ <5><6><7>cmsl8%
+ <8><9>gen*cmsl%
+ <10><10.95>cmsl10%
+ <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{it}{%
+ <5><6><7>cmti7%
+ <8>cmti8%
+ <9>cmti9%
+ <10><10.95>cmti10%
+ <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{sc}{%
+ <5><6><7><8><9><10><10.95><12>%
+ <14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmcsc10%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{ui}{%
<5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmu10%
}{}
-\DeclareFontShape{OT1}{cmr}{b}{n}{
+\DeclareFontShape{OT1}{cmr}{b}{n}{%
<5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmb10%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{n}{
+\DeclareFontShape{OT1}{cmr}{bx}{n}{%
<5><6><7><8><9>gen*cmbx%
<10><10.95>cmbx10%
<12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbx12%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{sl}{<5><6><7><8><9>%
+\DeclareFontShape{OT1}{cmr}{bx}{sl}{%
+ <5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{it}{<5><6><7><8><9>%
+\DeclareFontShape{OT1}{cmr}{bx}{it}{%
+ <5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10%
}{}
\input{size\@ptsize.clo}
diff --git a/Master/texmf-dist/source/latex/disser/doctor.dtx b/Master/texmf-dist/source/latex/disser/doctor.dtx
index 5bf6b770de0..63cb124038e 100644
--- a/Master/texmf-dist/source/latex/disser/doctor.dtx
+++ b/Master/texmf-dist/source/latex/disser/doctor.dtx
@@ -23,6 +23,13 @@
\deflength\thirdskip{1cm}
\deflength\fourthskip{1cm}
\deflength\fifthskip{1cm}
+\deflength\sixthskip{0cm}
+
+% \end{macrocode}
+% Горизонтальный отступ перед описанием научного руководителя и консультанта.
+% \DescribeMacro{\@sahshift}\index{Расстояния!\verb*+"\"@sahshift+}
+% \begin{macrocode}
+\deflength\@sahshift{8cm}
% \end{macrocode}
% Шрифты элементов титульного листа.
@@ -36,42 +43,74 @@
\def\authorfont{\large}
\def\specfont{\normalsize}
-\vskip\firstskip
-\normalfont
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+
+% \end{macrocode}
+% \paragraph{Название организации}
+% \begin{macrocode}
+\begin{center}
+ \instfont\@institution\par
+\end{center}
+\vskip\firstskip\normalfont
\begin{flushright}
% \end{macrocode}
+% Гриф секретности
+% \begin{macrocode}
+ \ifDis@classified\classify\fi
+% \end{macrocode}
% На правах рукописи
% \begin{macrocode}
- \asmanuscriptname\\
+ \asmanuscript
+% \end{macrocode}
+% Факсимиле
+% \begin{macrocode}
\ifDis@facsimile\facsimile\fi
% \end{macrocode}
% Номер УДК
% \begin{macrocode}
-\ifDis@libcat
- {\libcatname\ \@libcatnum}
-\fi
+ \ifDis@libcat\libcatname\ \@libcatnum\fi
\end{flushright}
\begin{center}
% \end{macrocode}
% Автор
% \begin{macrocode}
- \vskip\secondskip
+ \vskip\secondskip\normalfont
{\authorfont\@author}
% \end{macrocode}
% Название диссертации
% \begin{macrocode}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
{\topicfont\@topic\par}
% \end{macrocode}
% Шифр и наименование специальности
% \begin{macrocode}
- \vskip\fourthskip
- {\specfont\@specnum~--\;\@spec}
+ \vskip\fourthskip\normalfont
+ {\specfont\@specnum~--\ \@spec}
% \end{macrocode}
% Диссертация на соискание ученой степени...
% \begin{macrocode}
- \vskip\fifthskip
+ \vskip\fifthskip\normalfont
{\titlefont\@title}
\end{center}
+% \end{macrocode}
+% Научный консультант
+% \begin{macrocode}
+\ifx\@scon\empty\else
+ \vskip\sixthskip\normalfont
+ \begin{tabbing}
+ \hspace{\@sahshift}\={\sconname}\\
+ \>\@sconstatus\\
+ \>\@scon
+ \end{tabbing}
+\fi
+% \end{macrocode}
+% \paragraph{Город и год}
+% \begin{macrocode}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
%</doctor>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/env.dtx b/Master/texmf-dist/source/latex/disser/env.dtx
index 2c419560422..c1372c1394c 100644
--- a/Master/texmf-dist/source/latex/disser/env.dtx
+++ b/Master/texmf-dist/source/latex/disser/env.dtx
@@ -118,7 +118,7 @@
% \subsubsection{Генератор окружений типа <<теорема>>}
%
% \DescribeMacro{\newtheorem}\index{Макросы!\verb*+\newtheorem+}
-% Переопределяем |\newtheorem|, так чтобы автоматически создавались
+% Переопределяем |\newtheorem| так, чтобы автоматически создавались
% параметры формата теорем.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/gost705.dtx b/Master/texmf-dist/source/latex/disser/gost705.dtx
index db917197217..85ff7cc3da5 100644
--- a/Master/texmf-dist/source/latex/disser/gost705.dtx
+++ b/Master/texmf-dist/source/latex/disser/gost705.dtx
@@ -22,7 +22,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{gost705.drv}[2009/11/20 1.1.4 Bibliography style for dissertations.]
+\ProvidesFile{gost705.drv}[2009/03/23 1.1.5 Bibliography style for dissertations.]
\documentclass{ltxdoc}
\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
@@ -31,29 +31,25 @@
\definecolor{darkblue}{rgb}{0,0,.6}
\ifpdf
- \usepackage[%
- pdftex,
- colorlinks,
- plainpages=false,
- pdftitle = {Documented source code of the disser package},
- pdfauthor = {Stanislav Kruchinin},
- pdfsubject = {disser},
- pdfstartview = {FitH},
- pdfborder = {0 0 0},
- bookmarksopen,
- bookmarksnumbered,
- bookmarksopenlevel = 2,
- pdfusetitle,
- unicode]{hyperref}
+ \usepackage[pdftex,hyperindex,unicode]{hyperref}
\usepackage{cmap}
\else
\usepackage[hypertex]{hyperref}
\fi
\hypersetup{
- colorlinks = true, linkcolor = darkblue,
- citecolor = darkblue, filecolor = darkblue,
- menucolor = darkblue, urlcolor = darkblue
+ pdfusetitle,
+ pdftitle = {Documented source code of disser package},
+ pdfauthor = {Stanislav Kruchinin},
+ pdfsubject = {disser},
+ pdfstartview = {FitH},
+ pdfborder = {0 0 0},
+ bookmarksopen = true,
+ bookmarksnumbered = true,
+ bookmarksopenlevel = 2,
+ colorlinks = true, linkcolor = darkblue,
+ citecolor = darkblue, filecolor = darkblue,
+ menucolor = darkblue, urlcolor = darkblue
}
\IfFileExists{pscyr.sty}{%
@@ -67,6 +63,7 @@
}{}
}
\IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}}
+
\usepackage[T2A]{fontenc}
\usepackage[cp1251]{inputenc}
\usepackage[english,russian]{babel}
@@ -110,16 +107,15 @@
\makeindex
+\GetFileInfo{gost705.drv}
\begin{document}
\sloppy
- \PrintChanges
\DocInput{gost705.dtx}
\IndexPrologue{\section{Предметный указатель}}
\printindex
\end{document}
%</driver>
% \fi
-% \GetFileInfo{gost705.drv}
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -174,6 +170,8 @@ ENTRY
booklanguage
url
urldate
+ isbn
+ doi
}
{}
{ label }
@@ -493,12 +491,16 @@ FUNCTION {bbl.edby} % { "\bbledby{}" }
{ "Ed. by " }
{ curlanguage "russian" =
{ "{\cyr\CYRP\cyro\cyrd\ \cyrr\cyre\cyrd.\ }" }
- { "language is not defined: " language "edited by" * * warning$ "edited by" }
+ { "language is not defined: " language "edited by" * *
+ warning$ "edited by" }
if$
}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.cmplr}
+% \begin{macrocode}
FUNCTION {bbl.cmplr}
{
curlanguage "english" =
@@ -511,6 +513,9 @@ FUNCTION {bbl.cmplr}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.edition}
+% \begin{macrocode}
FUNCTION {bbl.edition} % { "\bbledition{}" }
{
curlanguage "english" =
@@ -523,6 +528,9 @@ FUNCTION {bbl.edition} % { "\bbledition{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.vvolume}
+% \begin{macrocode}
FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
{
curlanguage "english" =
@@ -535,6 +543,9 @@ FUNCTION {bbl.vvolume} % { "\bblVolume{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.vvol}
+% \begin{macrocode}
FUNCTION {bbl.vvol} % { "\bblVol{}" }
{
curlanguage "english" =
@@ -547,6 +558,9 @@ FUNCTION {bbl.vvol} % { "\bblVol{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.iissue}
+% \begin{macrocode}
FUNCTION {bbl.iissue} % { "\bblIssue{}" }
{
curlanguage "english" =
@@ -559,10 +573,13 @@ FUNCTION {bbl.iissue} % { "\bblIssue{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.iiss}
+% \begin{macrocode}
FUNCTION {bbl.iiss} % { "\bblIss{}" }
{
curlanguage "english" =
- {"Iss."}
+ { "Iss." }
{ curlanguage "russian" =
{ "{\cyr\CYRV\cyrery\cyrp.}" }
{ "language is not defined: " language * warning$ "Issue" }
@@ -571,10 +588,13 @@ FUNCTION {bbl.iiss} % { "\bblIss{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.of}
+% \begin{macrocode}
FUNCTION {bbl.of} % { "\bblof{}" }
{
curlanguage "english" =
- {"of"}
+ { "of" }
{ curlanguage "russian" =
{ "{\cyr\cyri\cyrz}" }
{ "language is not defined: " language "of" * * warning$ "of" }
@@ -583,6 +603,9 @@ FUNCTION {bbl.of} % { "\bblof{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.etal}
+% \begin{macrocode}
FUNCTION {bbl.etal} % { "\bblof{}" }
{
curlanguage "english" =
@@ -595,6 +618,9 @@ FUNCTION {bbl.etal} % { "\bblof{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.nnumber}
+% \begin{macrocode}
FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
{
curlanguage "english" =
@@ -607,6 +633,9 @@ FUNCTION {bbl.nnumber} % { "\bblNumber{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.number}
+% \begin{macrocode}
FUNCTION {bbl.number} % { "\bblnumber{}" }
{
curlanguage "english" =
@@ -619,6 +648,9 @@ FUNCTION {bbl.number} % { "\bblnumber{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.nr}
+% \begin{macrocode}
FUNCTION {bbl.nr} % { "\bblno{}" }
{
curlanguage "english" =
@@ -631,6 +663,9 @@ FUNCTION {bbl.nr} % { "\bblno{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.nnr}
+% \begin{macrocode}
FUNCTION {bbl.nnr} % { "\bblno{}" }
{
curlanguage "english" =
@@ -643,6 +678,9 @@ FUNCTION {bbl.nnr} % { "\bblno{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.in}
+% \begin{macrocode}
FUNCTION {bbl.in} % { "\bblin{}" }
{
curlanguage "english" =
@@ -655,6 +693,9 @@ FUNCTION {bbl.in} % { "\bblin{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.iin}
+% \begin{macrocode}
FUNCTION {bbl.iin} % { "\bblIn{}" }
{
curlanguage "english" =
@@ -667,6 +708,9 @@ FUNCTION {bbl.iin} % { "\bblIn{}" }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.pages}
+% \begin{macrocode}
FUNCTION {bbl.pages} % { "\bblpp." }
{
curlanguage "english" =
@@ -679,10 +723,13 @@ FUNCTION {bbl.pages} % { "\bblpp." }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.page}
+% \begin{macrocode}
FUNCTION {bbl.page} % { "\bblp." }
{
curlanguage "english" =
- {"p."}
+ { "p." }
{ curlanguage "russian" =
{ "{\cyr\cyrs.}"}
{ "language is not defined: " language "p." * * warning$ "p." }
@@ -691,6 +738,9 @@ FUNCTION {bbl.page} % { "\bblp." }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.ppages}
+% \begin{macrocode}
FUNCTION {bbl.ppages} % { "\bblPp." }
{
curlanguage "english" =
@@ -703,6 +753,9 @@ FUNCTION {bbl.ppages} % { "\bblPp." }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.ppage}
+% \begin{macrocode}
FUNCTION {bbl.ppage} % { "\bblP." }
{
curlanguage "english" =
@@ -715,6 +768,9 @@ FUNCTION {bbl.ppage} % { "\bblP." }
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.techrep}
+% \begin{macrocode}
FUNCTION {bbl.techrep}
{
curlanguage "english" =
@@ -727,24 +783,32 @@ FUNCTION {bbl.techrep}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.mthesis}
+% \begin{macrocode}
FUNCTION {bbl.mthesis}
{
curlanguage "english" =
{ "Master's thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRM\cyra\cyrg\cyri\cyrs\cyrt\cyre\cyrr\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Master's thesis" * * warning$ "P." }
if$
}
if$
}
+% \end{macrocode}
+% \DescribeBSTFunction{bbl.phdthesis}
+% \begin{macrocode}
FUNCTION {bbl.phdthesis}
{
curlanguage "english" =
{ "Ph.D. thesis" }
{ curlanguage "russian" =
- { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ \cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" }
+ { "{\cyr\CYRK\cyra\cyrn\cyrd\cyri\cyrd\cyra\cyrt\cyrs\cyrk\cyra\cyrya\ "
+ "\cyrd\cyri\cyrs\cyrs\cyre\cyrr\cyrt\cyra\cyrc\cyri\cyrya}" * }
{ "language is not defined: " language "Ph.D. thesis" * * warning$ "P." }
if$
}
@@ -769,8 +833,7 @@ FUNCTION {format.names}
{ s nameptr
"{vv~}{ll}{~f.}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -778,8 +841,7 @@ FUNCTION {format.names}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
+ { t "others" =
t "~others" =
or
{ " " * bbl.etal * }
@@ -809,8 +871,7 @@ FUNCTION {format.names.rev}
{ s nameptr
"{f.}{~vv}{~ll}{, jj}" format.name$ 't :=
nameptr #1 >
- {
- nameptr #4 =
+ { nameptr #4 =
numnames #4 > and
{ "others" 't :=
#1 'namesleft := }
@@ -818,10 +879,9 @@ FUNCTION {format.names.rev}
if$
namesleft #1 >
{ ", " * t * }
- {
- t "others" =
- t "~others" =
- or
+ { t "others" =
+ t "~others" =
+ or
{ " " * bbl.etal * }
{ ", " * t * }
if$
@@ -921,9 +981,7 @@ FUNCTION {format.date}
year empty$
{ month empty$
{ "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "there's a month but no year in " cite$ * warning$ month }
if$
}
{ month empty$
@@ -1203,8 +1261,7 @@ FUNCTION {format.vol.num.pages}
volume field.or.null
number empty$
'skip$
- {
- ", no." number tie.or.space.connect *
+ { ", no." number tie.or.space.connect *
volume empty$
{ "there's a number but no volume in " cite$ * warning$ }
'skip$
@@ -1292,8 +1349,7 @@ FUNCTION {author.before}
{
author empty$
'skip$
- {
- format.authors output
+ { format.authors output
new.sentence
}
if$
@@ -1306,8 +1362,7 @@ FUNCTION {bookauthor.before}
{
bookauthor empty$
'skip$
- {
- format.bookauthors output
+ { format.bookauthors output
new.sentence
}
if$
@@ -1423,6 +1478,31 @@ FUNCTION {format.annote}
}
% \end{macrocode}
+% \DescribeBSTFunction{format.isbn}
+% \begin{macrocode}
+FUNCTION {format.isbn}
+{
+ isbn empty$
+ { "" }
+ { "ISBN~" isbn * }
+ if$
+}
+
+% \end{macrocode}
+% \DescribeBSTFunction{add.doi}
+% \begin{macrocode}
+FUNCTION {add.doi}
+{ duplicate$ empty$
+ 'skip$
+ { doi empty$
+ 'skip$
+ { "\href{http://dx.doi.org/" doi * "}{" * swap$ * "}" * }
+ if$
+ }
+ if$
+}
+
+% \end{macrocode}
% \subsection{Описание типов библиографических ссылок}
% \DescribeBSTFunction{article}
% \begin{macrocode}
@@ -1432,7 +1512,7 @@ FUNCTION {article}
author.before
format.title "title" output.check
new.dblslash
- journal emphasize "journal" output.check
+ journal emphasize add.doi "journal" output.check
new.block
format.date output
new.block
@@ -1455,7 +1535,7 @@ FUNCTION {book}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
editor.organization.after
new.sentence
format.number.series output
@@ -1468,6 +1548,8 @@ FUNCTION {book}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1503,7 +1585,7 @@ FUNCTION {inbook}
{
output.bibitem
author.before
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.dblslash
bookauthor.before
booktitle "booktitle" output.check
@@ -1519,6 +1601,8 @@ FUNCTION {inbook}
new.block
format.pages.page output
new.block
+ format.isbn output
+ new.block
note output
new.sentence
output.url
@@ -1534,7 +1618,7 @@ FUNCTION {incollection}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1562,7 +1646,7 @@ FUNCTION {inproceedings}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.dblslash
booktitle "booktitle" output.check
new.slash
@@ -1622,8 +1706,7 @@ FUNCTION {manual}
'skip$
if$
}
- {
- organization address new.block.checkb
+ { organization address new.block.checkb
organization output
address output
}
@@ -1646,7 +1729,7 @@ FUNCTION {mastersthesis}
output.bibitem
format.authors "author" output.check
new.block
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.block
bbl.mthesis format.thesis.type output.nonnull
school "school" output.check
@@ -1661,7 +1744,7 @@ FUNCTION {mastersthesis}
}
% \end{macrocode}
-% \DescribeBSTFunction{phdthesis}
+% \DescribeBSTFunction{misc}
% \begin{macrocode}
FUNCTION {misc}
{
@@ -1689,7 +1772,7 @@ FUNCTION {phdthesis}
output.bibitem
format.authors "author" output.check
new.sentence
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.column
bbl.phdthesis format.thesis.type output.nonnull
new.slash
@@ -1711,7 +1794,7 @@ FUNCTION {phdthesis}
FUNCTION {proceedings}
{
output.bibitem
- format.btitle "title" output.check
+ format.btitle add.doi "title" output.check
new.slash
editor.organization.after
new.block
@@ -1743,7 +1826,7 @@ FUNCTION {techreport}
output.bibitem
author.before
new.sentence
- format.title "title" output.check
+ format.title add.doi "title" output.check
new.column
format.tr.number output.nonnull
editor.organization.after
@@ -1783,72 +1866,157 @@ FUNCTION {unpublished}
FUNCTION {default.type} { misc }
% \end{macrocode}
-% \subsection{Сокращения названий месяцев и журналов}
+% \subsection{Сокращения названий месяцев}
% \begin{macrocode}
MACRO {jan} {"\bbljan{}"}
-
MACRO {feb} {"\bblfeb{}"}
-
MACRO {mar} {"\bblmar{}"}
-
MACRO {apr} {"\bblapr{}"}
-
MACRO {may} {"\bblmay{}"}
-
MACRO {jun} {"\bbljun{}"}
-
MACRO {jul} {"\bbljul{}"}
-
MACRO {aug} {"\bblaug{}"}
-
MACRO {sep} {"\bblsep{}"}
-
MACRO {oct} {"\bbloct{}"}
-
MACRO {nov} {"\bblnov{}"}
-
MACRO {dec} {"\bbldec{}"}
-MACRO {acmcs} {"ACM Computing Surveys"}
-
-MACRO {acta} {"Acta Informatica"}
-
-MACRO {cacm} {"Communications of the ACM"}
-
-MACRO {ibmjrd} {"IBM Journal of Research and Development"}
-
-MACRO {ibmsj} {"IBM Systems Journal"}
-
-MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
-
-MACRO {ieeetc} {"IEEE Transactions on Computers"}
-
-MACRO {ieeetcad}
- {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
-
-MACRO {ipl} {"Information Processing Letters"}
-
-MACRO {jacm} {"Journal of the ACM"}
-
-MACRO {jcss} {"Journal of Computer and System Sciences"}
-
-MACRO {scp} {"Science of Computer Programming"}
-
-MACRO {sicomp} {"SIAM Journal on Computing"}
-
-MACRO {tocs} {"ACM Transactions on Computer Systems"}
-
-MACRO {tods} {"ACM Transactions on Database Systems"}
-
-MACRO {tog} {"ACM Transactions on Graphics"}
-
-MACRO {toms} {"ACM Transactions on Mathematical Software"}
-
-MACRO {toois} {"ACM Transactions on Office Information Systems"}
-
-MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
-
-MACRO {tcs} {"Theoretical Computer Science"}
+% \end{macrocode}
+% \subsection{Сокращения названий журналов}
+% \subsubsection{Физика и астрономия}
+% Код данной секции создан на основе файла \file{physjour.mbs}
+% пакета \pkg{custom-bib}.
+% \begin{macrocode}
+MACRO {aa}{"Astron. \& Astrophys."}
+MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
+MACRO {aj} {"Astron. J."}
+MACRO {aph} {"Acta Phys."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Amer. J. Phys."}
+MACRO {ajm} {"Amer. J. Math."}
+MACRO {amsci} {"Amer. Sci."}
+MACRO {anofd} {"Ann. Fluid Dyn."}
+MACRO {am} {"Ann. Math."}
+MACRO {ap} {"Ann. Phys. (NY)"}
+MACRO {adp} {"Ann. Phys. (Leipzig)"}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {app} {"Astroparticle Phys."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apjsup} {"Astrophys. J. Suppl."}
+MACRO {apss} {"Astrophys. Space Sci."}
+MACRO {araa} {"Ann. Rev. Astron. Astrophys."}
+MACRO {baas} {"Bull. Amer. Astron. Soc."}
+MACRO {baps} {"Bull. Amer. Phys. Soc."}
+MACRO {cmp} {"Comm. Math. Phys."}
+MACRO {cpam} {"Commun. Pure Appl. Math."}
+MACRO {cppcf} {"Comm. Plasma Phys. \& Controlled Fusion"}
+MACRO {cpc} {"Comp. Phys. Comm."}
+MACRO {cqg} {"Class. Quant. Grav."}
+MACRO {cra} {"C. R. Acad. Sci. A"}
+MACRO {fed} {"Fusion Eng. \& Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {grg} {"Gen. Relativ. Gravit."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Interntl. J. Infrared \& Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {irp} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jasa} {"J. Acoust. Soc. America"}
+MACRO {jcp} {"J. Comp. Phys."}
+MACRO {jetp} {"Sov. Phys.--JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnec} {"J. Nucl. Energy, C: Plasma Phys., Accelerators, Thermonucl. Res."}
+MACRO {jnm} {"J. Nucl. Mat."}
+MACRO {jpc} {"J. Phys. Chem."}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Japan"}
+MACRO {jsi} {"J. Sci. Instrum."}
+MACRO {jvst} {"J. Vac. Sci. \& Tech."}
+MACRO {nat} {"Nature"}
+MACRO {nature} {"Nature"}
+MACRO {nedf} {"Nucl. Eng. \& Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Inst. \& Meth."}
+MACRO {nimpr} {"Nucl. Inst. \& Meth. in Phys. Res."}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys. B"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {npbpc} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {inc} {"Nuovo Cimento"}
+MACRO {nc} {"Nuovo Cimento"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pfa} {"Phys. Fluids A: Fluid Dyn."}
+MACRO {pfb} {"Phys. Fluids B: Plasma Phys."}
+MACRO {pl} {"Phys. Lett."}
+MACRO {pla} {"Phys. Lett. A"}
+MACRO {plb} {"Phys. Lett. B"}
+MACRO {prep} {"Phys. Rep."}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Phys. Plasmas"}
+MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
+MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pra} {"Phys. Rev. A"}
+MACRO {prb} {"Phys. Rev. B"}
+MACRO {prc} {"Phys. Rev. C"}
+MACRO {prd} {"Phys. Rev. D"}
+MACRO {pre} {"Phys. Rev. E"}
+MACRO {ps} {"Phys. Scripta"}
+MACRO {procrsl} {"Proc. Roy. Soc. London"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Inst."}
+MACRO {science} {"Science"}
+MACRO {sciam} {"Sci. Am."}
+MACRO {sam} {"Stud. Appl. Math."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspeki"}
+MACRO {st} {"Sky and Telesc."}
+
+% \end{macrocode}
+% \subsubsection{Оптика}
+% Из файла~\file{photjour.mbs}.
+% \begin{macrocode}
+MACRO {appopt} {"Appl. Opt."}
+MACRO {bell} {"Bell Syst. Tech. J."}
+MACRO {ell} {"Electron. Lett."}
+MACRO {jasp} {"J. Appl. Spectr."}
+MACRO {jqe} {"IEEE J. Quantum Electron."}
+MACRO {jlwt} {"J. Lightwave Technol."}
+MACRO {jmo} {"J. Mod. Opt."}
+MACRO {josa} {"J. Opt. Soc. America"}
+MACRO {josaa} {"J. Opt. Soc. Amer.~A"}
+MACRO {josab} {"J. Opt. Soc. Amer.~B"}
+MACRO {jdp} {"J. Phys. (Paris)"}
+MACRO {oc} {"Opt. Commun."}
+MACRO {ol} {"Opt. Lett."}
+MACRO {os} {"Opt. Spectrosc."}
+MACRO {phtl} {"IEEE Photon. Technol. Lett."}
+MACRO {pspie} {"Proc. Soc. Photo-Opt. Instrum. Eng."}
+MACRO {sjot} {"Sov. J. Opt. Technol."}
+MACRO {sjqe} {"Sov. J. Quantum Electron."}
+MACRO {sleb} {"Sov. Phys.--Leb. Inst. Rep."}
+MACRO {stph} {"Sov. Phys.--Techn. Phys."}
+MACRO {stphl} {"Sov. Techn. Phys. Lett."}
+MACRO {vr} {"Vision Res."}
+MACRO {zph} {"Z. f. Physik"}
+MACRO {zphb} {"Z. f. Physik~B"}
+MACRO {zphd} {"Z. f. Physik~D"}
+
+% \end{macrocode}
+% \subsubsection{Физика твердого тела}
+% \begin{macrocode}
+MACRO {sse} {"Solid-State Electron."}
+MACRO {pss} {"Phys. Sol. State"}
+MACRO {sst} {"Semicond. Sci. Tech."}
READ
@@ -1930,15 +2098,11 @@ FUNCTION {author.sort}
{
author empty$
{ key empty$
- { "to sort, need author or key in " cite$ * warning$
- ""
- }
+ { "to sort, need author or key in " cite$ * warning$ "" }
{ key sortify }
if$
}
- {
- author sort.format.names
- }
+ { author sort.format.names }
if$
}
@@ -1950,18 +2114,14 @@ FUNCTION {author.title.sort}
author empty$
{ title empty$
{ key empty$
- { "to sort, need author, title, or key in " cite$ * warning$
- ""
- }
+ { "to sort, need author, title, or key in " cite$ * warning$ "" }
{ key sortify }
if$
}
{ title sort.format.title }
if$
}
- {
- author sort.format.names
- }
+ { author sort.format.names }
if$
}
diff --git a/Master/texmf-dist/source/latex/disser/gost732.dtx b/Master/texmf-dist/source/latex/disser/gost732.dtx
index 079ff7f9154..71a2d040c3a 100644
--- a/Master/texmf-dist/source/latex/disser/gost732.dtx
+++ b/Master/texmf-dist/source/latex/disser/gost732.dtx
@@ -20,40 +20,34 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%<*driver>
-\ProvidesFile{gost732.drv}[2009/11/20 1.1.4 GOST 7.32-2001 implementation]
+\ProvidesFile{gost732.drv}[2009/03/23 1.1.5 GOST 7.32-2001 implementation]
\documentclass{ltxdoc}
-\usepackage[a4paper, includeheadfoot, nohead, mag=1000,
- left=5cm, right=1cm, top=1.5cm, bottom=1.5cm]{geometry}
-\usepackage[T2A]{fontenc}
-\usepackage[cp1251]{inputenc}
-\usepackage[english,russian]{babel}
+\usepackage[a4paper,includeheadfoot,nohead,mag=1000,
+ left=5cm,right=1cm,top=1.5cm,bottom=1.5cm]{geometry}
\usepackage{ifpdf,indentfirst,color}
+
\definecolor{darkblue}{rgb}{0,0,.6}
\ifpdf
- \usepackage[%
- pdftex,
- colorlinks,
- plainpages=false,
- pdftitle = {User manual for disser},
- pdfauthor = {Stanislav Kruchinin},
- pdfsubject = {disser},
- pdfstartview = {FitH},
- pdfborder = {0 0 0},
- bookmarksopen,
- bookmarksnumbered,
- bookmarksopenlevel = 2,
- pdfusetitle,
- unicode]{hyperref}
+ \usepackage[pdftex,hyperindex,unicode]{hyperref}
\usepackage{cmap}
\else
\usepackage[hypertex]{hyperref}
\fi
\hypersetup{
- colorlinks = true, linkcolor = darkblue,
- citecolor = darkblue, filecolor = darkblue,
- menucolor = darkblue, urlcolor = darkblue
+ pdfusetitle,
+ pdftitle = {Documented source code of disser package},
+ pdfauthor = {Stanislav Kruchinin},
+ pdfsubject = {disser},
+ pdfstartview = {FitH},
+ pdfborder = {0 0 0},
+ bookmarksopen = true,
+ bookmarksnumbered = true,
+ bookmarksopenlevel = 2,
+ colorlinks = true, linkcolor = darkblue,
+ citecolor = darkblue, filecolor = darkblue,
+ menucolor = darkblue, urlcolor = darkblue
}
\IfFileExists{pscyr.sty}{%
@@ -66,6 +60,11 @@
\renewcommand\rmdefault{ftm}
}{}
}
+\IfFileExists{url.sty}{\RequirePackage{url}}{\newcommand\url{\texttt}}
+
+\usepackage[T2A]{fontenc}
+\usepackage[cp1251]{inputenc}
+\usepackage[english,russian]{babel}
\MakeShortVerb{\|}
@@ -103,7 +102,8 @@
% Насколько известно автору, на данный момент отсутствуют ГОСТы,
% регламентирующие структуру и правила оформления диссертаций.
% Диссертационные советы, как правило, не предъявляют каких-либо требований
-% к форматированию, за исключением тех, что реализованы в классе |disser|.
+% к форматированию, за исключением тех, что реализованы в классе \pkg{disser} и
+% библиографическом стиле \pkg{gost705}.
% Однако, если возникнет вопрос о соответствии верстки диссертации каким-либо
% ГОСТам, то следует воспользоваться наиболее подходящим среди существующих
% стандартов --- ГОСТ~7.32-2001 <<Отчет о научно-исследовательской работе>>,
@@ -113,7 +113,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2009/11/20 1.1.4 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2009/03/23 1.1.5 GOST 7.32-2001 implementation]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
\ProcessOptions\relax
diff --git a/Master/texmf-dist/source/latex/disser/master.dtx b/Master/texmf-dist/source/latex/disser/master.dtx
index 27b2d0534fe..45f902c30aa 100644
--- a/Master/texmf-dist/source/latex/disser/master.dtx
+++ b/Master/texmf-dist/source/latex/disser/master.dtx
@@ -29,10 +29,20 @@
\def\topiclabelfont{\large}
\def\topicfont{\large\bfseries}
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+% \end{macrocode}
+% \paragraph{Название организации}
+% \begin{macrocode}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
% \end{macrocode}
% Диссертация допущена к защите
% \begin{macrocode}
-\vskip\firstskip
+\vskip\firstskip\normalfont
\@approved
\vskip\secondskip
\begin{center}
@@ -40,29 +50,26 @@
% Заголовок.
% \begin{macrocode}
{\titlefont\@title}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
% \end{macrocode}
-%
% Тема
% \begin{macrocode}
{\topiclabelfont\topiclabel}
{\topicfont\@topic}
\end{center}
-\vskip\fourthskip
+\vskip\fourthskip\normalfont
\begin{tabbing}
\phantom{\masterproglabel}\=\\
% \end{macrocode}
-%
% Направление
% \begin{macrocode}
\courselabel\>\ \@coursenum\ --\ \@course\\
% \end{macrocode}
-%
% Магистерская программа: номер -- название.
% \begin{macrocode}
\masterproglabel\>\ \@masterprognum\ --\ \@masterprog
\end{tabbing}
-\vskip\fifthskip
+\vskip\fifthskip\normalfont
\begin{tabbing}
% \end{macrocode}
%
@@ -89,5 +96,12 @@
% \begin{macrocode}
\ifdefined\@con\field{con}\fi
\end{tabbing}
+% \end{macrocode}
+% \paragraph{Город и год}
+% \begin{macrocode}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
%</master>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/page.dtx b/Master/texmf-dist/source/latex/disser/page.dtx
index 67a4b16538c..a1adf56d25a 100644
--- a/Master/texmf-dist/source/latex/disser/page.dtx
+++ b/Master/texmf-dist/source/latex/disser/page.dtx
@@ -10,7 +10,7 @@
%
% \subsection{Формат страниц}
%
-% \subsubsection{Шрифты}
+% \subsubsection{Шрифт колонтитулов}
% \paragraph{Для двухсторонней печати}\hfil\\[6pt]
% Верхний, на четных страницах.
% \DescribeMacro{\evenheadfont}\index{Макросы!\verb*+\evenheadfont+}
@@ -49,6 +49,17 @@
% В диссертациях на русском языке не используются колонтитулы с заголовком текущей главы,
% поэтому все представленные стили влияют только на положение номера страницы.
%
+% \paragraph{empty}
+% \begin{macrocode}
+\def\ps@empty{
+ \let\@mkboth\@gobbletwo
+ \let\@oddhead\@empty
+ \let\@oddfoot\@empty
+ \let\@evenhead\@empty
+ \let\@evenfoot\@empty
+}
+
+% \end{macrocode}
% \paragraph{footcenter}
% \begin{macrocode}
\def\ps@footcenter{
diff --git a/Master/texmf-dist/source/latex/disser/sections.dtx b/Master/texmf-dist/source/latex/disser/sections.dtx
index 9a12dec5633..81ef04661b6 100644
--- a/Master/texmf-dist/source/latex/disser/sections.dtx
+++ b/Master/texmf-dist/source/latex/disser/sections.dtx
@@ -345,13 +345,13 @@
\ifnum #2>\c@secnumdepth \else
\protect\numberline{\@tocseccntformat{#1}}%
\fi
- #7}}%
+ #7}%
+ }%
\fi
\@xsect{#5}%
}
% \end{macrocode}
-%
% \DescribeMacro{\@tocline}\index{Макросы!\verb*+"\"@tocline+}
% Обобщенная версия стандартной команды, добавляющей запись в оглавление.
% \begin{macrocode}
@@ -376,7 +376,6 @@
}
% \end{macrocode}
-%
% Команды, создающие заголовки секций в тексте и записи в оглавлении.
% \DescribeMacro{\section}\index{Макросы!\verb*+\section+}
% \DescribeMacro{\l@section}\index{Макросы!\verb*+"\l"@section+}
diff --git a/Master/texmf-dist/source/latex/disser/titledefs.dtx b/Master/texmf-dist/source/latex/disser/titledefs.dtx
index b30881d935f..4e44b096527 100644
--- a/Master/texmf-dist/source/latex/disser/titledefs.dtx
+++ b/Master/texmf-dist/source/latex/disser/titledefs.dtx
@@ -104,6 +104,14 @@
\cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn}
\def\salabel{\saname}
% \end{macrocode}
+% \DescribeMacro{\scname}\index{Макросы!\verb+\scname+}
+% \DescribeMacro{\sclabel}\index{Макросы!\verb+\sclabel+}
+% Научный консультант
+% \begin{macrocode}
+\def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
+\cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
+\def\sconlabel{\sconname}
+% \end{macrocode}
% \DescribeMacro{\revname}\index{Макросы!\verb+\revname+}
% \DescribeMacro{\revlabel}\index{Макросы!\verb+\revlabel+}
% Рецензент
@@ -118,10 +126,10 @@
\def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
\def\conlabel{\conname\ \cyrp\cyro\ \@conspec}
% \end{macrocode}
-% \DescribeMacro{\asmanuscriptname}\index{Макросы!\verb+\asmanuscriptname+}
+% \DescribeMacro{\asmanuscript}\index{Макросы!\verb+\asmanuscript+}
% На правах рукописи
% \begin{macrocode}
-\def\asmanuscriptname{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ %
+\def\asmanuscript{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ %
\cyrr\cyru\cyrk\cyro\cyrp\cyri\cyrs\cyri}
% \end{macrocode}
% \DescribeMacro{\libcatname}\index{Макросы!\verb+\libcatname+}
@@ -254,6 +262,18 @@
\def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{}
% \end{macrocode}
%
+% \subsubsection{Научный консультант}
+% \DescribeMacro{\scon}\index{Макросы!\verb*+\scon+}
+% ФИО
+% \begin{macrocode}
+\def\scon#1{\gdef\@scon{#1}}\scon{}
+% \end{macrocode}
+% \DescribeMacro{\sconstatus}\index{Макросы!\verb*+\sconstatus+}
+% Учёное звание
+% \begin{macrocode}
+\def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{}
+% \end{macrocode}
+%
% \subsubsection{Рецензент}
% \DescribeMacro{\rev}\index{Макросы!\verb*+\rev+}
% ФИО
@@ -302,35 +322,36 @@
% \DescribeMacro{\introname}\index{Макросы!\verb*+\introname+}
% \DescribeMacro{\intro}\index{Макросы!\verb*+\intro+}
% \begin{macrocode}
-\newcommand\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}
-\newcommand\intro{\nchapter{\introname}}
+\providecommand*\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}
+\providecommand*\intro{\nchapter{\introname}}
% \end{macrocode}
% \item Заключение
% \DescribeMacro{\conclusionname}\index{Макросы!\verb*+\conclusionname+}
% \begin{macrocode}
-\newcommand\conclusionname{%
+\providecommand*\conclusionname{%
\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre
}
-\newcommand\conclusion{\nchapter{\conclusionname}}
+\providecommand*\conclusion{\nchapter{\conclusionname}}
% \end{macrocode}
% \item Список используемых обозначений
% \DescribeMacro{\defsname}\index{Макросы!\verb*+\defsname+}
+% \DescribeMacro{\defs}\index{Макросы!\verb*+\defs+}
% \end{itemize}
% \begin{macrocode}
-\newcommand\defsname{%
+\providecommand*\defsname{%
{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
\cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ %
\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt}
}
-\newcommand\defs{\nchapter{\defsname}}
+\providecommand*\defs{\nchapter{\defsname}}
% \end{macrocode}
% Обзор литературы
% \DescribeMacro{\reviewname}\index{Макросы!\verb*+\reviewname+}
% \begin{macrocode}
-\newcommand\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
+\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
-\newcommand\review{\nchapter{\reviewname}}
+\providecommand*\review{\nchapter{\reviewname}}
% \end{macrocode}
%
@@ -339,7 +360,7 @@
% \DescribeMacro{\field}\index{Макросы!\verb*+\field+}
% Формат записей для научного руководителя, рецензента и консультанта
% \begin{macrocode}
-\def\field#1{%
+\providecommand\field[1]{%
\csname #1label\endcsname,\\%
\csname @#1status\endcsname\>
\makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname}
@@ -347,17 +368,13 @@
% \end{macrocode}
%
% \DescribeMacro{\@approved}\index{Макросы!\verb+"\"@approved+}
-% \makeatother
% Диссертация допущена к защите
% \begin{macrocode}
-\def\@approved{
+\providecommand\@approved{
\begin{tabbing}
- \hspace{8cm}\={\approved}
-\\
- \>\appos
-\\[9pt]
- \>\makebox[8.5cm][r]{\hrulefill\ \@apname}
-\\[9pt]
+ \hspace{8cm}\={\approved}\\
+ \>\appos\\[9pt]
+ \>\makebox[8.5cm][r]{\hrulefill\ \@apname}\\[9pt]
\>\makebox[1.5cm][r]{<<\hrulefill>>}
\makebox[7cm][r]{\hrulefill\ \@date\,\yearname}
\end{tabbing}
@@ -370,6 +387,7 @@
% \begin{macrocode}
\providecommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}>>\ %
\rule[0pt]{3cm}{0.5pt}\ #1~\yearname}
+
% \end{macrocode}
% \DescribeMacro{\mkcommonsect}\index{Макросы!\verb*+\mkcommonsect+}
% Генератор команд для общего текста диссертации и автореферата.
@@ -382,6 +400,25 @@
\let\mkintrosect=\mkcommonsect
% \end{macrocode}
+% \DescribeMacro{\copynum}\index{Макросы!\verb*+\copynum+}
+% \DescribeMacro{\classlabel}\index{Макросы!\verb*+\classlabel+}
+% \DescribeMacro{\classify}\index{Макросы!\verb*+\classify+}
+% Номер копии и гриф секретности.
+% \begin{macrocode}
+\def\copynum#1{\gdef\@copynum{#1}}
+\copynum{1}
+\def\classlabel#1{\gdef\@classlabel{#1}}
+\classlabel{\cyr\CYRS\cyre\cyrk\cyrr\cyre\cyrt\cyrn\cyro}
+
+\def\classify{
+ \begin{flushright}
+ \@classlabel\\
+ {\cyr\CYREREV\cyrk\cyrz.~\textnumero\,\@copynum}
+ \end{flushright}
+ \vspace{2ex}
+}
+
+% \end{macrocode}
% \DescribeMacro{\facsimile}\index{Макросы!\verb*+\facsimile+}
% Команда для включения графического файла с подписью диссертанта.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/disser/titlepage.dtx b/Master/texmf-dist/source/latex/disser/titlepage.dtx
index eb5af19d55d..0177b5addfc 100644
--- a/Master/texmf-dist/source/latex/disser/titlepage.dtx
+++ b/Master/texmf-dist/source/latex/disser/titlepage.dtx
@@ -13,12 +13,11 @@
% \end{macrocode}
% Подключение констант и команд, используемых для верстки титульного листа.
% \begin{macrocode}
-\input{titledefs\substyle@ext}
+\input{titledefs.rtx}
\if@titlepage
% \end{macrocode}
-%
-% Параметры частей титульного листа
+% Параметры частей титульного листа по умолчанию.
% \DescribeMacro{\titlefont}\index{Макросы!\verb*+\titlefont+}
% \DescribeMacro{\topiclabelfont}\index{Макросы!\verb*+\topiclabelfont+}
% \DescribeMacro{\topicfont}\index{Макросы!\verb*+\topicfont+}
@@ -29,50 +28,19 @@
\newcommand\topicfont{\large\bfseries}
\newcommand\instfont{\normalfont}
% \end{macrocode}
-%
% Разделитель между названием города и годом.
% \DescribeMacro{\cdsep}\index{Макросы!\verb*+\cdsep+}
% \begin{macrocode}
\newcommand\cdsep{~-- }
% \end{macrocode}
+% \subsubsection{Разметка титульного листа}
% \DescribeMacro{\maketitle}\index{Макросы!\verb*+\maketitle+}
% \begin{macrocode}
\newcommand\maketitle{
-% \end{macrocode}
-%
-% \subsubsection{Общие элементы титульного листа}
-% \begin{macrocode}
- \thispagestyle{empty}
- \vspace*{-2cm}
-% \end{macrocode}
-% \paragraph{Название организации}
-% \begin{macrocode}
- \begin{center}
- \instfont\@institution\par
-% \end{macrocode}
-% Для решения проблемы с |@| в именах макросов.
-% \begin{macrocode}
- \makeatletter
-% \end{macrocode}
-% \paragraph{Включение того или иного титульного листа в зависимости от типа
-% документа}
-% \begin{macrocode}
- \ifDis@bachelor \input{bachelor\substyle@ext}\fi
- \ifDis@master \input{master\substyle@ext}\fi
- \ifDis@candidate\input{candidate\substyle@ext}\fi
- \ifDis@doctor \input{doctor\substyle@ext}\fi
- \ifDis@autoref \input{autoref\substyle@ext}\fi
- \enlargethispage{2cm}
- \vfill
-% \end{macrocode}
-% \paragraph{Город и год}
-% \begin{macrocode}
- {\@city\cdsep\@date}
- \end{center}
- \normalsize
- \clearpage
- \thispagestyle{empty}
+ \makeatletter
+ \input{\Dis@titlepagefile}
+ \normalfont\clearpage
} % \newcommand\maketitle
\setcounter{footnote}{0}
\else %\if@titlepage
@@ -94,8 +62,8 @@
}
% \end{macrocode}
% \DescribeMacro{\@maketitle}\index{Макросы!\verb+"\"@maketitle+}
-% Команда для форматирования заголовка документа, который не будет
-% расположен на отдельной странице.
+% Команда для форматирования заголовка документа без отдельного
+% титульного листа (см. описание опции \cmd{notitlepage}).
% \begin{macrocode}
\def\@maketitle{%
\newpage
diff --git a/Master/texmf-dist/source/latex/disser/toc.dtx b/Master/texmf-dist/source/latex/disser/toc.dtx
index 2f207dca0cb..7ec27da000c 100644
--- a/Master/texmf-dist/source/latex/disser/toc.dtx
+++ b/Master/texmf-dist/source/latex/disser/toc.dtx
@@ -48,11 +48,11 @@
\newcommand\tocsection{\chapter*{\contentsname}}
% \end{macrocode}
-%
% \DescribeMacro{\tableofcontents}\index{Макросы!\verb*+\tableofcontents+}
% \begin{macrocode}
\newcommand\tableofcontents{%
- \if@twocolumn\@restonecoltrue\onecolumn%
+ \if@twocolumn%
+ \@restonecoltrue\onecolumn%
\else\@restonecolfalse\fi%
\tocsection%
\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
@@ -69,7 +69,6 @@
\newcommand\lofsection{\nchapter{\listfigurename}}
% \end{macrocode}
-%
% \DescribeMacro{\listoffigures}\index{Макросы!\verb*+\listoffigures+}
% \begin{macrocode}
\newcommand\listoffigures{%
diff --git a/Master/texmf-dist/tex/latex/disser/autoref.rtx b/Master/texmf-dist/tex/latex/disser/autoref.rtx
index 74b63d3dc8c..97dbe501e3c 100644
--- a/Master/texmf-dist/tex/latex/disser/autoref.rtx
+++ b/Master/texmf-dist/tex/latex/disser/autoref.rtx
@@ -25,10 +25,19 @@
\def\authorfont{\large}
\def\specfont{\normalsize}
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
+\vskip\firstskip
\normalfont
+
\begin{flushright}
- \vskip\firstskip
- \asmanuscriptname\\
+ \ifDis@classified\classify\fi
+ \asmanuscript
\ifDis@facsimile\facsimile\fi
\end{flushright}
\begin{center}
@@ -40,6 +49,8 @@
{\specfont\@specnum~--\ \@spec}
\vskip\fifthskip
{\titlefont\@title}
+ \vfill
+ {\@city\cdsep\@date}
\end{center}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/disser/bachelor.rtx b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
index 1d55a905f7d..89d8d3f22f5 100644
--- a/Master/texmf-dist/tex/latex/disser/bachelor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/bachelor.rtx
@@ -14,7 +14,6 @@
\ProvidesFile{bachelor.rtx}
-
\deflength\firstskip{1.5cm}
\deflength\secondskip{1.5cm}
\deflength\thirdskip{1ex}
@@ -27,24 +26,37 @@
\def\workname{\CYRR\cyra\cyrb\cyro\cyrt\cyra}
-\vskip\firstskip
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
+\vskip\firstskip\normalfont
\@approved
\vskip\secondskip
+
\begin{center}
{\titlefont\@title\par}
- \vskip\thirdskip
- {\topiclabelfont\topiclabel\;}
+ \vskip\thirdskip\normalfont
+ {\topiclabelfont\topiclabel\ }%
{\topicfont\@topic\par}
\vskip\fourthskip\normalfont
\courselabel\ \@coursenum~--\ \@course
\end{center}
-\vskip\fifthskip
+
+\vskip\fifthskip\normalfont
\begin{tabbing}
\studentlabel\ \groupname\ \@group\hspace{2cm}\=
\makebox[8.5cm][l]{\hrulefill\ \@author}
\\[9pt]
\field{sa}
\end{tabbing}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
\endinput
%%
%% End of file `bachelor.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/candidate.rtx b/Master/texmf-dist/tex/latex/disser/candidate.rtx
index 17f7ea5217c..b77557a5881 100644
--- a/Master/texmf-dist/tex/latex/disser/candidate.rtx
+++ b/Master/texmf-dist/tex/latex/disser/candidate.rtx
@@ -24,7 +24,8 @@
\deflength\thirdskip{1cm}
\deflength\fourthskip{1cm}
\deflength\fifthskip{1cm}
-\deflength\sixthskip{0pt}
+\deflength\sixthskip{0cm}
+\deflength\seventhskip{0cm}
\deflength\@sahshift{8cm}
@@ -33,31 +34,49 @@
\def\authorfont{\large}
\def\specfont{\normalsize}
-\vskip\firstskip
-\normalfont
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+
+\begin{center}
+ \instfont\@institution\par
+\end{center}
+
+\vskip\firstskip\normalfont
\begin{flushright}
- \asmanuscriptname\\
+ \ifDis@classified\classify\fi
+ \asmanuscript
\ifDis@facsimile\facsimile\fi
- \ifDis@libcat
- {\libcatname\ \@libcatnum}
- \fi
+ \ifDis@libcat\libcatname\ \@libcatnum\fi
\end{flushright}
\begin{center}
- \vskip\secondskip
+ \vskip\secondskip\normalfont
{\authorfont\@author}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
{\topicfont\@topic\par}
- \vskip\fourthskip
+ \vskip\fourthskip\normalfont
{\specfont\@specnum~--\ \@spec}
- \vskip\fifthskip
+ \vskip\fifthskip\normalfont
{\titlefont\@title}
\end{center}
-\vskip\sixthskip
+\vskip\sixthskip\normalfont
\begin{tabbing}
\hspace{\@sahshift}\={\saname}\\
\>\@sastatus\\
\>\@sa
\end{tabbing}
+\ifx\@scon\empty\else
+ \vskip\seventhskip\normalfont
+ \begin{tabbing}
+ \hspace{\@sahshift}\={\sconname}\\
+ \>\@sconstatus\\
+ \>\@scon
+ \end{tabbing}
+\fi
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
\endinput
%%
%% End of file `candidate.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/disser.cls b/Master/texmf-dist/tex/latex/disser/disser.cls
index f99339f9388..64fb2370b9f 100644
--- a/Master/texmf-dist/tex/latex/disser/disser.cls
+++ b/Master/texmf-dist/tex/latex/disser/disser.cls
@@ -44,9 +44,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{disser}[2009/11/20 1.1.4 Document class for dissertations]
+\ProvidesClass{disser}[2009/03/23 1.1.5 Document class for dissertations]
-\def\substyle@ext{.rtx}
+\RequirePackage{kvoptions}
\RequirePackage{ifpdf}
@@ -59,6 +59,7 @@
\newif\ifDis@doctor\Dis@doctorfalse
\newif\ifDis@autoref\Dis@autoreffalse
\newif\ifDis@libcat\Dis@libcatfalse
+\newif\ifDis@classified\Dis@classifiedfalse
\newif\ifDis@facsimile\Dis@facsimilefalse
\newif\ifDis@ams\Dis@amstrue
\newif\ifDis@href\Dis@hreffalse
@@ -66,21 +67,12 @@
\newif\ifDis@times\Dis@timesfalse
\newif\ifDis@mtpro\Dis@mtprofalse
-\RequirePackage{kvoptions}[2006/08/17]
-
\DeclareOption{href}{\Dis@hreftrue}
\DeclareOption{subf}{\Dis@subftrue}
\DeclareOption{libcat}{\Dis@libcattrue}
+\DeclareOption{classified}{\Dis@classifiedtrue}
\DeclareOption{facsimile}{\Dis@facsimiletrue}
\DeclareOption{noams}{\Dis@amsfalse}
-
-\SetupKeyvalOptions{
- family=Dis,
- prefix=Dis@
-}
-
-\DeclareBoolOption[true]{fixint}
-
\DeclareOption{a4paper}{%
\setlength\paperheight{297mm}
\setlength\paperwidth {210mm}
@@ -178,10 +170,27 @@
\Dis@autoreftrue
}
+\SetupKeyvalOptions{
+ family=Dis,
+ prefix=Dis@
+}
+
+\DeclareBoolOption[true]{fixint}
+\DeclareBoolOption[false]{colorlinks}
+\DeclareStringOption{titlepagefile}
+
\ExecuteOptions{a4paper,14pt,oneside,titlepage,onecolumn,final,openany,candidate}
\ProcessKeyvalOptions{Dis}
\ProcessOptions
+\ifx\Dis@titlepagefile\@empty
+ \ifDis@bachelor \renewcommand*{\Dis@titlepagefile}{bachelor.rtx}\fi
+ \ifDis@master \renewcommand*{\Dis@titlepagefile}{master.rtx}\fi
+ \ifDis@candidate\renewcommand*{\Dis@titlepagefile}{candidate.rtx}\fi
+ \ifDis@doctor \renewcommand*{\Dis@titlepagefile}{doctor.rtx}\fi
+ \ifDis@autoref \renewcommand*{\Dis@titlepagefile}{autoref.rtx}\fi
+\fi
+
\DeclareRobustCommand\MakeTextUppercase{%
\@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
@@ -196,6 +205,7 @@
\DeclareFontShape{#1}{#2}{#3}{#4}%
{<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74>%
<24.88><29.86><35.83><42.99><51.59>genb*#5}{}}
+
\EC@family{T1}{cmr}{m}{n}{ecrm}
\EC@family{T1}{cmr}{m}{sl}{ecsl}
\EC@family{T1}{cmr}{m}{it}{ecti}
@@ -206,45 +216,49 @@
\EC@family{T1}{cmr}{bx}{sl}{ecbl}
\EC@family{T1}{cmr}{bx}{sc}{ecxc}
\EC@family{T1}{cmr}{m}{ui}{ecui}
-\DeclareFontShape{OT1}{cmr}{m}{n}%
- {<5><6><7><8><9><10><12>gen*cmr%
- <10.95>cmr10%
- <14.4>cmr12%
- <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17}{}
-\DeclareFontShape{OT1}{cmr}{m}{sl}%
- {<5><6><7>cmsl8%
- <8><9>gen*cmsl%
- <10><10.95>cmsl10%
- <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{it}%
- {<5><6><7>cmti7%
- <8>cmti8%
- <9>cmti9%
- <10><10.95>cmti10%
- <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{sc}%
- {<5><6><7><8><9><10><10.95><12>%
- <14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmcsc10%
- }{}
-\DeclareFontShape{OT1}{cmr}{m}{ui}{
+
+\DeclareFontShape{OT1}{cmr}{m}{n}{%
+ <5><6><7><8><9><10><12>gen*cmr%
+ <10.95>cmr10%
+ <14.4>cmr12%
+ <17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmr17%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{sl}{%
+ <5><6><7>cmsl8%
+ <8><9>gen*cmsl%
+ <10><10.95>cmsl10%
+ <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmsl12%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{it}{%
+ <5><6><7>cmti7%
+ <8>cmti8%
+ <9>cmti9%
+ <10><10.95>cmti10%
+ <12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmti12%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{sc}{%
+ <5><6><7><8><9><10><10.95><12>%
+ <14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmcsc10%
+}{}
+\DeclareFontShape{OT1}{cmr}{m}{ui}{%
<5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmu10%
}{}
-\DeclareFontShape{OT1}{cmr}{b}{n}{
+\DeclareFontShape{OT1}{cmr}{b}{n}{%
<5><6><7><8><9><10><10.95><12>%
<14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmb10%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{n}{
+\DeclareFontShape{OT1}{cmr}{bx}{n}{%
<5><6><7><8><9>gen*cmbx%
<10><10.95>cmbx10%
<12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbx12%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{sl}{<5><6><7><8><9>%
+\DeclareFontShape{OT1}{cmr}{bx}{sl}{%
+ <5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxsl10%
}{}
-\DeclareFontShape{OT1}{cmr}{bx}{it}{<5><6><7><8><9>%
+\DeclareFontShape{OT1}{cmr}{bx}{it}{%
+ <5><6><7><8><9>%
<10><10.95><12><14.4><17.28><20.74><24.88><29.86><35.83><42.99><51.59>cmbxti10%
}{}
\input{size\@ptsize.clo}
@@ -472,7 +486,7 @@
\providecommand\chapterfont{\Large\bfseries}
\providecommand\beforechapter{}
\providecommand\afterchapter{\par\nobreak\vskip 20\p@}
-\providecommand\chapterindent{0pt}
+\providecommand\chapterindent{0\p@}
\newcommand*\chaptermark[1]{}
@@ -505,6 +519,7 @@
\@afterheading
\fi
}
+
\def\@makechapterhead#1{{%
\parindent\z@
\normalfont\hskip\chapterindent%
@@ -530,6 +545,7 @@
\interlinepenalty\@M
\chapteralign\chapterfont\beforechapter #1\afterchapter
}}
+
\newcommand*\l@chapter[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}
@@ -566,7 +582,7 @@
\providecommand\appendixfont{\Large\bfseries}
\providecommand\beforeappendix{}
\providecommand\afterappendix{\par\nobreak\vskip 20\p@}
-\providecommand\appendixindent{0pt}
+\providecommand\appendixindent{0\p@}
\newcommand\appendix{
\setcounter{chapter}{0}
\setcounter{section}{0}
@@ -807,7 +823,8 @@
\ifnum #2>\c@secnumdepth \else
\protect\numberline{\@tocseccntformat{#1}}%
\fi
- #7}}%
+ #7}%
+ }%
\fi
\@xsect{#5}%
}
@@ -1079,6 +1096,14 @@
\newcommand\oddfootfont{\reset@font}
\newcommand\headfont{\reset@font}
\newcommand\footfont{\reset@font}
+\def\ps@empty{
+ \let\@mkboth\@gobbletwo
+ \let\@oddhead\@empty
+ \let\@oddfoot\@empty
+ \let\@evenhead\@empty
+ \let\@evenfoot\@empty
+}
+
\def\ps@footcenter{
\let\@mkboth\@gobbletwo
\let\@oddhead\@empty
@@ -1185,7 +1210,7 @@
\newcommand\today{}
-\input{titledefs\substyle@ext}
+\input{titledefs.rtx}
\if@titlepage
\newcommand\titlefont{\Large\bfseries}
@@ -1195,23 +1220,9 @@
\newcommand\cdsep{~-- }
\newcommand\maketitle{
- \thispagestyle{empty}
- \vspace*{-2cm}
- \begin{center}
- \instfont\@institution\par
- \makeatletter
- \ifDis@bachelor \input{bachelor\substyle@ext}\fi
- \ifDis@master \input{master\substyle@ext}\fi
- \ifDis@candidate\input{candidate\substyle@ext}\fi
- \ifDis@doctor \input{doctor\substyle@ext}\fi
- \ifDis@autoref \input{autoref\substyle@ext}\fi
- \enlargethispage{2cm}
- \vfill
- {\@city\cdsep\@date}
- \end{center}
- \normalsize
- \clearpage
- \thispagestyle{empty}
+ \makeatletter
+ \input{\Dis@titlepagefile}
+ \normalfont\clearpage
} % \newcommand\maketitle
\setcounter{footnote}{0}
\else %\if@titlepage
@@ -1260,7 +1271,8 @@
\newcommand\tocsection{\chapter*{\contentsname}}
\newcommand\tableofcontents{%
- \if@twocolumn\@restonecoltrue\onecolumn%
+ \if@twocolumn%
+ \@restonecoltrue\onecolumn%
\else\@restonecolfalse\fi%
\tocsection%
\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
@@ -1450,11 +1462,18 @@
\usepackage{graphicx}
\fi
\ifDis@href
- \usepackage{hypernat}
- \usepackage[all]{hypcap}
+ \ifDis@colorlinks
+ \usepackage{color}
+ \definecolor{darkblue}{rgb}{0,0,.6}
+ \hypersetup{
+ colorlinks = true, linkcolor = darkblue,
+ citecolor = darkblue, filecolor = darkblue,
+ menucolor = darkblue, urlcolor = darkblue
+ }
+ \fi
\fi
-\def\metaphantom#1{%
+\providecommand\metaphantom[1]{%
\ifDis@href
\Hy@GlobalStepCount\Hy@linkcounter
\xdef\@currentHref{#1*.\the\Hy@linkcounter}%
diff --git a/Master/texmf-dist/tex/latex/disser/doctor.rtx b/Master/texmf-dist/tex/latex/disser/doctor.rtx
index e696971d13b..b54bf6cd310 100644
--- a/Master/texmf-dist/tex/latex/disser/doctor.rtx
+++ b/Master/texmf-dist/tex/latex/disser/doctor.rtx
@@ -24,31 +24,51 @@
\deflength\thirdskip{1cm}
\deflength\fourthskip{1cm}
\deflength\fifthskip{1cm}
+\deflength\sixthskip{0cm}
+
+\deflength\@sahshift{8cm}
\def\titlefont{\normalsize}
\def\topicfont{\Large\bfseries}
\def\authorfont{\large}
\def\specfont{\normalsize}
-\vskip\firstskip
-\normalfont
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+
+\begin{center}
+ \instfont\@institution\par
+\end{center}
+\vskip\firstskip\normalfont
\begin{flushright}
- \asmanuscriptname\\
+ \ifDis@classified\classify\fi
+ \asmanuscript
\ifDis@facsimile\facsimile\fi
-\ifDis@libcat
- {\libcatname\ \@libcatnum}
-\fi
+ \ifDis@libcat\libcatname\ \@libcatnum\fi
\end{flushright}
\begin{center}
- \vskip\secondskip
+ \vskip\secondskip\normalfont
{\authorfont\@author}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
{\topicfont\@topic\par}
- \vskip\fourthskip
- {\specfont\@specnum~--\;\@spec}
- \vskip\fifthskip
+ \vskip\fourthskip\normalfont
+ {\specfont\@specnum~--\ \@spec}
+ \vskip\fifthskip\normalfont
{\titlefont\@title}
\end{center}
+\ifx\@scon\empty\else
+ \vskip\sixthskip\normalfont
+ \begin{tabbing}
+ \hspace{\@sahshift}\={\sconname}\\
+ \>\@sconstatus\\
+ \>\@scon
+ \end{tabbing}
+\fi
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
\endinput
%%
%% End of file `doctor.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/gost732.cls b/Master/texmf-dist/tex/latex/disser/gost732.cls
index b0a202e4731..635029c2055 100644
--- a/Master/texmf-dist/tex/latex/disser/gost732.cls
+++ b/Master/texmf-dist/tex/latex/disser/gost732.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{gost732}[2009/11/20 1.1.4 GOST 7.32-2001 implementation]
+\ProvidesClass{gost732}[2009/03/23 1.1.5 GOST 7.32-2001 implementation]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{disser}}
\ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/disser/master.rtx b/Master/texmf-dist/tex/latex/disser/master.rtx
index 9759d07598d..7e2ff5d74dd 100644
--- a/Master/texmf-dist/tex/latex/disser/master.rtx
+++ b/Master/texmf-dist/tex/latex/disser/master.rtx
@@ -24,22 +24,29 @@
\def\topiclabelfont{\large}
\def\topicfont{\large\bfseries}
-\vskip\firstskip
+\thispagestyle{empty}
+\enlargethispage{2cm}
+\vspace*{-2cm}
+\begin{center}
+\instfont\@institution\par
+\end{center}
+
+\vskip\firstskip\normalfont
\@approved
\vskip\secondskip
\begin{center}
{\titlefont\@title}
- \vskip\thirdskip
+ \vskip\thirdskip\normalfont
{\topiclabelfont\topiclabel}
{\topicfont\@topic}
\end{center}
-\vskip\fourthskip
+\vskip\fourthskip\normalfont
\begin{tabbing}
\phantom{\masterproglabel}\=\\
\courselabel\>\ \@coursenum\ --\ \@course\\
\masterproglabel\>\ \@masterprognum\ --\ \@masterprog
\end{tabbing}
-\vskip\fifthskip
+\vskip\fifthskip\normalfont
\begin{tabbing}
\studentlabel\ \groupname\ \@group\hspace{2cm}\=
\makebox[8.5cm][l]{\hrulefill\ \@author}
@@ -50,6 +57,10 @@
\\[9pt]
\ifdefined\@con\field{con}\fi
\end{tabbing}
+\vfill
+\begin{center}
+ {\@city\cdsep\@date}
+\end{center}
\endinput
%%
%% End of file `master.rtx'.
diff --git a/Master/texmf-dist/tex/latex/disser/titledefs.rtx b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
index ffd09227554..7b92d2e143a 100644
--- a/Master/texmf-dist/tex/latex/disser/titledefs.rtx
+++ b/Master/texmf-dist/tex/latex/disser/titledefs.rtx
@@ -47,11 +47,14 @@
\def\saname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
\cyrr\cyru\cyrk\cyro\cyrv\cyro\cyrd\cyri\cyrt\cyre\cyrl\cyrsftsn}
\def\salabel{\saname}
+\def\sconname{\cyr\CYRN\cyra\cyru\cyrch\cyrn\cyrery\cyrishrt\ %
+\cyrk\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
+\def\sconlabel{\sconname}
\def\revname{\cyr\CYRR\cyre\cyrc\cyre\cyrn\cyrz\cyre\cyrn\cyrt}
\def\revlabel{\revname}
\def\conname{\cyr\CYRK\cyro\cyrn\cyrs\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrn\cyrt}
\def\conlabel{\conname\ \cyrp\cyro\ \@conspec}
-\def\asmanuscriptname{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ %
+\def\asmanuscript{\cyr\CYRN\cyra\ \cyrp\cyrr\cyra\cyrv\cyra\cyrh\ %
\cyrr\cyru\cyrk\cyro\cyrp\cyri\cyrs\cyri}
\def\libcatname{\cyr\CYRU\CYRD\CYRK}
\def\consultname{%
@@ -80,6 +83,8 @@
\def\postcommonsect{\ }
\def\sa#1{\gdef\@sa{#1}}\sa{}
\def\sastatus#1{\gdef\@sastatus{#1}}\sastatus{}
+\def\scon#1{\gdef\@scon{#1}}\scon{}
+\def\sconstatus#1{\gdef\@sconstatus{#1}}\sconstatus{}
\def\rev#1{\gdef\@rev{#1}}\rev{}
\def\revstatus#1{\gdef\@revstatus{#1}}\revstatus{}
\def\conspec#1{\gdef\@conspec{#1}}
@@ -92,36 +97,33 @@
}
}
-\newcommand\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}
-\newcommand\intro{\nchapter{\introname}}
-\newcommand\conclusionname{%
+\providecommand*\introname{\cyr\CYRV\cyrv\cyre\cyrd\cyre\cyrn\cyri\cyre}
+\providecommand*\intro{\nchapter{\introname}}
+\providecommand*\conclusionname{%
\cyr\CYRZ\cyra\cyrk\cyrl\cyryu\cyrch\cyre\cyrn\cyri\cyre
}
-\newcommand\conclusion{\nchapter{\conclusionname}}
-\newcommand\defsname{%
+\providecommand*\conclusion{\nchapter{\conclusionname}}
+\providecommand*\defsname{%
{\cyr\CYRS\cyrp\cyri\cyrs\cyro\cyrk\ %
\cyri\cyrs\cyrp\cyro\cyrl\cyrsftsn\cyrz\cyru\cyre\cyrm\cyrery\cyrh\ %
\cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri\cyrishrt}
}
-\newcommand\defs{\nchapter{\defsname}}
+\providecommand*\defs{\nchapter{\defsname}}
-\newcommand\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
+\providecommand*\reviewname{\cyr\CYRO\cyrb\cyrz\cyro\cyrr\ %
\cyrl\cyri\cyrt\cyre\cyrr\cyra\cyrt\cyru\cyrr\cyrery}
-\newcommand\review{\nchapter{\reviewname}}
+\providecommand*\review{\nchapter{\reviewname}}
-\def\field#1{%
+\providecommand\field[1]{%
\csname #1label\endcsname,\\%
\csname @#1status\endcsname\>
\makebox[8.5cm][l]{\hrulefill\ \csname @#1\endcsname}
}
-\def\@approved{
+\providecommand\@approved{
\begin{tabbing}
- \hspace{8cm}\={\approved}
-\\
- \>\appos
-\\[9pt]
- \>\makebox[8.5cm][r]{\hrulefill\ \@apname}
-\\[9pt]
+ \hspace{8cm}\={\approved}\\
+ \>\appos\\[9pt]
+ \>\makebox[8.5cm][r]{\hrulefill\ \@apname}\\[9pt]
\>\makebox[1.5cm][r]{<<\hrulefill>>}
\makebox[7cm][r]{\hrulefill\ \@date\,\yearname}
\end{tabbing}
@@ -129,6 +131,7 @@
\providecommand\datefield[1][\number\year]{<<\rule[0pt]{1cm}{.5pt}>>\ %
\rule[0pt]{3cm}{0.5pt}\ #1~\yearname}
+
\providecommand\mkcommonsect[3]{%
\@namedef{#1head}{#2}
\@namedef{#1section}{\commonsect{\expandafter\csname #1head\endcsname}\postcommonsect}
@@ -136,6 +139,19 @@
}
\let\mkintrosect=\mkcommonsect
+\def\copynum#1{\gdef\@copynum{#1}}
+\copynum{1}
+\def\classlabel#1{\gdef\@classlabel{#1}}
+\classlabel{\cyr\CYRS\cyre\cyrk\cyrr\cyre\cyrt\cyrn\cyro}
+
+\def\classify{
+ \begin{flushright}
+ \@classlabel\\
+ {\cyr\CYREREV\cyrk\cyrz.~\textnumero\,\@copynum}
+ \end{flushright}
+ \vspace{2ex}
+}
+
\providecommand\facsimile{\vskip 6pt\includegraphics[width=3cm]{facsimile}}
\endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2c91096f65e..e3d68bac2ed 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -301,6 +301,8 @@ $Master = "$mydir/../..";
'hyphen-german',"die 'skipping, part of hyph-utf8'",
'ibycus-babel',"&MAKEibycusbabel",
'ibygrk', "&MAKEflatten",
+ 'ieeeconf', "die 'skipping, use IEEEconf'",
+ 'ieeetran', "die 'skipping, use IEEEtran'",
'ifacmtg', "die 'skipping, nonfree license'",
'indxcite', "die 'skipping, too old, license suboptimal'",
'induni-om', "die 'skipping, for omega, use of pua?'",
@@ -1431,6 +1433,7 @@ $standardbst='\.bst$';
$standardbib = 'NULL'; # almost all bib files are for the doc
#$standardbib='\.bib$'; # $ so we don't find README.bibtex in IEEEtran
%specialbib= (
+ 'IEEEtran' => '\.bib$',
'amsrefs' => 'ams.*bib', # not jr.bib
'computational-complexity' => '\.bib$',
);