@@ -101,9 +101,14 @@ sub use_wrappers{
101101 return $before . $stuff . $after . $_ ;
102102}
103103
104- sub use_current{
105- return use_wrappers(@_ [0], ' ' , ' ' );
104+ sub use_env_wrappers{
105+ local ($_ ,$before ,$after ,$tag ) = @_ ;
106+ push (@open_tags ,$tag );
107+ my $s = join (' ' , $before ,
108+ translate_commands(next_argument()), $after , $_ );
109+ return $s ;
106110}
111+
107112sub use_sans_serif{
108113 return use_wrappers(@_ [0], ' <font face="sans-serif">' , ' </font>' );
109114}
@@ -121,9 +126,9 @@ sub do_cmd_optional{
121126# output files for users that read them over the network rather than
122127# from local repositories.
123128
124- sub do_cmd_pytype{ return use_current( @_ ) ; }
125- sub do_cmd_makevar{ return use_current( @_ ) ; }
126- sub do_cmd_code{ return use_wrappers (@_ [0], ' <tt>' , ' </tt>' ); }
129+ sub do_cmd_pytype{ return @_ [0] ; }
130+ sub do_cmd_makevar{ return @_ [0] ; }
131+ sub do_cmd_code{ return use_env_wrappers (@_ [0], ' <tt>' , ' </tt>' , ' tt ' ); }
127132sub do_cmd_module{ return do_cmd_code(@_ ); }
128133sub do_cmd_keyword{ return do_cmd_code(@_ ); }
129134sub do_cmd_exception{ return do_cmd_code(@_ ); }
@@ -140,11 +145,19 @@ sub do_cmd_optional{
140145sub do_cmd_program{ return do_cmd_strong(@_ ); }
141146sub do_cmd_email{ return use_sans_serif(@_ ); }
142147sub do_cmd_mimetype{ return use_sans_serif(@_ ); }
143- sub do_cmd_var{ return use_italics(@_ ); }
148+ sub do_cmd_var{
149+ local ($_ , *open_args) = @_ ;
150+ my $prevtag = $open_args [(scalar @open_args ) - 1];
151+ if ($prevtag eq " code" || $prevtag eq " tt" ) {
152+ # in code of some sort....
153+ my $text = next_argument();
154+ return " </$prevtag ><i>$text </i><$prevtag >$_ " ;
155+ }
156+ return use_italics(@_ ); }
144157sub do_cmd_dfn{ return use_italics(@_ ); } # make an index entry?
145158sub do_cmd_emph{ return use_italics(@_ ); }
146159sub do_cmd_file{ return use_wrappers(@_ [0], ' "<tt>' , ' </tt>"' ); }
147- sub do_cmd_samp{ return use_wrappers (@_ [0], ' "<tt>' , ' </tt>"' ); }
160+ sub do_cmd_samp{ return use_env_wrappers (@_ [0], ' "<tt>' , ' </tt>"' , ' tt ' ); }
148161sub do_cmd_kbd{ return use_wrappers(@_ [0], ' <kbd>' , ' </kbd>' ); }
149162sub do_cmd_strong{ return use_wrappers(@_ [0], ' <b>' , ' </b>' ); }
150163
@@ -1024,4 +1037,10 @@ sub do_cmd_term{
10241037}
10251038
10261039
1040+ process_commands_wrap_deferred(<<_RAW_ARG_DEFERRED_CMDS_ );
1041+ code # {}
1042+ samp # {}
1043+ _RAW_ARG_DEFERRED_CMDS_
1044+
1045+
102710461; # This must be the last line
0 commit comments