From c05107078f9aa74730d13978c1801f7a14e6ec77 Mon Sep 17 00:00:00 2001 From: yggverse Date: Thu, 1 Aug 2024 21:08:09 +0300 Subject: [PATCH] enshort const names --- src/Abstract/Model/Gtk/Pango/Markup.php | 22 +++++++++++----------- src/Interface/Model/Gtk/Pango/Markup.php | 20 ++++++++++---------- src/Model/Gtk/Pango/Markup/Gemtext.php | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Abstract/Model/Gtk/Pango/Markup.php b/src/Abstract/Model/Gtk/Pango/Markup.php index 7ee8cbb5..a57ff0f8 100644 --- a/src/Abstract/Model/Gtk/Pango/Markup.php +++ b/src/Abstract/Model/Gtk/Pango/Markup.php @@ -13,7 +13,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return sprintf( - self::TAG_CODE, + self::CODE, self::_escape( $value ) @@ -26,7 +26,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_H1, + self::H1, $value, $width ); @@ -38,7 +38,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_H2, + self::H2, $value, $width ); @@ -50,7 +50,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_H3, + self::H3, $value, $width ); @@ -63,7 +63,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return sprintf( - self::TAG_LINK, + self::LINK, self::_escape( $href ), @@ -82,7 +82,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_LIST, + self::LIST, sprintf( '* %s', $value @@ -97,7 +97,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_QUOTE, + self::QUOTE, $value, $width ); @@ -109,7 +109,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup ): string { return self::_wrap( - self::TAG_TEXT, + self::TEXT, $value, $width ); @@ -137,7 +137,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup // @TODO optimization wanted, wordwrap / set_line_wrap not solution protected static function _wrap( - string $tag, // const + string $format, // const string $value, // unescaped int $width = self::WRAP_WIDTH, string $break = self::WRAP_BREAK, @@ -158,7 +158,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup { $label->set_markup( sprintf( - $tag, + $format, self::_escape( implode( ' ' , $words[$line] @@ -187,7 +187,7 @@ class Markup implements \Yggverse\Yoda\Interface\Model\Gtk\Pango\Markup $label->destroy(); return sprintf( - $tag, + $format, self::_escape( implode( $break, diff --git a/src/Interface/Model/Gtk/Pango/Markup.php b/src/Interface/Model/Gtk/Pango/Markup.php index 0b3c2b04..4ab289d9 100644 --- a/src/Interface/Model/Gtk/Pango/Markup.php +++ b/src/Interface/Model/Gtk/Pango/Markup.php @@ -10,17 +10,17 @@ namespace Yggverse\Yoda\Interface\Model\Gtk\Pango; */ interface Markup { - public const TAG_CODE = '%s'; - public const TAG_CODE_CLOSE = ''; - public const TAG_CODE_OPEN = ''; + public const CODE = '%s'; + public const H1 = '%s'; + public const H2 = '%s'; + public const H3 = '%s'; + public const LINK = '%s'; + public const LIST = '%s'; + public const QUOTE = '%s'; + public const TEXT = '%s'; - public const TAG_H1 = '%s'; - public const TAG_H2 = '%s'; - public const TAG_H3 = '%s'; - public const TAG_LINK = '%s'; - public const TAG_LIST = '%s'; - public const TAG_QUOTE = '%s'; - public const TAG_TEXT = '%s'; + public const CODE_BEGIN = ''; + public const CODE_CLOSE = ''; public const LINK_PREFIX_INTERNAL = ''; // | ⇒ public const LINK_PREFIX_EXTERNAL = '⇗'; diff --git a/src/Model/Gtk/Pango/Markup/Gemtext.php b/src/Model/Gtk/Pango/Markup/Gemtext.php index a85f58d8..00dd3681 100644 --- a/src/Model/Gtk/Pango/Markup/Gemtext.php +++ b/src/Model/Gtk/Pango/Markup/Gemtext.php @@ -44,8 +44,8 @@ class Gemtext extends \Yggverse\Yoda\Abstract\Model\Gtk\Pango\Markup else { - $line[] = $preformatted ? self::TAG_CODE_CLOSE - : self::TAG_CODE_OPEN; + $line[] = $preformatted ? self::CODE_CLOSE + : self::CODE_BEGIN; $preformatted = !($preformatted); // toggle }