From 99a14bc93fb7ae3f8825aa721f9517388371035e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Nov 2010 19:50:25 +0000 Subject: drv 0.96 (20nov10) git-svn-id: svn://tug.org/texlive/trunk@20511 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/drv/README | 2 +- .../texmf-dist/doc/metapost/drv/doc/drv-guide.mp | 4 +- .../texmf-dist/doc/metapost/drv/doc/drv-guide.tex | 7 +-- Master/texmf-dist/doc/metapost/drv/doc/drv.mp | 50 +++++++++++++++------ Master/texmf-dist/doc/metapost/drv/drv-guide.pdf | Bin 215172 -> 215341 bytes .../doc/metapost/drv/sample/coq-sample.mp | 2 +- Master/texmf-dist/doc/metapost/drv/sample/drv.mp | 50 +++++++++++++++------ Master/texmf-dist/doc/metapost/drv/template/drv.mp | 50 +++++++++++++++------ .../doc/metapost/drv/template/template.mp | 4 +- Master/texmf-dist/metapost/drv/drv.mp | 50 +++++++++++++++------ Master/tlpkg/bin/tlpkginfo | 1 + 11 files changed, 155 insertions(+), 65 deletions(-) diff --git a/Master/texmf-dist/doc/metapost/drv/README b/Master/texmf-dist/doc/metapost/drv/README index 05bd4192cf0..9052621445e 100644 --- a/Master/texmf-dist/doc/metapost/drv/README +++ b/Master/texmf-dist/doc/metapost/drv/README @@ -1,5 +1,5 @@ drv - derivation trees with MetaPost -version 0.95 +version 0.96 Licence lppl diff --git a/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.mp b/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.mp index 515cb68a6c7..08f549c5533 100644 --- a/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.mp +++ b/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.mp @@ -3,7 +3,7 @@ % Structure of a MetaPost file using drv % 1. Preamble % input drv; -% verbatimtex %&latex +% verbatimtex%&latex % % \begin{document} % etex; @@ -26,7 +26,7 @@ input drv; -verbatimtex %&latex +verbatimtex%&latex % Any piece of code related to font selection in the preamble of % `drv-guide.tex' (document class, font package, font selection commands ...) diff --git a/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.tex b/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.tex index 6f2fff63c77..4c8ea3606c7 100644 --- a/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.tex +++ b/Master/texmf-dist/doc/metapost/drv/doc/drv-guide.tex @@ -88,9 +88,9 @@ derivation trees with \MP% \thanks{Feel free to improve! (E.g., by correcting the poor English.) Last update: \today.}}} \author{Laurent \textsc{M\'ehats}\\ -{\small\href{mailto:laurent.mehats@gmail.com?subject=[drv 0.95]} +{\small\href{mailto:laurent.mehats@gmail.com?subject=[drv 0.96]} {\texttt{laurent.mehats@gmail.com}}}} -\date{documented version: 0.95} +\date{documented version: 0.96} \pagestyle{myheadings} \renewcommand{\sectionmark}[1]{% @@ -107,6 +107,7 @@ Last update: \today.}}} \end{gather*} % % +\pdfbookmark[1]{\contentsname}{}% \tableofcontents % % @@ -121,7 +122,7 @@ Last update: \today.}}} \item[Preamble]\ \begin{Verbatim}[commandchars=\\\{\}] input drv; - verbatimtex %&latex + verbatimtex%&latex \param{\LaTeX\ preamble} \texttt{\tbs{}begin\{document\}} etex; diff --git a/Master/texmf-dist/doc/metapost/drv/doc/drv.mp b/Master/texmf-dist/doc/metapost/drv/doc/drv.mp index a5791649f82..8323b9f00af 100644 --- a/Master/texmf-dist/doc/metapost/drv/doc/drv.mp +++ b/Master/texmf-dist/doc/metapost/drv/doc/drv.mp @@ -1,4 +1,4 @@ -%% drv 0.95 +%% drv 0.96 %% Copyright 2010 Laurent M\'ehats % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % This work consists of the file drv.mp newinternal drv_version; -drv_version:=0.95; +drv_version:=0.96; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -368,7 +368,29 @@ fi % copying LaTeX preamble % -vardef drv_read (expr search_str) (suffix accum_str)= +vardef drv_find_verbatimtex= + save readfrom_str; + string readfrom_str; + forever: + readfrom_str:=readfrom jobname; + exitif (readfrom_str="verbatimtex%&latex") + or (readfrom_str="verbatimtex %&latex") + or (readfrom_str=EOF); + endfor + if readfrom_str="verbatimtex %&latex": + drv_message "warning, "&ditto&"verbatimtex %&latex"&ditto& + " is deprecated, you should use "&ditto&"verbatimtex%&latex"&ditto& + " instead."; + fi + if readfrom_str=EOF: + closefrom jobname; + drv_errhelp ("`"&jobname&".mp' should contain "& + ditto&"verbatimtex%&latex"&ditto&" on a single line."); + drv_errmessage (ditto&"verbatimtex%&latex"&ditto&" is missing"); + fi +enddef; + +vardef drv_find (expr search_str) (suffix accum_str)= save readfrom_str, readfrom_substr; string readfrom_str, readfrom_substr; accum_str:=""; @@ -387,19 +409,19 @@ vardef drv_read (expr search_str) (suffix accum_str)= enddef; string tex_preamble_str[]; -% tex_preamble_str[0] from "verbatimtex %&latex" to "\begin{document}" +% tex_preamble_str[0] from "verbatimtex%&latex" to "\begin{document}" % tex_preamble_str[1] from "\begin{document}" to "etex;" drv_message ("reading `"&jobname&".mp' LateX preamble."); - drv_read ("verbatimtex %&latex", tex_preamble_str[0]); - drv_read ("\begin{document}", tex_preamble_str[0]); - drv_read ("etex;", tex_preamble_str[1]); + drv_find_verbatimtex; + drv_find ("\begin{document}", tex_preamble_str[0]); + drv_find ("etex;", tex_preamble_str[1]); closefrom jobname; write "%"&char(10)& "% AUTOMATICALLY GENERATED BY DRV.MP - DO NOT MODIFY."&char(10)& "%"&char(10)&char(10)& - "verbatimtex %&latex"&char(10)& + "verbatimtex%&latex"&char(10)& tex_preamble_str[0]& "\begin{document}"&char(10)& tex_preamble_str[1]& @@ -1594,14 +1616,14 @@ enddef; vardef drv_bot_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; @@ -1630,14 +1652,14 @@ enddef; vardef drv_top_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; diff --git a/Master/texmf-dist/doc/metapost/drv/drv-guide.pdf b/Master/texmf-dist/doc/metapost/drv/drv-guide.pdf index 6f16b8ecd87..b60e1fdee3e 100644 Binary files a/Master/texmf-dist/doc/metapost/drv/drv-guide.pdf and b/Master/texmf-dist/doc/metapost/drv/drv-guide.pdf differ diff --git a/Master/texmf-dist/doc/metapost/drv/sample/coq-sample.mp b/Master/texmf-dist/doc/metapost/drv/sample/coq-sample.mp index 31a25a22a63..131d7eee262 100644 --- a/Master/texmf-dist/doc/metapost/drv/sample/coq-sample.mp +++ b/Master/texmf-dist/doc/metapost/drv/sample/coq-sample.mp @@ -1,6 +1,6 @@ input drv; -verbatimtex %&latex +verbatimtex%&latex % Any piece of code related to font selection in the preambule of % `coq-sample.tex' (document class, font package, font selection commands ...) diff --git a/Master/texmf-dist/doc/metapost/drv/sample/drv.mp b/Master/texmf-dist/doc/metapost/drv/sample/drv.mp index a5791649f82..8323b9f00af 100644 --- a/Master/texmf-dist/doc/metapost/drv/sample/drv.mp +++ b/Master/texmf-dist/doc/metapost/drv/sample/drv.mp @@ -1,4 +1,4 @@ -%% drv 0.95 +%% drv 0.96 %% Copyright 2010 Laurent M\'ehats % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % This work consists of the file drv.mp newinternal drv_version; -drv_version:=0.95; +drv_version:=0.96; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -368,7 +368,29 @@ fi % copying LaTeX preamble % -vardef drv_read (expr search_str) (suffix accum_str)= +vardef drv_find_verbatimtex= + save readfrom_str; + string readfrom_str; + forever: + readfrom_str:=readfrom jobname; + exitif (readfrom_str="verbatimtex%&latex") + or (readfrom_str="verbatimtex %&latex") + or (readfrom_str=EOF); + endfor + if readfrom_str="verbatimtex %&latex": + drv_message "warning, "&ditto&"verbatimtex %&latex"&ditto& + " is deprecated, you should use "&ditto&"verbatimtex%&latex"&ditto& + " instead."; + fi + if readfrom_str=EOF: + closefrom jobname; + drv_errhelp ("`"&jobname&".mp' should contain "& + ditto&"verbatimtex%&latex"&ditto&" on a single line."); + drv_errmessage (ditto&"verbatimtex%&latex"&ditto&" is missing"); + fi +enddef; + +vardef drv_find (expr search_str) (suffix accum_str)= save readfrom_str, readfrom_substr; string readfrom_str, readfrom_substr; accum_str:=""; @@ -387,19 +409,19 @@ vardef drv_read (expr search_str) (suffix accum_str)= enddef; string tex_preamble_str[]; -% tex_preamble_str[0] from "verbatimtex %&latex" to "\begin{document}" +% tex_preamble_str[0] from "verbatimtex%&latex" to "\begin{document}" % tex_preamble_str[1] from "\begin{document}" to "etex;" drv_message ("reading `"&jobname&".mp' LateX preamble."); - drv_read ("verbatimtex %&latex", tex_preamble_str[0]); - drv_read ("\begin{document}", tex_preamble_str[0]); - drv_read ("etex;", tex_preamble_str[1]); + drv_find_verbatimtex; + drv_find ("\begin{document}", tex_preamble_str[0]); + drv_find ("etex;", tex_preamble_str[1]); closefrom jobname; write "%"&char(10)& "% AUTOMATICALLY GENERATED BY DRV.MP - DO NOT MODIFY."&char(10)& "%"&char(10)&char(10)& - "verbatimtex %&latex"&char(10)& + "verbatimtex%&latex"&char(10)& tex_preamble_str[0]& "\begin{document}"&char(10)& tex_preamble_str[1]& @@ -1594,14 +1616,14 @@ enddef; vardef drv_bot_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; @@ -1630,14 +1652,14 @@ enddef; vardef drv_top_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; diff --git a/Master/texmf-dist/doc/metapost/drv/template/drv.mp b/Master/texmf-dist/doc/metapost/drv/template/drv.mp index a5791649f82..8323b9f00af 100644 --- a/Master/texmf-dist/doc/metapost/drv/template/drv.mp +++ b/Master/texmf-dist/doc/metapost/drv/template/drv.mp @@ -1,4 +1,4 @@ -%% drv 0.95 +%% drv 0.96 %% Copyright 2010 Laurent M\'ehats % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % This work consists of the file drv.mp newinternal drv_version; -drv_version:=0.95; +drv_version:=0.96; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -368,7 +368,29 @@ fi % copying LaTeX preamble % -vardef drv_read (expr search_str) (suffix accum_str)= +vardef drv_find_verbatimtex= + save readfrom_str; + string readfrom_str; + forever: + readfrom_str:=readfrom jobname; + exitif (readfrom_str="verbatimtex%&latex") + or (readfrom_str="verbatimtex %&latex") + or (readfrom_str=EOF); + endfor + if readfrom_str="verbatimtex %&latex": + drv_message "warning, "&ditto&"verbatimtex %&latex"&ditto& + " is deprecated, you should use "&ditto&"verbatimtex%&latex"&ditto& + " instead."; + fi + if readfrom_str=EOF: + closefrom jobname; + drv_errhelp ("`"&jobname&".mp' should contain "& + ditto&"verbatimtex%&latex"&ditto&" on a single line."); + drv_errmessage (ditto&"verbatimtex%&latex"&ditto&" is missing"); + fi +enddef; + +vardef drv_find (expr search_str) (suffix accum_str)= save readfrom_str, readfrom_substr; string readfrom_str, readfrom_substr; accum_str:=""; @@ -387,19 +409,19 @@ vardef drv_read (expr search_str) (suffix accum_str)= enddef; string tex_preamble_str[]; -% tex_preamble_str[0] from "verbatimtex %&latex" to "\begin{document}" +% tex_preamble_str[0] from "verbatimtex%&latex" to "\begin{document}" % tex_preamble_str[1] from "\begin{document}" to "etex;" drv_message ("reading `"&jobname&".mp' LateX preamble."); - drv_read ("verbatimtex %&latex", tex_preamble_str[0]); - drv_read ("\begin{document}", tex_preamble_str[0]); - drv_read ("etex;", tex_preamble_str[1]); + drv_find_verbatimtex; + drv_find ("\begin{document}", tex_preamble_str[0]); + drv_find ("etex;", tex_preamble_str[1]); closefrom jobname; write "%"&char(10)& "% AUTOMATICALLY GENERATED BY DRV.MP - DO NOT MODIFY."&char(10)& "%"&char(10)&char(10)& - "verbatimtex %&latex"&char(10)& + "verbatimtex%&latex"&char(10)& tex_preamble_str[0]& "\begin{document}"&char(10)& tex_preamble_str[1]& @@ -1594,14 +1616,14 @@ enddef; vardef drv_bot_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; @@ -1630,14 +1652,14 @@ enddef; vardef drv_top_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; diff --git a/Master/texmf-dist/doc/metapost/drv/template/template.mp b/Master/texmf-dist/doc/metapost/drv/template/template.mp index 019c8f12da7..02d4448a747 100644 --- a/Master/texmf-dist/doc/metapost/drv/template/template.mp +++ b/Master/texmf-dist/doc/metapost/drv/template/template.mp @@ -3,7 +3,7 @@ % Structure of a MetaPost file using drv % 1. Preamble % input drv; -% verbatimtex %&latex +% verbatimtex%&latex % % \begin{document} % etex; @@ -26,7 +26,7 @@ input drv; -verbatimtex %&latex +verbatimtex%&latex % Any piece of code related to font selection in the preamble of % `template.tex' (document class, font package, font selection commands ...) diff --git a/Master/texmf-dist/metapost/drv/drv.mp b/Master/texmf-dist/metapost/drv/drv.mp index a5791649f82..8323b9f00af 100644 --- a/Master/texmf-dist/metapost/drv/drv.mp +++ b/Master/texmf-dist/metapost/drv/drv.mp @@ -1,4 +1,4 @@ -%% drv 0.95 +%% drv 0.96 %% Copyright 2010 Laurent M\'ehats % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % This work consists of the file drv.mp newinternal drv_version; -drv_version:=0.95; +drv_version:=0.96; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -368,7 +368,29 @@ fi % copying LaTeX preamble % -vardef drv_read (expr search_str) (suffix accum_str)= +vardef drv_find_verbatimtex= + save readfrom_str; + string readfrom_str; + forever: + readfrom_str:=readfrom jobname; + exitif (readfrom_str="verbatimtex%&latex") + or (readfrom_str="verbatimtex %&latex") + or (readfrom_str=EOF); + endfor + if readfrom_str="verbatimtex %&latex": + drv_message "warning, "&ditto&"verbatimtex %&latex"&ditto& + " is deprecated, you should use "&ditto&"verbatimtex%&latex"&ditto& + " instead."; + fi + if readfrom_str=EOF: + closefrom jobname; + drv_errhelp ("`"&jobname&".mp' should contain "& + ditto&"verbatimtex%&latex"&ditto&" on a single line."); + drv_errmessage (ditto&"verbatimtex%&latex"&ditto&" is missing"); + fi +enddef; + +vardef drv_find (expr search_str) (suffix accum_str)= save readfrom_str, readfrom_substr; string readfrom_str, readfrom_substr; accum_str:=""; @@ -387,19 +409,19 @@ vardef drv_read (expr search_str) (suffix accum_str)= enddef; string tex_preamble_str[]; -% tex_preamble_str[0] from "verbatimtex %&latex" to "\begin{document}" +% tex_preamble_str[0] from "verbatimtex%&latex" to "\begin{document}" % tex_preamble_str[1] from "\begin{document}" to "etex;" drv_message ("reading `"&jobname&".mp' LateX preamble."); - drv_read ("verbatimtex %&latex", tex_preamble_str[0]); - drv_read ("\begin{document}", tex_preamble_str[0]); - drv_read ("etex;", tex_preamble_str[1]); + drv_find_verbatimtex; + drv_find ("\begin{document}", tex_preamble_str[0]); + drv_find ("etex;", tex_preamble_str[1]); closefrom jobname; write "%"&char(10)& "% AUTOMATICALLY GENERATED BY DRV.MP - DO NOT MODIFY."&char(10)& "%"&char(10)&char(10)& - "verbatimtex %&latex"&char(10)& + "verbatimtex%&latex"&char(10)& tex_preamble_str[0]& "\begin{document}"&char(10)& tex_preamble_str[1]& @@ -1594,14 +1616,14 @@ enddef; vardef drv_bot_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; @@ -1630,14 +1652,14 @@ enddef; vardef drv_top_check[]= if unknown jdg[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; drv_errmessage (decimal @)&" has been used as an inference index but not"& " as a judgment index"; elseif unknown prm_num[@]: - drv_errhelp "An index must be used to declare a both a judgment and an"& + drv_errhelp "An index must be used to declare both a judgment and an"& " inference."; - drv_errmessage (decimal @)&" has been used as a judgment index but not"& + drv_errmessage (decimal @)&" has been used as a premise index but not"& " as an inference index"; else: save i_sty, prm_idx; diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 12f098a3828..b94316c56f2 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -92,6 +92,7 @@ sub find_ctan_dir for my $dir ( "macros/latex/contrib/$me", # most everything + "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt "macros/latex/contrib/\L$me", # HA-prosper "macros/latex/contrib/powerdot/contrib/$menopowerdot", # powerdot-doc-vn "macros/latex/exptl/$me", # semioneside -- cgit v1.2.3