(no commit message)

diff --git a/doc/plugins/contrib/bibtex.mdwn b/doc/plugins/contrib/bibtex.mdwn
index 481b72c8e88195f27bdcfba9ed77d8c5bea0b799..76b73886476c44a3c5282fb0ec41d2fa1ebccf1c 100644 (file)
--- a/doc/plugins/contrib/bibtex.mdwn
+++ b/doc/plugins/contrib/bibtex.mdwn
@@ -2,6 +2,10 @@
 
 # bibtex for ikiwiki #
 
 
 # bibtex for ikiwiki #
 

+(get me at [github]!)
+
+[github]: https://github.com/ihrke/iki-bibtex
+

 This [ikiwiki]-plugin provides a 
   
     [[!bibtex ]]
 This [ikiwiki]-plugin provides a 
   
     [[!bibtex ]]


@@ -9,17 +13,21 @@ This [ikiwiki]-plugin provides a
 directive for [ikiwiki]. 
 
 So far, it can display a raw or formatted bibtex-entry from a 
 directive for [ikiwiki]. 
 
 So far, it can display a raw or formatted bibtex-entry from a 

-bibtex-file (either checked into ikiwiki, or not).
+bibtex-file (either checked into ikiwiki, or not) and display a 
+list of all bibtex-keys used on a key.

 
 [ikiwiki]: http://ikiwiki.info/
 
 
 [ikiwiki]: http://ikiwiki.info/
 

-Get it at [github].
-
-[github]: https://github.com/ihrke/iki-bibtex
-

 Features:
 
 Features:
 

+* three different output formats for citations:
+  + cite - Author (year)
+  + citation - Author1, Author2 (year): **Title.** *Journal*
+  vol(num). pp.
+  + raw - raw bibtex-entry preformatted

 * supports websetup
 * supports websetup

+* bibliography
+

 
 ## Requirements ##
 
 
 ## Requirements ##
 


@@ -34,12 +42,18 @@ format (authors (year): journal. volume (number), pages.).
 
     [[!bibtex file="mybib.bib" key="key1" format="citation"]]
 
 
     [[!bibtex file="mybib.bib" key="key1" format="citation"]]
 

-Combine with toggle-plugin to optionally display the raw bibtex 
-(the extra \ in the toggle-directive is because it is expanded if it is not there)
+Combine with toggle-plugin to optionally display the raw bibtex

 
 

-    [[!bibtex key="Ihrke2011"]] [\[!toggle id="bibtexentry" text="(entry)"]]
-    [\[!toggleable  id="bibtexentry" text="""
+    [[!bibtex key="Ihrke2011"]] [[!toggle id="bibtexentry" text="(entry)"]]
+    [[!toggleable  id="bibtexentry" text="""

     [[!bibtex key="Ihrke2011" format="raw"]]
     [[!bibtex key="Ihrke2011" format="raw"]]

-    [\[!toggle id="bibtexentry" text="(hide)"]]
+    [[!toggle id="bibtexentry" text="(hide)"]]

     """]]
     
     """]]
     

+Add a bibliography that includes all bibtex-directives from that page
+
+
+    ## Bibliography ##
+    [[!bibtex_bibliography ]]
+
+    ----