From 7e1f91c7a239c9295ddc8a6c6ac3dea5be24660d Mon Sep 17 00:00:00 2001 From: Michael Kohlhase Date: Sat, 19 Jan 2019 06:49:51 +0100 Subject: [PATCH] marginnotes work better --- base/proposal.dtx | 4 ++-- base/proposal.pdf | Bin 361905 -> 361910 bytes base/proposal.sty | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/proposal.dtx b/base/proposal.dtx index 3eaf16e..2de3b80 100644 --- a/base/proposal.dtx +++ b/base/proposal.dtx @@ -703,10 +703,10 @@ % % \begin{macrocode} \ifsubmit -\RequirePackage[hide]{ed} +\RequirePackage[hide,marginnote]{ed} \if@svninfo\RequirePackage[final,today]{svninfo}\fi \else -\RequirePackage[show]{ed} +\RequirePackage[show,marginnote]{ed} \if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi \if@gitinfo\RequirePackage[mark]{gitinfo2}\fi \fi diff --git a/base/proposal.pdf b/base/proposal.pdf index 0e42242d483a1d797692d7f0f708d7436d2be0fe..a6f57776c17714d04729e14c0fc1bd73a5feeb1f 100644 GIT binary patch delta 3112 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 diff --git a/base/proposal.sty b/base/proposal.sty index 629b1b4..4d43d3e 100644 --- a/base/proposal.sty +++ b/base/proposal.sty @@ -42,10 +42,10 @@ citecolor=\prop@link@color,urlcolor=\prop@link@color,colorlinks=true, breaklinks=true, bookmarksopen=true]{hyperref} \ifsubmit -\RequirePackage[hide]{ed} +\RequirePackage[hide,marginnote]{ed} \if@svninfo\RequirePackage[final,today]{svninfo}\fi \else -\RequirePackage[show]{ed} +\RequirePackage[show,marginnote]{ed} \if@svninfo\RequirePackage[eso-foot,today]{svninfo}\fi \if@gitinfo\RequirePackage[mark]{gitinfo2}\fi \fi @@ -985,7 +985,7 @@ ganttgray,.60/.60,.60,.60/0,0,.60/0,0,0,.40} \newcommand\jsoft{\textcolor{\prop@link@color}{\textbf{@}}} \newcommand\jorga{\textcolor{\prop@link@color}{\textbf{\Large{$\circ$}}}} \newcommand\jsup{\textcolor{\prop@link@color}{\textbf{\smiley}}} -\newcommand\add@joint[3]{\message{addjoint}\@ifundefined{coherence@#1@#2}% +\newcommand\add@joint[3]{\@ifundefined{coherence@#1@#2}% {\@namedef{coherence@#1@#2}{#3}}% {\expandafter\g@addto@macro\csname coherence@#1@#2\endcsname{#3}}} \newcommand\prop@joint[2]{\@for\@first:=#2\do{%