Changeset 6188

Timestamp:

01/29/10 15:49:13 (2 years ago)

Author:

AndrewJones

Message:

Item8440: Expand Macros in References

Location:

trunk/BibliographyPlugin

Files:

• data/System/BibliographyPlugin.txt (modified) (2 diffs)
• lib/Foswiki/Plugins/BibliographyPlugin.pm (modified) (3 diffs)

trunk/BibliographyPlugin/data/System/BibliographyPlugin.txt

@@ -20 +20 @@
 
 | *Key* | *Description* |
-| big | Jass, Hugh. _A big paper_. The journal of big papers, 7991, volume MCMXCVII. |
+| big | Jass, Hugh. _A big paper_. The journal of big papers, 7991, volume MCMXCVII. %ICON{note}% |
 | small | Freely, I.P. _A small paper_. The journal of small papers, 1997. (to appear). |
 
@@ -99 +99 @@
 %$INSTALL_INSTRUCTIONS%
 
----++ Plugin Files
-
-   | *File:* | *Description:* |
-%$MANIFEST%
-
 ---++ Plugin Info
 
 |  Plugin Author(s): | Foswiki:Main.AndrewJones |
-|  Previous Author(s): | TWiki:Main.AntonioTerceiro |
-|  Copyright: | © 2009, Andrew Jones, © 2004, Antonio Terceiro |
+|  Previous Author(s): | Foswiki:Main.AntonioTerceiro |
+|  Copyright: | © 2009 - 2010, Andrew Jones, © 2004, Antonio Terceiro |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 |  Plugin Release: | %$RELEASE% |
 |  Plugin Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  17 Mar 2009 | 1.0: Foswikitask:Item1251 - Initial release for Foswiki - Foswiki:Main.AndrewJones |
+|  29 Jan 2010 | 1.1: Foswikitask:Item8440 - Expand Macros in References -- Foswiki:Main.AndrewJones |
+|  17 Mar 2009 | 1.0: Foswikitask:Item1251 - Initial release for Foswiki -- Foswiki:Main.AndrewJones |
 |  28 Aug 2005: | Adhering to official handlers in TWiki:Codev/DakarRelease. Added <code>%<nop/>CITEINLINE{...}%</code>. |
 |  23 Aug 2004: | Added multiple references sources support |

trunk/BibliographyPlugin/lib/Foswiki/Plugins/BibliographyPlugin.pm

@@ -1 +1 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2009 Andrew Jones, andrewjones86@gmail.com
+# Copyright (C) 2009 - 2010 Andrew Jones, http://andrew-jones.com
 # Copyright (C) 2004 Antonio Terceiro, asaterceiro@inf.ufrgs.br
 #
@@ -19 +19 @@
 
 # =========================
-use vars qw( $web $topic $VERSION $RELEASE $SHORTDESCRIPTION $debug $pluginName $NO_PREFS_IN_TOPIC );
+use vars qw( $web $topic );
 
 our $VERSION = '$Rev$';
-our $RELEASE = '1.0';
+our $RELEASE = '1.1';
 our $SHORTDESCRIPTION = 'Cite bibliography in one topic and get a references list automatically created.';
 our $NO_PREFS_IN_TOPIC = 1;
@@ -141 +141 @@
 }
 
-# was startRenderingHandler before. changed to preRenderingHandler as indicated
-# in Foswiki:Extensions/DeprecatedHandlers.
-sub preRenderingHandler
+# Changed from preRenderingHandler to allow for Macro expansion in references
+# See http://foswiki.org/Tasks/Item8440
+sub beforeCommonTagsHandler
 {
 ### my ( $text, $web ) = @_;   # do not uncomment, use $_[0], $_[1] instead
 
     Foswiki::Func::writeDebug( "- ${pluginName}::startRenderingHandler( $_[1] )" ) if $Foswiki::cfg{Plugins}{$pluginName}{Debug};
-
-    # This handler is called by getRenderedVersion just before the line loop
 
     # do custom extension rule, like for example: