csplain (11mar16)

git-svn-id: svn://tug.org/texlive/trunk@40002 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 58 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
index 050d83bbd40..4b94be25b21 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-iso690.tex
@@ -10,6 +10,7 @@
 
 % misc:
 
+\frenchspacing
 \def\maybedot{\ifnum\spacefactor=\sfcode`\.\relax\else.\fi}
 \tmpnum=\sfcode`\. \advance\tmpnum by-2 \sfcode`\.=\tmpnum \sfcode`\?=\tmpnum \sfcode`\!=\tmpnum
 \let\.=\maybedot  % prevents from double periods
@@ -91,8 +92,8 @@
 % Multilinguals:           English                Czech               Slovak
 
 \mtdef{bib.and}            {, and }               { a }               {}
-\mtdef{bib.etal}           { et al.}              { a~kol.}           {}
-\mtdef{bib.edition}        { ed.}                 { vyd.}             {}
+\mtdef{bib.etal}           {, et~al.}             { a~kol.}           {}
+\mtdef{bib.edition}        {~ed.}                 {~vyd.}             {}
 \mtdef{bib.bachthesis}     {Bachelor's Thesis}    {Bakalářská práce}  {Bakalárska práca}
 \mtdef{bib.masthesis}      {Master's Thesis}      {Diplomová práce}   {Diplomová práca}
 \mtdef{bib.phdthesis}      {Ph.D. Thesis}         {Disertační práce}  {Dizertačná práca}
@@ -171,7 +172,7 @@
 \def\docitedateCS#1#2#3{\hbox{\tmpnum=#3 \the\tmpnum. \tmpnum=#2 \the\tmpnum. #1}} 
 \let\docitedateSK=\docitedateCS
 
-\def\doyear#1{
+\def\doyear#1{%
    \biboptionvalue{yearprint}\yearprint
    \ifx\yearprint\empty#1\else\def\YEAR{#1}\yearprint\fi
 }
@@ -210,7 +211,7 @@
    \isbiboption{unpublished}\iftrue \let\bibwarninga=\relax \let\bibwarningb=\relax \fi
    \isbiboption{nowarn}\iftrue \let\bibwarning=\relax \fi
    \isbiboption{urlalso}\iftrue \def\preurl{\Mtext{bib.availablealso}}\fi
-   \RetrieveFieldIn{lang}\langentry \setlang\langentry 
+   \RetrieveFieldIn{lang}\langentry \setlang\langentry
 }
 \sdef{print:END}{%
    \bprinta [note]       {*.}{}%
@@ -413,12 +414,12 @@ output:    GREEN, John, Bob BROWN, and Alice BLACK.
    author = "John Green and Bob Brown and Alice Black",
    option = "aumax:1",
 
-output:    GREEN, John~et~al.
+output:    GREEN, John, et~al.
 
    author = "John Green and Bob Brown and Alice Black",
    option = "aumax:2",
 
-output:    GREEN, John, Bob BROWN~et~al.
+output:    GREEN, John, Bob BROWN, et~al.
 
    author = "John Green and Bob Brown and Alice Black",
    option = "aumax:3",
@@ -428,17 +429,17 @@ output:    GREEN, John, Bob BROWN, and Alice BLACK.
    author = "John Green and Bob Brown and Alice Black",
    option = "auetal",
    
-output:    GREEN, John, Bob BROWN, Alice BLACK~et~al.
+output:    GREEN, John, Bob BROWN, Alice BLACK, et~al.
 
 If you need to add a text before or after authors list, you can use
 the "auprint:{<value>}" option. The <value> will be printed instead of the
 authors list. The <value> can include \AU macro which expands to the authors
 list. Example:
 
-   author = "Robert Calbraith",
+   author = "Robert Galbraith",
    option = "auprint:{\AU\space [pseudonym of J. K. Rowling]}",
 
-output:    CALBRAITH Robert [pseudonym of J. K. Rowling].
+output:    GALBRAITH Robert [pseudonym of J. K. Rowling].
 
 You can use the "autrim:<number>" option. All Firstnames of all authors
 are trimmed (i. e. reduced to initials) iff the number of authors in the 
@@ -449,7 +450,7 @@ Another example: "autrim:1" means that all Firstnames are trimmed.
    author = "John Green and Bob Brown and Alice Black",
    option = "auetal autrim:1",
 
-output:    GREEN, J., B. BROWN, A. BLACK~et~al.
+output:    GREEN, J., B. BROWN, A. BLACK, et~al.
 
 If you need to write a team name or institution instead authors, replace all
 spaces by \<space> in this name. Such text is interpreted as Lastname. You
@@ -616,7 +617,7 @@ It means, that the output of previous example is:
 
 Available from \url{http://petr.olsak.net/opmac.html}.
 
-If the "cs" language is the current one than the output is:
+If the "cs" language is the current one then the output is:
 
 Dostupné z: \url{http://petr.olsak.net/opmac.html}.
 
@@ -893,6 +894,7 @@ This style uses the following fields unkown by bibTeX:
 
 option    ... options separated by spaces
 lang      ... the language two-letter code of one entry
+bibmark   ... the mark used when \nonumcitations is set
 ednote    ... editional info (secondary authors etc.) or
               global data in @MISC-like entries
 citedate  ... the date of the citation in year/month/day format
@@ -920,3 +922,13 @@ unpublished  ... the publisher etc. fields are not mandatory
 nowarn       ... no mandatory fields
 
 Another options in the option field are silently ignored.
+
+======================
+
+History:
+
+Apr. 2015: Released
+Jan. 2016: \doyear -- unwanted space corrected
+           ~ed. ~vyd. instead space ed., space vyd.
+           \frenchspacing added
+Mar. 2016: et~al. -> , et~al. corrected.
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
index 642c6d84825..d0eb78daa1c 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib-simple.tex
@@ -10,6 +10,7 @@
 
 % misc:
 
+\frenchspacing
 \def\maybedot{\ifnum\spacefactor=\sfcode`\.\relax\else.\fi}
 \tmpnum=\sfcode`\. \advance\tmpnum by-2 \sfcode`\.=\tmpnum 
 \sfcode`\?=\tmpnum \sfcode`\!=\tmpnum
