csplain (24dec14)

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

8 files changed, 297 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini
index 271d5f070b2..5f0cfefaf87 100644
--- a/Master/texmf-dist/tex/csplain/base/csplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/csplain.ini
@@ -212,6 +212,10 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
 
   Dec. 2014: [format wasn't modified]
 * opmac <Dec. 2014> added (new implementation of color stuff)
+* \setmathcodechanges bug fixed (in ams-math, tx-math and ntx-math.tex)
+* \crq corrected in ucode.tex
+* luatex 0.79  uses luaotfload-main file, corrected in luafonts.tex
+* op-example.bib added
 
 COPYRIGHT
 =========
diff --git a/Master/texmf-dist/tex/csplain/base/ucode.tex b/Master/texmf-dist/tex/csplain/base/ucode.tex
index 2b09558115e..1faab7fd39b 100644
--- a/Master/texmf-dist/tex/csplain/base/ucode.tex
+++ b/Master/texmf-dist/tex/csplain/base/ucode.tex
@@ -304,7 +304,7 @@
 \chardef \flq      8249
 \chardef \frq      8250
 \chardef \clq      8218
-\chardef \crq      8219
+\chardef \crq      8216 % corrected form 8219, which is mirrored 9, no 6
 \chardef \elqq     8220
 \chardef \erqq     8221
 \chardef \sterling  163  
diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
index 4f9c9de10b7..d46f617bf7e 100644
--- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
@@ -171,11 +171,11 @@
 \def\mitvariables{\def\rm{\fam0\tenrm}%
   \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z}
 
-\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1
+\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }%
    \count0=`#2  \count1=\count0  \advance\count1 by"7#100
    \loop \mathcode\count0=\count1
          \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat
-   \count0=\tmp \count1=\tmpa
+   \tmp\relax
 }
 \def\whichtfm #1{\ifx\dgsize\undefined #1\else
    \expandafter \ifx\csname#1:reg\endcsname\relax
diff --git a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
index f4653c74321..b6d5899a096 100644
--- a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
@@ -21,6 +21,9 @@
 }
 \else %%% \luatexversion>=76
 
+\ifnum\luatexversion<79 \def\luaotfloadfile{luaotfload}
+\else \def\luaotfloadfile{luaotfload-main}\fi
+
 \message{processing luaotfload.lua (2)}
 \expandafter\ifx\csname LuT@AllocAttribute\endcsname \relax
    \csname newcount\expandafter \endcsname \csname LuT@AllocAttribute\endcsname \fi
@@ -33,7 +36,7 @@
            oriwrite = texio.write_nl % I don't need to see unusual info
            function texio.write_nl(...) end
            require('luatexbase.mcb')
-           luatexbase.require_module('luaotfload')
+           luatexbase.require_module('\luaotfloadfile')
            texio.write_nl = oriwrite % return to original meaning
 }
 \fi
diff --git a/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex b/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex
index 705480ea45b..27634210a62 100644
--- a/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex
@@ -1,5 +1,5 @@
-% This file loads TX math fonts by plainTeX macros
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file loads NTX math fonts by plainTeX macros
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Petr Olsak, 2012, 2014 (derived from tx-math.tex)
 
 \message{FONT: NTX math fonts - \string\mathchardef's prepared, 14 math families preloaded.}
@@ -121,11 +121,11 @@
 \def\mitvariables{\def\rm{\fam0\tenrm}%
   \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z}
 
-\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1
+\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }%
    \count0=`#2  \count1=\count0  \advance\count1 by"7#100
    \loop \mathcode\count0=\count1
          \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat
-   \count0=\tmp \count1=\tmpa
+   \tmp\relax
 }
 \ifx\whichtfm\undefined \def\whichtfm#1{#1}\fi
 
diff --git a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
index 4f3a121788f..655de704252 100644
--- a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
@@ -115,11 +115,11 @@
 \def\mitvariables{\def\rm{\fam0\tenrm}%
   \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z}
 
