resphilosophica (22jul13)

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

1 files changed, 32 insertions, 21 deletions

diff --git a/Master/texmf-dist/bibtex/bst/resphilosophica/resphilosophica.bst b/Master/texmf-dist/bibtex/bst/resphilosophica/resphilosophica.bst
index 86f0be4e6fd..72e5f38b7c2 100644
--- a/Master/texmf-dist/bibtex/bst/resphilosophica/resphilosophica.bst
+++ b/Master/texmf-dist/bibtex/bst/resphilosophica/resphilosophica.bst
@@ -959,6 +959,11 @@ FUNCTION {format.booktitle}
 FUNCTION {format.in.ed.booktitle}
 { format.booktitle duplicate$ empty$ 'skip$
     {
+      format.edition duplicate$ empty$ 'pop$
+         {
+           ", " swap$ * * 
+         }
+      if$
       editor "editor" format.names.ed duplicate$ empty$ 'pop$
         {
           bbl.edby
@@ -1061,7 +1066,7 @@ FUNCTION {article}
       emphasize
       "journal" output.check
       add.blank
-      format.vol.num.pages output
+      format.vol.num.pages output 
     }
     { format.article.crossref output.nonnull
       format.pages output
@@ -1087,16 +1092,21 @@ FUNCTION {book}
   format.date "year" output.check
   date.block
   format.btitle "title" output.check
+  edition empty$ 
+     'skip$
+     {new.sentence
+      format.edition output}
+  if$
+  titlenote empty$
+    'skip$
+    { new.sentence
+      titlenote output }
+  if$
   crossref missing$
     { new.sentence
       format.bvolume output
       new.block
       format.number.series output
-      titlenote empty$
-         'skip$
-         { new.sentence
-         titlenote output }
-      if$
       new.sentence
       format.publisher.address output
     }
@@ -1106,7 +1116,6 @@ FUNCTION {book}
     }
   if$
   new.sentence
-  format.edition output
   new.block
   format.note output
   fin.entry
@@ -1147,6 +1156,11 @@ FUNCTION {inbook}
   format.date "year" output.check
   date.block
   format.btitle "title" output.check
+  edition empty$ 
+     'skip$
+     {new.sentence
+      format.edition output}
+  if$
   crossref missing$
     {
       new.sentence
@@ -1168,7 +1182,6 @@ FUNCTION {inbook}
       format.book.crossref output.nonnull
     }
   if$
-  format.edition output
   new.block
   format.note output
   fin.entry
@@ -1181,20 +1194,19 @@ FUNCTION {incollection}
   format.date "year" output.check
   date.block
   format.title "title" output.check
+  titlenote empty$
+    'skip$
+    { new.sentence
+      titlenote output }
+  if$
   new.block
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
       format.bvolume output
       format.number.series output
       format.chapter.pages output
-      titlenote empty$
-        'skip$
-        { new.sentence
-        titlenote output }
-      if$
       new.sentence
       format.publisher.address output
-      format.edition output
     }
     { format.incoll.inproc.crossref output.nonnull
       format.chapter.pages output
@@ -1216,11 +1228,6 @@ FUNCTION {inproceedings}
     { format.in.ed.booktitle "booktitle" output.check
       format.bvolume output
       format.number.series output
-      titlenote empty$
-        'skip$
-        { new.sentence
-        titlenote output }
-      if$
       format.pages output
       new.sentence
       publisher empty$
@@ -1246,6 +1253,11 @@ FUNCTION {manual}
   format.date "year" output.check
   date.block
   format.btitle "title" output.check
+  edition empty$ 
+     'skip$
+     {new.sentence
+      format.edition output}
+  if$
   titlenote empty$
     'skip$
     { new.sentence
@@ -1254,7 +1266,6 @@ FUNCTION {manual}
   organization address new.block.checkb
   organization "organization" bibinfo.check output
   address "address" bibinfo.check output
-  format.edition output
   new.block
   format.note output
   fin.entry
@@ -1678,7 +1689,7 @@ FUNCTION {begin.bib}
   write$ newline$
   "\providecommand{\url}[1]{\texttt{#1}}"
   write$ newline$
-  "\providecommand{\urlprefix}{URL:~}"
+  "\providecommand{\urlprefix}{}"
   write$ newline$
   "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}"
     write$ newline$}