[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6818] parsetexi update
From: |
Gavin D. Smith |
Subject: |
[6818] parsetexi update |
Date: |
Mon, 30 Nov 2015 18:43:07 +0000 |
Revision: 6818
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6818
Author: gavin
Date: 2015-11-30 18:43:06 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
parsetexi update
Modified Paths:
--------------
trunk/parsetexi/end_line.c
trunk/parsetexi/handle_commands.c
Modified: trunk/parsetexi/end_line.c
===================================================================
--- trunk/parsetexi/end_line.c 2015-11-30 14:56:04 UTC (rev 6817)
+++ trunk/parsetexi/end_line.c 2015-11-30 18:43:06 UTC (rev 6818)
@@ -812,7 +812,22 @@
}
else // 2913
{
- abort (); /*TODO*/
+ // Perl code was sceptical whether we could get here,
+ // but we got here from t/21multitable.t on 2015.11.30.
+ if (!e->cmd)
+ {
+ command_warnf ("unexpected argument on @%s line:",
+ command_name(current->cmd));
+ // TODO: Convert argument to Texinfo
+ }
+ else if (e->cmd != CM_c && e->cmd != CM_comment)
+ {
+ /* Copy element. */
+ ELEMENT *new;
+ new = malloc (sizeof (ELEMENT));
+ memcpy (new, e, sizeof (ELEMENT));
+ add_to_element_contents (prototypes, new);
+ }
}
}
Modified: trunk/parsetexi/handle_commands.c
===================================================================
--- trunk/parsetexi/handle_commands.c 2015-11-30 14:56:04 UTC (rev 6817)
+++ trunk/parsetexi/handle_commands.c 2015-11-30 18:43:06 UTC (rev 6818)
@@ -238,7 +238,7 @@
}
else
{ /* 4480 */
- int max_columns = 0;
+ int max_columns = 99; // FIXME
KEY_PAIR *prototypes;
prototypes = lookup_extra_key (parent, "prototypes");
@@ -257,7 +257,7 @@
if (row->type == ET_before_item)
line_error ("@tab before @item");
// 4489
- else if (counter_value (&count_cells, parent)
+ else if (counter_value (&count_cells, row)
>= max_columns)
{
line_errorf ("too many columns in multitable item"
@@ -301,6 +301,7 @@
add_extra_string (current, "cell_number", s);
}
}
+ current = begin_preformatted (current);
} /* In @multitable */
else if (cmd == CM_tab) // 4526
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6818] parsetexi update,
Gavin D. Smith <=