Commit graph

513 commits

Author SHA1 Message Date
Michel Fortin
e5a7c782a8 Fixed a few typos. 2008-11-09 08:47:42 -05:00
Michel Fortin
1ed856de54 Corrected a merge error in PHP Markdown Extra Readme.text. 2008-07-03 12:05:41 -04:00
Michel Fortin
9006c53fcf Wordpress footnote fix. 2008-07-03 08:33:44 -04:00
Michel Fortin
7b2fe0d55c Merge branch 'master' into extra 2008-06-21 07:58:26 -04:00
Michel Fortin
a9bdbe6cea Fixed a bug introduced while moving code to prepareItalicsAndBold. 2008-06-21 07:58:10 -04:00
Michel Fortin
5f9587c27c Merge branch 'master' into extra; updated version to 1.2.2
Conflicts:

	PHP Markdown Extra Readme.text
	markdown.php
2008-06-21 07:46:14 -04:00
Michel Fortin
9c0365feab Updated version number to 1.0.1m. 2008-06-21 07:41:47 -04:00
Michel Fortin
5cc25b617b Merge branch 'master' into extra 2008-06-21 07:21:33 -04:00
Michel Fortin
bb3ebbba45 Increased performance of em and strong by preparing regular expressions in advance. 2008-06-21 07:21:11 -04:00
Michel Fortin
774fe75d47 Fixed Extra's header parser to work correctly with empty list item. 2008-06-07 10:18:59 -04:00
Michel Fortin
b784dcd29f Renamed a few more variables with _re prefix. 2008-06-07 10:18:00 -04:00
Michel Fortin
29a23148f5 Merge branch 'master' into extra 2008-06-07 10:11:47 -04:00
Michel Fortin
1cd4dccefd Fixed small error in emphasis parser. 2008-06-07 10:11:16 -04:00
Michel Fortin
595d8f2224 Redefined Extra emphasis parsing by using the regular parser with changed marker expressions. 2008-06-07 10:10:32 -04:00
Michel Fortin
69a544dee1 Merge branch 'master' into extra
Conflicts:

	PHP Markdown Extra Readme.text
2008-06-07 09:25:24 -04:00
Michel Fortin
f6a8c76f17 Rewrote the emphasis and strong emphasis parser. 2008-06-07 09:23:36 -04:00
Michel Fortin
4ba5b3209e Lists can now have empty items. 2008-06-06 22:59:40 -04:00
Michel Fortin
0ea71037e3 Merge branch 'master' into extra 2008-06-06 07:47:21 -04:00
Michel Fortin
a98a3aa137 Made encodeAmpsAndAngles not try anymore to see if < is part of tags or not.
(This is no longer needed since all tags are "hashed".)
2008-06-06 07:47:04 -04:00
Michel Fortin
60b11fef73 Adopted the _re sufix convention for string variables ready to be embeded in regular expressions. 2008-06-06 07:38:32 -04:00
Michel Fortin
78e8c904fa Merge branch 'master' into extra
Conflicts:

	markdown.php
2008-06-06 07:29:08 -04:00
Michel Fortin
947cb24f69 Adopted the _re sufix convention for string variables ready to be embeded in regular expressions. 2008-06-06 07:26:31 -04:00
Michel Fortin
7d02282115 Fix for the document gamut being run inside fenced code blocks. 2008-06-05 23:12:06 -04:00
Michel Fortin
25941e626b Fix for unencoded " in footnote ids. 2008-06-05 23:07:43 -04:00
Michel Fortin
ff5ad6b9d6 Bug fix and various changes for abbreviations. 2008-06-05 22:37:42 -04:00
Michel Fortin
f1613e9718 Merge branch 'master' into extra 2008-06-05 22:19:33 -04:00
Michel Fortin
19d69e9018 Removed double attribute encoding for by-reference URLs and titles. 2008-06-05 22:18:57 -04:00
Michel Fortin
ef6e25229d Added preg_quote in handling of code span tokens in handleSpanToken to satisfy the security paranoid. 2008-06-05 22:08:11 -04:00
Michel Fortin
1e69a09585 Clarified documentation comment for encodeAttribute. 2008-06-05 22:06:54 -04:00
Michel Fortin
49883b131c Now cleaning up input of any \x1A character to avoid potential issues with "hashed" values. 2008-06-05 09:41:29 -04:00
Michel Fortin
034800129e Updated Extra's version number to 1.2.1. 2008-05-26 22:58:17 -04:00
Michel Fortin
34f521d4aa Fixed problem with headers and horizontal rules within fenced code blocks. 2008-05-17 07:35:07 -04:00
Michel Fortin
c10f487ec9 Merge branch 'master' into extra
Conflicts:

	License.text
2008-05-11 07:20:06 -04:00
Michel Fortin
8199d0c515 Updated copyright year in license file. 2008-05-11 07:19:26 -04:00
Michel Fortin
ff6ace4c39 Renamed *flat* code blocks as *fenced* code blocks. 2008-05-11 07:15:28 -04:00
Michel Fortin
4e14bf6095 Merge branch 'master' into extra
Conflicts:

	markdown.php

nothing to commit (working directory clean)
2008-05-10 08:28:52 -04:00
Michel Fortin
af8daf1db6 Updated version number for the WordPress plugin description; I forgot in the last commit. 2008-05-10 08:26:33 -04:00
Michel Fortin
445f334ac9 Merge branch 'master' into extra; updated version numbers.
Conflicts:

	PHP Markdown Extra Readme.text
	markdown.php
2008-05-10 08:24:36 -04:00
Michel Fortin
af5af620d0 Updated version numbers and copyright year. 2008-05-10 07:48:40 -04:00
Michel Fortin
d8a71b1149 Fixed some out-of-date comment. 2008-05-10 07:47:59 -04:00
Michel Fortin
65737a4454 Fixed a typo. 2008-05-05 07:55:10 -04:00
Michel Fortin
315d1f9806 Added more precision to the predefined URLs and titles feature. 2008-05-05 07:52:16 -04:00
Michel Fortin
fc4d819fa6 Updated Extra's version history. 2008-05-05 07:48:04 -04:00
Michel Fortin
6533be340c Merge branch 'master' into extra 2008-05-05 07:36:48 -04:00
Michel Fortin
452117f493 Updated version history. 2008-05-05 07:36:37 -04:00
Michel Fortin
5ee3747a3c Fixed small variable-naming error. 2008-05-05 07:17:35 -04:00
Michel Fortin
6415572946 Now emmiting <br>s for newlines starting a flat code block (to aleviate inconsistant browser behaviour). 2008-05-04 08:03:14 -04:00
Michel Fortin
82c323389c Fixed an issue with code blocks preceded by a blank line with whitespace on it. 2008-05-04 08:01:33 -04:00
Michel Fortin
834cd345a0 Added support for predefined abbreviations. 2008-05-04 07:59:55 -04:00
Michel Fortin
3035152603 Merge branch 'master' into extra 2008-04-20 23:30:50 -04:00