html: @option inside @emph

[Ralf Wildenhues]

Some texinfo highlighting commands do not nest well.  Below is an
example, written as a test: an @option inside an @emph causes a
  <em>...<samp></em>...</samp>

in the output.  There are more cases like this, e.g., with @option
replaced by @samp.

I'm not familiar enough with texinfo to suggest a fix, sorry.

Cheers,
Ralf

        * makeinfo/tests/emph-option: New test.
        * makeinfo/tests/emph-option.txi: New file.
        * makeinfo/tests/Makefile.am: Adjust.

Index: makeinfo/tests/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/tests/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- makeinfo/tests/Makefile.am  11 Apr 2004 17:56:47 -0000      1.5
+++ makeinfo/tests/Makefile.am  6 Jun 2006 19:49:27 -0000
@@ -13,6 +13,7 @@
   cond \
   copying \
   defxcond \
+  emph-option \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
   html-top \
   include-value \
@@ -28,6 +29,7 @@
   accent.txi accentenc.txi accent-text.txi \
   cond.txi copying.txi \
   defxcond.txi \
+  emph-option.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
   html-top.txi \
   include-value.txi incl-incl.txi \
--- /dev/null   1970-01-01 00:00:01.000000000 +0200
+++ makeinfo/tests/emph-option  2006-06-06 19:22:17.000000000 +0200
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Test @option inside @emph. 
+
+unset TEXINFO_OUTPUT
+: ${srcdir=.}
+
+../makeinfo --no-split --html -o emph-option.out $srcdir/emph-option.txi || 
exit 1
+fgrep '<em>emphasized and referring to <samp></em>' emph-option.out && exit 3
+
+rm -f emph-option.out
--- /dev/null   1970-01-01 00:00:01.000000000 +0200
+++ makeinfo/tests/emph-option.txi      2006-06-06 19:18:29.000000000 +0200
@@ -0,0 +1,8 @@
+\input texinfo
address@hidden cond.info
+
address@hidden Top
+
+Foo @emph{emphasized and referring to @option{--some} option}.
+
address@hidden