Skip to content

Commit

Permalink
Optional package call points
Browse files Browse the repository at this point in the history
 - pbox and todonotes are optional packages and are now located in langsci-optional
 - tabularx was loaded twice, once in langscibook.cls and once in langsci-optional. It is now loaded
   only once, in langsci-optional, where it is located near the column specifiers
 - Moved the rotating package to sit near the other float packages
  • Loading branch information
kopeckyf committed Nov 9, 2020
1 parent 510d408 commit df60aa7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
8 changes: 4 additions & 4 deletions langsci-optional.sty
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\usepackage{pbox} % boxes with maximum width
\usepackage{todonotes}

% Heiko Oberdiek
% http://tex.stackexchange.com/questions/136644/vertical-space-in-interaction-with-figure-center-environment
\newcommand{\oneline}[1]{%
Expand Down Expand Up @@ -109,7 +112,6 @@
}
\newcommand{\fittable}[1]{\resizebox{\textwidth}{!}{#1}}

\usepackage{tabularx}
\usepackage{array}
\newenvironment{widetabular}[1][1]
{\tabularx{#1\textwidth}}
Expand All @@ -134,6 +136,7 @@
\node at (2.25,1) (O) {ɔ};
}

\usepackage{tabularx}
%no hyphenation left alingned
\newcolumntype{Q}{>{\raggedright\arraybackslash}X}
%no hyphenation right aligned
Expand All @@ -147,9 +150,6 @@
%no hyphenation right aligned fixed width
\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}

\newcolumntype{d}[1]{D{.}{.}{#1}}


% Underlining in gb4e-example Environments. Usual underlining commands that span multiple words do not work, because gb4e would parse it as one word.
% Example: \underline{My example phrase} should become \ulp{My}{~~~~~} \ulp{example}{~~~~~} \ule{phrase}
% Note: The 2nd Argument of the \ulp command is filled in by experience - if you are not familiar with the command, you should experiment a bit. Usually, five tildes are enough, but be sure to check the outcome.
Expand Down
10 changes: 1 addition & 9 deletions langscibook.cls
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,12 @@
\usetikzlibrary{positioning}
\usetikzlibrary{calc}

\usepackage{pbox} % boxes with maximum width
\usepackage[hyphens]{url}
\urlstyle{same}


%% standard commands
\usepackage{langsci-basic}
\usepackage{todonotes}


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Covers
Expand Down Expand Up @@ -1534,7 +1531,7 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
%% This sets the default for the positioning of floats
\renewcommand{\fps@figure}{htbp}
\renewcommand{\fps@table}{htbp}

\usepackage[figuresright]{rotating}
\usepackage{booktabs} % for nicer lines

%% floats
Expand Down Expand Up @@ -1781,10 +1778,6 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
\providecommand{\tabref}[1]{Table~\ref{#1}}
\providecommand{\figref}[1]{Figure~\ref{#1}}



\usepackage{tabularx} %must be loaded after hyperref. Maybe all float commands should be loaded here.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Collection (edited volume):
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -2141,7 +2134,6 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

\newlength{\LSPTmp}
\usepackage[figuresright]{rotating}

\ifbool{uniformtopskip}{}{% Donald Arseneau's automatic handling of page breaking from comp.text.tex: https://groups.google.com/d/topic/comp.text.tex/3eehwzortPg/discussion
% With the optimisations from the memoir class. The memoir class has relative instead of absolute values.
Expand Down

0 comments on commit df60aa7

Please sign in to comment.