Fix ctan2tds for pgf installation

comment powerdot-doc-vn in tpm-ctan-check, it always breaks

Update of the following packages:
labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj
pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref
muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo


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

1 files changed, 66 insertions, 30 deletions

diff --git a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst
index 219185cdc3b..7621588702e 100644
--- a/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst
+++ b/Master/texmf-dist/bibtex/bst/babelbib/babalpha-fl.bst
@@ -17,9 +17,11 @@
 %% 
 %%   h.harders@tu-bs.de
 %% 
-%% 2005/09/01 v1.15  babelbib: multilingual bibliographies (HH)
+%% 2005/11/13 v1.20  babelbib: multilingual bibliographies (HH)
 ENTRY
   { address
+    annote
+    annotelanguage
     author
     booktitle
     chapter
@@ -150,26 +152,24 @@ FUNCTION {output.bibitem}
 { newline$
   language empty$
     { "empty language in " cite$ * warning$
+      "\expandafter\btxselectlanguage\expandafter {"
+      "\btxfallbacklanguage}" *
       language.state "nolanguage" =
         'skip$
-        {
-          "\expandafter\btxselectlanguage\expandafter {"
-          "\btxfallbacklanguage}" * write$
-          newline$
-        }
+        { duplicate$ write$ newline$ }
       if$
       "nolanguage" 'language.state :=
     }
-    { language.state language =
+    {
+      "\btxselectlanguage {" language * "}" *
+      language.state language =
         'skip$
-        { "\btxselectlanguage {" language * "}" * write$
-          newline$
-        }
+        { duplicate$ write$ newline$ }
       if$
       language 'language.state :=
     }
   if$
-  "\bibitem[" label * "]{" * write$
+  "\bibitem [{" swap$ * label * "}]{" * write$
   cite$ write$
   "}" write$
   newline$
@@ -320,21 +320,24 @@ FUNCTION {lastnamefont}
     { "\btxlastnamefont {" swap$ * "}" * }
   if$
 }
-
 FUNCTION {titlefont}
 { duplicate$ empty$
     { pop$ "" }
     { "\btxtitlefont {" swap$ * "}" * }
   if$
 }
-
+FUNCTION {jtitlefont}
+{ duplicate$ empty$
+    { pop$ "" }
+    { "\btxjtitlefont {" swap$ * "}" * }
+  if$
+}
 FUNCTION {journalfont}
 { duplicate$ empty$
     { pop$ "" }
     { "\btxjournalfont {" swap$ * "}" * }
   if$
 }
-
 FUNCTION {volumefont}
 { duplicate$ empty$
     { pop$ "" }
@@ -359,9 +362,10 @@ FUNCTION {format.names}
     { namesleft #0 > }
     { nameptr #1 >
       {
-        s nameptr "{ff~}{vv~}" format.name$
+        s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$
         s nameptr "{ll}" format.name$ lastnamefont *
-        s nameptr "{, jj}" format.name$ * 't :=
+        s nameptr "{, jj}" format.name$ *
+        't :=
           namesleft #1 >
             { ", " * t namefont * }
             { numnames #2 >
@@ -376,9 +380,9 @@ FUNCTION {format.names}
           if$
         }
         {
-          s nameptr "{ff~}{vv~}" format.name$
+          s nameptr "{ff{\btxfnamespacelong } }{vv~}" format.name$
           s nameptr "{ll}" format.name$ lastnamefont *
-          s nameptr "{, jj}" format.name$ * namefont
+          s nameptr "{,~jj}" format.name$ * namefont
         }
       if$
       nameptr #1 + 'nameptr :=
@@ -405,14 +409,18 @@ FUNCTION {format.editors}
     }
   if$
 }
-
 FUNCTION {format.title}
 { title empty$
     { "" }
     { title "t" language.change.case titlefont }
   if$
 }
-
+FUNCTION {format.jtitle}
+{ title empty$
+    { "" }
+    { title "t" language.change.case jtitlefont }
+  if$
+}
 FUNCTION {n.dashify}
 { 't :=
   ""
@@ -524,9 +532,11 @@ FUNCTION {format.edition}
     { "" }
     {
       output.state mid.sentence =
-        { edition "l" language.change.case "~\btxeditionlong {}" * }
-        { edition "t" language.change.case "~\btxeditionlong {}" * }
+        { edition "l" change.case$ }
+        { edition "t" change.case$ }
       if$
+      "\btxnumerallong {" swap$ *
+      "}~\btxeditionlong {}" *
     }
   if$
 }
@@ -544,23 +554,34 @@ FUNCTION {format.issn}
     { "\btxISSN~\btxISSNfont {" issn * "}" * }
   if$
 }
-
 FUNCTION {format.url}
 { url empty$
     { "" }
     {
       urldate empty$
-      { "\btxurlfont{" url * "}" * }
+      { "{\latintext \btxurlfont {" url * "}}" * }
       {
-        "\btxurlfont{" url *
-        "}, \btxurldatecomment{} \btxkeywordlanguage {\btxurldatefont{" *
-          urldate * "}}" *
+        "{\latintext \btxurlfont {" url *
+        "}}\btxurldatecomment {\btxkeywordlanguage {\btxurldatefont{" *
+          urldate * "}}}" *
       }
       if$
     }
   if$
 }
-
+FUNCTION {write.annote}
+{ annote empty$
+  'skip$
+  {
+    annotelanguage empty$
+    { "\btxkeywordlanguage {" }
+    { "{\selectlanguage {" annotelanguage * "}" * }
+    if$
+    "\btxannotation {" * annote * "}}" *
+    write$ newline$
+  }
+  if$
+}
 INTEGERS { multiresult }
 
 FUNCTION {multi.page.check}
@@ -738,7 +759,7 @@ FUNCTION {format.book.crossref}
         { key titlefont * }
       if$
     }
-    { "\Btxinlong {}\ " format.crossref.editor * }
+    { format.crossref.editor * }
   if$
   " \cite{" * crossref * "}" *
 }
@@ -768,7 +789,7 @@ FUNCTION {article}
 { output.bibitem
   format.authors "author" output.check
   after.authors
-  format.title "title" output.check
+  format.jtitle "title" output.check
   new.block
   crossref missing$
     { journal
@@ -789,6 +810,7 @@ FUNCTION {article}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {book}
@@ -823,6 +845,7 @@ FUNCTION {book}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {booklet}
@@ -838,6 +861,7 @@ FUNCTION {booklet}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {inbook}
@@ -874,6 +898,7 @@ FUNCTION {inbook}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {incollection}
@@ -902,6 +927,7 @@ FUNCTION {incollection}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {inproceedings}
@@ -938,6 +964,7 @@ FUNCTION {inproceedings}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {conference} { inproceedings }
@@ -976,6 +1003,7 @@ FUNCTION {manual}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {mastersthesis}
@@ -992,6 +1020,7 @@ FUNCTION {mastersthesis}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {misc}
@@ -1009,6 +1038,7 @@ FUNCTION {misc}
   format.url output
   note output
   fin.entry
+  write.annote
   empty.misc.check
 }
 
@@ -1027,6 +1057,7 @@ FUNCTION {phdthesis}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {proceedings}
@@ -1064,6 +1095,7 @@ FUNCTION {proceedings}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {techreport}
@@ -1081,6 +1113,7 @@ FUNCTION {techreport}
   format.url output
   note output
   fin.entry
+  write.annote
 }
 
 FUNCTION {unpublished}
@@ -1093,6 +1126,7 @@ FUNCTION {unpublished}
   note "note" output.check
   format.date output
   fin.entry
+  write.annote
 }
 
 FUNCTION {default.type} { misc }
@@ -1471,12 +1505,14 @@ FUNCTION {begin.bib}
   "  \providebibliographyfont{name}{}%" write$ newline$
   "  \providebibliographyfont{lastname}{}%" write$ newline$
   "  \providebibliographyfont{title}{\emph}%" write$ newline$
+  "  \providebibliographyfont{jtitle}{\btxtitlefont}%" write$ newline$
   "  \providebibliographyfont{etal}{\emph}%" write$ newline$
   "  \providebibliographyfont{journal}{}%" write$ newline$
   "  \providebibliographyfont{volume}{}%" write$ newline$
   "  \providebibliographyfont{ISBN}{\MakeUppercase}%" write$ newline$
   "  \providebibliographyfont{ISSN}{\MakeUppercase}%" write$ newline$
   "  \providebibliographyfont{url}{\url}%" write$ newline$
+  "  \providebibliographyfont{numeral}{}%" write$ newline$
 }
 
 EXECUTE {begin.bib}