@@ -66,7 +67,7 @@
 }  
 \sdef{print:book}{%
    \bprinta [!author]    {*\.\ }{\bibwarning}%
-   \bprintb [title]      {{\em##1}.\ }{\bibwarning}%
+   \bprintb [title]      {{\em##1}\.\ }{\bibwarning}%
    \bprinta [edition]    {*~\mtext{bib.edition}.\ }{}%
    \bprinta [address]    {*: }{\bibwarning}%
    \bprinta [publisher]  {*, }{\bibwarning}%
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex
index a2f542d97a0..d5c90b9733d 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-bib.tex
@@ -1,6 +1,6 @@
 % opmac-bib
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Petr Olsak, version Apr. 2015 (beta)
+% Petr Olsak, version Jan. 2016 (beta)
 
 % This is module for OPmac macros, see http://petr.olsak.net/opmac.html
 % The command:
@@ -82,12 +82,13 @@
 }
 \def\lb@readentry#1#2#3,{% space before key have to be ingnored
   \def\lb@temp{#2#3}%      we need case sensitive keys
+  \def\lb@next{\expandafter\lb@gotoat\lb@gobbletoeoe}%
   \lb@ifcs\lb@temp{requested}%
           {\let\lb@entrykey\lb@temp
-           \lb@defcs\lb@entrykey{fields}{}%
-           \lowercase{\lb@addfield{entrytype}{#1}}%
-           \let\lb@next\lb@analyzeentry}%
-          {\def\lb@next{\expandafter\lb@gotoat\lb@gobbletoeoe}}%
+           \lb@ifcs\lb@entrykey{fields}{}%
+                {\lb@defcs\lb@entrykey{fields}{}%
+                 \lowercase{\lb@addfield{entrytype}{#1}}%
+                 \let\lb@next\lb@analyzeentry}}{}%
   \lb@next
 }
 \let\lb@compareA=\lb@compare
@@ -214,6 +215,15 @@ bibliographics references (only those declared by by \cite[] or \nocite[]
 in the text). The formatting of such references is defined in the style
 file. The usage is mentioned in OPmac documentation too.
 
+The principle "first entry wins" is used. Suppose
+
+   \usebib/s (simple) local,global
+
+If an entry with the same label is declared in local.bib and in
+global.bib too then the first wins. So, you can set an exceptions in your
+local.bib file for your document, for example.
+
+
 Notes for style writers:
 ------------------------
 
@@ -308,4 +318,12 @@ If you need (for example) to place the autocitations before other citations,
 then you can mark your entries in .bib file by sortedby = "@", because this
 character is sorted before A.
 
+
+History:
+--------
+
+Apr. 2014:  released
+Jan. 2016:  "first entry wins" implemented
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% end of the opmac-bib.tex
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
index 9df65b02326..1c189d00bb7 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
@@ -89,7 +89,7 @@
 
 \def\inspic #1 {\hbox{\def\tmp##1.pdf##2\relax{%
    \ifnum\strcmp{##2}{.pdf}=0 \XeTeXpdffile \else \XeTeXpicfile \fi}%
-   \lowercase{\tmp #1}.pdf\relax \picdir#1
+   \lowercase{\tmp #1}.pdf\relax \picdir#1 \inspicpage
        \ifdim\picwidth=0pt \else width\picwidth\fi
        \ifdim\picheight=0pt \else height\picheight\fi}}
 
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 4b6dc67c69e..fbd35930f14 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
@@ -5,7 +5,7 @@
 %% The history of versions is at the end of this file, after \endpinput
 
 \ifx\OPmacversion\undefined \else \endinput \fi
-\def\OPmacversion{Nov. 2015}  
+\def\OPmacversion{Mar. 2016}  
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -252,7 +252,8 @@
 
 \ifx\uselanguage\undefined \def\isolangset#1#2{}\else 
   \message{OPmac: etex.src macros detected}
-  \def\isolangset#1#2{{\uselanguage{#1}\sxdef{lan:\the\language}{#2}}}
+  \def\isolangset#1#2{{\uselanguage{#1}\sxdef{lan:\the\language}{#2}%
+      \global\expandafter\chardef\csname#2Patt\endcsname=\language}}
   \isolangset{USenglish}{en} \isolangset{czech}{cs} \isolangset{slovak}{sk}
 \fi
 
@@ -1211,12 +1212,13 @@
 \ifpdftex
   \def\inspic #1 {\hbox{%
       \pdfximage \ifdim\picwidth=0pt \else width\picwidth\fi 
-                 \ifdim\picheight=0pt \else height\picheight\fi {\picdir#1}%
+                 \ifdim\picheight=0pt \else height\picheight\fi \inspicpage {\picdir#1}%
       \pdfrefximage\pdflastximage}}
 \else
   \def\inspic #1 {\opwarning
      {The \noexpand\inspic is supported for PDF output only}}
 \fi
+\def\inspicpage{}
 
 %%%%%%%%%%%%%%% transformation matrix -- sec. 3.21 in opmac-d.pdf
 
@@ -1283,7 +1285,7 @@
    {\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
 }
 \def\fnmarkx{\isdefined{fn:\the\fnotenum}\iftrue\thefnote\else$^?$\fi}
-\def\thefnote{$^{\locfnum}$)}
+\def\thefnote{$^{\locfnum}$}
 \def\locfnum{\csname fn:\the\fnotenum\endcsname}
 
 \def\Xfnote{\advance\fnotenumlocal by1 \advance\fnotenum by1
@@ -1753,5 +1755,8 @@ Oct. 2015  \printttline, \ptthook introduced, \viprintline redesigned.
 Nov. 2015  \parskip=0 in \doverbinput, \vskip\parskip before first \ttskip
            \addto\prepghook instead \def\prepghook in \draft
            \mnote: ifvmode \hbox{\strut...} added
+Jan. 2016  \inspicpage introduced
+           \isolangset: \chardef..Patt added
+Mar. 2016  \thefnote default changed: ^{num}) -> ^{num} 
 
 %%%%%%%%%%%%%% End of opmac.tex