From 995edf8021bfe0eed8e2cecc25b1d0b1e8179fa4 Mon Sep 17 00:00:00 2001 From: Ben Wiley Sittler Date: Tue, 4 Nov 2008 00:41:56 +0000 Subject: [PATCH] merge latest CLI example bugfixes into the HTML versions --- caca-php/examples/www/colors.php | 8 ++++---- caca-php/examples/www/export.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/caca-php/examples/www/colors.php b/caca-php/examples/www/colors.php index 2d3e531..2ad07d7 100644 --- a/caca-php/examples/www/colors.php +++ b/caca-php/examples/www/colors.php @@ -52,13 +52,13 @@ for($i = 0; $i < 16; $i++) caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK); caca_put_str($cv, 3, 20, "This is bold This is blink This is italics This is underline"); -caca_set_attr($cv, CACA_BOLD, CACA_DEFAULT); +caca_set_attr($cv, CACA_BOLD); caca_put_str($cv, 3 + 8, 20, "bold"); -caca_set_attr($cv, CACA_BLINK, CACA_DEFAULT); +caca_set_attr($cv, CACA_BLINK); caca_put_str($cv, 3 + 24, 20, "blink"); -caca_set_attr($cv, CACA_ITALICS, CACA_DEFAULT); +caca_set_attr($cv, CACA_ITALICS); caca_put_str($cv, 3 + 41, 20, "italics"); -caca_set_attr($cv, CACA_UNDERLINE, CACA_DEFAULT); +caca_set_attr($cv, CACA_UNDERLINE); caca_put_str($cv, 3 + 60, 20, "underline"); echo caca_export_string($cv, "html3"); diff --git a/caca-php/examples/www/export.php b/caca-php/examples/www/export.php index 63e670b..73d121e 100644 --- a/caca-php/examples/www/export.php +++ b/caca-php/examples/www/export.php @@ -157,15 +157,15 @@ else caca_put_str($cv, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ"); caca_put_str($cv, WIDTH / 2 - 5, HEIGHT / 2 + 4, "(\") \\o/ <&>"); - caca_set_attr($cv, CACA_BOLD, CACA_DEFAULT); + caca_set_attr($cv, CACA_BOLD); caca_put_str($cv, WIDTH / 2 - 16, HEIGHT / 2 + 3, "Bold"); - caca_set_attr($cv, CACA_BLINK, CACA_DEFAULT); + caca_set_attr($cv, CACA_BLINK); caca_put_str($cv, WIDTH / 2 - 9, HEIGHT / 2 + 3, "Blink"); - caca_set_attr($cv, CACA_ITALICS, CACA_DEFAULT); + caca_set_attr($cv, CACA_ITALICS); caca_put_str($cv, WIDTH / 2 - 1, HEIGHT / 2 + 3, "Italics"); - caca_set_attr($cv, CACA_UNDERLINE, CACA_DEFAULT); + caca_set_attr($cv, CACA_UNDERLINE); caca_put_str($cv, WIDTH / 2 + 8, HEIGHT / 2 + 3, "Underline"); - caca_set_attr($cv, 0, CACA_DEFAULT); + caca_set_attr($cv, 0); caca_set_color_ansi($cv, CACA_WHITE, CACA_LIGHTBLUE); caca_put_str($cv, WIDTH / 2 - 7, HEIGHT / 2, " LIBCACA ");