[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7089] parsetexi update
From: |
Gavin D. Smith |
Subject: |
[7089] parsetexi update |
Date: |
Sun, 03 Apr 2016 14:05:16 +0000 |
Revision: 7089
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7089
Author: gavin
Date: 2016-04-03 14:05:16 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
parsetexi update
Modified Paths:
--------------
trunk/tp/parsetexi/api.c
trunk/tp/parsetexi/end_line.c
trunk/tp/parsetexi/separator.c
Modified: trunk/tp/parsetexi/api.c
===================================================================
--- trunk/tp/parsetexi/api.c 2016-03-31 18:58:58 UTC (rev 7088)
+++ trunk/tp/parsetexi/api.c 2016-04-03 14:05:16 UTC (rev 7089)
@@ -234,7 +234,7 @@
|| e->type == ET_brace_command_arg
|| e->cmd == CM_TeX
|| (command_data(e->cmd).flags & CF_brace
- && (command_data(e->cmd).data >= 0
+ && (command_data(e->cmd).data > 0
|| command_data(e->cmd).data == BRACE_style
|| command_data(e->cmd).data == BRACE_context
|| command_data(e->cmd).data == BRACE_other
Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c 2016-03-31 18:58:58 UTC (rev 7088)
+++ trunk/tp/parsetexi/end_line.c 2016-04-03 14:05:16 UTC (rev 7089)
@@ -970,7 +970,22 @@
// check that command_as_argument is alone on the line
}
- // check if command_as_argument isn't an accent command
+ // 3040 Check if command_as_argument isn't an accent command
+ if (current->cmd == CM_itemize || item_line_command(current->cmd))
+ {
+ KEY_PAIR *k = lookup_extra_key (current, "command_as_argument");
+ if (k && k->value)
+ {
+ char *s = (char *) k->value;
+ enum command_id cmd = lookup_command (s);
+ if (cmd && (command_data(cmd).flags & CF_accent))
+ {
+ command_warn (current, "accent command address@hidden' "
+ "not allowed as @%s argument", s,
+ command_name(current->cmd));
+ }
+ }
+ }
/* 3052 - if no command_as_argument given, default to @bullet for
@itemize, and @asis for @table. */
Modified: trunk/tp/parsetexi/separator.c
===================================================================
--- trunk/tp/parsetexi/separator.c 2016-03-31 18:58:58 UTC (rev 7088)
+++ trunk/tp/parsetexi/separator.c 2016-04-03 14:05:16 UTC (rev 7089)
@@ -430,6 +430,7 @@
if (k->value->contents.number == 0)
{
+ k->key = "";
k->type = extra_deleted;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7089] parsetexi update,
Gavin D. Smith <=