summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-08-03 09:18:52 -0700
committerGitHub <noreply@github.com>2017-08-03 09:18:52 -0700
commit61b51fa7c8ec635eee19a16c6aa38c39093a0572 (patch)
tree15359c03f7bc7929dc36c893471259c7d5a5625e
parent4b10d323bab7078aede0b0c1cbc8789d3e20521b (diff)
parent1a4a339d49c17768c2c650bb8f8644c556603978 (diff)
Merge pull request #224 from pclouds/make-format-source-code
`make format` the source code
-rw-r--r--README.md4
-rw-r--r--src/inlines.c11
-rw-r--r--src/latex.c22
3 files changed, 20 insertions, 17 deletions
diff --git a/README.md b/README.md
index 1c9dd69..6b0c003 100644
--- a/README.md
+++ b/README.md
@@ -110,9 +110,9 @@ To run a test for memory leaks using `valgrind`:
make leakcheck
-To reformat source code using `astyle`:
+To reformat source code using `clang-format`:
- make astyle
+ make format
To run a "fuzz test" against ten long randomly generated inputs:
diff --git a/src/inlines.c b/src/inlines.c
index f223baf..6bf82e2 100644
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -615,7 +615,7 @@ static delimiter *S_insert_emph(subject *subj, delimiter *opener,
cmark_node *tmp, *tmpnext, *emph;
// calculate the actual number of characters used from this closer
- use_delims = (closer_num_chars >= 2 && opener_num_chars >=2) ? 2 : 1;
+ use_delims = (closer_num_chars >= 2 && opener_num_chars >= 2) ? 2 : 1;
// remove used characters from associated inlines.
opener_num_chars -= use_delims;
@@ -821,7 +821,8 @@ noMatch:
return 0;
}
-static bufsize_t manual_scan_link_url_2(cmark_chunk *input, bufsize_t offset, cmark_chunk *output) {
+static bufsize_t manual_scan_link_url_2(cmark_chunk *input, bufsize_t offset,
+ cmark_chunk *output) {
bufsize_t i = offset;
size_t nb_p = 0;
@@ -854,7 +855,8 @@ static bufsize_t manual_scan_link_url_2(cmark_chunk *input, bufsize_t offset, cm
return i - offset;
}
-static bufsize_t manual_scan_link_url(cmark_chunk *input, bufsize_t offset, cmark_chunk *output) {
+static bufsize_t manual_scan_link_url(cmark_chunk *input, bufsize_t offset,
+ cmark_chunk *output) {
bufsize_t i = offset;
if (i < input->len && input->data[i] == '<') {
@@ -924,7 +926,8 @@ static cmark_node *handle_close_bracket(subject *subj) {
// First, look for an inline link.
if (peek_char(subj) == '(' &&
((sps = scan_spacechars(&subj->input, subj->pos + 1)) > -1) &&
- ((n = manual_scan_link_url(&subj->input, subj->pos + 1 + sps, &url_chunk)) > -1)) {
+ ((n = manual_scan_link_url(&subj->input, subj->pos + 1 + sps,
+ &url_chunk)) > -1)) {
// try to parse an explicit link:
endurl = subj->pos + 1 + sps + n;
diff --git a/src/latex.c b/src/latex.c
index f372a13..0d9517d 100644
--- a/src/latex.c
+++ b/src/latex.c
@@ -252,24 +252,24 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
CR();
list_number = cmark_node_get_list_start(node);
if (list_number > 1) {
- enumlevel = S_get_enumlevel(node);
- // latex normally supports only five levels
- if (enumlevel >= 1 && enumlevel <= 5) {
+ enumlevel = S_get_enumlevel(node);
+ // latex normally supports only five levels
+ if (enumlevel >= 1 && enumlevel <= 5) {
snprintf(list_number_string, LIST_NUMBER_STRING_SIZE, "%d",
list_number);
LIT("\\setcounter{enum");
- switch(enumlevel) {
- case 1: LIT("i"); break;
- case 2: LIT("ii"); break;
- case 3: LIT("iii"); break;
- case 4: LIT("iv"); break;
- case 5: LIT("v"); break;
- default: LIT("i"); break;
+ switch (enumlevel) {
+ case 1: LIT("i"); break;
+ case 2: LIT("ii"); break;
+ case 3: LIT("iii"); break;
+ case 4: LIT("iv"); break;
+ case 5: LIT("v"); break;
+ default: LIT("i"); break;
}
LIT("}{");
OUT(list_number_string, false, NORMAL);
LIT("}");
- }
+ }
CR();
}
} else {