diff options
| author | Karl Berry <karl@freefriends.org> | 2017-05-11 18:08:47 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-05-11 18:08:47 +0000 |
| commit | 5593c8e2719c3ace767d347b769f172886490a0f (patch) | |
| tree | 06de0cc7927eebdaacc3f8b28b685cc7a0d7d5c7 /Master | |
| parent | e37eefe7f19eb9756b8c1dca37ff149e3b24b785 (diff) | |
set $: to just space and newline, to avoid breaking at - in longdesc blocks; do not repeat definition of multilineformat
git-svn-id: svn://tug.org/texlive/trunk@44293 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 5 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 8f9cbf33196..d7a9d795e30 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLPOBJ.pm - module for using tlpobj files -# Copyright 2007-2016 Norbert Preining +# Copyright 2007-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -279,7 +279,7 @@ sub writeout { defined($self->{'shortdesc'}) && print $fd "shortdesc $self->{'shortdesc'}\n"; defined($self->{'license'}) && print $fd "license $self->{'license'}\n"; defined($self->{'relocated'}) && $self->{'relocated'} && print $fd "relocated 1\n"; - # ugly hack to get rid of use FileHandle; see man perlform + # don't want to use FileHandle.pm; see man perlform #format_name $fd "multilineformat"; select((select($fd),$~ = "multilineformat")[0]); $fd->format_lines_per_page (99999); # no pages in this format @@ -1351,6 +1351,7 @@ sub cataloguedata { return $self->{'cataloguedata'}; } +$: = " \n"; # don't break at - format multilineformat = longdesc ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~ $_tmp diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 83736ec2ad9..daee8923d5f 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLPSRC.pm - module for handling tlpsrc files -# Copyright 2007-2016 Norbert Preining +# Copyright 2007-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -197,7 +197,7 @@ sub from_file { sub writeout { my $self = shift; my $fd = (@_ ? $_[0] : STDOUT); - format_name $fd "multilineformat"; + format_name $fd "multilineformat"; # format defined in TLPOBJ, and $: $fd->format_lines_per_page (99999); # no pages in this format print $fd "name ", $self->name, "\n"; print $fd "category ", $self->category, "\n"; @@ -628,11 +628,6 @@ sub postactions { return @{ $self->{'postactions'} }; } -format multilineformat = -longdesc ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~ -$_tmp -. - 1; __END__ |