From 6fc04300fe1717e2829a249e27a3e253bb34ea59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Fri, 12 Apr 2013 03:24:06 +0200 Subject: [PATCH 1/3] fix rainbowdrop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- ponies/rainbowdrop.pony | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ponies/rainbowdrop.pony b/ponies/rainbowdrop.pony index 3fbcda44..e08e0bdc 100644 --- a/ponies/rainbowdrop.pony +++ b/ponies/rainbowdrop.pony @@ -20,9 +20,9 @@ HEIGHT: 23 $$$ - $\$  - $\$  - $\$  +$balloon34$ + $\$  + $\$  $\$  ▄▄▄▄▄▄▄█▀▄ ▄▄▄█▄▄▄▄▄▄▄▄███  From 30f3cfc18b67d17a04ef94979117d2925f47b942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Fri, 12 Apr 2013 03:24:33 +0200 Subject: [PATCH 2/3] update gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c2c7b1bc..29cd02e0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ ## Compile files +/completion/*-completion.pony* /completion/*-completion-think.* /completion/pony*.pony* /truncater From f5f41cf11528706e3001cf75198647d2b58382f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Fri, 12 Apr 2013 03:27:53 +0200 Subject: [PATCH 3/3] status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- CHANGELOG | 2 ++ manuals/manpage.0 | 2 +- manuals/manpage.es.0 | 2 +- manuals/ponysay.texinfo | 4 +++- src/ponysay.py | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ad23d113..69985d31 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Version 3.0.2 New ponies: deepblue, peachbottom, rainbowdrop, strawberrycream, wildflower + Default value for -W has been changed from 40 to 60. + Version 3.0.1 New ponies: harshwhinny diff --git a/manuals/manpage.0 b/manuals/manpage.0 index 5d04937f..864db635 100644 --- a/manuals/manpage.0 +++ b/manuals/manpage.0 @@ -35,7 +35,7 @@ ponysay \- Cowsay reimplementation for ponies .\" respectively. \fBponysay\fP displays an image of a pony saying some text provided by the user in a terminal. If \fImessage\fP is not provided, it accepts standard input, word-wraps the message given at -about 40 columns, and prints the pony saying the given message on standard output. +about 60 columns, and prints the pony saying the given message on standard output. .PP If no arguments are provided, the program only accepts standard input piped from another program, a file or either here documents or here strings (see man bash(1) for details on here diff --git a/manuals/manpage.es.0 b/manuals/manpage.es.0 index bcdc2255..5f8d59f0 100644 --- a/manuals/manpage.es.0 +++ b/manuals/manpage.es.0 @@ -37,7 +37,7 @@ ponysay \- Una reimplementación de cowsay usando ponis terminal. .br Si el \fImesaje\fP no es provisto, ponysay aceptará una orden estándar. -El mensaje debería de tener alrededor de 40 columnas, y el o la poni devería de mostrar este +El mensaje debería de tener alrededor de 60 columnas, y el o la poni devería de mostrar este mensaje en una salida estándar. .PP diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 0b9de80a..9811c4f8 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -282,7 +282,7 @@ balloon style is specified a fallback style will be used. @itemx --wrap COLUMN @opindex @option{-W} @opindex @option{--wrap} -Specify the screen column where the message should be wrapped, this is by default 40, +Specify the screen column where the message should be wrapped, this is by default 460, as with @command{cowsay}. The balloon's extra width is taken into consideration. If the argument is not a number, but starts instead with @code{n} (for ‘none’ or @@ -3005,6 +3005,8 @@ sequences. @itemize @bullet @item New ponies: @file{deepblue}, @file{peachbottom}, @file{rainbowdrop}, @file{strawberrycream}, @file{wildflower} +@item +Default value for @option{-W}, the message wrapping column, has been changed from 40 to 60, to wrap messages better. @end itemize @heading Version 3.0.1 diff --git a/src/ponysay.py b/src/ponysay.py index 94eaefaf..0b556430 100755 --- a/src/ponysay.py +++ b/src/ponysay.py @@ -905,7 +905,7 @@ class Ponysay(): env_width = os.environ['PONYSAY_FULL_WIDTH'] if 'PONYSAY_FULL_WIDTH' in os.environ else None if env_width is None: env_width = '' widthtruncation = gettermsize()[1] if env_width not in ('yes', 'y', '1') else None - messagewrap = 40 + messagewrap = 60 if (args.opts['-W'] is not None) and (len(args.opts['-W'][0]) > 0): messagewrap = args.opts['-W'][0] if messagewrap[0] in 'nmsNMS': # m is left to n on QWERTY and s is left to n on Dvorak