-\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1
+\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }%
    \count0=`#2  \count1=\count0  \advance\count1 by"7#100
    \loop \mathcode\count0=\count1
          \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat
-   \count0=\tmp \count1=\tmpa
+   \tmp\relax
 }
 \ifx\whichtfm\undefined \def\whichtfm#1{#1}\fi
 
diff --git a/Master/texmf-dist/tex/csplain/opmac/op-example.bib b/Master/texmf-dist/tex/csplain/opmac/op-example.bib
new file mode 100644
index 00000000000..78c45fc70b4
--- /dev/null
+++ b/Master/texmf-dist/tex/csplain/opmac/op-example.bib
@@ -0,0 +1,258 @@
+This is an example of .bib file using by opmac-bib package.
+Petr Olsak  2014
+----------------------------------------------------------
+See the opmac-bib-iso690.tex file for documentation.
+
+@BOOK{white,
+  author    = "David J. Whitehouse",
+  title     = "Handbook of surface and nanometrology",
+  edition   = "2nd",
+  address   = "Boca Raton",
+  publisher = "CRC Press",
+  year      = 2011,
+  isbn      = "978-1-4200-8201-2",
+  lang      = "en",
+}
+@BOOK{lech,
+  author    = "Richard Lech",
+  title     = "Fundamental principles of engineering nanometrology",
+  howpublished = "online",
+  address   = "Oxford",
+  publisher = "Elsevier",
+  year      = 2009,
+  isbn      = "978-0-08-096454-6",
+  citedate  = "2011/08/29",
+  url       = "http://www.sciencedirect.com/science/book/9780080964546",
+  option    = "autrim:1",
+}
+@BOOK{Cmej,
+  author    = "Světla Čmejrková and František Daneš and Jindra Světlá",
+  title     = "Jak napsat odborný text",
+  address   = "Praha",
+  publisher = "Leda",
+  year      = 1999,
+  isbn      = "80-85927-69-1",
+  key       = "Czzmejrkova",
+}
+@BOOK{ tbn,
+  author    = "Petr Olšák",
+  title     = "\TeX{}book naruby",
+  edition   = "2.",
+  address   = "Brno",
+  publisher = "Konvoj",
+  year      = 2001,
+  isbn      = "80-7302-007-6",
+  url       = "http://math.feld.cvut.cz/olsak/tbn.html",
+  option    = "urlalso",
+}
+@BOOK{ tst,
+  author    = "Petr Olšák",
+  title     = "Typografický systém \TeX{}",
+  edition   = "2.",
+  address   = "Brno",
+  publisher = "Konvoj",
+  year      = 2000,
+  url       = "http://math.feld.cvut.cz/olsak/tst.html",
+  isbn      = "80-85615-91-6",
+}
+@BOOK{ tpp,
+  author    = "Petr Olšák",
+  title     = "\TeX{} pro pragmatiky",
+  year      = "2013",
+  option    = "unpublished titlepost:{\TeX{} -- CSplain -- OPmac}",
+  howpublished = "online",
+  url       = "http://math.feld.cvut.cz/olsak/tpp.html",
+}
+@BOOK{texbook,
+  author    = "Donald Ervin Knuth",
+  title     = "The \TeX{}book",
+  address   = "Boston",
+  publisher = "Addison-Wesley",
+  year      = 1984,
+  isbn      = "02-011-3448-9",
+}
+@BOOK{ rowling,
+   author  = "Robert Calbraith",
+   option  = "auprint:{\AU\space [pseudonym of J. K. Rowling]}",
+   title   = "The Cuckoo's Calling",
+   address = "New York",
+   publisher = "Mulholland Books",
+   isbn    = "0-316-20684-6",
+   year    = 2013,
+}
+@BOOK{ earle,
+   author  = "Richard Earle",
+   title   = "The art of cause marketing: 
+              how to use advertising to change personal behavior and public policy",
+   ednote  = "Cover and interior design by Monica \upper{Baziuk}",
+   address = "New York",
+   publisher = "McGraw-Hill",
+   year    = 2000,
+   isbn    = "0-07-138702-1",
+   option  = "yearprint:{\copyright2000}",
+}
+@BOOK{ novaci,
+   author  = "Jan Novák and Helena Nováková",
+   title   = "Alergenní rostliny",
+   address = "Praha",
+   publisher = "Knižní klub",
+   year    = 2010,
+   isbn    = "80-242-2591-3",
+}
+@BOOK{ adobe,
+   author  = "Adobe\ creative\ team",
+   title   = "Adobe Flash CS4 Professional: Oficiální výukový kurz",
+   ednote  = "Přeložil Lukáš \upper{Krejčí}",
+   address = "Brno",
+   publisher = "Computer Press",
+   year    = 2009,
+   isbn    = "80-251-2334-8",
+}
+@BOOK{ nierhaus,
+  author  = "Grehard Nierhaus",
+  title   = "Algorithmic Composition: Paradigms of Automated Music Generation",
+  address = "Wien",
+  publisher = "Springer",
+  year    = 2009,
+  isbn    = "3-211-77539-6",
+  url     = "http://www.springerlink.com/content/g7h129",
+  option  = "yearprint:{\copyright2009} urlalso",
+}
+@BOOK{ taschen,
+  author  = "Laszlo Taschen",
+  title   = "Modern architekture A-Z",
+  ednote  = "vol. 1, A-L",
+  address = "Köln",
+  publisher = "Tashen",
+  year    = 2010,
+  isbn    = "383-6521-321",
+}
+@ARTICLE{ opmactug,
+  author  = "Petr Olšák",
+  title   = "OPmac: Macros for Plain \TeX",
+  journal = "TUGboat",
+  publisher = "\TeX{} Users Group",
+  year    = 2013,
+  volume  = 34,
+  number  = 1,
+  pages   = "88--96",
+  issn    = "0896-3207",
+  url     = "http://petr.olsak.net/ftp/olsak/bulletin/tb106olsak-csplain.pdf",
+  option  = "urlalso",
+  lang    = "en",
+}  
+@THESIS{ mirek,
+  author  = "Miroslav Olšák",
+  title   = "Kvadratické rovnice na slovech",
+  school  = "Univerzita Karlova v~Praze, fakulta Matematicko-fyzikální",
+  address = "Praha",
+  year    = 2013,
+  url     = "http://www.olsak.net/mirek/bakalarka/",
+  type    = "Bakalářská práce",
+  option  = "urlalso",
+}
+@INBOOK{ zakonVS,
+  author   = "Česko",
+  title    = "Zákon č. 111 ze dne 22. dubna 1998 o vysokých školách a o změně a
+              doplnění dalších zákonů (zákon o vysokých školách)",
+  booktitle = "Sbírka zákonů České republiky",
+  year    = 1998,
+  series  = "částka 39, s. 5388--5419",
+  url     = "http://aplikace.mvcr.cz/archiv2008/sbirka/1998/sb039-98.pdf",
+  issn    = "1211-1244",
+  option  = "urlalso unpublished",
+  key     = "Czzesko",
+}
+@INBOOK{ lonka,
+  author  = "Kristi Lonka",
+  title   = "Helping doctoral students to finish their theses",
+  booktitle = "Teaching academic writing in European higher education",
+  editor  = "Lennart Björk and Gerd Bräuer and Lotte Reinecker and Peter Stray Jörgensen",
+  address = "Dordrecht",
+  publisher = "Kluwer Academic Publ.",
+  year    = 2003,
+  pages   = "113--131",
+  isbn    = "1-4020-1208-X",
+  option  = "edprint:{\ED,~eds.}",
+}
+@INBOOK{ demay,
+  author  = "Y. Demay",
+  title   = "Computation of 2D viscoelastic flows for a differential constitutive equation",
+  editor  = "J-M. Piau and J-F. Agassant",
+  booktitle = "Rheology for Polymer Melt Processing",
+  howpublished = "online",
+  publisher = "Elsevier",
+  year     = 2011,
+  numbering = "s.~237--255",
+  isbn    = "0444822369",
+  citedate = "2011/08/29",
+  url     = "htpp://www.sciencedirect.com/science/article/pii/S0169310796800098",
+  option  = "nowarn",
+}
+@INPROCEEDINGS{ distler,
+  author  = "Tobias Distler and Rüdiger Kapitza",
+  title   = "Increasing performance in Byzantine fault-tolerant systems on-demand replica consistency",
+  booktitle = "Proceedings of the Eurosys' 2011 conference. April 10 -- April 13, 2011, Salzburg, Austria",
+  address = "New York",
+  publisher = "Association of computer machinery",
+  year = 2011,
+  numbering = "pp.~91--105",
+  isbn = "1-4503-0634-8",
+}
+@INPROCEEDINGS{ talich,
+  author  = "Milan Talich and Filip Antoš",
+  title   = "Metody a postupy doigitalizace a online zpřístupnění starých kartografických děl",
+  howpublished = "online",
+  booktitle = "INFORUM 2011: 17. ročník konference o profesionálních informačních zdrojích, 
+               24.--26. května 2011, Vysoká škola ekonomická v Praze",
+  option  = "unpublished",
+  url     = "http://www.inforum.cz/pdf/2011/talich-milan.pdf",
+  citedate = "2011/08/29",
+  option  = "nowarn",
+}
+@ARTICLE{ mansouri,
+  author   = "Majdi mansouri and Quachani Ilham and Hicham Snoussi and Richard Cédric",
+  title    = "Adaptive quantized target tracking in wireless sensors networks",
+  journal  = "Wireles Networks",
+  number   = 7,
+  volume   = 17,
+  pages    = "1625--1639",
+  lang     = "en",
+  option   = "nowarn",
+}
+@ARTICLE{ calafiore,
+  author   = "Giuseppe C. Calafiore and Fabrizio Dabbene and Roberto Tempo",
+  title    = "Research~ on probabilistic methods for control system design",
+  journal  = "Automatica",
+  howpublished = "online",
+  Publisher = "Elsevier",
+  month     = "July",
+  year      = 2011,
+  volume    = 47,
+  number    = 7,
+  pages     = "1279--1293",
+  issn      = "0005-1090",
+  citedate  = "2011/07/17",
+  doi       = "10.1016/j.automatica.2011.02.029",
+  lang      = "en",
+}
+@MISC{ bowles,
+  title   = "What is fluid technology?",
+  ednote  = "Bowles Fluidics Corp.",
+  citedate = "2011/10/10",
+  url     = "http://www.bowlesfluidics.com/capabilites/technology/",
+  key     = "zzzz"
+}
+@MISC{ biernatova,
+  author   = "Olga Biernátová and Jan Skůpa",
+  title    = "Bibliografické okazy a citace dokumentů: dle ČSN ISO 690 (01~0197) platné od 1. dubna 2011",
+  ednote   = "Brno, 2011. Vytvořeno ve spolupráci s portálem citace.com",
+  url      = "http://www.citace.com/dokumenty.php",
+}
+@MISC{ trtikova,
+  author   = "Ilona Trtíková and Ludmila Tichá",
+  title    = "Jak citovat",
+  ednote   = "Ústřední knihovna ČVUT, 2011, 2012, 2013",
+  citedate = "2014/04/22",
+  url      = "http://knihovna.cvut.cz/studium/jak-psat-vskp/doporuceni/jak-citovat/",
+}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 62769a82fc9..767fa843c72 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{Dec. 2014}
+\def\OPmacversion{Dec. 2014c}
 \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
 
 %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -41,7 +41,7 @@
                   \csname iftrue\expandafter\endcsname \fi}% end of \def\tmp
    \expandafter\tmp#1\endlistsep#2\end
 }
-\long\def\isnextchar#1#2#3{\def\tmpa{#2}\def\tmpb{#3}%
+\long\def\isnextchar#1#2#3{\begingroup\def\tmpa{\endgroup#2}\def\tmpb{\endgroup#3}%
    \let\tmp=#1\futurelet\next\isnextcharA
 }
 \def\isnextcharA{\ifx\tmp\next\expandafter\tmpa\else\expandafter\tmpb\fi}
@@ -705,24 +705,24 @@
   \fi
 }
 \def\dosorting{%
-   \message{Opmac: Sorting index...}
+   \message{Opmac: Sorting index...}%
    \def\act##1{\ifx##1\relax\else \global\addto\iilist{##1,}%
-             \expandafter\act\fi}
+             \expandafter\act\fi}%
    \expandafter\removeiilist \expandafter\act \iilist\relax
    \expandafter\removeiilist \expandafter\mergesort \iilist \end,\end
 }
 \def\removeiilist{\gdef\iilist{}}
 
 \def\mergesort #1#2,#3{% by Miroslav Olsak
-   \ifx,#1                       % prazdna-skupina,neco,  (#2=neco #3=pokracovani)
-      \addto\iilist{#2,}         % dvojice skupin vyresena
+   \ifx,#1%                      % prazdna-skupina,neco,  (#2=neco #3=pokracovani)
+      \addto\iilist{#2,}%        % dvojice skupin vyresena
       \return{\fif\mergesort#3}%    % \mergesort pokracovani
    \fi
-   \ifx,#3                       % neco,prazna-skupina,  (#1#2=neco #3=,)
+   \ifx,#3%                      % neco,prazna-skupina,  (#1#2=neco #3=,)
       \addto\iilist{#1#2,}%      % dvojice skupin vyresena
       \return{\fif\mergesort}%      % \mergesort dalsi
    \fi
-   \ifx\end#3                    % neco,konec (#1#2=neco)
+   \ifx\end#3%                   % neco,konec (#1#2=neco)
       \ifx\empty\iilist                % neco=kompletni setrideny seznam
          \def\iilist{#1#2}%
          \return{\fif\fif\gobbletoend}%   % koncim
@@ -1179,11 +1179,10 @@
 \def\rulewidthA{\edef\hrule{\orihrule height\the\tmpdim}%
                 \edef\vrule{\orivrule width\the\tmpdim}}
 
-\long\def\frame#1{\setbox0=\hbox{{#1}}\setbox1=\vbox{\hrule}%
-   \tmpdim=\dp0 \advance\tmpdim by\ht1 \advance\tmpdim by\hhkern
-   \vbox{\hrule\hbox{\vrule\kern\vvkern
-         \vbox{\kern\hhkern\box0\kern\hhkern}\kern\vvkern\vrule}%
-         \hrule\kern-\tmpdim\hbox{\vrule depth\tmpdim width0pt}}}
+\long\def\frame#1{%
+   \hbox{\vrule\vtop{\vbox{\hrule\kern\vvkern{%
+      \hbox{\kern\hhkern#1\kern\hhkern}%
+   }}\kern\vvkern\hrule}\vrule}}
 
 
 %%%%%%%%%%%%%% \inspic -- sec. 3.20 in opmac-d.pdf
@@ -1581,12 +1580,14 @@
 }
 \def\rbmargin#1#2#3{\advance#1\pgwidth \advance#1-#2 \advance#1-#3}
 
-\def\setpagedimens#1 {\isdefined{pgs:#1}\iftrue
-   \expandafter\expandafter\expandafter \setpagedimensA \csname pgs:#1\endcsname&%
+\def\setpagedimens{\isnextchar({\setpagedimensB}{\setpagedimensA}}
+\def\setpagedimensA#1 {\isdefined{pgs:#1}\iftrue
+   \expandafter\expandafter\expandafter\setpagedimensB \csname pgs:#1\expandafter\endcsname\space
    \else \opwarning{page specification "#1" is undefined}\fi}
-\def\setpagedimensA (#1,#2)#3&{\pgwidth=#1\trueunit#3 \pgheight=#2\trueunit#3\relax
+\def\setpagedimensB (#1,#2)#3 {\setpagedimensC\pgwidth=#1:#3 \setpagedimensC\pgheight=#2:#3
     \ifx\pdfpagewidth\undefined \else
         \pdfpagewidth=\pgwidth \pdfpageheight=\pgheight \fi}
+\def\setpagedimensC #1=#2:#3 {#1=#2\ifx^#3^\tmp\else#3\fi\relax}
 
 \sdef{pgs:a3}{(297,420)mm}  \sdef{pgs:a4}{(210,297)mm}  \sdef{pgs:a5}{(148,210)mm}
 \sdef{pgs:a3l}{(420,297)mm} \sdef{pgs:a4l}{(297,210)mm} \sdef{pgs:a5l}{(210,148)mm}
@@ -1706,7 +1707,10 @@ Nov. 2014  \sortingdata corrected, \specsortingdata introduced.
            \bfshape used in \titfont and \Xchap
            \adef{ }{\ } in verbatim environment (instead \adef{ }[ }).
            \fnotemark+\fnotetext+\runningfnotes bug fixed.
-           \flushcolumns, \iiparams removed, \mullines introduced
-Dec. 2014  Color features rewritten using \pdfcolorstack
+           \flushcolumns, \iiparams removed, \mullines introduced.
+Dec. 2014  Color features rewritten using \pdfcolorstack.
+           Unwanted spaces in \dosorting removed.
+           Better definition of \frame.
+           \margins/\setpagedimens improved, \isnextchar: \bgroup\egroup added.
 
 %%%%%%%%%%%%%% End of opmac.tex