Merge branch 'master' into jneeman

[lilypond.git] / Documentation / de / user / macros.itexi

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 295a4689f823d5884f1893e8949691d2e5a4c1c1..bf7aa7ac00e586c43321b6afb2ff1ed8e80ee2ae 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -250,24 +250,64 @@ internals document, @internalsref{\NAME\}
 user manual, @internalsref{\NAME\}
 @end macro
 
-@c ecrm char codes
-@c but texinfo.tex uses cm
-@c FIXME
+@ignore
 @tex
-\gdef\glq{\char015\relax}%
-\gdef\grq{\char140\relax}%
-\gdef\glqq{\char022\relax}%
-\gdef\grqq{\char020\relax}%
+% from german.sty
+\def\allowhyphens{%
+  \penalty\@M
+  \hskip\z@skip}
+
+\gdef\set@low@box#1{%
+  \setbox\tw@\hbox{,}%
+  \setbox\z@\hbox{#1}%
+  \setbox\z@\hbox{%
+    \dimen@\ht\z@
+    \advance\dimen@ -\ht\tw@
+    \lower\dimen@\box\z@}%
+  \ht\z@\ht\tw@
+  \dp\z@\dp\tw@}
+
+\gdef\save@sf@q#1{%
+  {\ifhmode
+     \edef\@SF{\spacefactor\the\spacefactor}%
+   \else
+     \let\@SF\empty
+   \fi
+   \leavevmode #1
+   \@SF}}
+
+\gdef\glq{%
+  \save@sf@q{%
+    \set@low@box{'\/}%
+    \box\z@
+    \kern-.04em
+    \allowhyphens}}
+\gdef\grq{%
+  \save@sf@q{%
+    \kern-.0125em
+    `%
+    \kern.07em}}
+\gdef\glqq{%
+  \save@sf@q{%
+    \set@low@box{''\/}%
+    \box\z@
+    \kern-.04em
+    \allowhyphens}}
+\gdef\grqq{%
+  \save@sf@q{%
+    \kern-.07em
+    ``%
+    \kern.07em}}
 @end tex
+@end ignore
 
-@c to get decent German quotes in `foo'
-@c FIXME: use glq/grq
+@c FIXME
+@c to get decent quotes in `foo'
 @macro q{TEXT}
 `\TEXT\'
 @end macro
 
-@c to get decent German quotes in ``foo''
-@c FIXME: use glqq/grqq
+@c to get decent quotes in ``foo''
 @macro qq{TEXT}
 ``\TEXT\''
 @end macro