Reconciled all changes by Rainy and the branch with MattKing's LocalFont function. The trunk now contains all current code changes.

Added changes to RANDOM function based on Rainy's input.  If there were multiple RANDOM statements in multiple CALC measure, they would all get the same random number.  Fixed.

Added new RANDOM function and LocalFont to the help files and History.htm

Library/MeterWindow.h

@@ -175,6 +175,11 @@ public:
 
 	std::wstring MakePathAbsolute(std::wstring path);
 
+	//========================================================
+	//MattKing Code
+	Gdiplus::PrivateFontCollection* GetPrivateFontCollection(){ return m_FontCollection; }
+	//MattKing Code End
+
 protected:
 	static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
@@ -316,6 +321,11 @@ private:
 	CRainmeter* m_Rainmeter;					// Pointer to the main object
 
 	static int m_InstanceCount;
+
+	//==========================================================
+	//MattKing code
+	Gdiplus::PrivateFontCollection* m_FontCollection;
+	//MattKing end
 };
 
 #endif