From: Mischa POSLAWSKY Date: Wed, 17 May 2017 13:22:04 +0000 (+0200) Subject: common: wrap some long code lines to 78 columns X-Git-Tag: v1.11~72 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/6e999e79e078ca87e22b3474d532b3d570453661 common: wrap some long code lines to 78 columns --- diff --git a/browser.plp b/browser.plp index 7e096b0..1c5bb85 100644 --- a/browser.plp +++ b/browser.plp @@ -511,5 +511,7 @@ sub showversions { - + diff --git a/common.inc.plp b/common.inc.plp index b1cf2d1..6672bd5 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -27,7 +27,7 @@ BEGIN { $PLP::ERROR = sub { my ($text, $html) = @_; warn $text; - unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) { + unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) { Html({nocache => 1}); say '

Page unavailable

'; } @@ -59,7 +59,7 @@ sub stylesheet { my $cookie = CGI::Cookie->new( -name => 'style', -value => $setstyle || '', - -path => '/', # site-wide; current page is confusing to most users + -path => '/', # site-wide -expires => $setstyle ? '+5y' : '-1d', ) or die "empty object returned\n"; AddCookie($cookie->as_string); @@ -121,9 +121,8 @@ sub Html { push @{ $meta->{raw} }, ( '', '', - !$showkeys ? '' - : $showkeys eq 'ghost' ? '' - : (), + !$showkeys ? '' : + $showkeys eq 'ghost' ? '' : (), '', ) if $meta->{keys}; @@ -132,7 +131,8 @@ sub Html { say ''; say ''; say ''; - say sprintf '', $header{content_type}; + say sprintf '', $_ + for $header{content_type}; say sprintf '%s', $meta->{title}; say sprintf '', EscapeHTML($_) for join(' ', @{ $meta->{description} }) || (); @@ -166,8 +166,9 @@ sub Html { version $meta->{version} created by • - AGPLv3 + AGPLv3 EOT say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time; say '

'; diff --git a/latin.plp b/latin.plp index e304a36..38dc426 100644 --- a/latin.plp +++ b/latin.plp @@ -115,5 +115,7 @@ else { :> - + diff --git a/writing-latn.inc.pl b/writing-latn.inc.pl index c411b1a..c7bc11c 100644 --- a/writing-latn.inc.pl +++ b/writing-latn.inc.pl @@ -12,11 +12,13 @@ my %C = ( my $U = 0; # optional unicode alternatives my @wrapstyle = ( - 'td { white-space: normal; word-spacing: 10em }', # force line break between words + 'td { white-space: normal; word-spacing: 10em }', + # force line break between words '.sample { word-spacing: 0 }', - '.sample span { margin-right: 1ex; white-space: nowrap; display: inline-block }', # larger space between letters + '.sample span { margin-right: 1ex; white-space: nowrap; display: inline-block }', + # larger space between letters ); -my $spacestyle = '.sample span { margin-right: 0.5ex }'; # separate multiple letters +my $spacestyle = '.sample span { margin-right: 0.5ex }'; # separate letters my @tapstyle = ( @wrapstyle, '{ line-height: 1ex }', @@ -116,8 +118,8 @@ roman => { ], list => [ map { - !m/^(-?)(\w.+)/ ? $_ : - $1.'' + s{\A-?\K(\w.+)} + {}r } "m2,4 c1,2 8,9 8,9 M2,15 6,9", "m2,4 c0,0 3,-2 4,1 1,2 0,9 3,9 1,-0 2,-1 2,-1 m-6,-2 c-5,4 -0,6 1,3", @@ -210,12 +212,14 @@ edgewrite => { map { my @route = split //; my @coords = map { $_ % 2 << 3, $_ >> 1 << 3 } @route; # x,y, - sprintf('', @coords[0, 1]) . # start point - sprintf('', join ' ', map { - my $pos = join(',', @coords[$_*2, $_*2 + 1]); - $_ > 1 && $route[$_] == $route[$_ - 2] ? 'Q4,4 '.$pos.'L' : # curve back - $pos - } 0 .. $#route) + sprintf('', + @coords[0, 1], # start point + join(' ', map { + my $pos = join(',', @coords[$_*2, $_*2 + 1]); + $_ > 1 && $route[$_] == $route[$_ - 2] # curve back + ? 'Q4,4 '.$pos.'L' : $pos + } 0 .. $#route), + ) } # corners (0..3) clockwise from top-left in order qw( @@ -333,7 +337,8 @@ maritime => { - + - + @@ -377,8 +383,8 @@ maritime => { - + @@ -482,7 +488,7 @@ code128 => { list => [map { dispbar($_) } qw( 111323 131123 131321 112313 132113 132311 211313 231113 231311 112133 112331 132131 113123 113321 133121 313121 211331 231131 213113 213311 - 213131 311123 311321 331121 312113 312311 212222 0 211412 23311120 + 213131 311123 311321 331121 312113 312311 212222 0 211412 23311120 )], }, rm4scc => { @@ -562,8 +568,10 @@ dni => { 'M4,-.5 0,4 4,8.5', 'M4,8 4,2 8,2', ]; - sprintf '', - $h->[$_ % 5] . $v->[$_ / 5] || $v->[6]; + sprintf( + '', + $h->[$_ % 5] . $v->[$_ / 5] || $v->[6], + ); } 0 .. 5*5 ], }, @@ -616,7 +624,8 @@ nyctographs => { # draw style (0=empty, 1=dot, 2=line connect) to right, down, left, up qw( 0010 0112 2022 2220 2000 2012 0122 0202 0020 0220 0012 0022 2202 - 0222 2222 0102 0200 2201 2002 2200 0100 0110 0120 2001 2010 2020 0000 + 0222 2222 0102 0200 2201 2002 2200 0100 0110 0120 2001 2010 2020 + 0000 ), ], }, @@ -631,12 +640,13 @@ chromacons => { ); } qw{ - F0A3FF:Amethyst 0075DC:Blue 993F00:Caramel 4C005C:Damson 191919:Ebony - 005C31:Forest 2BCE48:Green FFCC99:Honeydew 808080:Iron 94FFB5:Jade - 8F7C00:Khaki 9DCC00:Lime C20088:Mallow - 003380:Navy FFA405:Orpiment FFA8BB:Pink 426600:Quagmire FF0010:Red - 5EF1F2:Sky 00998F:Turquoise E0FF66:Uranium 740AFF:Violet 990000:Wine - FFFF80:Xanthin FFFF00:Yellow FF5005:Zinnia 0 + F0A3FF:Amethyst 0075DC:Blue 993F00:Caramel 4C005C:Damson + 191919:Ebony 005C31:Forest 2BCE48:Green FFCC99:Honeydew + 808080:Iron 94FFB5:Jade 8F7C00:Khaki 9DCC00:Lime + C20088:Mallow 003380:Navy FFA405:Orpiment FFA8BB:Pink + 426600:Quagmire FF0010:Red 5EF1F2:Sky 00998F:Turquoise + E0FF66:Uranium 740AFF:Violet 990000:Wine FFFF80:Xanthin + FFFF00:Yellow FF5005:Zinnia 0 } ], },