From a5c7ba9a66252ed6e222ccdf8975bf72095f5720 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 3 Sep 2015 04:02:19 -0700 Subject: [PATCH] Markdown 1.0.2 Update version number to 1.0.2 and tweak documentation to eliminate outside links to documentation that is no longer complete since the enhancements have been added. Signed-off-by: Kyle J. McKay --- License.text | 8 ++++---- Markdown Readme.text | 47 ++++++++++++++++++++++++-------------------- Markdown.pl | 34 +++++++++++--------------------- README.md | 1 + basics.text | 11 ++++------- syntax.text | 11 +++++------ 6 files changed, 51 insertions(+), 61 deletions(-) create mode 120000 README.md diff --git a/License.text b/License.text index 6d76506..9513f08 100644 --- a/License.text +++ b/License.text @@ -1,13 +1,13 @@ -Copyright (c) 2004, John Gruber - +Copyright (C) 2004, John Gruber +Copyright (C) 2015, Kyle J. McKay All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the diff --git a/Markdown Readme.text b/Markdown Readme.text index 6fbb95f..01ba994 100644 --- a/Markdown Readme.text +++ b/Markdown Readme.text @@ -1,10 +1,10 @@ Markdown ======== -Version 1.0.1 - Tue 14 Dec 2004 +Version 1.0.2 - Thu 03 Sep 2015 -by John Gruber - +John Gruber +Kyle J. McKay Introduction @@ -23,8 +23,9 @@ script -- which means it can also be used as a text filter in BBEdit (or any other application that supporst filters written in Perl). Full documentation of Markdown's syntax and configuration options is -available on the web: . -(Note: this readme file is formatted in Markdown.) +available in the basics.text and syntax.text files. +(Note: this readme file and the basics and syntax files are formatted +in Markdown.) @@ -158,16 +159,28 @@ Markdown.pl source code for more information. -Bugs ----- +Version History +--------------- -To file bug reports or feature requests please send email to: -. +1.0.2 (03 Sep 2015): ++ Added support for -h and --help to display Markdown.pl help. ++ Added support for third-level headers using setext-like + underlining using tildes (`~`'s). + ++ Added support for an optional overline using the same character + as the underline when using setext-style headers. + ++ Stopped recognizing `_` within words. The `*` character is still + recognized within words. + ++ Added support for strike through text using `~~` similarly to the + way strong works using `**`. + ++ Added support for non-indended code blocks by preceding and following + them with a line consisting of 3 backtick quotes (`` ` ``) or more. -Version History ---------------- 1.0.1 (14 Dec 2004): @@ -298,19 +311,11 @@ Version History -Donations ---------- - -Donations to support Markdown's development are happily accepted. See: - for details. - - - Copyright and License --------------------- -Copyright (c) 2003-2004 John Gruber - +Copyright (C) 2003-2004 John Gruber +Copyright (C) 2015 Kyle J. McKay All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Markdown.pl b/Markdown.pl index 1bbcbd1..c6c8cda 100755 --- a/Markdown.pl +++ b/Markdown.pl @@ -15,8 +15,8 @@ use warnings; use Digest::MD5 qw(md5_hex); use vars qw($VERSION); -$VERSION = '1.0.1'; -# Tue 14 Dec 2004 +$VERSION = '1.0.2'; +# Thu 03 Sep 2015 ## Disabled; causes problems under Perl 5.6.1: # use utf8; @@ -1399,9 +1399,8 @@ specifically to serve as a front-end to (X)HTML. You can use span-level HTML tags anywhere in a Markdown document, and you can use block level HTML tags (like
and as well). -For more information about Markdown's syntax, see: - - http://daringfireball.net/projects/markdown/ +For more information about Markdown's syntax, see the `basics.text` +and `syntax.text` files included with `Markdown.pl`. =head1 OPTIONS @@ -1442,22 +1441,12 @@ Display Markdown's help. =back - -=head1 BUGS - -To file bug reports or feature requests (other than topics listed in the -Caveats section above) please send email to: - - support@daringfireball.net - -Please include with your report: (1) the example input; (2) the output -you expected; (3) the output Markdown actually produced. - - =head1 VERSION HISTORY See the readme file for detailed release notes for this version. +1.0.2 - 03 Sep 2015 + 1.0.1 - 14 Dec 2004 1.0 - 28 Aug 2004 @@ -1478,17 +1467,16 @@ See the readme file for detailed release notes for this version. =head1 COPYRIGHT AND LICENSE -Copyright (C) 2003-2004 John Gruber -Copyright (C) 2015 Kyle J. McKay - -All rights reserved. + Copyright (C) 2003-2004 John Gruber + Copyright (C) 2015 Kyle J. McKay + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the diff --git a/README.md b/README.md new file mode 120000 index 0000000..be71c54 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +Markdown Readme.text \ No newline at end of file diff --git a/basics.text b/basics.text index ae6ed81..3cd6019 100644 --- a/basics.text +++ b/basics.text @@ -2,11 +2,9 @@ Markdown: Basics ================ @@ -27,9 +25,8 @@ and translate it to XHTML. **Note:** This document is itself written using Markdown; you can [see the source for it by adding '.text' to the URL] [src]. - [s]: /projects/markdown/syntax "Markdown Syntax" - [d]: /projects/markdown/dingus "Markdown Dingus" - [src]: /projects/markdown/basics.text + [s]: syntax.html "Markdown Syntax" + [src]: basics.text ## Paragraphs, Headers, Blockquotes ## diff --git a/syntax.text b/syntax.text index 74b0478..e9564d2 100644 --- a/syntax.text +++ b/syntax.text @@ -2,11 +2,9 @@ Markdown: Syntax ================ @@ -34,7 +32,8 @@ Markdown: Syntax **Note:** This document is itself written using Markdown; you can [see the source for it by adding '.text' to the URL][src]. - [src]: /projects/markdown/syntax.text + [b]: basics.html "Markdown Basics" + [src]: syntax.text * * * @@ -639,7 +638,7 @@ The following three link definitions are equivalent: [foo]: http://example.com/ 'Optional Title Here' [foo]: http://example.com/ (Optional Title Here) -**Note:** There is a known bug in Markdown.pl 1.0.1 which prevents +**Note:** There is a known bug in Markdown.pl 1.0.2 which prevents single quotes from being used to delimit link titles. The link URL may, optionally, be surrounded by angle brackets: