diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa7/apa7.pdf | bin | 520965 -> 521278 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf | bin | 196731 -> 196731 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf | bin | 63826 -> 64110 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/apa7/apa7.dtx | 19 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/apa7/apa7.cls | 11 |
5 files changed, 19 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf Binary files differindex c854fb9117e..11a47e7b3e7 100644 --- a/Master/texmf-dist/doc/latex/apa7/apa7.pdf +++ b/Master/texmf-dist/doc/latex/apa7/apa7.pdf diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf Binary files differindex e7ea5d3a3c6..5b7f1dc8866 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf +++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf Binary files differindex 68e951e2c7e..b56f7cbfd44 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index 5eb0137424e..47b0ca5af8e 100644 --- a/Master/texmf-dist/source/latex/apa7/apa7.dtx +++ b/Master/texmf-dist/source/latex/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%<class>\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)] +%<class>\ProvidesClass{apa7}[2020/05/10 v1.07 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2020/05/04} -\def\apaSevenVersionNumber{1.06} +\def\apaSevenVersionDate{2020/05/10} +\def\apaSevenVersionNumber{1.07} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -241,6 +241,8 @@ and the derived files apa7.ins, % % \changes{v1.06}{2020/05/04}{Added figurenote command.} % +% \changes{v1.07}{2020/05/10}{Fixed bug in figurenote command. Fixed figure title formatting in doc mode. Thanks RH.} +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -545,7 +547,7 @@ and the derived files apa7.ins, % | \begin{threeparttable}|\par % \item % \DescribeMacro{\figurenote}|\figurenote|\marg{figure-note-text}: -% Formats figure note when placed immidiatly after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|. +% Formats figure note when placed after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|. % \item % \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}: % Automatically fit a postscript figure; use instead of @@ -1767,17 +1769,20 @@ and the derived files apa7.ins, \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\} }{% jou \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} }{% doc \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} } -\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext} -\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it} +\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext} +\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it} % space between caption and surrounding document text % \setlength{\belowcaptionskip}{0pt} @@ -1789,7 +1794,7 @@ and the derived files apa7.ins, % %============================================================= -\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}} +\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}} % Code from theapa.sty diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index e687fc681e0..5ff2bf5d47e 100644 --- a/Master/texmf-dist/tex/latex/apa7/apa7.cls +++ b/Master/texmf-dist/tex/latex/apa7/apa7.cls @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)] +\ProvidesClass{apa7}[2020/05/10 v1.07 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -710,21 +710,24 @@ \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\} }{% jou \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} }{% doc \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}} + \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} } -\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext} -\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it} +\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext} +\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it} -\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}} +\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}} \newcounter{APAenum} |