summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex/bst
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/bibtex/bst')
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2003.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2003s.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008l.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008n.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost2008s.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost780.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/gost780s.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2003.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst232
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst231
-rw-r--r--Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst232
18 files changed, 3312 insertions, 854 deletions
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2003.bst b/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
index 26fd1cc3529..1cedcea6fbd 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2003.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -827,18 +830,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -868,14 +905,32 @@ FUNCTION {output.address.publisher}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -883,6 +938,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1033,24 +1089,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1731,20 +1820,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1817,6 +1904,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1834,12 +1922,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1856,19 +1980,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1912,6 +2041,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst b/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
index 7d197ada700..5d1bb9fc5fe 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2003s.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -837,18 +840,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -878,14 +915,32 @@ FUNCTION {output.address.publisher}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -893,6 +948,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1043,24 +1099,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1741,20 +1830,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1827,6 +1914,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1844,12 +1932,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1866,19 +1990,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2036,6 +2165,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
index 4b8c820d51e..9cb201ef6ab 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -852,18 +855,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -884,14 +921,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -899,6 +954,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1049,24 +1105,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1739,20 +1828,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1825,6 +1912,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1842,12 +1930,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1864,19 +1988,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1920,9 +2049,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
index 51a9518f16d..617ac185024 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008l.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -852,18 +855,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -884,14 +921,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -899,6 +954,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1049,24 +1105,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1727,20 +1816,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1813,6 +1900,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1830,12 +1918,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1852,19 +1976,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1908,9 +2037,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
index ba24714d0a5..690f11a6735 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008ls.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -862,18 +865,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -894,14 +931,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -909,6 +964,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1059,24 +1115,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1737,20 +1826,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1823,6 +1910,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1840,12 +1928,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1862,19 +1986,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2032,9 +2161,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
index 8d3fc6de2dc..419c976e49c 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008n.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -46,11 +47,11 @@
%% The \cite command functions as follows:
%% \citet{key} => Jones et al. (1990)
%% \citet*{key} => Jones, Baker, and Smith (1990)
-%% \citep{key} => (Jones et al., 1990)
-%% \citep*{key} => (Jones, Baker, and Smith, 1990)
-%% \citep[chap. 2]{key} => (Jones et al., 1990, chap. 2)
-%% \citep[e.g.][]{key} => (e.g. Jones et al., 1990)
-%% \citep[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
+%% \cite{key} => (Jones et al., 1990)
+%% \cite*{key} => (Jones, Baker, and Smith, 1990)
+%% \cite[chap. 2]{key} => (Jones et al., 1990, chap. 2)
+%% \cite[e.g.][]{key} => (e.g. Jones et al., 1990)
+%% \cite[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
%% \citeauthor{key} => Jones et al.
%% \citeauthor*{key} => Jones, Baker, and Smith
%% \citeyear{key} => 1990
@@ -75,17 +76,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -1021,18 +1024,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -1145,9 +1182,17 @@ FUNCTION {output.bibitem}
"]{" * write$
cite$ write$
"}" write$
- language empty$
- { "english" 'curlanguage := }
- {language 'curlanguage := }
+%% language empty$
+%% { "english" 'curlanguage := }
+%% {language 'curlanguage := }
+%% if$
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -1309,24 +1354,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -2016,20 +2094,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -2102,6 +2178,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -2119,12 +2196,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -2141,19 +2254,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2260,9 +2378,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
"\providecommand{\natexlab}[1]{#1}" write$ newline$
preamble$ empty$
'skip$
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
index 5f36afd5d00..691ea1524a1 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008ns.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -46,11 +47,11 @@
%% The \cite command functions as follows:
%% \citet{key} => Jones et al. (1990)
%% \citet*{key} => Jones, Baker, and Smith (1990)
-%% \citep{key} => (Jones et al., 1990)
-%% \citep*{key} => (Jones, Baker, and Smith, 1990)
-%% \citep[chap. 2]{key} => (Jones et al., 1990, chap. 2)
-%% \citep[e.g.][]{key} => (e.g. Jones et al., 1990)
-%% \citep[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
+%% \cite{key} => (Jones et al., 1990)
+%% \cite*{key} => (Jones, Baker, and Smith, 1990)
+%% \cite[chap. 2]{key} => (Jones et al., 1990, chap. 2)
+%% \cite[e.g.][]{key} => (e.g. Jones et al., 1990)
+%% \cite[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
%% \citeauthor{key} => Jones et al.
%% \citeauthor*{key} => Jones, Baker, and Smith
%% \citeyear{key} => 1990
@@ -75,17 +76,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -1021,18 +1024,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -1145,9 +1182,17 @@ FUNCTION {output.bibitem}
"]{" * write$
cite$ write$
"}" write$
- language empty$
- { "english" 'curlanguage := }
- {language 'curlanguage := }
+%% language empty$
+%% { "english" 'curlanguage := }
+%% {language 'curlanguage := }
+%% if$
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -1309,24 +1354,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -2016,20 +2094,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -2102,6 +2178,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -2119,12 +2196,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -2141,19 +2254,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2394,9 +2512,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
"\providecommand{\natexlab}[1]{#1}" write$ newline$
preamble$ empty$
'skip$
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst b/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
index 62b0211204f..a86aac7500f 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost2008s.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -862,18 +865,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -894,14 +931,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -909,6 +964,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1059,24 +1115,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1749,20 +1838,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1835,6 +1922,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1852,12 +1940,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1874,19 +1998,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2044,9 +2173,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost780.bst b/Master/texmf-dist/bibtex/bst/gost/gost780.bst
index a6da9056253..8e12bb33c96 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost780.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost780.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -822,18 +825,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -859,14 +896,32 @@ FUNCTION {output.address.publisher.date}
format.date output
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -874,6 +929,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1024,24 +1080,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1649,20 +1738,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1735,6 +1822,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1752,12 +1840,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1774,19 +1898,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1830,6 +1959,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/gost780s.bst b/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
index e4b802101ae..2e879f4f425 100644
--- a/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/gost780s.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -832,18 +835,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "\CYRYA\cyrn\cyrv." }
+ { month "Feb." =
+ { "\CYRF\cyre\cyrv\cyrr." }
+ { month "Mar." =
+ { "\CYRM\cyra\cyrr\cyrt" }
+ { month "Apr." =
+ { "\CYRA\cyrp\cyrr." }
+ { month "May" =
+ { "\CYRM\cyra\cyrishrt" }
+ { month "Jun." =
+ { "\CYRI\cyryu\cyrn\cyrsftsn" }
+ { month "Jul." =
+ { "\CYRI\cyryu\cyrl\cyrsftsn" }
+ { month "Aug." =
+ { "\CYRA\cyrv\cyrg\." }
+ { month "Sep." =
+ { "\CYRS\cyre\cyn\cyrt." }
+ { month "Oct." =
+ { "\CYRO\cyrk\cyrt." }
+ { month "Nov." =
+ { "\CYRN\cyro\cyrya\cyrb." }
+ { month "Dec." =
+ { "\CYRD\cyre\cyrk." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -869,14 +906,32 @@ FUNCTION {output.address.publisher.date}
format.date output
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -884,6 +939,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1034,24 +1090,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1659,20 +1748,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1745,6 +1832,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1762,12 +1850,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1784,19 +1908,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"\CYRU\CYRF\CYRN"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1954,6 +2083,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
index e25ae4b4aad..c1f63813b7e 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2003.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -822,18 +825,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -863,14 +900,32 @@ FUNCTION {output.address.publisher}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -878,6 +933,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1028,24 +1084,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1726,20 +1815,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1812,6 +1899,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1829,12 +1917,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1851,19 +1975,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1907,6 +2036,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
index f0c342298e3..2f12ad6f73c 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2003s.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -107,7 +110,7 @@ FUNCTION {output.nonnull}
{ ", " * write$ }
{ output.state after.block =
{ add.period$ write$
- " " quote$ "--- " * * write$
+ " \BibDash " write$ %%" " quote$ "--- " * * write$ % since v1.2c
newline$
"\newblock " write$
}
@@ -832,18 +835,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". " quote$ "--- " month * * * * }
+ { year ". \BibDash " format.month * * }%%{ year ". " quote$ "--- " month * * * * }
if$
}
if$
@@ -873,14 +910,32 @@ FUNCTION {output.address.publisher}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -888,6 +943,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1038,24 +1094,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1736,20 +1825,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1822,6 +1909,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1839,12 +1927,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1861,19 +1985,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2030,6 +2159,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
index ee362890c9a..3071ae6c775 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -847,18 +850,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -879,14 +916,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -894,6 +949,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1044,24 +1100,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1734,20 +1823,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1820,6 +1907,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1837,12 +1925,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1859,19 +1983,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1915,9 +2044,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
index 6df2f79f8f7..4a693df4e83 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008l.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -847,18 +850,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -879,14 +916,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -894,6 +949,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1044,24 +1100,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1722,20 +1811,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1808,6 +1895,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1825,12 +1913,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1847,19 +1971,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -1903,9 +2032,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
index ebaa7857837..fe51a068dc3 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008ls.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -857,18 +860,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -889,14 +926,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -904,6 +959,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1054,24 +1110,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1744,20 +1833,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1830,6 +1917,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1847,12 +1935,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1869,19 +1993,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2038,9 +2167,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
index 5372cfe35c9..eef10e17c45 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008n.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -46,11 +47,11 @@
%% The \cite command functions as follows:
%% \citet{key} => Jones et al. (1990)
%% \citet*{key} => Jones, Baker, and Smith (1990)
-%% \citep{key} => (Jones et al., 1990)
-%% \citep*{key} => (Jones, Baker, and Smith, 1990)
-%% \citep[chap. 2]{key} => (Jones et al., 1990, chap. 2)
-%% \citep[e.g.][]{key} => (e.g. Jones et al., 1990)
-%% \citep[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
+%% \cite{key} => (Jones et al., 1990)
+%% \cite*{key} => (Jones, Baker, and Smith, 1990)
+%% \cite[chap. 2]{key} => (Jones et al., 1990, chap. 2)
+%% \cite[e.g.][]{key} => (e.g. Jones et al., 1990)
+%% \cite[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
%% \citeauthor{key} => Jones et al.
%% \citeauthor*{key} => Jones, Baker, and Smith
%% \citeyear{key} => 1990
@@ -75,17 +76,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -1016,18 +1019,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -1140,9 +1177,17 @@ FUNCTION {output.bibitem}
"]{" * write$
cite$ write$
"}" write$
- language empty$
- { "english" 'curlanguage := }
- {language 'curlanguage := }
+%% language empty$
+%% { "english" 'curlanguage := }
+%% {language 'curlanguage := }
+%% if$
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -1304,24 +1349,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -2011,20 +2089,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -2097,6 +2173,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -2114,12 +2191,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -2136,19 +2249,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2254,9 +2372,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
"\providecommand{\natexlab}[1]{#1}" write$ newline$
preamble$ empty$
'skip$
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
index 6814cecc1d0..329d76725ce 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008ns.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -46,11 +47,11 @@
%% The \cite command functions as follows:
%% \citet{key} => Jones et al. (1990)
%% \citet*{key} => Jones, Baker, and Smith (1990)
-%% \citep{key} => (Jones et al., 1990)
-%% \citep*{key} => (Jones, Baker, and Smith, 1990)
-%% \citep[chap. 2]{key} => (Jones et al., 1990, chap. 2)
-%% \citep[e.g.][]{key} => (e.g. Jones et al., 1990)
-%% \citep[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
+%% \cite{key} => (Jones et al., 1990)
+%% \cite*{key} => (Jones, Baker, and Smith, 1990)
+%% \cite[chap. 2]{key} => (Jones et al., 1990, chap. 2)
+%% \cite[e.g.][]{key} => (e.g. Jones et al., 1990)
+%% \cite[e.g.][p. 32]{key} => (e.g. Jones et al., p. 32)
%% \citeauthor{key} => Jones et al.
%% \citeauthor*{key} => Jones, Baker, and Smith
%% \citeyear{key} => 1990
@@ -75,17 +76,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -1016,18 +1019,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -1140,9 +1177,17 @@ FUNCTION {output.bibitem}
"]{" * write$
cite$ write$
"}" write$
- language empty$
- { "english" 'curlanguage := }
- {language 'curlanguage := }
+%% language empty$
+%% { "english" 'curlanguage := }
+%% {language 'curlanguage := }
+%% if$
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -1304,24 +1349,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -2011,20 +2089,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -2097,6 +2173,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -2114,12 +2191,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -2136,19 +2249,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2388,9 +2506,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
"\providecommand{\natexlab}[1]{#1}" write$ newline$
preamble$ empty$
'skip$
diff --git a/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst b/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
index 7dd8f410f3f..d29d3e64497 100644
--- a/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
+++ b/Master/texmf-dist/bibtex/bst/gost/ugost2008s.bst
@@ -16,7 +16,8 @@
%%
%% This file has the LPPL maintenance status "maintained".
%% Maintained by Igor A. Kotelnikov.
-%% Current version: 2012.02.02
+%%
+%% Current version: 1.2d, 2016.02.18
%%
%% Please, send bug report via e-mail:
%% kia999 at mail dot ru <Igor Kotelnikov>
@@ -49,17 +50,19 @@ ENTRY
number
organization
pages
+ eid % new in v1.2c
publisher
school
series
title
- medium % new in v.2.
+ medium % new in v1.2.
type
volume
year
language
+ langid % new in v1.2c
booklanguage
- numpages
+ pagetotal
url
urldate
isbn
@@ -857,18 +860,52 @@ FUNCTION {format.title}
if$
}
+FUNCTION {format.month}
+{ month empty$
+ { "" }
+ { curlanguage "russian" =
+ { month "Jan." =
+ { "Янв." }
+ { month "Feb." =
+ { "Фев." }
+ { month "Mar." =
+ { "Март" }
+ { month "Apr." =
+ { "Апр." }
+ { month "May" =
+ { "Май" }
+ { month "Jun." =
+ { "Июнь" }
+ { month "Jul." =
+ { "Июль" }
+ { month "Aug." =
+ { "Авг." }
+ { month "Sep." =
+ { "Сент." }
+ { month "Oct." =
+ { "Окт." }
+ { month "Nov." =
+ { "Нояб." }
+ { month "Dec." =
+ { "Дек." }
+ { month }
+ if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}if$}
+ { month }
+ if$}
+ if$
+}
FUNCTION {format.date}
{ year empty$
{ month empty$
{ "" }
{ "there's a month but no year in " cite$ * warning$
- month
+ format.month
}
if$
}
{ month empty$
'year
- { year ". \BibDash " month * * }
+ { year ". \BibDash " format.month * * }
if$
}
if$
@@ -889,14 +926,32 @@ FUNCTION {output.address.publisher}
}
+%%FUNCTION {output.bibitem}
+%%{ newline$
+%% "\bibitem" write$
+%% cite$ bracify write$
+%% newline$
+%% language empty$
+%% { "english" 'curlanguage := }
+%% { language 'curlanguage := }
+%% if$
+%% "\selectlanguageifdefined" curlanguage bracify * write$
+%% newline$
+%% ""
+%% before.all 'output.state :=
+%%}
FUNCTION {output.bibitem}
{ newline$
"\bibitem" write$
cite$ bracify write$
newline$
- language empty$
- { "english" 'curlanguage := }
- { language 'curlanguage := }
+ langid empty$
+ { language empty$
+ { "english" 'curlanguage := }
+ { language 'curlanguage := }
+ if$
+ }
+ { langid 'curlanguage := }
if$
"\selectlanguageifdefined" curlanguage bracify * write$
newline$
@@ -904,6 +959,7 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
+
FUNCTION {n.dashify}
{ 't :=
""
@@ -1054,24 +1110,57 @@ FUNCTION {multi.page.check}
multiresult
}
+%%FUNCTION {format.pages}
+%%{ pages empty$
+%% { "" }
+%% { pages multi.page.check
+%% { bbl.ppages pages n.dashify tie.connect }
+%% { bbl.ppage pages tie.connect }
+%% if$
+%% }
+%% if$
+%%}
FUNCTION {format.pages}
-{ pages empty$
- { "" }
- { pages multi.page.check
- { bbl.ppages pages n.dashify tie.connect }
- { bbl.ppage pages tie.connect }
+{ eid empty$
+ {
+ pages empty$
+ { "" }
+ { pages multi.page.check
+ { bbl.ppages pages n.dashify tie.connect }
+ { bbl.ppage pages tie.connect }
+ if$
+ }
+ if$
+ }
+ { eid multi.page.check
+ { bbl.ppages eid n.dashify tie.connect }
+ { bbl.ppage eid tie.connect }
if$
}
if$
}
+%%FUNCTION {format.pages.page}
+%%{ pages empty$
+%% { pagetotal empty$
+%% { "" }
+%% { pagetotal bbl.pages tie.connect }
+%% if$}
+%% { format.pages}
+%% if$
+%%}
FUNCTION {format.pages.page}
-{ pages empty$
- { numpages empty$
- { "" }
- { numpages bbl.pages tie.connect }
- if$}
- { format.pages}
+{ eid empty$
+ { pages empty$
+ { pagetotal empty$
+ { "" }
+ { pagetotal bbl.pages tie.connect }
+ if$
+ }
+ { format.pages}
+ if$
+ }
+ { format.pages }
if$
}
@@ -1744,20 +1833,18 @@ FUNCTION {techreport}
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 {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"Jun."}
+MACRO {jul} {"Jul."}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sep."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
MACRO {aa}{"Astron. \& Astrophys."}
MACRO {aasup}{"Astron. \& Astrophys. Suppl. Ser."}
MACRO {aj} {"Astron. J."}
@@ -1830,6 +1917,7 @@ MACRO {plb} {"Phys. Lett. B"}
MACRO {prep} {"Phys. Rep."}
MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
MACRO {pp} {"Phys. Plasmas"}
+MACRO {pop} {"Phys. Plasmas"}
MACRO {ppcf} {"Plasma Phys. \& Controlled Fusion"}
MACRO {phitrsl} {"Philos. Trans. Roy. Soc. London"}
MACRO {prl} {"Phys. Rev. Lett."}
@@ -1847,12 +1935,48 @@ 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.--Uspekhi"}
MACRO {st} {"Sky and Telesc."}
-
+MACRO {cjp} {"Czech. J. Phys."}
+MACRO {el} {"Europhys. Lett."}
+MACRO {en} {"Europhys. News"}
+MACRO {fujitsustj} {"FUJITSU Sci. Tech. J."}
+MACRO {ieeeed} {"IEEE Trans. Electron Devices"}
+MACRO {ieeeim} {"IEEE Trans. Instrum. Meas."}
+MACRO {ieeejqe} {"IEEE J. Quantum Electron."}
+MACRO {ieeem} {"IEEE Trans. Magn."}
+MACRO {ieeeptl} {"IEEE Photonic Technol. Lett."}
+MACRO {ieeeuffc} {"IEEE Trans. Ultrason., Ferroelect., Freq. Cont."}
+MACRO {jem} {"J. Electron. Mater."}
+MACRO {jes} {"J. Electrochem. Soc."}
+MACRO {jetplett} {"JETP Lett."}
+MACRO {jjap} {"Japan. J. Appl. Phys."}
+MACRO {jpha} {"J. Phys. A: Math. Gen."}
+MACRO {jphb} {"J. Phys. B: At. Mol. Opt. Phys."}
+MACRO {jphbold} {"J. Phys. B: At. Mol. Phys."}
+MACRO {jphc} {"J. Phys.: Condens. Matter"}
+MACRO {jphcold} {"J. Phys. C: Solid State Phys."}
+MACRO {jphd} {"J. Phys. D: Appl. Phys."}
+MACRO {jvsta} {"J. Vac. Sci. Technol. A"}
+MACRO {jvstb} {"J. Vac. Sci. Technol. B"}
+MACRO {me} {"Microelectron. Eng."}
+MACRO {necrd} {"NEC Res.{\&} Develop."}
+MACRO {pa} {"Physica A"}
+MACRO {pb} {"Physica B"}
+MACRO {pc} {"Physica C"}
+MACRO {pd} {"Physica D"}
+MACRO {procieee} {"Proc. IEEE"}
+MACRO {procspie} {"Proc. SPIE"}
+MACRO {pssa} {"Phys. Stat. Sol. A"}
+MACRO {pssb} {"Phys. Stat. Sol. B"}
+MACRO {rpp} {"Rep. Progr. Phys."}
+MACRO {sm} {"Synthet. Metal"}
+MACRO {sost} {"Solid State Technol."}
+MACRO {ss} {"Surf. Sci."}
+MACRO {ssc} {"Solid State Commun."}
+MACRO {sst} {"Semicond. Sci. Technol."}
+MACRO {suplatt} {"Superlatt. Microstr."}
+MACRO {sust} {"Supercond. Sci. Technol."}
+MACRO {znat} {"Z. Naturforsch."}
MACRO {appopt} {"Appl. Opt."}
MACRO {bell} {"Bell Syst. Tech. J."}
MACRO {ell} {"Electron. Lett."}
@@ -1869,19 +1993,24 @@ 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."}
MACRO {nl} {"Nano Lett."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.--Doklady"}
+MACRO {sptp} {"Sov. Phys.--Tech. Phys."}
+MACRO {spu} {"Sov. Phys.--Uspekhi"}
+MACRO {ufn} {"УФН"}
+MACRO {pu} {"Phys.--Uspekhi"}
+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."}
READ
@@ -2038,9 +2167,18 @@ FUNCTION {begin.bib}
"\providecommand*{\BibUrl}[1]{\url{#1}}" write$ newline$
"\providecommand{\BibAnnote}[1]{}" write$ newline$
"\providecommand*{\BibEmph}[1]{#1}" write$ newline$
- "\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
- "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em\fi" write$ newline$
- "\cyrdash\hskip.2em\ignorespaces}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{---}" write$ newline$
+ %\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+ %"\let\cyrdash\textemdash" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\hbox to.8em{--\hss--}}" write$ newline$
+ %"\ProvideTextCommandDefault{\cyrdash}{\textemdash}" write$ newline$
+ "\ProvideTextCommandDefault{\cyrdash}{\iflanguage{russian}{\hbox to.8em{--\hss--}}{\textemdash}}" write$ newline$
+ %%"\ProvideTextCommandDefault{\cyrdash}{%" write$ newline$
+ %%" \iflanguage{russian}{\hbox to.8em{--\hss--}}{%" write$ newline$
+ %%" \iflanguage{ukrainian}{\hbox to.8em{--\hss--}}{\textemdash}}}" write$ newline$
+ "\providecommand*{\BibDash}{\ifdim\lastskip>0pt\unskip\nobreak\hskip.2em plus 0.1em\fi" write$ newline$
+ "\cyrdash\hskip.2em plus 0.1em\ignorespaces}" write$ newline$
+ "\renewcommand{\newblock}{\ignorespaces}" write$ newline$
preamble$ empty$
'skip$
{ preamble$ write$ newline$ }