From 791eb5445a537aee2664f91b3145972d918130c7 Mon Sep 17 00:00:00 2001
From: Dmitry Fedyuk <admin@dmitry-fedyuk.com>
Date: Wed, 15 Mar 2017 00:16:40 +0300
Subject: [PATCH] no message

---
 Fonts/Fs.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Fonts/Fs.php b/Fonts/Fs.php
index c4bd50b..63a6c1b 100644
--- a/Fonts/Fs.php
+++ b/Fonts/Fs.php
@@ -1,31 +1,27 @@
 <?php
 namespace Df\GoogleFont\Fonts;
 use Df\GoogleFont\Font\Variant\Preview\Params;
-class Fs extends \Df\Core\O {
+// 2015-12-08
+class Fs {
 	/**
 	 * 2015-12-08
 	 * @param string[] $relativeParts
 	 * @return string
 	 */
-	function absolute(array $relativeParts) {
-		return $this->baseAbsolute() . df_cc_path($relativeParts);
-	}
+	function absolute(array $relativeParts) {return $this->baseAbsolute() . df_cc_path($relativeParts);}
 
 	/**
 	 * 2015-12-08
 	 * @return string
 	 */
-	function nameColorsSizeMargin() {
-		if (!isset($this->{__METHOD__})) {
-			$this->{__METHOD__} = implode('_', [
-				's' . df_pad0(2, $this->params()->fontSize())
-				, 'f' . implode('-', $this->params()->fontColor())
-				, 'b' . implode('-', $this->params()->bgColor())
-				, 'm' . $this->params()->marginLeft()
-			]);
-		}
-		return $this->{__METHOD__};
-	}
+	function nameColorsSizeMargin() {return dfc($this, function() {$p = $this->params(); return
+		implode('_', [
+			's' . df_pad0(2, $p->fontSize())
+			,'f' . implode('-', $p->fontColor())
+			,'b' . implode('-', $p->bgColor())
+			,'m' . $p->marginLeft()
+		])
+	;});}
 
 	/**
 	 * 2015-12-08
@@ -38,12 +34,9 @@ function namePng(array $params) {return df_fs_name(implode('_', $params)) . '.pn
 	 * 2015-12-08
 	 * @return string
 	 */
-	function nameResolution() {
-		if (!isset($this->{__METHOD__})) {
-			$this->{__METHOD__} = implode('x', [$this->params()->width(), $this->params()->height()]);
-		}
-		return $this->{__METHOD__};
-	}
+	function nameResolution() {return dfc($this, function() {$p = $this->params(); return
+		implode('x', [$p->width(), $p->height()])
+	;});}
 
 	/** @return string */
 	private function baseAbsolute() {return df_media_path_absolute(self::baseRelative());}
@@ -53,4 +46,10 @@ private function baseRelative() {return df_cc_path_t('df', 'api', 'google', 'fon
 
 	/** @return Params */
 	private function params() {return Params::fromRequest();}
+
+	/**
+	 * 2017-03-15
+	 * @return self
+	 */
+	static function s() {static $r; return $r ? $r : $r = new self;}
 }
\ No newline at end of file