[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/makeinfo cmds.c,1.8,1.9 defun.c,1.4,1.5 footnote.c,1.1.1.1,1.2 h
|
From: |
dirt |
|
Subject: |
texinfo/makeinfo cmds.c,1.8,1.9 defun.c,1.4,1.5 footnote.c,1.1.1.1,1.2 html.c,1.1.1.1,1.2 index.c,1.1.1.1,1.2 insertion.c,1.7,1.8 makeinfo.c,1.11,1.12 multi.c,1.1.1.1,1.2 node.c,1.1.1.1,1.2 sectioning.c,1.3,1.4 |
|
Date: |
Sun, 28 Dec 2003 12:48:55 +0100 |
Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv9970/makeinfo
Modified Files:
cmds.c defun.c footnote.c html.c index.c insertion.c
makeinfo.c multi.c node.c sectioning.c
Log Message:
2003-12-28 Alper Ersoy <address@hidden>
* makeinfo/cmds.c (cm_sp): for HTML use <pre>.
* makeinfo/defun.c (defun_internal): do not close paragraph when
outputting HTML to avoid empty <p> elements.
(process_defun_args): joined duplicate if/else blocks.
* makeinfo/html.c (insert_html_tag): removed redundant paragraph
starting code.
* makeinfo/insertion.c (begin_insertion): keep state of the first <dt>
child of a <dl> in the new html_deflist_has_term variable for ...
(cm_item): cleaner <br> insertion checks. Fixed non-functional empty
<dd> rollback code.
* makeinfo/makeinfo.c (add_html_block_elt, add_html_block_elt_args):
new functions for inserting block level elements that must not be
preceded by a <p> element.
(add_char): insert <p> only if in_html_block_level_elt is not true.
* makeinfo/cmds.c (cm_comment, cm_center):
* makeinfo/footnote.c (output_pending_notes):
* makeinfo/html.c (html_output_head):
* makeinfo/index.c (cm_printindex):
* makeinfo/insertion.c (enum_html, begin_insertion, end_insertion)
(handle_verbatim_environment, cm_item):
* makeinfo/makeinfo.c (handle_menu_entry):
* makeinfo/multi.c (do_multitable):
* makeinfo/node.c (cm_node):
* makeinfo/sectioning.c (sectioning_html): use add_html_block_elt and
add_html_block_elt_args instead of add_word and add_word_args
respectively, when inserting <ul>, <div>, <h?> and the like.
Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cmds.c 2003/12/23 12:54:29 1.8
--- cmds.c 2003/12/28 11:48:52 1.9
***************
*** 648,652 ****
/* Crunch double hyphens in comments. */
! add_word ("<!-- ");
for (i = 0; i < strlen (line); i++)
{
--- 648,652 ----
/* Crunch double hyphens in comments. */
! add_html_block_elt ("<!-- ");
for (i = 0; i < strlen (line); i++)
{
***************
*** 1366,1392 ****
}
else
! {
! /* Must disable filling since otherwise multiple newlines is like
! multiple spaces. Must close paragraph since that's what the
! manual says and that's what TeX does. */
! int save_filling_enabled = filling_enabled;
! filling_enabled = 0;
!
! /* close_paragraph generates an extra blank line. */
! close_single_paragraph ();
! if (lines && html && !executing_string)
! html_output_head ();
! while (lines--)
! {
! if (html)
! insert_string ("<br><p>\n");
! else
! add_char ('\n');
! }
! filling_enabled = save_filling_enabled;
! }
}
free (line);
--- 1366,1393 ----
}
else
! {
! /* Must disable filling since otherwise multiple newlines is like
! multiple spaces. Must close paragraph since that's what the
! manual says and that's what TeX does. */
! int save_filling_enabled = filling_enabled;
! filling_enabled = 0;
! /* close_paragraph generates an extra blank line. */
! close_single_paragraph ();
! if (lines && html && !executing_string)
! html_output_head ();
! if (html)
! add_html_block_elt ("<pre class=\"sp\">\n");
!
! while (lines--)
! add_char ('\n');
!
! if (html)
! add_html_block_elt ("</pre>\n");
!
! filling_enabled = save_filling_enabled;
! }
}
free (line);
***************
*** 1453,1457 ****
if (html)
! add_word ("<div align=\"center\">");
inhibit_output_flushing ();
--- 1454,1458 ----
if (html)
! add_html_block_elt ("<div align=\"center\">");
inhibit_output_flushing ();
***************
*** 1461,1465 ****
uninhibit_output_flushing ();
if (html)
! add_word ("</div>");
else
--- 1462,1466 ----
uninhibit_output_flushing ();
if (html)
! add_html_block_elt ("</div>");
else
Index: defun.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** defun.c 2003/12/16 21:49:39 1.4
--- defun.c 2003/12/28 11:48:52 1.5
***************
*** 277,300 ****
insert_html_tag (END, "");
}
! else if (defun_arg[0] == '&')
! if (html)
! {
! defun_arg = escape_string (xstrdup (defun_arg));
! execute_string ("%s", defun_arg);
! free (defun_arg);
! }
! else
! execute_string ("%s", defun_arg);
! else if (defun_arg[0] == COMMAND_PREFIX)
! execute_string ("%s", defun_arg);
! else if (auto_var_p)
! if (html)
! {
! defun_arg = escape_string (xstrdup (defun_arg));
! execute_string ("%s", defun_arg);
! free (defun_arg);
! }
! else
! execute_string ("%s", defun_arg);
else
execute_string ("%s", defun_arg);
--- 277,284 ----
insert_html_tag (END, "");
}
! /* else if (defun_arg[0] == '&' || defun_arg[0] == COMMAND_PREFIX) */
! /* execute_string ("%s", defun_arg); */
! /* else if (auto_var_p) */
! /* execute_string ("%s", defun_arg); */
else
execute_string ("%s", defun_arg);
***************
*** 678,682 ****
current_indent -= default_indentation_increment;
! close_single_paragraph ();
/* Make an entry in the appropriate index. */
--- 662,667 ----
current_indent -= default_indentation_increment;
! if (!html)
! close_single_paragraph ();
/* Make an entry in the appropriate index. */
Index: footnote.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/footnote.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** footnote.c 2003/12/06 01:33:25 1.1.1.1
--- footnote.c 2003/12/28 11:48:52 1.2
***************
*** 295,299 ****
if (html)
{
! add_word ("<div class=\"footnote\">\n<hr>\n<h4>");
add_word (_("Footnotes"));
add_word ("</h4>\n");
--- 295,299 ----
if (html)
{
! add_html_block_elt ("<div class=\"footnote\">\n<hr>\n<h4>");
add_word (_("Footnotes"));
add_word ("</h4>\n");
***************
*** 349,353 ****
{
/* Make the text of every footnote begin a separate paragraph. */
! add_word ("<p class=\"footnote\"><small>");
/* Make footnote number a link to its definition. */
add_word_args ("[<a name=\"fn-%d\" href=\"#fnd-%d\">%d</a>]",
--- 349,353 ----
{
/* Make the text of every footnote begin a separate paragraph. */
! add_html_block_elt ("<p class=\"footnote\"><small>");
/* Make footnote number a link to its definition. */
add_word_args ("[<a name=\"fn-%d\" href=\"#fnd-%d\">%d</a>]",
Index: html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** html.c 2003/12/06 01:33:30 1.1.1.1
--- html.c 2003/12/28 11:48:52 1.2
***************
*** 48,52 ****
html_title = escape_string (title ? text_expansion (title) :
_("Untitled"));
! add_word_args ("<html lang=\"%s\">\n<head>\n",
language_table[language_code].abbrev);
--- 48,52 ----
html_title = escape_string (title ? text_expansion (title) :
_("Untitled"));
! add_html_block_elt_args ("<html lang=\"%s\">\n<head>\n",
language_table[language_code].abbrev);
***************
*** 421,433 ****
char *old_tag = NULL;
int do_return = 0;
-
- if (!paragraph_is_open && (start_or_end == START))
- {
- /* Need to compensate for the <p> we are about to insert, or
- else cm_xxx functions that call us will get wrong text
- between START and END. */
- adjust_braces_following (output_paragraph_offset, 3);
- add_word ("<p>");
- }
if (start_or_end != START)
--- 421,424 ----
Index: index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.c 2003/12/06 01:33:30 1.1.1.1
--- index.c 2003/12/28 11:48:52 1.2
***************
*** 711,715 ****
close_paragraph ();
if (html)
! add_word_args ("<ul class=\"index-%s\" compact>", index_name);
else if (!no_headers && !docbook)
add_word ("* Menu:\n\n");
--- 711,715 ----
close_paragraph ();
if (html)
! add_html_block_elt_args ("<ul class=\"index-%s\" compact>",
index_name);
else if (!no_headers && !docbook)
add_word ("* Menu:\n\n");
***************
*** 872,876 ****
if (html)
! add_word ("</ul>");
else if (xml && docbook)
xml_end_index ();
--- 872,876 ----
if (html)
! add_html_block_elt ("</ul>");
else if (xml && docbook)
xml_end_index ();
Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** insertion.c 2003/12/25 11:04:58 1.7
--- insertion.c 2003/12/28 11:48:52 1.8
***************
*** 71,75 ****
static int float_active = 0;
! static const char dl_tag[] = "<dl>\n";
extern void cm_insert_copying ();
--- 71,78 ----
static int float_active = 0;
! /* Non-zero if a <dl> element has a <dt> element in it. We use this when
! deciding whether to insert a <br> or not. */
! static int html_deflist_has_term = 0;
!
extern void cm_insert_copying ();
***************
*** 399,403 ****
}
! add_word_args ("<ol type=%c start=%d>\n", type, start);
}
--- 402,406 ----
}
! add_html_block_elt_args ("<ol type=%c start=%d>\n", type, start);
}
***************
*** 553,557 ****
/* @quotation does filling (@display doesn't). */
if (html)
! add_word ("<blockquote>\n");
else
{
--- 556,560 ----
/* @quotation does filling (@display doesn't). */
if (html)
! add_html_block_elt ("<blockquote>\n");
else
{
***************
*** 592,596 ****
mozilla, maybe others render an extra blank line before the
pre-formatted block. So don't output a newline. */
! add_word_args ("<pre class=\"%s\">", command);
if (type != format && type != smallformat)
--- 595,599 ----
mozilla, maybe others render an extra blank line before the
pre-formatted block. So don't output a newline. */
! add_html_block_elt_args ("<pre class=\"%s\">", command);
if (type != format && type != smallformat)
***************
*** 645,653 ****
if (type == itemize)
{
! add_word ("<ul>\n");
in_paragraph = 0;
}
else
! add_word (dl_tag);
}
if (xml)
--- 648,660 ----
if (type == itemize)
{
! add_html_block_elt ("<ul>\n");
in_paragraph = 0;
}
else
! { /* We are just starting, so this <dl>
! has no <dt> children yet. */
! html_deflist_has_term = 0;
! add_html_block_elt ("<dl>\n");
! }
}
if (xml)
***************
*** 704,708 ****
case cartouche:
if (html)
! add_word ("<p><table class=\"cartouche\" border=1><tr><td>\n");
if (in_menu)
no_discard++;
--- 711,715 ----
case cartouche:
if (html)
! add_html_block_elt ("<p><table class=\"cartouche\"
summary=\"cartouche\" border=\"1\"><tr><td>\n");
if (in_menu)
no_discard++;
***************
*** 799,803 ****
if (html)
! add_word ("<div class=\"float\">\n");
else if (xml)
{
--- 806,810 ----
if (html)
! add_html_block_elt ("<div class=\"float\">\n");
else if (xml)
{
***************
*** 884,888 ****
filling_enabled = indented_fill = no_indent = 0;
if (html)
! add_word ("<div align=\"left\">");
break;
--- 891,895 ----
filling_enabled = indented_fill = no_indent = 0;
if (html)
! add_html_block_elt ("<div align=\"left\">");
break;
***************
*** 893,897 ****
force_flush_right++;
if (html)
! add_word ("<div align=\"right\">");
break;
--- 900,904 ----
force_flush_right++;
if (html)
! add_html_block_elt ("<div align=\"right\">");
break;
***************
*** 1050,1054 ****
in_menu--; /* No longer hacking menus. */
if (html && !no_headers)
! add_word ("</ul>\n");
else if (!no_headers)
close_insertion_paragraph ();
--- 1057,1061 ----
in_menu--; /* No longer hacking menus. */
if (html && !no_headers)
! add_html_block_elt ("</ul>\n");
else if (!no_headers)
close_insertion_paragraph ();
***************
*** 1089,1093 ****
{
if (html)
! add_word ("<p><strong class=\"float-caption\">");
else
close_paragraph ();
--- 1096,1100 ----
{
if (html)
! add_html_block_elt ("<p><strong class=\"float-caption\">");
else
close_paragraph ();
***************
*** 1156,1160 ****
current_indent -= default_indentation_increment;
if (html)
! add_word ("</dl>\n");
close_insertion_paragraph ();
break;
--- 1163,1167 ----
current_indent -= default_indentation_increment;
if (html)
! add_html_block_elt ("</dl>\n");
close_insertion_paragraph ();
break;
***************
*** 1163,1167 ****
current_indent -= default_indentation_increment;
if (html)
! add_word ("</ul>\n");
close_insertion_paragraph ();
break;
--- 1170,1174 ----
current_indent -= default_indentation_increment;
if (html)
! add_html_block_elt ("</ul>\n");
close_insertion_paragraph ();
break;
***************
*** 1170,1174 ****
force_flush_right--;
if (html)
! add_word ("</div>\n");
close_insertion_paragraph ();
break;
--- 1177,1181 ----
force_flush_right--;
if (html)
! add_html_block_elt ("</div>\n");
close_insertion_paragraph ();
break;
***************
*** 1199,1205 ****
{
if (paragraph_is_open)
! add_word ("</p>");
/* close the div which has been opened in defun.c */
! add_word ("</div>\n");
}
if (xml && !docbook)
--- 1206,1212 ----
{
if (paragraph_is_open)
! add_html_block_elt ("</p>");
/* close the div which has been opened in defun.c */
! add_html_block_elt ("</div>\n");
}
if (xml && !docbook)
***************
*** 1576,1580 ****
int i;
kill_self_indent (default_indentation_increment);
! add_word ("<pre class=\"verbatim\">");
for (i = current_indent; i > 0; i--)
add_char (' ');
--- 1583,1587 ----
int i;
kill_self_indent (default_indentation_increment);
! add_html_block_elt ("<pre class=\"verbatim\">");
for (i = current_indent; i > 0; i--)
add_char (' ');
***************
*** 2075,2086 ****
{
if (html)
! {
! if (in_paragraph)
! {
! add_word ("</p>");
! in_paragraph = 0;
! }
! add_word ("<li>");
! }
else if (xml)
xml_begin_item ();
--- 2082,2086 ----
{
if (html)
! add_html_block_elt ("<li>");
else if (xml)
xml_begin_item ();
***************
*** 2136,2151 ****
case vtable:
if (html)
! {
! static int last_html_output_position = 0;
!
! /* If nothing has been output since the last <dd>,
remove the empty <dd> element. Some browsers render
an extra empty line for <dd><dt>, which makes @itemx
conversion look ugly. */
! if (last_html_output_position == output_position
! && strncmp ((char *) output_paragraph, "<dd>",
! output_paragraph_offset) == 0)
! output_paragraph_offset = 0;
/* Force the browser to render one blank line before
each new @item in a table. But don't do that if
--- 2136,2164 ----
case vtable:
if (html)
! { /* If nothing has been output since the last <dd>,
remove the empty <dd> element. Some browsers render
an extra empty line for <dd><dt>, which makes @itemx
conversion look ugly. */
! if (output_paragraph_offset > 0)
! { /* Start comparing at this position. */
! int check_position = 0;
!
! /* Skip whitespace at the start of output_paragraph. */
! while (output_paragraph[check_position] == ' '
! || output_paragraph[check_position] == '\n'
! || output_paragraph[check_position] == '\t')
! check_position++;
+ /* Since we flush output just before inserting a <dd>,
+ output_paragraph is supposed to have only indentation
+ whitespace and <dd>, if we are just after a <dt>. If
+ so, that means this is an @itemx. Rollback the empty
+ <dd>. */
+ if (strncmp ((char *) output_paragraph + check_position,
+ "<dd>", sizeof ("<dd>") - 1) == 0
+ && check_position + sizeof ("<dd>") - 1 ==
output_paragraph_offset)
+ output_paragraph_offset = check_position;
+ }
+
/* Force the browser to render one blank line before
each new @item in a table. But don't do that if
***************
*** 2156,2167 ****
in this context, but I cannot find any way to force
them all render exactly one blank line. */
! if (!itemx_flag
! && ((output_paragraph_offset < sizeof (dl_tag) + 1)
! || strncmp ((char *) output_paragraph
! + output_paragraph_offset - sizeof (dl_tag) +
1,
! dl_tag, sizeof (dl_tag) - 1) != 0))
! add_word ("<br>");
! add_word ("<dt>");
if (item_func && *item_func)
execute_string ("%s{%s}", item_func, rest_of_line);
--- 2169,2180 ----
in this context, but I cannot find any way to force
them all render exactly one blank line. */
! if (!itemx_flag && html_deflist_has_term)
! add_html_block_elt ("<br>");
!
! /* We are about to insert a <dt>, so this <dl> has a term.
! Feel free to insert a <br> next time. :) */
! html_deflist_has_term = 1;
! add_html_block_elt ("<dt>");
if (item_func && *item_func)
execute_string ("%s{%s}", item_func, rest_of_line);
***************
*** 2177,2182 ****
remember it. */
close_single_paragraph ();
! last_html_output_position = output_position;
! add_word ("<dd>");
}
else if (xml) /* && docbook)*/ /* 05-08 */
--- 2190,2194 ----
remember it. */
close_single_paragraph ();
! add_html_block_elt ("<dd>");
}
else if (xml) /* && docbook)*/ /* 05-08 */
Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makeinfo.c 2003/12/24 14:08:24 1.11
--- makeinfo.c 2003/12/28 11:48:52 1.12
***************
*** 137,140 ****
--- 137,144 ----
int in_html_elt = 0;
+ /* Nonzero means we are inserting a block level HTML element that must not be
+ enclosed in a <p>, such as <ul>, <ol> and <h?>. */
+ int in_html_block_level_elt = 0;
+
/* True when expanding a macro definition. */
static int executing_macro = 0;
***************
*** 174,177 ****
--- 178,182 ----
void pop_and_call_brace (), discard_braces ();
void add_word (), add_char (), insert (), flush_output ();
+ void add_html_block_elt ();
void insert_string ();
void close_paragraph ();
***************
*** 194,200 ****
--- 199,207 ----
/* Unfortunately we must use prototypes if we are to use <stdarg.h>. */
void add_word_args (const char *, ...);
+ void add_html_block_elt_args (const char *, ...);
void execute_string (char *, ...);
#else
void add_word_args ();
+ void add_html_block_elt_args ();
void execute_string ();
#endif /* no prototypes */
***************
*** 1851,1871 ****
if (had_menu_commentary)
{
! add_word ("<ul class=\"menu\">\n");
had_menu_commentary = 0;
in_paragraph = 0;
}
- else if (!in_paragraph && !paragraph_is_open)
- {
- add_word ("<p>\n");
- in_paragraph = 1;
- }
if (in_paragraph)
{
! add_word ("</p>");
in_paragraph = 0;
}
! add_word ("<li><a");
if (next_menu_item_number <= 9)
{
--- 1858,1873 ----
if (had_menu_commentary)
{
! add_html_block_elt ("<ul class=\"menu\">\n");
had_menu_commentary = 0;
in_paragraph = 0;
}
if (in_paragraph)
{
! add_html_block_elt ("</p>");
in_paragraph = 0;
}
! add_html_block_elt ("<li><a");
if (next_menu_item_number <= 9)
{
***************
*** 2449,2452 ****
--- 2451,2491 ----
}
+ /* These two functions below, add_html_block_elt and add_html_block_elt_args,
+ are mixtures of add_html_elt and add_word_args. They inform makeinfo that
+ the current HTML element being inserted should not be enclosed in a <p>
+ element. */
+ void
+ add_html_block_elt (string)
+ char *string;
+ {
+ in_html_block_level_elt++;
+ add_word (string);
+ in_html_block_level_elt--;
+ }
+
+ void
+ #if defined (VA_FPRINTF) && __STDC__
+ add_html_block_elt_args (const char *format, ...)
+ #else
+ add_html_block_elt_args (format, va_alist)
+ const char *format;
+ va_dcl
+ #endif
+ {
+ char buffer[2000]; /* xx no fixed limits */
+ #ifdef VA_FPRINTF
+ va_list ap;
+ #endif
+
+ VA_START (ap, format);
+ #ifdef VA_SPRINTF
+ VA_SPRINTF (buffer, format, ap);
+ #else
+ sprintf (buffer, format, a1, a2, a3, a4, a5, a6, a7, a8);
+ #endif /* not VA_SPRINTF */
+ va_end (ap);
+ add_html_block_elt (buffer);
+ }
+
/* Here is another awful kludge, used in add_char. Ordinarily, macro
expansions take place in the body of the document, and therefore we
***************
*** 2599,2607 ****
pending_indent = 0;
! /* This horrible kludge of checking for a < prevents <p>
! from being inserted when we already have html markup
! starting a paragraph, as with <ul> and <h1> and the like. */
! if ((html || xml) && escape_html && character != '<'
! && (!in_fixed_width_font || in_menu || in_detailmenu))
{
insert_string ("<p>");
--- 2638,2645 ----
pending_indent = 0;
! /* This check for in_html_block_level_elt prevents <p> from being
! inserted when we already have html markup starting a paragraph,
! as with <ul> and <h1> and the like. */
! if (!in_html_block_level_elt)
{
insert_string ("<p>");
Index: multi.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** multi.c 2003/12/06 01:33:51 1.1.1.1
--- multi.c 2003/12/28 11:48:52 1.2
***************
*** 179,183 ****
current paragraph, so this is ok. */
if (html)
! add_word ("<p><table>");
/* else if (docbook)*/ /* 05-08 */
else if (xml)
--- 179,183 ----
current paragraph, so this is ok. */
if (html)
! add_html_block_elt ("<p><table summary=\"\">");
/* else if (docbook)*/ /* 05-08 */
else if (xml)
Index: node.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** node.c 2003/12/06 01:33:52 1.1.1.1
--- node.c 2003/12/28 11:48:52 1.2
***************
*** 922,926 ****
if (splitting || !no_headers)
{ /* Navigation bar. */
! add_word ("<div class=\"node\">\n");
/* The <p> avoids the links area running on with old Lynxen. */
add_word_args ("<p>%s\n", splitting ? "" : "<hr>");
--- 922,926 ----
if (splitting || !no_headers)
{ /* Navigation bar. */
! add_html_block_elt ("<div class=\"node\">\n");
/* The <p> avoids the links area running on with old Lynxen. */
add_word_args ("<p>%s\n", splitting ? "" : "<hr>");
Index: sectioning.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sectioning.c 2003/12/23 10:39:00 1.3
--- sectioning.c 2003/12/28 11:48:52 1.4
***************
*** 500,504 ****
/* level 0 (chapter) is <h2>, and we go down from there. */
! add_word_args ("<h%d class=\"%s\">", level + 2, cmd);
/* If we are outside of any node, produce an anchor that
--- 500,504 ----
/* level 0 (chapter) is <h2>, and we go down from there. */
! add_html_block_elt_args ("<h%d class=\"%s\">", level + 2, cmd);
/* If we are outside of any node, produce an anchor that
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/makeinfo cmds.c,1.8,1.9 defun.c,1.4,1.5 footnote.c,1.1.1.1,1.2 html.c,1.1.1.1,1.2 index.c,1.1.1.1,1.2 insertion.c,1.7,1.8 makeinfo.c,1.11,1.12 multi.c,1.1.1.1,1.2 node.c,1.1.1.1,1.2 sectioning.c,1.3,1.4,
dirt <=