Diff options
| -rw-r--r-- | README | 2 | |
| -rw-r--r-- | cgitrc.5.txt | 2 | |
| -rw-r--r-- | filter.c | 2 | |
| -rwxr-xr-x | filters/html-converters/resources/markdown.pl | 36 | |
| -rw-r--r-- | ui-blob.c | 2 | |
| -rw-r--r-- | ui-summary.c | 4 |
6 files changed, 24 insertions, 24 deletions
@@ -95,5 +95,5 @@ Online presence * The cgit homepage is hosted by cgit at <http://git.zx2c4.com/cgit/about/> * Patches, bug reports, discussions and support should go to the cgit - mailing list: <cgit@lists.zx2c4.com>. To sign up, visit + mailing list: <cgit@lists.zx2c4.com>. To sign up, visit <http://lists.zx2c4.com/mailman/listinfo/cgit> diff --git a/cgitrc.5.txt b/cgitrc.5.txt index cbaebca..b7570db 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -603,7 +603,7 @@ specification with the relevant string; available values are: This is called when the current filtering operation is completed. It must return an integer value. Usually 0 indicates success. - + Additionally, cgit exposes to the Lua the following built-in functions: 'html(str)':: @@ -210,7 +210,7 @@ static inline int hook_lua_filter(lua_State *lua_state, void (*fn)(const char *t str = lua_tostring(lua_state, 1); if (!str) return 0; - + save_filter_write = filter_write; save_filter = current_write_filter; unhook_write(); diff --git a/filters/html-converters/resources/markdown.pl b/filters/html-converters/resources/markdown.pl index d40b2d0..4c39808 100755 --- a/filters/html-converters/resources/markdown.pl +++ b/filters/html-converters/resources/markdown.pl @@ -36,7 +36,7 @@ my $g_nested_brackets; $g_nested_brackets = qr{ (?> # Atomic matching [^\[\]]+ # Anything other than brackets - | + | \[ (??{ $g_nested_brackets }) # Recursive set of nested brackets \] @@ -125,7 +125,7 @@ unless ($@) { my $ctx = shift; my $raw = 0; if (defined $ctx) { - my $output = $ctx->stash('markdown_output'); + my $output = $ctx->stash('markdown_output'); if (defined $output && $output =~ m/^html/i) { $g_empty_element_suffix = ">"; $ctx->stash('markdown_output', ''); @@ -160,7 +160,7 @@ unless ($@) { my $text = shift; my $ctx = shift; if (defined $ctx) { - my $output = $ctx->stash('markdown_output'); + my $output = $ctx->stash('markdown_output'); if (defined $output && $output eq 'html') { $g_empty_element_suffix = ">"; } @@ -647,7 +647,7 @@ sub _HashHTMLBlocks { "\n\n" . $key . "\n\n"; }egmx; # Special case just for <hr />. It was easier to make a special case than - # to make the other regex more complicated. + # to make the other regex more complicated. $text =~ s{ (?: (?<=\n\n) # Starting after a blank line @@ -658,7 +658,7 @@ sub _HashHTMLBlocks { [ ]{0,$less_than_tab} <(hr) # start tag = $2 \b # word break - ([^<>])*? # + ([^<>])*? # /?> # the matching end tag [ \t]* (?=\n{2,}|\Z) # followed by a blank line or end of document @@ -998,7 +998,7 @@ sub _DoHeaders { # Setext-style headers: # Header 1 # ======== - # + # # Header 2 # -------- # @@ -1193,7 +1193,7 @@ sub _ProcessListItems { sub _DoCodeBlocks { # # Process Markdown `<pre><code>` blocks. -# +# my $text = shift; @@ -1227,26 +1227,26 @@ sub _DoCodeBlocks { sub _DoCodeSpans { # # * Backtick quotes are used for <code></code> spans. -# +# # * You can use multiple backticks as the delimiters if you want to # include literal backticks in the code span. So, this input: -# +# # Just type ``foo `bar` baz`` at the prompt. -# +# # Will translate to: -# +# # <p>Just type <code>foo `bar` baz</code> at the prompt.</p> -# +# # There's no arbitrary limit to the number of backticks you # can use as delimters. If you need three consecutive backticks # in your code, use four for delimiters, etc. # # * You can use spaces to get literal backticks at the edges: -# +# # ... type `` `bar` `` ... -# +# # Turns to: -# +# # ... type <code>`bar`</code> ... # @@ -1287,7 +1287,7 @@ sub _EncodeCode { { no warnings 'once'; if (defined($blosxom::version)) { - s/\$/$/g; + s/\$/$/g; } } @@ -1693,8 +1693,8 @@ See the readme file for detailed release notes for this version. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2003-2004 John Gruber -<http://daringfireball.net/> +Copyright (c) 2003-2004 John Gruber +<http://daringfireball.net/> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -54,7 +54,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) if (get_sha1(ref, sha1)) return 0; - if (sha1_object_info(sha1, &size) != OBJ_COMMIT) + if (sha1_object_info(sha1, &size) != OBJ_COMMIT) return 0; read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); return walk_tree_ctx.found_path; diff --git a/ui-summary.c b/ui-summary.c index ddd8f1b..df99ce1 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -112,7 +112,7 @@ static char* append_readme_path(const char *filename, const char *ref, const cha full_path = xstrdup(path); } else full_path = fmtalloc("%s/%s", base_dir, path); - + if (!ref) { resolved_base = realpath(base_dir, NULL); resolved_full = realpath(full_path, NULL); @@ -136,7 +136,7 @@ void cgit_print_repo_readme(char *path) if (ctx.repo->readme.nr == 0) return; - + filename = ctx.repo->readme.items[0].string; ref = ctx.repo->readme.items[0].util; |