Skip to content
Permalink
Browse files

don't pass -shoreup to texexpand if non-integer scaling

  • Loading branch information
Dan Gildea
Dan Gildea committed Oct 14, 2019
1 parent c2f59b1 commit 330fb80ab781738023312fe68d4369a1576b37b7
Showing with 19 additions and 26 deletions.
  1. +0 −2 docs/.latex2html-init
  2. +1 −1 docs/credits.tex
  3. +0 −2 docs/manhtml.tex
  4. +3 −9 latex2html.1
  5. +15 −12 latex2html.pin
@@ -5,7 +5,5 @@ $INDEX_WIDTH = 250;
$CONTENTS_WIDTH = 250;
$HTML_VALIDATE = '';
$LOCAL_ICONS = 1;
@IMAGE_TYPES = qw(png gif);
$IMAGE_TYPE = $IMAGE_TYPES[0];

1;
@@ -314,7 +314,7 @@ \subsection*{Developments: late 1996 to mid 1997\label{recent97}}%
\end{itemize}

\noindent
Also present were representatives from the \DANTE\ \Praesidium\ and
Also present were representatives from the \DANTE\ Praesidium and
members of the \LaTeXiii\ development team.\html{\\}
In all it was a very pleasant and constructive meeting.

@@ -262,8 +262,6 @@
%
\newcommand{\DANTE}{\index{DANTE}%
\htmladdnormallink{DANTE e.V.}{http://www.dante.de/}}
\newcommand{\Praesidium}{\index{DANTE!Praesidium}%
\htmladdnormallink{Praesidium}{http://www.dante.de/dante/Organe.html}}
\newcommand{\LaTeXiii}{\index{LaTeX@\LaTeX!LaTeX3@\LaTeX{3}}%
\htmladdnormallink{\LaTeX{3}}{http://www.tex.ac.uk/CTAN/latex/latex3}}
%
@@ -423,7 +423,6 @@ processed, so the contents of the file may change any of the values of
any of the variables that were previously established, as well as any
default options. More than one initialisation file can be read in this
way.
[change_begin]98.1
.TP
.B -no_fork
Same as setting:
@@ -441,10 +440,9 @@ error.
.TP
.B -iso_language <type>
This enables you to specify a different language type than 'EN' to be
used in the DTD entries of the
used in the lang attribute of the
.B HTML
document, e.g. 'EN.US'.
[change_end] 98.1
document, e.g. 'en-US'.
.TP
.B -short_index
Same as setting:
@@ -466,14 +464,12 @@ is done as in
using code such as follows.
\\renewcommand{\\thefootnote}{\\arabic{footnote}}
All the styles \\arabic, \\alph, \\roman, \\Alph and \\Roman are available.
[change_begin]98.1
.TP
.B -numbered_footnotes
Same as setting:
.I $NUMBERED_FOOTNOTES = 1;
If this is set you will get every footnote applied with a subsequent
number, to ease readability.
[change_end] 98.1
.TP
.B -address <author-address>
Same as setting:
@@ -654,7 +650,6 @@ effects. Although on-screen images of text are definitely improved
using anti-aliasing, printed images can be badly blurred, even at
300dpi. Higher resolution printers do a much better job with the
resulting grey-scale images.
[change_begin]98.1
.TP
.B -white
Same as setting:
@@ -688,7 +683,6 @@ is called twice -- once to create the format-dump, then again to
load and use it. The pay-off comes with the faster loading on
subsequent runs. Approximately 1 Meg of disk space is consumed by the
dump file.
[change_end] 98.1
.SH Switches controlling Navigation Panels
The following switches govern whether to include one or more navigation
panels on each
@@ -1110,7 +1104,7 @@ the appropriate time the value of
is the document name, which
usually coincides with the name of the working directory.
.TP
.B $CHARSET = 'iso_8859_1';
.B $CHARSET = 'utf-8';
This specifies the character set used within the
.B HTML
pages produced by
@@ -227,7 +227,7 @@ if ($PK_GENERATION && ! $DVIPS_MODE) {
}

# language of the DTD specified in the <DOCTYPE...> tag
$ISO_LANGUAGE = 'EN' unless $ISO_LANGUAGE;
$ISO_LANGUAGE = 'en' unless $ISO_LANGUAGE;

# Save the command line arguments, quote where necessary
$argv = join(' ', map {/[\s#*!\$%]/ ? "'$_'" : $_ } @ARGV);
@@ -360,9 +360,6 @@ if(defined $opt{'link'}) {
die "Error: Unrecognised value for -link: $opt{'link'}\n";
}
}
unless ($ISO_LANGUAGE =~ /^[A-Z.]+$/) {
die "Error: Language (-iso_language) must be uppercase and dots only: $ISO_LANGUAGE\n";
}
if ($HTML_VALIDATE && !$HTML_VALIDATOR) {
die "Error: Need a HTML_VALIDATOR when -validate is specified.\n";
}
@@ -4391,7 +4388,7 @@ sub extract_image_bitmap { # clean
. (($custom_size)? "-geometry $custom_size " : '' )
. $croparg
. (($scale != 1)? "-scale $scale " : '' )
. ((($exscale)&&($exscale != 1)&&
. ((($exscale == int($exscale))&&($exscale != 1)&&
!($ANTI_ALIAS_TEXT &&($LATEX_COLOR)))?
"-shoreup $exscale$under " :'')
. ((($TRANSPARENT_FIGURES ||($trans))
@@ -4422,7 +4419,7 @@ sub extract_image_bitmap { # clean
. (($INTERLACE) ? "-interlace " : '' )
. ((($ANTI_ALIAS_TEXT||($aalias))&&(!($aalias =~ /no/)))?
"-antialias -depth 1 " :'')
. ((($exscale)&&($exscale != 1)&&
. ((($exscale == int($exscale))&&($exscale != 1)&&
!($ANTI_ALIAS_TEXT &&($LATEX_COLOR)))?
"-shoreup $exscale " :'')
. (($scale ne 1) ? "-scale $scale " : '' )

=item B<-toc_depth> I<num>

MISSING_DESCRIPTION
Sectioning levels down to I<num> are to be included within the
Table-of-Contents tree.

=item B<->(B<no>)B<toc_stars>

MISSING_DESCRIPTION
Sections created using the starred form of sectioning commands are
included within the Table of Contents.

=item B<->(B<no>)B<short_extn>


=item B<-iso_language> I<lang>

MISSING_DESCRIPTION
Language code for the HTML lang attribute. Default is "en".

=item B<->(B<no>)B<validate>


=item B<-long_titles> I<num>

MISSING_DESCRIPTION
The filenames for each HTML page are constructed from the first I<num>
words of the section heading for that page, separated by the `_'
character.

=item B<->(B<no>)B<custom_titles>

MISSING_DESCRIPTION
The filenames for each HTML page are constructed by a user-specified
perl subroutine.

=item B<-title>|B<-t> I<top_page_title>


=item B<->(B<no>)B<auto_link>

MISSING_DESCRIPTION
Creates hard link to index.html, or other filename specified
in config file.

=item B<-reuse> I<num> | B<-noreuse>

0 comments on commit 330fb80

Please sign in to comment.
You can’t perform that action at this time.