extend note and warn macro not to fail when outside par mode. Now they also set a new paragraph. Still has problems from within tables though
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9400 a1c6a512-1295-4272-9138-f99709370657
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 1a10de7..138d983 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -103,15 +103,17 @@
% Usage: \note{text of your note}
% Note: do NOT use \textbf or similar to emphasize text, use \emph!
\newcommand{\note}[1]{
- \noindent\\%
- \textbf{Note:}\marginpar{\raisebox{-6pt}{\Huge\Writinghand}}\ #1%
- \newline
+ \ifinner\else\par\noindent\fi
+ \textbf{Note:}\ %
+ \ifinner#1\else\marginpar{\raisebox{-6pt}{\Huge\Writinghand}}#1\par\fi%
}
% command to display a warning.
% Usage: \warn{text of your warning}
% Note: do NOT use \textbf or similar to emphasize text!
\newcommand{\warn}[1]{
- \noindent\textbf{Warning:}\marginpar{\raisebox{-6pt}{\Huge\Stopsign}}\ #1%
- \newline
-}
\ No newline at end of file
+ \ifinner\else\par\noindent\fi
+ \textbf{Warning:\ }%
+ \ifinner#1\else\marginpar{\raisebox{-6pt}{\Huge\Stopsign}}#1\par\fi%
+}
+