[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7382] parsetexi more global commands
From: |
gavinsmith0123 |
Subject: |
[7382] parsetexi more global commands |
Date: |
Mon, 19 Sep 2016 13:18:12 +0000 (UTC) |
Revision: 7382
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7382
Author: gavin
Date: 2016-09-19 13:18:12 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
parsetexi more global commands
Modified Paths:
--------------
trunk/tp/parsetexi/handle_commands.c
trunk/tp/parsetexi/tree_types.h
Modified: trunk/tp/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/parsetexi/handle_commands.c 2016-09-19 12:56:57 UTC (rev
7381)
+++ trunk/tp/parsetexi/handle_commands.c 2016-09-19 13:18:12 UTC (rev
7382)
@@ -144,27 +144,40 @@
break;
where = &global_info.setfilename;
break;
- case CM_settitle:
- where = &global_info.settitle;
- break;
- case CM_shorttitlepage:
- where = &global_info.shorttitlepage;
- break;
- case CM_title:
- where = &global_info.title;
- break;
- case CM_titlepage:
- where = &global_info.titlepage;
- break;
- case CM_top:
- where = &global_info.top;
- break;
- case CM_copying:
- where = &global_info.copying;
- break;
- case CM_documentdescription:
- where = &global_info.documentdescription;
- break;
+
+#define GLOBAL_UNIQUE_CASE(cmd) \
+ case CM_##cmd: \
+ where = &global_info.cmd; \
+ break
+
+ GLOBAL_UNIQUE_CASE(settitle);
+ GLOBAL_UNIQUE_CASE(copying);
+ GLOBAL_UNIQUE_CASE(titlepage);
+ GLOBAL_UNIQUE_CASE(top);
+ GLOBAL_UNIQUE_CASE(documentdescription);
+ GLOBAL_UNIQUE_CASE(setcontentsaftertitlepage);
+ GLOBAL_UNIQUE_CASE(setshortcontentsaftertitlepage);
+ GLOBAL_UNIQUE_CASE(novalidate);
+ GLOBAL_UNIQUE_CASE(validatemenus);
+ GLOBAL_UNIQUE_CASE(pagesizes);
+ GLOBAL_UNIQUE_CASE(fonttextsize);
+ GLOBAL_UNIQUE_CASE(footnotestyle);
+ GLOBAL_UNIQUE_CASE(setchapternewpage);
+ GLOBAL_UNIQUE_CASE(everyheading);
+ GLOBAL_UNIQUE_CASE(everyfooting);
+ GLOBAL_UNIQUE_CASE(evenheading);
+ GLOBAL_UNIQUE_CASE(evenfooting);
+ GLOBAL_UNIQUE_CASE(oddheading);
+ GLOBAL_UNIQUE_CASE(oddfooting);
+ GLOBAL_UNIQUE_CASE(everyheadingmarks);
+ GLOBAL_UNIQUE_CASE(everyfootingmarks);
+ GLOBAL_UNIQUE_CASE(evenheadingmarks);
+ GLOBAL_UNIQUE_CASE(oddheadingmarks);
+ GLOBAL_UNIQUE_CASE(evenfootingmarks);
+ GLOBAL_UNIQUE_CASE(oddfootingmarks);
+ GLOBAL_UNIQUE_CASE(shorttitlepage);
+ GLOBAL_UNIQUE_CASE(title);
+#undef GLOBAL_UNIQUE_CASE
}
if (where)
{
@@ -335,7 +348,6 @@
}
else if (cmd == CM_novalidate)
{
- global_info.novalidate = 1;
}
mark_and_warn_invalid (cmd, invalid_parent, misc);
@@ -354,9 +366,8 @@
if (close_preformatted_command(cmd))
current = begin_preformatted (current);
- //line += strlen (line); /* FIXME: Where does the control flow go? */
- // last; go to line 3687
*status = 1; /* Get a new line */
+ goto funexit;
}
else
{
Modified: trunk/tp/parsetexi/tree_types.h
===================================================================
--- trunk/tp/parsetexi/tree_types.h 2016-09-19 12:56:57 UTC (rev 7381)
+++ trunk/tp/parsetexi/tree_types.h 2016-09-19 13:18:12 UTC (rev 7382)
@@ -110,18 +110,37 @@
typedef struct GLOBAL_INFO {
char *input_file_name;
char *input_encoding_name;
- int novalidate;
/* Elements that should be unique. */
// 288 and Common.pm:164
ELEMENT *settitle; /* Title of document. */
ELEMENT *copying;
- ELEMENT *shorttitlepage;
ELEMENT *title;
ELEMENT *titlepage;
ELEMENT *top;
ELEMENT *setfilename;
ELEMENT *documentdescription;
+ ELEMENT *setcontentsaftertitlepage;
+ ELEMENT *setshortcontentsaftertitlepage;
+ ELEMENT *novalidate;
+ ELEMENT *validatemenus;
+ ELEMENT *pagesizes;
+ ELEMENT *fonttextsize;
+ ELEMENT *footnotestyle;
+ ELEMENT *setchapternewpage;
+ ELEMENT *everyheading;
+ ELEMENT *everyfooting;
+ ELEMENT *evenheading;
+ ELEMENT *evenfooting;
+ ELEMENT *oddheading;
+ ELEMENT *oddfooting;
+ ELEMENT *everyheadingmarks;
+ ELEMENT *everyfootingmarks;
+ ELEMENT *evenheadingmarks;
+ ELEMENT *oddheadingmarks;
+ ELEMENT *evenfootingmarks;
+ ELEMENT *oddfootingmarks;
+ ELEMENT *shorttitlepage;
/* Arrays of elements */
ELEMENT footnotes;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7382] parsetexi more global commands,
gavinsmith0123 <=