Ignore:
Timestamp:
Jun 6, 2016, 11:35:39 AM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, resolv-new, with_gc
Children:
321a2481
Parents:
e365cb5 (diff), e229c22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into ctor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/common.tex

    re365cb5 rb8387fc  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Wed May  4 08:01:10 2016
    14 %% Update Count     : 54
     13%% Last Modified On : Fri Jun  3 09:32:19 2016
     14%% Update Count     : 62
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    1717%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     18
     19\setlength{\textheight}{9in}
     20%\oddsidemargin 0.0in
     21\renewcommand{\topfraction}{0.8}        % float must be greater than X of the page before it is forced onto its own page
     22\renewcommand{\bottomfraction}{0.8}     % float must be greater than X of the page before it is forced onto its own page
     23\renewcommand{\floatpagefraction}{0.8}  % float must be greater than X of the page before it is forced onto its own page
     24\renewcommand{\textfraction}{0.0}       % the entire page maybe devoted to floats with no text on the page at all
     25\usepackage{pslatex}                            % reduce size of san serif font
    1826
    1927% Names used in the document.
     
    2735
    2836\makeatletter
     37% parindent is relative, i.e., toggled on/off in environments like itemize,
     38% so store the value for use rather than use \parident directly.
     39\newlength{\parindentlength}
     40\setlength{\parindentlength}{\parindent}
     41
    2942% allow escape sequence in lstinline
    3043%\usepackage{etoolbox}
     
    3245
    3346% make fontsize "small" slightly larger, specifically for san serif (helvetica) in program code
    34 \renewcommand\small{%
    35    \@setfontsize\small{8.5}{11}%
    36    \abovedisplayskip 8.5pt \@plus 3pt \@minus 4pt
    37    \abovedisplayshortskip \z@ \@plus 2pt
    38    \belowdisplayshortskip 4pt \@plus 2pt \@minus 2pt
    39    \def\@listi{\leftmargin\leftmargini
    40                \topsep 4pt \@plus 2pt \@minus 2pt
    41                \parsep 2pt \@pluspt \@minuspt
    42                \itemsep \parsep}%
    43    \belowdisplayskip \abovedisplayskip
    44 }
     47%\renewcommand\small{%
     48%   \@setfontsize\small{8.5}{11}%
     49%   \abovedisplayskip 8.5pt \@plus 3pt \@minus 4pt
     50%   \abovedisplayshortskip \z@ \@plus 2pt
     51%   \belowdisplayshortskip 4pt \@plus 2pt \@minus 2pt
     52%   \def\@listi{\leftmargin\leftmargini
     53%               \topsep 4pt \@plus 2pt \@minus 2pt
     54%               \parsep 2pt \@pluspt \@minuspt
     55%               \itemsep \parsep}%
     56%   \belowdisplayskip \abovedisplayskip
     57%}
    4558\usepackage{relsize}                                    % must be after change to small or selects old size
    4659
     
    186199language=CFA,
    187200columns=flexible,
    188 basicstyle=\sf\relsize{-1},
     201basicstyle=\sf,
    189202stringstyle=\tt,
    190203tabsize=4,
    191 xleftmargin=\parindent,
     204xleftmargin=\parindentlength,
    192205extendedchars=true,
    193206escapechar=§,
Note: See TracChangeset for help on using the changeset viewer.