Revert "Quickly fix German macros.itexi"

This reverts commit 86198f025cb90ff01e5c8fb18f6ddff783e04738.

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 295a4689f823d5884f1893e8949691d2e5a4c1c1..6aa222e3139d91969e190e7a8ba135c1aabda32b 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -250,26 +250,63 @@ internals document, @internalsref{\NAME\}
 user manual, @internalsref{\NAME\}
 @end macro
 
-@c ecrm char codes
-@c but texinfo.tex uses cm
-@c FIXME
 @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
 
-@c to get decent German quotes in `foo'
-@c FIXME: use glq/grq
+@c to get decent quotes in `foo'
 @macro q{TEXT}
-`\TEXT\'
+@glq\TEXT\@grq
 @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\''
+@glqq\TEXT\@grqq
 @end macro
 
 @end iftex