[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/makeinfo insertion.c,1.25,1.26 html.c,1.12,1.13
|
From: |
dirt |
|
Subject: |
texinfo/makeinfo insertion.c,1.25,1.26 html.c,1.12,1.13 |
|
Date: |
Tue, 17 Feb 2004 15:59:01 +0100 |
Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv14006/makeinfo
Modified Files:
insertion.c html.c
Log Message:
2004-02-17 Alper Ersoy <address@hidden>
* makeinfo/insertion.c (begin_insertion): do not expand @copying for
HTML and Info too.
(cm_insert_copying): expand copying_text for all formats here.
* makeinfo/html.c (html_output_head): use text_expansion for copying
text.
Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** insertion.c 17 Feb 2004 13:56:49 -0000 1.25
--- insertion.c 17 Feb 2004 14:58:59 -0000 1.26
***************
*** 504,539 ****
case copying:
- {
/* Save the copying text away for @insertcopying,
typically used on the back of the @titlepage (for TeX) and
the Top node (for info/html). */
- char *text;
- int start_of_end;
- int save_line_number;
- int real_line_number;
-
discard_until ("\n"); /* ignore remainder of @copying line */
! save_line_number = line_number;
! start_of_end = get_until ("address@hidden copying", &text);
! real_line_number = line_number;
! line_number = save_line_number;
!
! if (!xml)
! {
! copying_text = full_expansion (text, 0);
! free (text);
! }
! else
! copying_text = text;
!
canon_white (copying_text);
- input_text_offset = start_of_end; /* go back to the @end to match */
-
- line_number = real_line_number;
- line_number--;
- }
-
/* For info, output the copying text right away, so it will end up
in the header of the Info file, before the first node, and thus
--- 504,515 ----
case copying:
/* Save the copying text away for @insertcopying,
typically used on the back of the @titlepage (for TeX) and
the Top node (for info/html). */
discard_until ("\n"); /* ignore remainder of @copying line */
! input_text_offset = get_until ("address@hidden copying",
©ing_text);
canon_white (copying_text);
/* For info, output the copying text right away, so it will end up
in the header of the Info file, before the first node, and thus
***************
*** 1454,1467 ****
}
! if (xml)
! execute_string ("%s", copying_text);
! else
! {
! insert_string (copying_text);
! insert_string ("\n\n");
! /* Update output_position so that the node positions in the tag
! tables will take account of the copying text. */
! flush_output ();
! }
}
--- 1430,1442 ----
}
! execute_string ("%s", copying_text);
!
! if (!xml && !html)
! {
! add_word ("\n\n");
! /* Update output_position so that the node positions in the tag
! tables will take account of the copying text. */
! flush_output ();
! }
}
Index: html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** html.c 13 Feb 2004 22:01:38 -0000 1.12
--- html.c 17 Feb 2004 14:58:59 -0000 1.13
***************
*** 265,275 ****
if (copying_text)
! { /* copying_text has already been fully expanded in
! begin_insertion (by full_expansion), so use insert_ rather than
! add_. It is not ideal that we include the html markup here within
! <head>, but the alternative is to have yet more and different
! expansions of the copying text. Yuck. */
insert_string ("<!--\n");
! insert_string (copying_text);
insert_string ("-->\n");
}
--- 265,272 ----
if (copying_text)
! { /* It is not ideal that we include the html markup here within
! <head>, so we use text_expansion. */
insert_string ("<!--\n");
! insert_string (text_expansion (copying_text));
insert_string ("-->\n");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/makeinfo insertion.c,1.25,1.26 html.c,1.12,1.13,
dirt <=