[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Change in spacing
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Change in spacing |
|
Date: |
Sun, 12 May 2024 14:55:35 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new e612e96401 Change in spacing
e612e96401 is described below
commit e612e9640164c081458352be24c422122f5304d1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun May 12 20:55:17 2024 +0200
Change in spacing
---
tp/Texinfo/XS/parsetexi/api.c | 4 +--
tp/Texinfo/XS/parsetexi/close.c | 10 ++++----
tp/Texinfo/XS/parsetexi/commands.c | 6 ++---
tp/Texinfo/XS/parsetexi/context_stack.c | 2 +-
tp/Texinfo/XS/parsetexi/context_stack.h | 2 +-
tp/Texinfo/XS/parsetexi/end_line.c | 41 ++++++++++++++++---------------
tp/Texinfo/XS/parsetexi/handle_commands.c | 16 ++++++------
tp/Texinfo/XS/parsetexi/input.c | 16 ++++++------
tp/Texinfo/XS/parsetexi/macro.c | 14 +++++------
tp/Texinfo/XS/parsetexi/menus.c | 24 +++++++++---------
tp/Texinfo/XS/parsetexi/multitable.c | 14 +++++------
tp/Texinfo/XS/parsetexi/parser.c | 40 +++++++++++++++---------------
tp/Texinfo/XS/parsetexi/separator.c | 12 ++++-----
tp/Texinfo/XS/parsetexi/source_marks.c | 4 +--
14 files changed, 103 insertions(+), 102 deletions(-)
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index ff693023bb..4cddc45b78 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -99,7 +99,7 @@ reset_parser_except_conf (void)
void
reset_parser (int local_debug_output)
{
- /* We cannot call debug() here, because the configuration of the previous
+ /* We cannot call debug () here, because the configuration of the previous
parser invokation has not been reset already, and new configuration has
not been read, so we need to pass the configuration information
directly */
@@ -274,5 +274,5 @@ parser_set_accept_internalvalue (int value)
void
parser_set_restricted (int value)
{
- set_restricted(value);
+ set_restricted (value);
}
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 8e6dad58d9..52c01244fd 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -240,7 +240,7 @@ close_command_cleanup (ELEMENT *current)
}
}
- add_to_element_contents (last_contents_child(current), row);
+ add_to_element_contents (last_contents_child (current), row);
}
else
{
@@ -329,7 +329,7 @@ close_command_cleanup (ELEMENT *current)
{
int empty_format = 1;
/* Check for an element that could represent an @item in the
- block. The type of this element will depend on the block
+ block. The type of this element will depend on the block
command we are in. */
for (i = 0; i < current->contents.number; i++)
{
@@ -436,7 +436,7 @@ close_current (ELEMENT *current,
}
else
{
- /* @item and @tab commands are closed here, as well as line commands
+ /* @item and @tab commands are closed here, as well as line commands
with invalid content. */
current = current->parent;
}
@@ -494,8 +494,8 @@ close_current (ELEMENT *current,
/* Return lowest level ancestor of CURRENT containing a CLOSED_BLOCK_COMMAND
element, or the lowest level ancestor if CLOSED_BLOCK_COMMAND is 0.
- Set CLOSED_BLOCK_ELEMENT to the last closed element. INTERRUPTING is used
in
- close_brace_command to display an error message. Remove a context from
+ Set CLOSED_BLOCK_ELEMENT to the last closed element. INTERRUPTING is used
+ in close_brace_command to display an error message. Remove a context from
context stack if CLOSED_BLOCK_COMMAND is not 0 and a context was added
by the CLOSED_BLOCK_COMMAND.
CLOSED_BLOCK_COMMAND should be the id of a block command.
diff --git a/tp/Texinfo/XS/parsetexi/commands.c
b/tp/Texinfo/XS/parsetexi/commands.c
index d9b926bc82..357ee6d2ab 100644
--- a/tp/Texinfo/XS/parsetexi/commands.c
+++ b/tp/Texinfo/XS/parsetexi/commands.c
@@ -39,7 +39,7 @@ lookup_command (char *cmdname)
int i;
/* Check for user-defined commands: macros, indexes, etc. */
- /* Do this before looking in the built-in commands, in case the user uses
+ /* Do this before looking in the built-in commands, in case the user uses
@definfoenclose or similar to override a command.
If speed is a problem, then we could set a bit in the flags on the
builtin command (maybe reusing CF_INFOENCLOSE) to say to look in the
@@ -61,8 +61,8 @@ lookup_command (char *cmdname)
return cmd;
}
-/* Add a new user-defined Texinfo command, like an index or macro command. No
- reference to NAME is retained. */
+/* Add a new user-defined Texinfo command, like an index or macro command.
+ No reference to NAME is retained. */
enum command_id
add_texinfo_command (char *name)
{
diff --git a/tp/Texinfo/XS/parsetexi/context_stack.c
b/tp/Texinfo/XS/parsetexi/context_stack.c
index 009397352c..86d9f71c1a 100644
--- a/tp/Texinfo/XS/parsetexi/context_stack.c
+++ b/tp/Texinfo/XS/parsetexi/context_stack.c
@@ -130,7 +130,7 @@ NESTING_CONTEXT nesting_context;
/* used for @kbd */
int
-in_preformatted_context_not_menu()
+in_preformatted_context_not_menu ()
{
int i;
diff --git a/tp/Texinfo/XS/parsetexi/context_stack.h
b/tp/Texinfo/XS/parsetexi/context_stack.h
index bf6d4c8fde..9abe0b8b9c 100644
--- a/tp/Texinfo/XS/parsetexi/context_stack.h
+++ b/tp/Texinfo/XS/parsetexi/context_stack.h
@@ -65,5 +65,5 @@ typedef struct {
extern NESTING_CONTEXT nesting_context;
-int in_preformatted_context_not_menu(void);
+int in_preformatted_context_not_menu (void);
#endif
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 40e41a2473..33cef11882 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -59,7 +59,7 @@ is_decimal_number (char *string)
char *p = string;
char *first_digits = 0;
char *second_digits = 0;
-
+
if (string[0] == '\0')
return 0;
@@ -74,8 +74,8 @@ is_decimal_number (char *string)
}
if (*p /* Bytes remaining at end of argument. */
- || (!first_digits && !second_digits)) /* Need digits either
- before or after the
+ || (!first_digits && !second_digits)) /* Need digits either
+ before or after the
decimal point. */
{
return 0;
@@ -93,7 +93,7 @@ is_whole_number (char *string)
}
/* Parse the arguments to a line command. Return an element whose contents
- is an array of the arguments. For some commands, there is further
+ is an array of the arguments. For some commands, there is further
processing of the arguments (for example, for an @alias, remember the
alias.) */
ELEMENT *
@@ -178,7 +178,7 @@ parse_line_command_args (ELEMENT *line_command)
if (command_data(existing_cmd).flags & CF_ALIAS)
{
enum command_id alias_exist_cmd = command_data(existing_cmd).data;
- if (! strcmp(command_name(alias_exist_cmd), new))
+ if (! strcmp (command_name(alias_exist_cmd), new))
line_warn ("recursive alias definition of %s through %s ignored",
new, command_name(existing_cmd));
else
@@ -299,7 +299,7 @@ parse_line_command_args (ELEMENT *line_command)
q = strpbrk (p, whitespace_chars);
if (!q)
q = p + strlen (p);
-
+
arg = strndup (p, q - p);
/* Check argument is valid. */
@@ -423,7 +423,7 @@ parse_line_command_args (ELEMENT *line_command)
ADD_ARG(index_name_from);
ADD_ARG(index_name_to);
/* Note that 'current_to' may not end up as the index
- 'from_index' merges into if there are further @synindex
+ 'from_index' merges into if there are further @synindex
commands. */
}
else
@@ -815,7 +815,7 @@ end_line_starting_block (ELEMENT *current)
for (i = 0; i < current->contents.number; i++)
{
- ELEMENT *e = contents_child_by_index(current, i);
+ ELEMENT *e = contents_child_by_index (current, i);
if (e->type == ET_bracketed_arg)
{
@@ -1023,10 +1023,10 @@ end_line_starting_block (ELEMENT *current)
{
ELEMENT *e;
ELEMENT *block_line_arg;
- if (last_args_child(current)
- && last_args_child(current)->type == ET_block_line_arg)
+ if (last_args_child (current)
+ && last_args_child (current)->type == ET_block_line_arg)
{
- block_line_arg = last_args_child(current);
+ block_line_arg = last_args_child (current);
}
else
{
@@ -1312,7 +1312,7 @@ end_line_misc_line (ELEMENT *current)
if (status)
{
char *decoded_file_path
- = convert_to_utf8 (strdup(fullpath));
+ = convert_to_utf8 (strdup (fullpath));
command_error (current,
"@include: could not open %s: %s",
decoded_file_path,
@@ -1514,7 +1514,7 @@ end_line_misc_line (ELEMENT *current)
if (superfluous_arg)
{
char *texi_line, *p, *p1;
- p = convert_to_texinfo (args_child_by_index(current, 0));
+ p = convert_to_texinfo (args_child_by_index (current, 0));
texi_line = p;
@@ -1528,7 +1528,7 @@ end_line_misc_line (ELEMENT *current)
p1--;
*p1 = '\0';
}
- command_error (current, "bad argument to @%s: %s",
+ command_error (current, "bad argument to @%s: %s",
command_name(current->cmd), texi_line);
free (p);
}
@@ -1597,12 +1597,12 @@ end_line_misc_line (ELEMENT *current)
add_info_string_dup (current, "command_name",
command_name(current->cmd));
}
- /* All the other "line" commands. Check they have an argument. Empty
+ /* All the other "line" commands. Check they have an argument. Empty
@top is allowed. */
if (current->args.list[0]->contents.number == 0
&& current->cmd != CM_top)
{
- command_warn (current, "@%s missing argument",
+ command_warn (current, "@%s missing argument",
command_name(current->cmd));
}
else
@@ -1626,7 +1626,7 @@ end_line_misc_line (ELEMENT *current)
if ((command_flags(current) & CF_index_entry_command
|| current->cmd == CM_subentry))
{
- set_non_ignored_space_in_index_before_command(
+ set_non_ignored_space_in_index_before_command (
current->args.list[0]);
}
}
@@ -1666,7 +1666,8 @@ end_line_misc_line (ELEMENT *current)
add_to_element_contents (closed_command, end_elt);
if (command_data(closed_command->cmd).data == BLOCK_menu
- && command_data(current_context_command()).data ==
BLOCK_menu)
+ && command_data(current_context_command ()).data
+ == BLOCK_menu)
{
ELEMENT *e;
debug ("CLOSE menu but still in menu context");
@@ -1750,7 +1751,7 @@ end_line_misc_line (ELEMENT *current)
current = last_contents_child (current);
if (cmd == CM_node)
counter_pop (&count_remaining_args);
-
+
/* Set 'associated_section' extra key for a node. */
if (cmd != CM_node && cmd != CM_part)
{
@@ -1879,7 +1880,7 @@ end_line (ELEMENT *current)
{
debug_nonl ("Still opened line/block command %s: ",
context_name (current_context ()));
- debug_parser_print_element (current, 1); debug("");
+ debug_parser_print_element (current, 1); debug ("");
if (current_context () == ct_def)
{
while (current->parent
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index fbaf45741a..8438445136 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -209,7 +209,7 @@ parse_rawline_command (char *line, enum command_id cmd,
else /* very specific case of end of text fragment after name
without anything following the name, in particular
without new line */
- q = p + strlen(p);
+ q = p + strlen (p);
ADD_ARG(p, q - p); /* name */
@@ -322,7 +322,7 @@ parse_rawline_command (char *line, enum command_id cmd,
break;
default:
*special_arg = 0;
- ADD_ARG (line, strlen(line));
+ ADD_ARG (line, strlen (line));
}
return args;
@@ -350,7 +350,7 @@ handle_other_command (ELEMENT *current, char **line_inout,
if (command_data(cmd).flags & CF_in_heading_spec
&& (nesting_context.basic_inline_stack_on_line.top <= 0
|| !(command_data(
- top_command(&nesting_context.basic_inline_stack_on_line)).flags
+ top_command (&nesting_context.basic_inline_stack_on_line)).flags
& CF_heading_spec)))
{
@@ -373,7 +373,7 @@ handle_other_command (ELEMENT *current, char **line_inout,
else /* NOBRACE_other */
{
register_global_command (command_e);
- if (close_preformatted_command(cmd))
+ if (close_preformatted_command (cmd))
current = begin_preformatted (current);
}
}
@@ -722,7 +722,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
goto funexit;
}
- if (close_preformatted_command(cmd))
+ if (close_preformatted_command (cmd))
current = begin_preformatted (current);
*status = GET_A_NEW_LINE;
@@ -1038,10 +1038,10 @@ handle_block_command (ELEMENT *current, char
**line_inout,
{
/* This is, in general, caused by @detailmenu within @menu */
if (current->type == ET_menu_comment)
- current = close_container(current);
+ current = close_container (current);
else /* menu_entry_description */
{
- current = close_container(current);
+ current = close_container (current);
if (current->type == ET_menu_entry)
current = current->parent;
else
@@ -1227,7 +1227,7 @@ handle_brace_command (ELEMENT *current, char
**line_inout, enum command_id cmd,
}
else if (cmd == CM_kbd)
{
- if (kbd_formatted_as_code(current))
+ if (kbd_formatted_as_code (current))
{
add_extra_integer (command_e, "code", 1);
}
diff --git a/tp/Texinfo/XS/parsetexi/input.c b/tp/Texinfo/XS/parsetexi/input.c
index f15f751a41..56b8ab9701 100644
--- a/tp/Texinfo/XS/parsetexi/input.c
+++ b/tp/Texinfo/XS/parsetexi/input.c
@@ -98,10 +98,10 @@ int value_expansion_nr = 0;
of cases where this happens */
int after_end_fetch_nr = -1;
-/* Collect text from the input sources until a newline is found. This is used
- instead of next_text when we need to be sure we get an entire line of
- Texinfo input (for example as a line argument to a command), which might
not
- be the case if the input is the result of a macro expansion.
+/* Collect text from the input sources until a newline is found. This is used
+ instead of next_text when we need to be sure we get an entire line of
+ Texinfo input (for example as a line argument to a command), which might
+ not be the case if the input is the result of a macro expansion.
Return value should not be freed by caller, and becomes invalid after
a subsequent call. */
@@ -362,7 +362,7 @@ next_text (ELEMENT *current)
source_mark->line = convert_to_utf8 (strdup (comment+1));
else
source_mark->line = 0;
- input_push_text(strdup (""),
+ input_push_text (strdup (""),
input->source_info.line_nr, 0, 0);
/* if the input_stack was reallocated in input_push_text,
the input pointer for the file may have been freed and
@@ -400,7 +400,7 @@ next_text (ELEMENT *current)
messages.
*/
char *decoded_file_name
- = convert_to_utf8 (strdup(input->input_file_path));
+ = convert_to_utf8 (strdup (input->input_file_path));
line_warn ("error on closing %s: %s",
decoded_file_name,
strerror (errno));
@@ -532,8 +532,8 @@ set_input_source_mark (SOURCE_MARK *source_mark)
input_stack[input_number - 1].input_source_mark = source_mark;
}
-/* For filenames and macro names, it is possible that they won't be referenced
- in the line number of any element. It would be too much work to keep
track,
+/* For filenames and macro names, it is possible that they won't be referenced
+ in the line number of any element. It would be too much work to keep track,
so just keep them all here, and free them all together at the end. */
char **small_strings = 0;
size_t small_strings_num = 0;
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index 9489e14d7d..69d5916671 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -110,8 +110,8 @@ new_macro (char *name, ELEMENT *macro)
m->macrobody = convert_contents_to_texinfo (macro);
}
-/* CMD will be either CM_macro or CM_rmacro. Read the line defining a macro's
- name and the arguments it takes, and return this information in a new
+/* CMD will be either CM_macro or CM_rmacro. Read the line defining a macro's
+ name and the arguments it takes, and return this information in a new
ELEMENT. */
ELEMENT *
parse_macro_command_line (enum command_id cmd, char **line_inout,
@@ -269,7 +269,7 @@ lookup_macro_parameter (char *name, ELEMENT *macro)
{
int i, pos;
ELEMENT **args;
-
+
/* Find 'arg' in MACRO parameters. */
args = macro->args.list;
pos = 0;
@@ -639,7 +639,7 @@ expand_linemacro_arguments (ELEMENT *macro, char
**line_inout,
{
if (k_toplevel_braces_nr->integer == 1)
{
- int text_len = strlen(argument_content->text.text);
+ int text_len = strlen (argument_content->text.text);
if (argument_content->text.text[0] == '{'
&& argument_content->text.text[text_len -1] == '}')
{
@@ -650,7 +650,7 @@ expand_linemacro_arguments (ELEMENT *macro, char
**line_inout,
text_reset (&argument_content->text);
text_append_n (&argument_content->text,
braced_text+1, text_len -2);
- free(braced_text);
+ free (braced_text);
argument_content->type = ET_bracketed_linemacro_arg;
}
}
@@ -935,7 +935,7 @@ handle_macro (ELEMENT *current, char **line_inout, enum
command_id cmd)
if (!p)
{
arg_elt = merge_text (arg_elt, line, 0);
- line += strlen(line);
+ line += strlen (line);
}
else
{
@@ -1061,7 +1061,7 @@ store_value (const char *name, const char *value)
/* Internal Texinfo flag */
if (!strncmp (name, "txi", 3))
{
- int val = (strcmp(value, "0") != 0);
+ int val = (strcmp (value, "0") != 0);
if (!strcmp (name, "txiindexbackslashignore"))
global_info.ignored_chars.backslash = val;
else if (!strcmp (name, "txiindexhyphenignore"))
diff --git a/tp/Texinfo/XS/parsetexi/menus.c b/tp/Texinfo/XS/parsetexi/menus.c
index ac7c1b4938..79b4b9bbb2 100644
--- a/tp/Texinfo/XS/parsetexi/menus.c
+++ b/tp/Texinfo/XS/parsetexi/menus.c
@@ -124,8 +124,8 @@ handle_menu_entry_separators (ELEMENT **current_inout, char
**line_inout)
&& (current->parent->type == ET_menu_comment
|| current->parent->type == ET_menu_entry_description)
&& current->contents.number > 0
- && last_contents_child(current)->type == ET_empty_line
- && last_contents_child(current)->text.end == 0)
+ && last_contents_child (current)->type == ET_empty_line
+ && last_contents_child (current)->text.end == 0)
{
ELEMENT *star;
@@ -142,7 +142,7 @@ handle_menu_entry_separators (ELEMENT **current_inout, char
**line_inout)
/* A space after a "*" at the beginning of a line. */
else if (strchr (whitespace_chars, *line)
&& current->contents.number > 0
- && last_contents_child(current)->type == ET_internal_menu_star)
+ && last_contents_child (current)->type == ET_internal_menu_star)
{
ELEMENT *menu_entry, *leading_text, *entry_name;
ELEMENT *menu_star_element;
@@ -191,12 +191,12 @@ handle_menu_entry_separators (ELEMENT **current_inout,
char **line_inout)
}
/* A "*" followed by anything other than a space. */
else if (current->contents.number > 0
- && last_contents_child(current)->type == ET_internal_menu_star)
+ && last_contents_child (current)->type == ET_internal_menu_star)
{
debug_nonl ("ABORT MENU STAR before: ");
debug_print_protected_string (line); debug ("");
- last_contents_child(current)->type = ET_NONE;
+ last_contents_child (current)->type = ET_NONE;
}
/* After a separator in a menu, end of menu entry node or menu entry name
(. must be followed by a space to stop the node). */
@@ -330,12 +330,12 @@ end_line_menu_entry (ELEMENT *current)
menu = current->parent->parent;
menu_entry = pop_element_from_contents (menu);
if (menu->contents.number > 0
- && last_contents_child(menu)->type == ET_menu_entry)
+ && last_contents_child (menu)->type == ET_menu_entry)
{
ELEMENT *entry, *description = 0;
int j;
- entry = last_contents_child(menu);
+ entry = last_contents_child (menu);
for (j = entry->contents.number - 1; j >= 0; j--)
{
ELEMENT *e = contents_child_by_index (entry, j);
@@ -358,16 +358,16 @@ end_line_menu_entry (ELEMENT *current)
}
}
else if (menu->contents.number > 0
- && last_contents_child(menu)->type == ET_menu_comment)
+ && last_contents_child (menu)->type == ET_menu_comment)
{
- description_or_menu_comment = last_contents_child(menu);
+ description_or_menu_comment = last_contents_child (menu);
}
if (description_or_menu_comment)
{
current = description_or_menu_comment;
if (current->contents.number > 0
- && last_contents_child(current)->type == ET_preformatted)
- current = last_contents_child(current);
+ && last_contents_child (current)->type == ET_preformatted)
+ current = last_contents_child (current);
else
{
ELEMENT *e;
@@ -393,7 +393,7 @@ end_line_menu_entry (ELEMENT *current)
int i, j;
for (i = 0; i < menu_entry->contents.number; i++)
{
- ELEMENT *arg = contents_child_by_index(menu_entry, i);
+ ELEMENT *arg = contents_child_by_index (menu_entry, i);
if (arg->text.end > 0)
current = merge_text (current, arg->text.text, arg);
else
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index f86d64085a..1bb28ab8e6 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -61,8 +61,8 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
int i, contents_count;
int begin = -1, end = -1, term_begin = -1;
- if (last_contents_child(current)
- && last_contents_child(current)->type == ET_before_item)
+ if (last_contents_child (current)
+ && last_contents_child (current)->type == ET_before_item)
{
/* before_item before the first @item, nothing to do for now */
if (next_command == CM_itemx)
@@ -110,7 +110,7 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
table_after_terms. */
insert_slice_into_contents (table_after_terms, 0, current, begin, end);
for (i = 0; i < table_after_terms->contents.number; i++)
- contents_child_by_index(table_after_terms, i)->parent = table_after_terms;
+ contents_child_by_index (table_after_terms, i)->parent = table_after_terms;
remove_slice_from_contents (current, begin, end);
if (type == ET_table_definition)
@@ -142,7 +142,7 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
insert_slice_into_contents (table_term, 0, current,
term_begin, begin);
for (i = 0; i < table_term->contents.number; i++)
- contents_child_by_index(table_term, i)->parent = table_term;
+ contents_child_by_index (table_term, i)->parent = table_term;
remove_slice_from_contents (current, term_begin, begin);
if (before_item)
{
@@ -152,10 +152,10 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
/* Reparent any trailing index entries in the before_item to the
beginning of table term. */
while (before_item->contents.number > 0
- && (last_contents_child(before_item)->type
+ && (last_contents_child (before_item)->type
== ET_index_entry_command
- || last_contents_child(before_item)->cmd == CM_c
- || last_contents_child(before_item)->cmd
+ || last_contents_child (before_item)->cmd == CM_c
+ || last_contents_child (before_item)->cmd
== CM_comment))
{
ELEMENT *e = pop_element_from_contents (before_item);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 4035ade2a2..426079da08 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -649,7 +649,7 @@ begin_paragraph (ELEMENT *current)
ELEMENT *
begin_preformatted (ELEMENT *current)
{
- if (current_context() == ct_preformatted)
+ if (current_context () == ct_preformatted)
{
ELEMENT *preformatted = new_element (ET_preformatted);
add_to_element_contents (current, preformatted);
@@ -669,7 +669,7 @@ end_paragraph (ELEMENT *current,
if (current->type == ET_paragraph)
{
debug ("CLOSE PARA");
- current = close_container(current);
+ current = close_container (current);
}
return current;
@@ -685,7 +685,7 @@ end_preformatted (ELEMENT *current,
if (current->type == ET_preformatted)
{
debug ("CLOSE PREFORMATTED");
- current = close_container(current);
+ current = close_container (current);
}
return current;
}
@@ -970,8 +970,8 @@ isolate_last_space (ELEMENT *current)
/* Store a final comment command in the 'info' hash, except for brace
commands */
if (current->type != ET_brace_command_arg
- && (last_contents_child(current)->cmd == CM_c
- || last_contents_child(current)->cmd == CM_comment))
+ && (last_contents_child (current)->cmd == CM_c
+ || last_contents_child (current)->cmd == CM_comment))
{
add_info_element_oot (current, "comment_at_end",
pop_element_from_contents (current));
@@ -1090,14 +1090,14 @@ register_command_as_argument (ELEMENT *cmd_as_arg)
add_extra_element (cmd_as_arg->parent->parent,
"command_as_argument", cmd_as_arg);
if (cmd_as_arg->cmd == CM_kbd
- && kbd_formatted_as_code(cmd_as_arg->parent->parent)) {
+ && kbd_formatted_as_code (cmd_as_arg->parent->parent)) {
add_extra_integer (cmd_as_arg->parent->parent,
"command_as_argument_kbd_code", 1);
}
}
void
-gather_spaces_after_cmd_before_arg(ELEMENT *current)
+gather_spaces_after_cmd_before_arg (ELEMENT *current)
{
ELEMENT *spaces_element = pop_element_from_contents (current);
spaces_element->type = ET_NONE;
@@ -1398,7 +1398,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
char *command = 0;
/*
- debug_nonl("PROCESS "); debug_print_protected_string (line); debug ("");
+ debug_nonl ("PROCESS "); debug_print_protected_string (line); debug ("");
*/
/********* BLOCK_raw ******************/
@@ -1533,7 +1533,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
closed_nested_raw = 1;
}
else
- pop_raw_block_stack();
+ pop_raw_block_stack ();
}
/* a temporary element was created based on the top stack cmd, remove */
if (top_stack_cmd != CM_NONE)
@@ -1636,9 +1636,9 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
while (1)
{
q = strstr (q, delimiter);
- if (!q || q[strlen(delimiter)] == '}')
+ if (!q || q[strlen (delimiter)] == '}')
break;
- q += strlen(delimiter);
+ q += strlen (delimiter);
}
}
else
@@ -1874,7 +1874,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
value_source_mark
= new_source_mark (SM_type_value_expansion);
value_source_mark->status = SM_status_start;
- value_source_mark->line = strdup(value);
+ value_source_mark->line = strdup (value);
sm_value_element = new_value_element (cmd, flag,
spaces_element);
value_source_mark->element = sm_value_element;
@@ -2003,8 +2003,8 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
{
line_warn ("command `@%s' must not be followed by new line",
command_name(current->cmd));
- if (current_context() == ct_def
- || current_context() == ct_line)
+ if (current_context () == ct_def
+ || current_context () == ct_line)
{
/* do not consider the end of line to be possibly between
the @-command and the argument if at the end of a
@@ -2073,7 +2073,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
line, whitespaces_len);
debug ("BRACE CMD before brace add spaces '%s'",
current->contents.list[0]->text.text
- + strlen(current->contents.list[0]->text.text)
+ + strlen (current->contents.list[0]->text.text)
- whitespaces_len);
line += whitespaces_len;
}
@@ -2134,7 +2134,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
enum command_id data_cmd = cmd;
ELEMENT *command_element;
- debug ("COMMAND @%s", debug_parser_command_name(cmd));
+ debug ("COMMAND @%s", debug_parser_command_name (cmd));
line = line_after_command;
@@ -2252,7 +2252,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
/* special case with @ followed by a newline protecting end of lines
in @def* */
- def_line_continuation = (current_context() == ct_def
+ def_line_continuation = (current_context () == ct_def
&& cmd == CM_NEWLINE);
/* warn on not appearing at line beginning. Need to do before closing
@@ -2308,7 +2308,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
|| cmd == CM_seealso
|| cmd == CM_subentry)
&& current->contents.number > 0
- && last_contents_child(current)->text.end > 0
+ && last_contents_child (current)->text.end > 0
/* it is important to check if in an index command, as otherwise
the internal space type is not processed and remains as is in
the final tree. */
@@ -2665,7 +2665,7 @@ parse_texi (ELEMENT *root_elt, ELEMENT *current_elt)
debug ("BEGIN LINE");
if (current->contents.number > 0
- && last_contents_child(current)->type
+ && last_contents_child (current)->type
== ET_internal_spaces_before_argument)
{
/* Remove this element and update 'info' values. */
@@ -2780,7 +2780,7 @@ parse_texi (ELEMENT *root_elt, ELEMENT *current_elt)
identifiers_target
= set_labels_identifiers_target (labels_list, labels_number);
- document_descriptor = store_document(current);
+ document_descriptor = store_document (current);
complete_indices (document_descriptor, debug_output);
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index a87213036e..950d6104c1 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -226,9 +226,9 @@ handle_open_brace (ELEMENT *current, char **line_inout)
math. Note that for rawpreformatted, it can only happen
within an @-command as { is simply added as seen just above.
*/
- else if (current_context() == ct_math
- || current_context() == ct_rawpreformatted
- || current_context() == ct_inlineraw)
+ else if (current_context () == ct_math
+ || current_context () == ct_rawpreformatted
+ || current_context () == ct_inlineraw)
{
ELEMENT *b = new_element (ET_balanced_braces);
ELEMENT *open_brace = new_element (ET_NONE);
@@ -260,7 +260,7 @@ check_empty_expansion (ELEMENT *e)
for (i = 0; i < e->contents.number; i++)
{
ELEMENT *f = e->contents.list[i];
- if (!check_space_element(f))
+ if (!check_space_element (f))
{
return 0;
}
@@ -325,7 +325,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
if (nesting_context.regions_stack.top > 0)
{
add_extra_string_dup (current, "element_region",
- command_name(top_command(&nesting_context.regions_stack)));
+ command_name(top_command
(&nesting_context.regions_stack)));
}
}
}
@@ -585,7 +585,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
current = close_brace_command (current->parent, 0, 0, 0);
- if (close_preformatted_command(closed_command))
+ if (close_preformatted_command (closed_command))
current = begin_preformatted (current);
} /* CF_brace */
else if (current->type == ET_rawpreformatted)
diff --git a/tp/Texinfo/XS/parsetexi/source_marks.c
b/tp/Texinfo/XS/parsetexi/source_marks.c
index 1e5938c415..a0fee655ae 100644
--- a/tp/Texinfo/XS/parsetexi/source_marks.c
+++ b/tp/Texinfo/XS/parsetexi/source_marks.c
@@ -85,8 +85,8 @@ place_source_mark (ELEMENT *e, SOURCE_MARK *source_mark)
source_mark->status == SM_status_start ? "start"
: source_mark->status == SM_status_end ? "end"
: "UNDEF", add_element_string);
- debug_parser_print_element(mark_element, 0); debug_nonl (" ");
- debug_parser_print_element(e, 0); debug ("");
+ debug_parser_print_element (mark_element, 0); debug_nonl (" ");
+ debug_parser_print_element (e, 0); debug ("");
add_source_mark (source_mark, mark_element);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Change in spacing,
Patrice Dumas <=