Skip to content
This repository
  • 2 commits
  • 107 files changed
  • 0 comments
  • 2 contributors

Showing 107 changed files with 753 additions and 422 deletions. Show diff stats Hide diff stats

  1. 82  .gitignore
  2. 195  MANIFEST
  3. 88  MANIFEST.SKIP
  4. 2  Makefile.PL
  5. 1  discount-2.1.2/VERSION
  6. 0  {discount-2.1.2 → discount-2.1.5a}/COPYRIGHT
  7. 0  {discount-2.1.2 → discount-2.1.5a}/CREDITS
  8. 2  {discount-2.1.2 → discount-2.1.5a}/Csio.c
  9. 0  {discount-2.1.2 → discount-2.1.5a}/INSTALL
  10. 62  {discount-2.1.2 → discount-2.1.5a}/Makefile.in
  11. 0  {discount-2.1.2 → discount-2.1.5a}/Plan9/README
  12. 0  {discount-2.1.2 → discount-2.1.5a}/Plan9/markdown.1
  13. 0  {discount-2.1.2 → discount-2.1.5a}/Plan9/markdown.2
  14. 0  {discount-2.1.2 → discount-2.1.5a}/Plan9/markdown.6
  15. 0  {discount-2.1.2 → discount-2.1.5a}/Plan9/mkfile
  16. 0  {discount-2.1.2 → discount-2.1.5a}/README
  17. 1  discount-2.1.5a/VERSION
  18. 0  {discount-2.1.2 → discount-2.1.5a}/amalloc.c
  19. 0  {discount-2.1.2 → discount-2.1.5a}/amalloc.h
  20. 0  {discount-2.1.2 → discount-2.1.5a}/basename.c
  21. 146  {discount-2.1.2 → discount-2.1.5a}/configure.inc
  22. 19  {discount-2.1.2 → discount-2.1.5a}/configure.sh
  23. 0  {discount-2.1.2 → discount-2.1.5a}/css.c
  24. 4  {discount-2.1.2 → discount-2.1.5a}/cstring.h
  25. 0  {discount-2.1.2 → discount-2.1.5a}/docheader.c
  26. 0  {discount-2.1.2 → discount-2.1.5a}/dumptree.c
  27. 0  {discount-2.1.2 → discount-2.1.5a}/emmatch.c
  28. 1  {discount-2.1.2 → discount-2.1.5a}/flags.c
  29. 129  {discount-2.1.2 → discount-2.1.5a}/generate.c
  30. 100  discount-2.1.5a/github_flavoured.c
  31. 0  {discount-2.1.2 → discount-2.1.5a}/html5.c
  32. 31  {discount-2.1.2 → discount-2.1.5a}/main.c
  33. 0  {discount-2.1.2 → discount-2.1.5a}/makepage.1
  34. 1  {discount-2.1.2 → discount-2.1.5a}/makepage.c
  35. 14  {discount-2.1.2 → discount-2.1.5a}/markdown.1
  36. 0  {discount-2.1.2 → discount-2.1.5a}/markdown.3
  37. 0  {discount-2.1.2 → discount-2.1.5a}/markdown.7
  38. 42  {discount-2.1.2 → discount-2.1.5a}/markdown.c
  39. 37  {discount-2.1.2 → discount-2.1.5a}/markdown.h
  40. 0  {discount-2.1.2 → discount-2.1.5a}/mkd-callbacks.3
  41. 0  {discount-2.1.2 → discount-2.1.5a}/mkd-extensions.7
  42. 0  {discount-2.1.2 → discount-2.1.5a}/mkd-functions.3
  43. 0  {discount-2.1.2 → discount-2.1.5a}/mkd-line.3
  44. 0  {discount-2.1.2 → discount-2.1.5a}/mkd2html.1
  45. 28  {discount-2.1.2 → discount-2.1.5a}/mkd2html.c
  46. 42  {discount-2.1.2 → discount-2.1.5a}/mkdio.c
  47. 6  {discount-2.1.2 → discount-2.1.5a}/mkdio.h.in
  48. 2  {discount-2.1.2 → discount-2.1.5a}/mktags.c
  49. 7  {discount-2.1.2 → discount-2.1.5a}/pgm_options.c
  50. 0  {discount-2.1.2 → discount-2.1.5a}/pgm_options.h
  51. 0  {discount-2.1.2 → discount-2.1.5a}/resource.c
  52. 0  {discount-2.1.2 → discount-2.1.5a}/setup.c
  53. 0  {discount-2.1.2 → discount-2.1.5a}/tags.c
  54. 0  {discount-2.1.2 → discount-2.1.5a}/tags.h
  55. 0  {discount-2.1.2 → discount-2.1.5a}/tests/autolink.t
  56. 0  {discount-2.1.2 → discount-2.1.5a}/tests/automatic.t
  57. 0  {discount-2.1.2 → discount-2.1.5a}/tests/backslash.t
  58. 0  {discount-2.1.2 → discount-2.1.5a}/tests/callbacks.t
  59. 0  {discount-2.1.2 → discount-2.1.5a}/tests/chrome.text
  60. 15  {discount-2.1.2 → discount-2.1.5a}/tests/code.t
  61. 0  {discount-2.1.2 → discount-2.1.5a}/tests/compat.t
  62. 0  {discount-2.1.2 → discount-2.1.5a}/tests/crash.t
  63. 17  discount-2.1.5a/tests/defects.t
  64. 0  {discount-2.1.2 → discount-2.1.5a}/tests/div.t
  65. 0  {discount-2.1.2 → discount-2.1.5a}/tests/dl.t
  66. 0  {discount-2.1.2 → discount-2.1.5a}/tests/embedlinks.text
  67. 0  {discount-2.1.2 → discount-2.1.5a}/tests/emphasis.t
  68. 0  {discount-2.1.2 → discount-2.1.5a}/tests/extrafootnotes.t
  69. 0  {discount-2.1.2 → discount-2.1.5a}/tests/flow.t
  70. 0  {discount-2.1.2 → discount-2.1.5a}/tests/footnotes.t
  71. 0  {discount-2.1.2 → discount-2.1.5a}/tests/functions.sh
  72. 0  {discount-2.1.2 → discount-2.1.5a}/tests/header.t
  73. 9  {discount-2.1.2 → discount-2.1.5a}/tests/html.t
  74. 0  {discount-2.1.2 → discount-2.1.5a}/tests/html5.t
  75. 0  {discount-2.1.2 → discount-2.1.5a}/tests/links.text
  76. 0  {discount-2.1.2 → discount-2.1.5a}/tests/linkylinky.t
  77. 0  {discount-2.1.2 → discount-2.1.5a}/tests/linkypix.t
  78. 0  {discount-2.1.2 → discount-2.1.5a}/tests/list.t
  79. 0  {discount-2.1.2 → discount-2.1.5a}/tests/list3deep.t
  80. 0  {discount-2.1.2 → discount-2.1.5a}/tests/misc.t
  81. 0  {discount-2.1.2 → discount-2.1.5a}/tests/pandoc.t
  82. 0  {discount-2.1.2 → discount-2.1.5a}/tests/para.t
  83. 0  {discount-2.1.2 → discount-2.1.5a}/tests/paranoia.t
  84. 0  {discount-2.1.2 → discount-2.1.5a}/tests/peculiarities.t
  85. 0  {discount-2.1.2 → discount-2.1.5a}/tests/pseudo.t
  86. 0  {discount-2.1.2 → discount-2.1.5a}/tests/reddit.t
  87. 0  {discount-2.1.2 → discount-2.1.5a}/tests/reparse.t
  88. 0  {discount-2.1.2 → discount-2.1.5a}/tests/schiraldi.t
  89. 0  {discount-2.1.2 → discount-2.1.5a}/tests/smarty.t
  90. 0  {discount-2.1.2 → discount-2.1.5a}/tests/snakepit.t
  91. 0  {discount-2.1.2 → discount-2.1.5a}/tests/strikethrough.t
  92. 2  {discount-2.1.2 → discount-2.1.5a}/tests/style.t
  93. 0  {discount-2.1.2 → discount-2.1.5a}/tests/superscript.t
  94. 0  {discount-2.1.2 → discount-2.1.5a}/tests/syntax.text
  95. 22  {discount-2.1.2 → discount-2.1.5a}/tests/tables.t
  96. 0  {discount-2.1.2 → discount-2.1.5a}/tests/tabstop.t
  97. 12  {discount-2.1.2 → discount-2.1.5a}/tests/toc.t
  98. 0  {discount-2.1.2 → discount-2.1.5a}/tests/xml.t
  99. 2  {discount-2.1.2 → discount-2.1.5a}/theme.1
  100. 23  {discount-2.1.2 → discount-2.1.5a}/theme.c
  101. 31  {discount-2.1.2 → discount-2.1.5a}/toc.c
  102. 0  {discount-2.1.2 → discount-2.1.5a}/tools/checkbits.sh
  103. 0  {discount-2.1.2 → discount-2.1.5a}/tools/cols.c
  104. 0  {discount-2.1.2 → discount-2.1.5a}/tools/echo.c
  105. 0  {discount-2.1.2 → discount-2.1.5a}/version.c.in
  106. 0  {discount-2.1.2 → discount-2.1.5a}/xml.c
  107. 0  {discount-2.1.2 → discount-2.1.5a}/xmlpage.c
82  .gitignore
@@ -6,44 +6,44 @@ Discount.c
6 6
 Discount.o
7 7
 pm_to_blib
8 8
 *.swp
9  
-discount-2.1.2/Csio.o
10  
-discount-2.1.2/basename.o
11  
-discount-2.1.2/blocktags
12  
-discount-2.1.2/cols
13  
-discount-2.1.2/config.cmd
14  
-discount-2.1.2/config.h
15  
-discount-2.1.2/config.log
16  
-discount-2.1.2/config.mak
17  
-discount-2.1.2/config.md
18  
-discount-2.1.2/config.sub
19  
-discount-2.1.2/css.o
20  
-discount-2.1.2/docheader.o
21  
-discount-2.1.2/dumptree.o
22  
-discount-2.1.2/echo
23  
-discount-2.1.2/emmatch.o
24  
-discount-2.1.2/flags.o
25  
-discount-2.1.2/generate.o
26  
-discount-2.1.2/html5.o
27  
-discount-2.1.2/libmarkdown
28  
-discount-2.1.2/libmarkdown.a
29  
-discount-2.1.2/librarian.sh
30  
-discount-2.1.2/main.o
31  
-discount-2.1.2/makepage
32  
-discount-2.1.2/markdown
33  
-discount-2.1.2/markdown.o
34  
-discount-2.1.2/mkd2html
35  
-discount-2.1.2/mkd2html.o
36  
-discount-2.1.2/mkdio.h
37  
-discount-2.1.2/mkdio.o
38  
-discount-2.1.2/mktags
39  
-discount-2.1.2/pgm_options.o
40  
-discount-2.1.2/resource.o
41  
-discount-2.1.2/setup.o
42  
-discount-2.1.2/tags.o
43  
-discount-2.1.2/theme
44  
-discount-2.1.2/theme.o
45  
-discount-2.1.2/toc.o
46  
-discount-2.1.2/version.c
47  
-discount-2.1.2/version.o
48  
-discount-2.1.2/xml.o
49  
-discount-2.1.2/xmlpage.o
  9
+discount-2.1.5a/Csio.o
  10
+discount-2.1.5a/basename.o
  11
+discount-2.1.5a/blocktags
  12
+discount-2.1.5a/cols
  13
+discount-2.1.5a/config.cmd
  14
+discount-2.1.5a/config.h
  15
+discount-2.1.5a/config.log
  16
+discount-2.1.5a/config.mak
  17
+discount-2.1.5a/config.md
  18
+discount-2.1.5a/config.sub
  19
+discount-2.1.5a/css.o
  20
+discount-2.1.5a/docheader.o
  21
+discount-2.1.5a/dumptree.o
  22
+discount-2.1.5a/echo
  23
+discount-2.1.5a/emmatch.o
  24
+discount-2.1.5a/flags.o
  25
+discount-2.1.5a/generate.o
  26
+discount-2.1.5a/html5.o
  27
+discount-2.1.5a/libmarkdown
  28
+discount-2.1.5a/libmarkdown.a
  29
+discount-2.1.5a/librarian.sh
  30
+discount-2.1.5a/main.o
  31
+discount-2.1.5a/makepage
  32
+discount-2.1.5a/markdown
  33
+discount-2.1.5a/markdown.o
  34
+discount-2.1.5a/mkd2html
  35
+discount-2.1.5a/mkd2html.o
  36
+discount-2.1.5a/mkdio.h
  37
+discount-2.1.5a/mkdio.o
  38
+discount-2.1.5a/mktags
  39
+discount-2.1.5a/pgm_options.o
  40
+discount-2.1.5a/resource.o
  41
+discount-2.1.5a/setup.o
  42
+discount-2.1.5a/tags.o
  43
+discount-2.1.5a/theme
  44
+discount-2.1.5a/theme.o
  45
+discount-2.1.5a/toc.o
  46
+discount-2.1.5a/version.c
  47
+discount-2.1.5a/version.o
  48
+discount-2.1.5a/xml.o
  49
+discount-2.1.5a/xmlpage.o
195  MANIFEST
... ...
@@ -1,10 +1,105 @@
1 1
 .gitignore
2 2
 Changes
  3
+discount-2.1.5a/amalloc.c
  4
+discount-2.1.5a/amalloc.h
  5
+discount-2.1.5a/basename.c
  6
+discount-2.1.5a/configure.inc
  7
+discount-2.1.5a/configure.sh
  8
+discount-2.1.5a/COPYRIGHT
  9
+discount-2.1.5a/CREDITS
  10
+discount-2.1.5a/Csio.c
  11
+discount-2.1.5a/css.c
  12
+discount-2.1.5a/cstring.h
  13
+discount-2.1.5a/docheader.c
  14
+discount-2.1.5a/dumptree.c
  15
+discount-2.1.5a/emmatch.c
  16
+discount-2.1.5a/flags.c
  17
+discount-2.1.5a/generate.c
  18
+discount-2.1.5a/github_flavoured.c
  19
+discount-2.1.5a/github_flavoured.o
  20
+discount-2.1.5a/html5.c
  21
+discount-2.1.5a/INSTALL
  22
+discount-2.1.5a/main.c
  23
+discount-2.1.5a/Makefile
  24
+discount-2.1.5a/Makefile.in
  25
+discount-2.1.5a/mkd-callbacks.3
  26
+discount-2.1.5a/mkd-extensions.7
  27
+discount-2.1.5a/mkd-functions.3
  28
+discount-2.1.5a/mkd-line.3
  29
+discount-2.1.5a/mkdio.c
  30
+discount-2.1.5a/pgm_options.c
  31
+discount-2.1.5a/pgm_options.h
  32
+discount-2.1.5a/Plan9/markdown.1
  33
+discount-2.1.5a/Plan9/markdown.2
  34
+discount-2.1.5a/Plan9/markdown.6
  35
+discount-2.1.5a/Plan9/mkfile
  36
+discount-2.1.5a/Plan9/README
  37
+discount-2.1.5a/README
  38
+discount-2.1.5a/resource.c
  39
+discount-2.1.5a/setup.c
  40
+discount-2.1.5a/tags.c
  41
+discount-2.1.5a/tags.h
  42
+discount-2.1.5a/tests/autolink.t
  43
+discount-2.1.5a/tests/automatic.t
  44
+discount-2.1.5a/tests/backslash.t
  45
+discount-2.1.5a/tests/callbacks.t
  46
+discount-2.1.5a/tests/chrome.text
  47
+discount-2.1.5a/tests/code.t
  48
+discount-2.1.5a/tests/compat.t
  49
+discount-2.1.5a/tests/crash.t
  50
+discount-2.1.5a/tests/defects.t
  51
+discount-2.1.5a/tests/div.t
  52
+discount-2.1.5a/tests/dl.t
  53
+discount-2.1.5a/tests/embedlinks.text
  54
+discount-2.1.5a/tests/emphasis.t
  55
+discount-2.1.5a/tests/extrafootnotes.t
  56
+discount-2.1.5a/tests/flow.t
  57
+discount-2.1.5a/tests/footnotes.t
  58
+discount-2.1.5a/tests/functions.sh
  59
+discount-2.1.5a/tests/header.t
  60
+discount-2.1.5a/tests/html.t
  61
+discount-2.1.5a/tests/html5.t
  62
+discount-2.1.5a/tests/links.text
  63
+discount-2.1.5a/tests/linkylinky.t
  64
+discount-2.1.5a/tests/linkypix.t
  65
+discount-2.1.5a/tests/list.t
  66
+discount-2.1.5a/tests/list3deep.t
  67
+discount-2.1.5a/tests/misc.t
  68
+discount-2.1.5a/tests/pandoc.t
  69
+discount-2.1.5a/tests/para.t
  70
+discount-2.1.5a/tests/paranoia.t
  71
+discount-2.1.5a/tests/peculiarities.t
  72
+discount-2.1.5a/tests/pseudo.t
  73
+discount-2.1.5a/tests/reddit.t
  74
+discount-2.1.5a/tests/reparse.t
  75
+discount-2.1.5a/tests/schiraldi.t
  76
+discount-2.1.5a/tests/smarty.t
  77
+discount-2.1.5a/tests/snakepit.t
  78
+discount-2.1.5a/tests/strikethrough.t
  79
+discount-2.1.5a/tests/style.t
  80
+discount-2.1.5a/tests/superscript.t
  81
+discount-2.1.5a/tests/syntax.text
  82
+discount-2.1.5a/tests/tables.t
  83
+discount-2.1.5a/tests/tabstop.t
  84
+discount-2.1.5a/tests/toc.t
  85
+discount-2.1.5a/tests/xml.t
  86
+discount-2.1.5a/toc.c
  87
+discount-2.1.5a/tools/checkbits.sh
  88
+discount-2.1.5a/tools/cols.c
  89
+discount-2.1.5a/tools/echo.c
  90
+discount-2.1.5a/VERSION
  91
+discount-2.1.5a/xml.c
  92
+discount-2.1.5a/xmlpage.c
  93
+Discount.bs
  94
+Discount.c
  95
+Discount.o
3 96
 Discount.xs
4 97
 INSTALL.Discount
5 98
 lib/Text/Markdown/Discount.pm
6 99
 Makefile.PL
7 100
 MANIFEST
  101
+MYMETA.json
  102
+MYMETA.yml
8 103
 ppport.h
9 104
 README
10 105
 t/00.load.t
@@ -58,103 +153,3 @@ xt/MarkdownTest_1.0.3/Tests/Tidyness.html
58 153
 xt/MarkdownTest_1.0.3/Tests/Tidyness.text
59 154
 xt/MarkdownXS.pl
60 155
 xt/test.pl
61  
-discount-2.1.2/markdown.1
62  
-discount-2.1.2/configure.inc
63  
-discount-2.1.2/main.c
64  
-discount-2.1.2/theme.c
65  
-discount-2.1.2/mktags.c
66  
-discount-2.1.2/mkd-callbacks.3
67  
-discount-2.1.2/VERSION
68  
-discount-2.1.2/COPYRIGHT
69  
-discount-2.1.2/configure.sh
70  
-discount-2.1.2/theme.1
71  
-discount-2.1.2/Csio.c
72  
-discount-2.1.2/cstring.h
73  
-discount-2.1.2/markdown.3
74  
-discount-2.1.2/README
75  
-discount-2.1.2/amalloc.c
76  
-discount-2.1.2/pgm_options.h
77  
-discount-2.1.2/mkd-functions.3
78  
-discount-2.1.2/mkdio.c
79  
-discount-2.1.2/resource.c
80  
-discount-2.1.2/xml.c
81  
-discount-2.1.2/dumptree.c
82  
-discount-2.1.2/INSTALL
83  
-discount-2.1.2/mkdio.h.in
84  
-discount-2.1.2/tools/cols.c
85  
-discount-2.1.2/tools/checkbits.sh
86  
-discount-2.1.2/tools/echo.c
87  
-discount-2.1.2/amalloc.h
88  
-discount-2.1.2/flags.c
89  
-discount-2.1.2/mkd2html.1
90  
-discount-2.1.2/generate.c
91  
-discount-2.1.2/makepage.c
92  
-discount-2.1.2/html5.c
93  
-discount-2.1.2/Makefile.in
94  
-discount-2.1.2/CREDITS
95  
-discount-2.1.2/pgm_options.c
96  
-discount-2.1.2/xmlpage.c
97  
-discount-2.1.2/docheader.c
98  
-discount-2.1.2/tags.c
99  
-discount-2.1.2/markdown.h
100  
-discount-2.1.2/version.c.in
101  
-discount-2.1.2/toc.c
102  
-discount-2.1.2/markdown.7
103  
-discount-2.1.2/mkd-extensions.7
104  
-discount-2.1.2/setup.c
105  
-discount-2.1.2/makepage.1
106  
-discount-2.1.2/mkd-line.3
107  
-discount-2.1.2/tests/list.t
108  
-discount-2.1.2/tests/para.t
109  
-discount-2.1.2/tests/crash.t
110  
-discount-2.1.2/tests/misc.t
111  
-discount-2.1.2/tests/autolink.t
112  
-discount-2.1.2/tests/code.t
113  
-discount-2.1.2/tests/list3deep.t
114  
-discount-2.1.2/tests/pandoc.t
115  
-discount-2.1.2/tests/linkylinky.t
116  
-discount-2.1.2/tests/div.t
117  
-discount-2.1.2/tests/embedlinks.text
118  
-discount-2.1.2/tests/dl.t
119  
-discount-2.1.2/tests/tabstop.t
120  
-discount-2.1.2/tests/functions.sh
121  
-discount-2.1.2/tests/links.text
122  
-discount-2.1.2/tests/footnotes.t
123  
-discount-2.1.2/tests/html.t
124  
-discount-2.1.2/tests/header.t
125  
-discount-2.1.2/tests/chrome.text
126  
-discount-2.1.2/tests/pseudo.t
127  
-discount-2.1.2/tests/schiraldi.t
128  
-discount-2.1.2/tests/extrafootnotes.t
129  
-discount-2.1.2/tests/flow.t
130  
-discount-2.1.2/tests/reparse.t
131  
-discount-2.1.2/tests/snakepit.t
132  
-discount-2.1.2/tests/xml.t
133  
-discount-2.1.2/tests/peculiarities.t
134  
-discount-2.1.2/tests/tables.t
135  
-discount-2.1.2/tests/strikethrough.t
136  
-discount-2.1.2/tests/emphasis.t
137  
-discount-2.1.2/tests/automatic.t
138  
-discount-2.1.2/tests/compat.t
139  
-discount-2.1.2/tests/callbacks.t
140  
-discount-2.1.2/tests/linkypix.t
141  
-discount-2.1.2/tests/style.t
142  
-discount-2.1.2/tests/superscript.t
143  
-discount-2.1.2/tests/html5.t
144  
-discount-2.1.2/tests/paranoia.t
145  
-discount-2.1.2/tests/smarty.t
146  
-discount-2.1.2/tests/backslash.t
147  
-discount-2.1.2/tests/reddit.t
148  
-discount-2.1.2/tests/toc.t
149  
-discount-2.1.2/tests/syntax.text
150  
-discount-2.1.2/basename.c
151  
-discount-2.1.2/tags.h
152  
-discount-2.1.2/emmatch.c
153  
-discount-2.1.2/mkd2html.c
154  
-discount-2.1.2/markdown.c
155  
-discount-2.1.2/Plan9/markdown.1
156  
-discount-2.1.2/Plan9/markdown.6
157  
-discount-2.1.2/Plan9/README
158  
-discount-2.1.2/Plan9/markdown.2
159  
-discount-2.1.2/Plan9/mkfile
160  
-discount-2.1.2/css.c
88  MANIFEST.SKIP
@@ -12,47 +12,47 @@
12 12
 \.gz$
13 13
 \.cvsignore
14 14
 \.shipit
15  
-^discount-2.1.2/Csio.o
16  
-^discount-2.1.2/basename.o
17  
-^discount-2.1.2/blocktags
18  
-^discount-2.1.2/cols
19  
-^discount-2.1.2/config.cmd
20  
-^discount-2.1.2/config.h
21  
-^discount-2.1.2/config.log
22  
-^discount-2.1.2/config.mak
23  
-^discount-2.1.2/config.md
24  
-^discount-2.1.2/config.sub
25  
-^discount-2.1.2/css.o
26  
-^discount-2.1.2/docheader.o
27  
-^discount-2.1.2/dumptree.o
28  
-^discount-2.1.2/echo
29  
-^discount-2.1.2/emmatch.o
30  
-^discount-2.1.2/flags.o
31  
-^discount-2.1.2/generate.o
32  
-^discount-2.1.2/html5.o
33  
-^discount-2.1.2/libmarkdown
34  
-^discount-2.1.2/libmarkdown.a
35  
-^discount-2.1.2/librarian.sh
36  
-^discount-2.1.2/main.o
37  
-^discount-2.1.2/makepage
38  
-^discount-2.1.2/markdown
39  
-^discount-2.1.2/markdown.o
40  
-^discount-2.1.2/mkd2html
41  
-^discount-2.1.2/mkd2html.o
42  
-^discount-2.1.2/mkdio.h
43  
-^discount-2.1.2/mkdio.o
44  
-^discount-2.1.2/mktags
45  
-^discount-2.1.2/pgm_options.o
46  
-^discount-2.1.2/resource.o
47  
-^discount-2.1.2/setup.o
48  
-^discount-2.1.2/tags.o
49  
-^discount-2.1.2/theme
50  
-^discount-2.1.2/theme.o
51  
-^discount-2.1.2/toc.o
52  
-^discount-2.1.2/theme
53  
-^discount-2.1.2/theme.o
54  
-^discount-2.1.2/toc.o
55  
-^discount-2.1.2/version.c
56  
-^discount-2.1.2/version.o
57  
-^discount-2.1.2/xml.o
58  
-^discount-2.1.2/xmlpage.o
  15
+^discount-2.1.5a/Csio.o
  16
+^discount-2.1.5a/basename.o
  17
+^discount-2.1.5a/blocktags
  18
+^discount-2.1.5a/cols
  19
+^discount-2.1.5a/config.cmd
  20
+^discount-2.1.5a/config.h
  21
+^discount-2.1.5a/config.log
  22
+^discount-2.1.5a/config.mak
  23
+^discount-2.1.5a/config.md
  24
+^discount-2.1.5a/config.sub
  25
+^discount-2.1.5a/css.o
  26
+^discount-2.1.5a/docheader.o
  27
+^discount-2.1.5a/dumptree.o
  28
+^discount-2.1.5a/echo
  29
+^discount-2.1.5a/emmatch.o
  30
+^discount-2.1.5a/flags.o
  31
+^discount-2.1.5a/generate.o
  32
+^discount-2.1.5a/html5.o
  33
+^discount-2.1.5a/libmarkdown
  34
+^discount-2.1.5a/libmarkdown.a
  35
+^discount-2.1.5a/librarian.sh
  36
+^discount-2.1.5a/main.o
  37
+^discount-2.1.5a/makepage
  38
+^discount-2.1.5a/markdown
  39
+^discount-2.1.5a/markdown.o
  40
+^discount-2.1.5a/mkd2html
  41
+^discount-2.1.5a/mkd2html.o
  42
+^discount-2.1.5a/mkdio.h
  43
+^discount-2.1.5a/mkdio.o
  44
+^discount-2.1.5a/mktags
  45
+^discount-2.1.5a/pgm_options.o
  46
+^discount-2.1.5a/resource.o
  47
+^discount-2.1.5a/setup.o
  48
+^discount-2.1.5a/tags.o
  49
+^discount-2.1.5a/theme
  50
+^discount-2.1.5a/theme.o
  51
+^discount-2.1.5a/toc.o
  52
+^discount-2.1.5a/theme
  53
+^discount-2.1.5a/theme.o
  54
+^discount-2.1.5a/toc.o
  55
+^discount-2.1.5a/version.c
  56
+^discount-2.1.5a/version.o
  57
+^discount-2.1.5a/xml.o
  58
+^discount-2.1.5a/xmlpage.o
2  Makefile.PL
@@ -4,7 +4,7 @@ use warnings;
4 4
 use ExtUtils::MakeMaker;
5 5
 use File::Spec;
6 6
 
7  
-my $extdir = 'discount-2.1.2';
  7
+my $extdir = 'discount-2.1.5a';
8 8
 my $myextlib = File::Spec->catfile($extdir, 'libmarkdown.a');
9 9
 my $clean_files = join (" ",
10 10
                   map{ File::Spec->catfile($extdir, $_) }
1  discount-2.1.2/VERSION
... ...
@@ -1 +0,0 @@
1  
-2.1.2
0  discount-2.1.2/COPYRIGHT → discount-2.1.5a/COPYRIGHT
File renamed without changes
0  discount-2.1.2/CREDITS → discount-2.1.5a/CREDITS
File renamed without changes
2  discount-2.1.2/Csio.c → discount-2.1.5a/Csio.c
@@ -54,7 +54,7 @@ Csreparse(Cstring *iot, char *buf, int size, int flags)
54 54
 {
55 55
     MMIOT f;
56 56
     ___mkd_initmmiot(&f, 0);
57  
-    ___mkd_reparse(buf, size, 0, &f);
  57
+    ___mkd_reparse(buf, size, 0, &f, 0);
58 58
     ___mkd_emblock(&f);
59 59
     SUFFIX(*iot, T(f.out), S(f.out));
60 60
     ___mkd_freemmiot(&f, 0);
0  discount-2.1.2/INSTALL → discount-2.1.5a/INSTALL
File renamed without changes
62  discount-2.1.2/Makefile.in → discount-2.1.5a/Makefile.in
... ...
@@ -1,4 +1,5 @@
1  
-CC=@CC@ -I. -L.
  1
+CC=@CC@ -I.
  2
+LFLAGS=-L.
2 3
 CFLAGS=@CFLAGS@
3 4
 AR=@AR@
4 5
 RANLIB=@RANLIB@
@@ -15,56 +16,59 @@ MKDLIB=libmarkdown
15 16
 OBJS=mkdio.o markdown.o dumptree.o generate.o \
16 17
      resource.o docheader.o version.o toc.o css.o \
17 18
      xml.o Csio.o xmlpage.o basename.o emmatch.o \
18  
-     setup.o tags.o html5.o flags.o @AMALLOC@
  19
+     github_flavoured.o setup.o tags.o html5.o flags.o @AMALLOC@
19 20
 TESTFRAMEWORK=echo cols
20 21
 
21 22
 MAN3PAGES=mkd-callbacks.3 mkd-functions.3 markdown.3 mkd-line.3
22 23
 
23 24
 all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
24 25
 
25  
-install: $(PGMS) $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(LIBDIR) $(DESTDIR)/$(INCDIR)
26  
-	@INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)/$(BINDIR)
27  
-	./librarian.sh install libmarkdown VERSION $(DESTDIR)/$(LIBDIR)
28  
-	@INSTALL_DATA@ mkdio.h $(DESTDIR)/$(INCDIR)
  26
+install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR)
  27
+	@INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)$(BINDIR)
  28
+	./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR)
  29
+	@INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR)
29 30
 
30 31
 install.everything: install install.samples install.man
31 32
 
32  
-install.samples: $(SAMPLE_PGMS) install $(DESTDIR)/$(BINDIR)
33  
-	@INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(DESTDIR)/$(BINDIR)
34  
-	@INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1
35  
-	@INSTALL_DATA@ theme.1 makepage.1 mkd2html.1 $(DESTDIR)/$(MANDIR)/man1
  33
+install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
  34
+	@INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(DESTDIR)$(BINDIR)
  35
+	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
  36
+	@INSTALL_DATA@ theme.1 makepage.1 mkd2html.1 $(DESTDIR)$(MANDIR)/man1
36 37
 
37 38
 install.man:
38  
-	@INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man3
39  
-	@INSTALL_DATA@ $(MAN3PAGES) $(DESTDIR)/$(MANDIR)/man3
  39
+	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man3
  40
+	@INSTALL_DATA@ $(MAN3PAGES) $(DESTDIR)$(MANDIR)/man3
40 41
 	for x in mkd_line mkd_generateline; do \
41  
-	    ( echo '.\"' ; echo ".so man3/mkd-line.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3;\
  42
+	    ( echo '.\"' ; echo ".so man3/mkd-line.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3;\
42 43
 	done
43 44
 	for x in mkd_in mkd_string; do \
44  
-	    ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3;\
  45
+	    ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3;\
45 46
 	done
46 47
 	for x in mkd_compile mkd_css mkd_generatecss mkd_generatehtml mkd_cleanup mkd_doc_title mkd_doc_author mkd_doc_date; do \
47  
-	    ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3; \
  48
+	    ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)$(MANDIR)/man3/$$x.3; \
48 49
 	done
49  
-	@INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man7
50  
-	@INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)/$(MANDIR)/man7
51  
-	@INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1
52  
-	@INSTALL_DATA@ markdown.1 $(DESTDIR)/$(MANDIR)/man1
  50
+	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7
  51
+	@INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7
  52
+	@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
  53
+	@INSTALL_DATA@ markdown.1 $(DESTDIR)$(MANDIR)/man1
53 54
 
54 55
 install.everything: install install.man
55 56
 
56  
-$(DESTDIR)/$(BINDIR):
57  
-	@INSTALL_DIR@ $(DESTDIR)/$(BINDIR)
  57
+$(DESTDIR)$(BINDIR):
  58
+	@INSTALL_DIR@ $(DESTDIR)$(BINDIR)
58 59
 
59  
-$(DESTDIR)/$(INCDIR):
60  
-	@INSTALL_DIR@ $(DESTDIR)/$(INCDIR)
  60
+$(DESTDIR)$(INCDIR):
  61
+	@INSTALL_DIR@ $(DESTDIR)$(INCDIR)
61 62
 
62  
-$(DESTDIR)/$(LIBDIR):
63  
-	@INSTALL_DIR@ $(DESTDIR)/$(LIBDIR)
  63
+$(DESTDIR)$(LIBDIR):
  64
+	@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
64 65
 
65 66
 version.o: version.c VERSION
66 67
 	$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
67 68
 
  69
+VERSION:
  70
+	@true
  71
+
68 72
 tags.o: tags.c blocktags
69 73
 
70 74
 blocktags: mktags
@@ -72,17 +76,17 @@ blocktags: mktags
72 76
 
73 77
 # example programs
74 78
 @THEME@theme:  theme.o $(MKDLIB) mkdio.h
75  
-@THEME@	$(CC) -o theme theme.o -lmarkdown @LIBS@
  79
+@THEME@	$(CC) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@
76 80
 
77 81
 
78 82
 mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
79  
-	$(CC) -o mkd2html mkd2html.o -lmarkdown @LIBS@
  83
+	$(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
80 84
 
81 85
 markdown: main.o pgm_options.o $(MKDLIB)
82  
-	$(CC) $(CFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
  86
+	$(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
83 87
 	
84 88
 makepage:  makepage.c pgm_options.o $(MKDLIB) mkdio.h
85  
-	$(CC) $(CFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
  89
+	$(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
86 90
 
87 91
 pgm_options.o: pgm_options.c mkdio.h config.h
88 92
 	$(CC) -I. -c pgm_options.c
0  discount-2.1.2/Plan9/README → discount-2.1.5a/Plan9/README
File renamed without changes
0  discount-2.1.2/Plan9/markdown.1 → discount-2.1.5a/Plan9/markdown.1
File renamed without changes
0  discount-2.1.2/Plan9/markdown.2 → discount-2.1.5a/Plan9/markdown.2
File renamed without changes
0  discount-2.1.2/Plan9/markdown.6 → discount-2.1.5a/Plan9/markdown.6
File renamed without changes
0  discount-2.1.2/Plan9/mkfile → discount-2.1.5a/Plan9/mkfile
File renamed without changes
0  discount-2.1.2/README → discount-2.1.5a/README
File renamed without changes
1  discount-2.1.5a/VERSION
... ...
@@ -0,0 +1 @@
  1
+2.1.5a
0  discount-2.1.2/amalloc.c → discount-2.1.5a/amalloc.c
File renamed without changes
0  discount-2.1.2/amalloc.h → discount-2.1.5a/amalloc.h
File renamed without changes
0  discount-2.1.2/basename.c → discount-2.1.5a/basename.c
File renamed without changes
146  discount-2.1.2/configure.inc → discount-2.1.5a/configure.inc
@@ -193,8 +193,8 @@ AC_CHECK_FUNCS () {
193 193
     B=`echo "$1" | sed -e 's/(.*)//'`
194 194
 
195 195
     case "$B" in
196  
-    "$1") F="$1()" ;;
197  
-    *)    F="$1" ;;
  196
+    "$1") F="$1()"; need_proto=1 ;;
  197
+    *)    F="$1"  ; unset need_proto ;;
198 198
     esac
199 199
 
200 200
     shift
@@ -205,6 +205,10 @@ AC_CHECK_FUNCS () {
205 205
 	shift
206 206
     done
207 207
 
  208
+    if [ "$need_proto" ]; then
  209
+	echo "void $F;" >> ngc$$.c
  210
+    fi
  211
+
208 212
     cat >> ngc$$.c << EOF
209 213
 main()
210 214
 {
@@ -385,8 +389,13 @@ EOF
385 389
     TLOGN " ($AC_CC)"
386 390
 
387 391
     if [ $status -eq 0 ]; then
388  
-	if $AC_CC -v 2>&1 | grep 'gcc version' >/dev/null; then
  392
+	if $AC_CC -x c /dev/null -dM -E 2>&1 | grep '__clang__' >/dev/null; then
  393
+	    TLOG " yuck, you're using clang"
  394
+	    IS_CLANG=T
  395
+	    IS_BROKEN_CC=T
  396
+	elif $AC_CC -v 2>&1 | grep 'gcc version' >/dev/null; then
389 397
 	    TLOG " oh ick, it looks like gcc"
  398
+	    IS_GCC=T
390 399
 	    IS_BROKEN_CC=T
391 400
 	else
392 401
 	    TLOG " ok"
@@ -422,8 +431,6 @@ EOF
422 431
 	AC_FAIL " does not compile code properly"
423 432
     fi
424 433
 
425  
-    AC_SUB 'CC' "$AC_CC"
426  
-
427 434
     __remove ngc$$ ngc$$.c ngc$$.o
428 435
 
429 436
     return $status
@@ -874,7 +881,6 @@ say(char *w, char *v)
874 881
 			: "s:@%s@:%s:g\n", w, v);
875 882
 }
876 883
 
877  
-void
878 884
 main(argc, argv)
879 885
 char **argv;
880 886
 {
@@ -938,6 +944,7 @@ AC_OUTPUT () {
938 944
     AC_SUB 'LIBS'    "$AC_LIBS"
939 945
     AC_SUB 'CONFIGURE_FILES' "$__config_files"
940 946
     AC_SUB 'GENERATED_FILES' "$*"
  947
+    AC_SUB 'CC'      "$AC_CC"
941 948
     AC_SUB 'CFLAGS'  "$AC_CFLAGS"
942 949
     AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
943 950
     AC_SUB 'srcdir'  "$AC_SRCDIR"
@@ -1166,6 +1173,8 @@ AC_CHECK_BASENAME() {
1166 1173
     cat > ngc$$.c << EOF
1167 1174
 #include <string.h>
1168 1175
 
  1176
+extern char *basename(char*);
  1177
+
1169 1178
 main()
1170 1179
 {
1171 1180
     char *a = basename("/a/test");
@@ -1177,7 +1186,7 @@ main()
1177 1186
 EOF
1178 1187
 
1179 1188
     if $AC_CC -o ngc$$ ngc$$.c $LIBS; then
1180  
-	if ngc$$; then
  1189
+	if ./ngc$$; then
1181 1190
 	    TLOG "(found)"
1182 1191
 	    AC_DEFINE 'HAVE_BASENAME' 1
1183 1192
 	    AC_CHECK_HEADERS libgen.h
@@ -1212,31 +1221,16 @@ AC_COMPILER_PIC () {
1212 1221
     return $__rc
1213 1222
 }
1214 1223
 
1215  
-#
1216  
-# AC_CC_SHLIBS checks if the C compiler can produce shared libraries
1217  
-# and if it can writes a librarian that handles those libraries for us.
1218  
-#
1219  
-AC_CC_SHLIBS () {
1220  
-    AC_PROG_CC || AC_FAIL "Need a C compiler to build shared libraries"
1221  
-    AC_PROG_LN_S || AC_FAIL "Need to be able to make symbolic links for shared libraries"
1222  
-    AC_PROG_INSTALL || AC_FAIL "Need an install program to install shared libraries"
1223  
-    LOGN "checking whether the C compiler can build shared libraries "
1224 1224
 
1225  
-    echo "int some_variable = 0;" > ngc$$.c 
1226  
-
1227  
-    if $AC_CC $AC_PICFLAG -shared -o ngc$$.so ngc$$.c; then
1228  
-	AC_SUB LD_LIBRARY_PATH LD_LIBRARY_PATH
1229  
-	# -Wl option probably works, but be paranoid anyway
1230  
-	_VFLAGS="$AC_PICFLAG -shared -Wl,-soname,ngc$$.so.1"
1231  
-	if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
1232  
-	    USE_SONAME=T
1233  
-	fi
1234  
-	LDCONFIG=`AC_PATH=/sbin:/usr/sbin:/usr/local/sbin acLookFor ldconfig`
1235  
-	__config_files="$__config_files librarian.sh"
1236  
-	cat > librarian.sh << EOF
  1225
+# generate a macosX librarian
  1226
+#
  1227
+__AC_MACOS_LIBRARIAN() {
  1228
+    AC_SUB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
  1229
+    __config_files="$__config_files librarian.sh"
  1230
+    cat > librarian.sh << EOF
1237 1231
 #! /bin/sh
1238 1232
 #
1239  
-#  Build ELF shared libraries, hiding (some) ickiness from the makefile
  1233
+#  Build MacOS shared libraries, hiding (some) ickiness from the makefile
1240 1234
 
1241 1235
 ACTION=\$1; shift
1242 1236
 LIBRARY=\$1; shift
@@ -1245,41 +1239,43 @@ eval \`awk -F. '{ printf "MAJOR=%d\n", \$1;
1245 1239
 		  printf "VERSION=%d.%d.%d\n", \$1, \$2, \$3; }' \$1\`
1246 1240
 shift
1247 1241
 
1248  
-LIBNAME=\$LIBRARY.so
1249  
-FULLNAME=\$LIBNAME.\$VERSION
  1242
+LIBNAME=\$LIBRARY.dylib
  1243
+FULLNAME=\$LIBNAME
1250 1244
 
1251 1245
 case "\$ACTION" in
1252  
-make)   FLAGS="$AC_CFLAGS -shared"
1253  
-	unset VFLAGS
1254  
-	test "$USE_SONAME" && VFLAGS="-Wl,-soname,\$LIBNAME.\$MAJOR"
  1246
+make)   FLAGS="$AC_CFLAGS -dynamiclib"
  1247
+	VFLAGS="-current_version \$VERSION -compatibility_version \$MAJOR"
1255 1248
 
1256  
-	rm -f \$LIBRARY \$LIBNAME \$LIBNAME.\$MAJOR
  1249
+	rm -f \$LIBRARY
1257 1250
 	if $AC_CC \$FLAGS \$VFLAGS -o \$FULLNAME "\$@"; then
1258 1251
 	    $PROG_LN_S \$FULLNAME \$LIBRARY
1259  
-	    $PROG_LN_S \$FULLNAME \$LIBNAME
1260  
-	    $PROG_LN_S \$FULLNAME \$LIBNAME.\$MAJOR
1261 1252
 	fi
1262 1253
 	;;
1263  
-files)  echo "\$FULLNAME" "\$LIBNAME" "\$LIBNAME.\$MAJOR"
  1254
+files)  echo "\$FULLNAME"
1264 1255
 	;;
1265 1256
 install)$PROG_INSTALL -c \$FULLNAME "\$1"
1266  
-	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
1267  
-	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
1268  
-	test "$LDCONFIG" && $LDCONFIG "\$1"
1269 1257
 	;;
1270 1258
 esac
1271 1259
 EOF
1272  
-	chmod +x librarian.sh
1273  
-        LOG "(yes; -shared)"
1274  
-	__rc=0
1275  
-    elif $AC_CC $AC_PICFLAG  -dynamiclib -o ngc$$.so ngc$$.c; then
1276  
-	# macosx
1277  
-	AC_SUB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
1278  
-	__config_files="$__config_files librarian.sh"
1279  
-	cat > librarian.sh << EOF
  1260
+    chmod +x librarian.sh
  1261
+}
  1262
+
  1263
+
  1264
+# Generate an ELF librarian (for Linux, freebsd)
  1265
+#
  1266
+__AC_ELF_LIBRARIAN() {
  1267
+    AC_SUB LD_LIBRARY_PATH LD_LIBRARY_PATH
  1268
+    # -Wl option probably works, but be paranoid anyway
  1269
+    _VFLAGS="$AC_PICFLAG -shared -Wl,-soname,ngc$$.so.1"
  1270
+    if $AC_CC $_VFLAGS -o ngc$$.so ngc$$.c; then
  1271
+	USE_SONAME=T
  1272
+    fi
  1273
+    LDCONFIG=`AC_PATH=/sbin:/usr/sbin:/usr/local/sbin acLookFor ldconfig`
  1274
+    __config_files="$__config_files librarian.sh"
  1275
+    cat > librarian.sh << EOF
1280 1276
 #! /bin/sh
1281 1277
 #
1282  
-#  Build MacOS shared libraries, hiding (some) ickiness from the makefile
  1278
+#  Build ELF shared libraries, hiding (some) ickiness from the makefile
1283 1279
 
1284 1280
 ACTION=\$1; shift
1285 1281
 LIBRARY=\$1; shift
@@ -1288,26 +1284,60 @@ eval \`awk -F. '{ printf "MAJOR=%d\n", \$1;
1288 1284
 		  printf "VERSION=%d.%d.%d\n", \$1, \$2, \$3; }' \$1\`
1289 1285
 shift
1290 1286
 
1291  
-LIBNAME=\$LIBRARY.dylib
1292  
-FULLNAME=\$LIBNAME
  1287
+LIBNAME=\$LIBRARY.so
  1288
+FULLNAME=\$LIBNAME.\$VERSION
1293 1289
 
1294 1290
 case "\$ACTION" in
1295  
-make)   FLAGS="$AC_CFLAGS -dynamiclib"
1296  
-	VFLAGS="-current_version \$VERSION -compatibility_version \$MAJOR"
  1291
+make)   FLAGS="$AC_CFLAGS -shared"
  1292
+	unset VFLAGS
  1293
+	test "$USE_SONAME" && VFLAGS="-Wl,-soname,\$LIBNAME.\$MAJOR"
1297 1294
 
1298  
-	rm -f \$LIBRARY
  1295
+	rm -f \$LIBRARY \$LIBNAME \$LIBNAME.\$MAJOR
1299 1296
 	if $AC_CC \$FLAGS \$VFLAGS -o \$FULLNAME "\$@"; then
1300 1297
 	    $PROG_LN_S \$FULLNAME \$LIBRARY
  1298
+	    $PROG_LN_S \$FULLNAME \$LIBNAME
  1299
+	    $PROG_LN_S \$FULLNAME \$LIBNAME.\$MAJOR
1301 1300
 	fi
1302 1301
 	;;
1303  
-files)  echo "\$FULLNAME"
  1302
+files)  echo "\$FULLNAME" "\$LIBNAME" "\$LIBNAME.\$MAJOR"
1304 1303
 	;;
1305 1304
 install)$PROG_INSTALL -c \$FULLNAME "\$1"
  1305
+	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
  1306
+	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
  1307
+	test "$LDCONFIG" && $LDCONFIG "\$1"
1306 1308
 	;;
1307 1309
 esac
1308 1310
 EOF
1309  
-	chmod +x librarian.sh
1310  
-        LOG "(yes; macos dylib)"
  1311
+    chmod +x librarian.sh
  1312
+}
  1313
+
  1314
+
  1315
+#
  1316
+# AC_CC_SHLIBS checks if the C compiler can produce shared libraries
  1317
+# and if it can writes a librarian that handles those libraries for us.
  1318
+#
  1319
+AC_CC_SHLIBS () {
  1320
+    AC_PROG_CC || AC_FAIL "Need a C compiler to build shared libraries"
  1321
+    AC_PROG_LN_S || AC_FAIL "Need to be able to make symbolic links for shared libraries"
  1322
+    AC_PROG_INSTALL || AC_FAIL "Need an install program to install shared libraries"
  1323
+    LOGN "checking whether the C compiler can build shared libraries "
  1324
+
  1325
+    echo "int some_variable = 0;" > ngc$$.c 
  1326
+
  1327
+    if uname -a | grep Darwin >/dev/null; then
  1328
+	# Claims to be macos?
  1329
+	if $AC_CC $AC_PICFLAG  -dynamiclib -o ngc$$.so ngc$$.c; then
  1330
+	    __AC_MACOS_LIBRARIAN
  1331
+
  1332
+	    LOG "(yes; macos dylib)"
  1333
+	    __rc=0
  1334
+	else
  1335
+	    LOG "(no)"
  1336
+	    __rc=1
  1337
+	fi
  1338
+    elif $AC_CC $AC_PICFLAG -shared -o ngc$$.so ngc$$.c; then
  1339
+	__AC_ELF_LIBRARIAN
  1340
+        LOG "(yes; -shared)"
1311 1341
 	__rc=0
1312 1342
     else
1313 1343
         LOG "(no)"
19  discount-2.1.2/configure.sh → discount-2.1.5a/configure.sh
@@ -62,10 +62,21 @@ AC_PROG_CC
62 62
 
63 63
 test "$TRY_SHARED" && AC_COMPILER_PIC && AC_CC_SHLIBS
64 64
 
65  
-case "$AC_CC $AC_CFLAGS" in
66  
-*-Wall*)    AC_DEFINE 'while(x)' 'while( (x) != 0 )'
67  
-	    AC_DEFINE 'if(x)' 'if( (x) != 0 )' ;;
68  
-esac
  65
+if [ "IS_BROKEN_CC" ]; then
  66
+    case "$AC_CC $AC_CFLAGS" in
  67
+    *-pedantic*) ;;
  68
+    *)  # hack around deficiencies in gcc and clang
  69
+	#
  70
+	AC_DEFINE 'while(x)' 'while( (x) != 0 )'
  71
+	AC_DEFINE 'if(x)' 'if( (x) != 0 )'
  72
+
  73
+	if [ "$IS_CLANG" ]; then
  74
+	    AC_CC="$AC_CC -Wno-implicit-int"
  75
+	elif [ "$IS_GCC" ]; then
  76
+	    AC_CC="$AC_CC -Wno-return-type -Wno-implicit-int"
  77
+	fi ;;
  78
+    esac
  79
+fi
69 80
 
70 81
 AC_PROG ar || AC_FAIL "$TARGET requires ar"
71 82
 AC_PROG ranlib
0  discount-2.1.2/css.c → discount-2.1.5a/css.c
File renamed without changes
4  discount-2.1.2/cstring.h → discount-2.1.5a/cstring.h
@@ -27,9 +27,9 @@
27 27
 #define DELETE(x)	ALLOCATED(x) ? (free(T(x)), S(x) = (x).alloc = 0) \
28 28
 				     : ( S(x) = 0 )
29 29
 #define CLIP(t,i,sz)	\
30  
-	    ( ((i) >= 0) && ((sz) > 0) && (((i)+(sz)) <= S(t)) ) ? \
  30
+	    S(t) -= ( ((i) >= 0) && ((sz) > 0) && (((i)+(sz)) <= S(t)) ) ? \
31 31
 	    (memmove(&T(t)[i], &T(t)[i+sz], (S(t)-(i+sz)+1)*sizeof(T(t)[0])), \
32  
-		S(t) -= (sz)) : -1
  32
+		(sz)) : 0
33 33
 
34 34
 #define RESERVE(x, sz)	T(x) = ((x).alloc > S(x) + (sz) \
35 35
 			    ? T(x) \
0  discount-2.1.2/docheader.c → discount-2.1.5a/docheader.c
File renamed without changes
0  discount-2.1.2/dumptree.c → discount-2.1.5a/dumptree.c
File renamed without changes
0  discount-2.1.2/emmatch.c → discount-2.1.5a/emmatch.c
File renamed without changes
1  discount-2.1.2/flags.c → discount-2.1.5a/flags.c
@@ -29,6 +29,7 @@ static struct flagnames flagnames[] = {
29 29
     { MKD_NOALPHALIST,    "!ALPHALIST" },
30 30
     { MKD_NODLIST,        "!DLIST" },
31 31
     { MKD_EXTRA_FOOTNOTE, "FOOTNOTE" },
  32
+    { MKD_NOSTYLE,        "!STYLE" },
32 33
 };
33 34
 #define NR(x)	(sizeof x/sizeof x[0])
34 35
 
129  discount-2.1.2/generate.c → discount-2.1.5a/generate.c
@@ -183,9 +183,10 @@ Qem(MMIOT *f, char c, int count)
183 183
 /* generate html from a markup fragment
184 184
  */
185 185
 void
186  
-___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
  186
+___mkd_reparse(char *bfr, int size, int flags, MMIOT *f, char *esc)
187 187
 {
188 188
     MMIOT sub;
  189
+    struct escaped e;
189 190
 
190 191
     ___mkd_initmmiot(&sub, f->footnotes);
191 192
     
@@ -193,6 +194,14 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
193 194
     sub.cb = f->cb;
194 195
     sub.ref_prefix = f->ref_prefix;
195 196
 
  197
+    if ( esc ) {
  198
+	sub.esc = &e;
  199
+	e.up = f->esc;
  200
+	e.text = esc;
  201
+    }
  202
+    else
  203
+	sub.esc = f->esc;
  204
+
196 205
     push(bfr, size, &sub);
197 206
     EXPAND(sub.in) = 0;
198 207
     S(sub.in)--;
@@ -207,6 +216,23 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
207 216
 
208 217
 
209 218
 /*
  219
+ * check the escape list for special cases
  220
+ */
  221
+static int
  222
+escaped(MMIOT *f, char c)
  223
+{
  224
+    struct escaped *thing = f->esc;
  225
+
  226
+    while ( thing ) {
  227
+	if ( strchr(thing->text, c) )
  228
+	    return 1;
  229
+	thing = thing->up;
  230
+    }
  231
+    return 0;
  232
+}
  233
+
  234
+
  235
+/*
210 236
  * write out a url, escaping problematic characters
211 237
  */
212 238
 static void
@@ -553,7 +579,7 @@ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
553 579
 	    puturl(link + tag->szpat, size - tag->szpat, f, 0);
554 580
     }
555 581
     else
556  
-	___mkd_reparse(link + tag->szpat, size - tag->szpat, MKD_TAGTEXT, f);
  582
+	___mkd_reparse(link + tag->szpat, size - tag->szpat, MKD_TAGTEXT, f, 0);
557 583
 
558 584
     Qstring(tag->link_sfx, f);
559 585
 
@@ -585,7 +611,7 @@ extra_linky(MMIOT *f, Cstring text, Footnote *ref)
585 611
 	return 0;
586 612
 	
587 613
     if ( f->flags & IS_LABEL )
588  
-    	___mkd_reparse(T(text), S(text), linkt.flags, f);
  614
+    	___mkd_reparse(T(text), S(text), linkt.flags, f, 0);
589 615
     else {
590 616
 	ref->flags |= REFERENCED;
591 617
 	ref->refnumber = ++ f->reference;
@@ -604,7 +630,8 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
604 630
 {
605 631
     linkytype *tag;
606 632
 
607  
-    if ( image || (ref == 0) )
  633
+
  634
+    if ( image )
608 635
 	tag = &imaget;
609 636
     else if ( tag = pseudo(ref->link) ) {
610 637
 	if ( f->flags & (MKD_NO_EXT|MKD_SAFELINK) )
@@ -624,7 +651,7 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
624 651
 	return 0;
625 652
 
626 653
     if ( f->flags & IS_LABEL )
627  
-	___mkd_reparse(T(text), S(text), tag->flags, f);
  654
+	___mkd_reparse(T(text), S(text), tag->flags, f, 0);
628 655
     else if ( tag->link_pfx ) {
629 656
 	printlinkyref(f, tag, T(ref->link), S(ref->link));
630 657
 
@@ -635,12 +662,12 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
635 662
 
636 663
 	if ( S(ref->title) ) {
637 664
 	    Qstring(" title=\"", f);
638  
-	    ___mkd_reparse(T(ref->title), S(ref->title), MKD_TAGTEXT, f);
  665
+	    ___mkd_reparse(T(ref->title), S(ref->title), MKD_TAGTEXT, f, 0);
639 666
 	    Qchar('"', f);
640 667
 	}
641 668
 
642 669
 	Qstring(tag->text_pfx, f);
643  
-	___mkd_reparse(T(text), S(text), tag->flags, f);
  670
+	___mkd_reparse(T(text), S(text), tag->flags, f, 0);
644 671
 	Qstring(tag->text_sfx, f);
645 672
     }
646 673
     else
@@ -707,8 +734,6 @@ linkylinky(int image, MMIOT *f)
707 734
 		    else
708 735
 			status = linkyformat(f, name, image, ref);
709 736
 		}
710  
-		else if ( f->flags & IS_LABEL )
711  
-		    status = linkyformat(f, name, image, 0);
712 737
 	    }
713 738
 	}
714 739
     }
@@ -810,6 +835,8 @@ code(MMIOT *f, char *s, int length)
810 835
     for ( i=0; i < length; i++ )
811 836
 	if ( (c = s[i]) == 003)  /* ^C: expand back to 2 spaces */
812 837
 	    Qstring("  ", f);
  838
+	else if ( c == '\\' && (i < length-1) && escaped(f, s[i+1]) )
  839
+	    cputc(s[++i], f);
813 840
 	else
814 841
 	    cputc(c, f);
815 842
 } /* code */
@@ -821,7 +848,7 @@ static void
821 848
 delspan(MMIOT *f, int size)
822 849
 {
823 850
     Qstring("<del>", f);
824  
-    ___mkd_reparse(cursor(f)-1, size, 0, f);
  851
+    ___mkd_reparse(cursor(f)-1, size, 0, f, 0);
825 852
     Qstring("</del>", f);
826 853
 }
827 854
 
@@ -1058,7 +1085,7 @@ islike(MMIOT *f, char *s)
1058 1085
     int len;
1059 1086
     int i;
1060 1087
 
1061  
-    if ( s[0] == '<' ) {
  1088
+    if ( s[0] == '|' ) {
1062 1089
 	if ( !isthisnonword(f, -1) )
1063 1090
 	    return 0;
1064 1091
        ++s;
@@ -1067,7 +1094,7 @@ islike(MMIOT *f, char *s)
1067 1094
     if ( !(len = strlen(s)) )
1068 1095
 	return 0;
1069 1096
 
1070  
-    if ( s[len-1] == '>' ) {
  1097
+    if ( s[len-1] == '|' ) {
1071 1098
 	if ( !isthisnonword(f,len-1) )
1072 1099
 	    return 0;
1073 1100
 	len--;
@@ -1086,13 +1113,13 @@ static struct smarties {
1086 1113
     char *entity;
1087 1114
     int shift;
1088 1115
 } smarties[] = {
1089  
-    { '\'', "'s>",      "rsquo",  0 },
1090  
-    { '\'', "'t>",      "rsquo",  0 },
1091  
-    { '\'', "'re>",     "rsquo",  0 },
1092  
-    { '\'', "'ll>",     "rsquo",  0 },
1093  
-    { '\'', "'ve>",     "rsquo",  0 },
1094  
-    { '\'', "'m>",      "rsquo",  0 },
1095  
-    { '\'', "'d>",      "rsquo",  0 },
  1116
+    { '\'', "'s|",      "rsquo",  0 },
  1117
+    { '\'', "'t|",      "rsquo",  0 },
  1118
+    { '\'', "'re|",     "rsquo",  0 },
  1119
+    { '\'', "'ll|",     "rsquo",  0 },
  1120
+    { '\'', "'ve|",     "rsquo",  0 },
  1121
+    { '\'', "'m|",      "rsquo",  0 },
  1122
+    { '\'', "'d|",      "rsquo",  0 },
1096 1123
     { '-',  "---",      "mdash",  2 },
1097 1124
     { '-',  "--",       "ndash",  1 },
1098 1125
     { '.',  "...",      "hellip", 2 },
@@ -1100,11 +1127,11 @@ static struct smarties {
1100 1127
     { '(',  "(c)",      "copy",   2 },
1101 1128
     { '(',  "(r)",      "reg",    2 },
1102 1129
     { '(',  "(tm)",     "trade",  3 },
1103  
-    { '3',  "<3/4>",    "frac34", 2 },
1104  
-    { '3',  "<3/4ths>", "frac34", 2 },
1105  
-    { '1',  "<1/2>",    "frac12", 2 },
1106  
-    { '1',  "<1/4>",    "frac14", 2 },
1107  
-    { '1',  "<1/4th>",  "frac14", 2 },
  1130
+    { '3',  "|3/4|",    "frac34", 2 },
  1131
+    { '3',  "|3/4ths|", "frac34", 2 },
  1132
+    { '1',  "|1/2|",    "frac12", 2 },
  1133
+    { '1',  "|1/4|",    "frac14", 2 },
  1134
+    { '1',  "|1/4th|",  "frac14", 2 },
1108 1135
     { '&',  "&#0;",      0,       3 },
1109 1136
 } ;
1110 1137
 #define NRSMART ( sizeof smarties / sizeof smarties[0] )
@@ -1146,7 +1173,7 @@ smartypants(int c, int *flags, MMIOT *f)
1146 1173
 			    break;
1147 1174
 			else if ( c == '\'' && peek(f, j+1) == '\'' ) {
1148 1175
 			    Qstring("&ldquo;", f);
1149  
-			    ___mkd_reparse(cursor(f)+1, j-2, 0, f);
  1176
+			    ___mkd_reparse(cursor(f)+1, j-2, 0, f, 0);
1150 1177
 			    Qstring("&rdquo;", f);
1151 1178
 			    shift(f,j+1);
1152 1179
 			    return 1;
@@ -1268,7 +1295,7 @@ text(MMIOT *f)
1268 1295
 			    shift(f,len);
1269 1296
 			}
1270 1297
 			Qstring("<sup>",f);
1271  
-			___mkd_reparse(sup, len, 0, f);
  1298
+			___mkd_reparse(sup, len, 0, f, "()");
1272 1299
 			Qstring("</sup>", f);
1273 1300
 		    }
1274 1301
 		    break;
@@ -1327,16 +1354,16 @@ text(MMIOT *f)
1327 1354
 				Qchar(c, f);
1328 1355
 				break;
1329 1356
 				
1330  
-		    case '>': case '#': case '.': case '-':
1331  
-		    case '+': case '{': case '}': case ']':
1332  
-		    case '!': case '[': case '*': case '_':
1333  
-		    case '\\':case '(': case ')':
1334  
-		    case '`':	Qchar(c, f);
  1357
+		    case EOF:	Qchar('\\', f);
1335 1358
 				break;
1336  
-		    default:
1337  
-				Qchar('\\', f);
1338  
-				if ( c != EOF )
1339  
-				    shift(f,-1);
  1359
+				
  1360
+		    default:    if ( escaped(f,c) ||
  1361
+				     strchr(">#.-+{}]![*_\\()`", c) )
  1362
+				    Qchar(c, f);
  1363
+				else {
  1364
+				    Qchar('\\', f);
  1365
+				    shift(f, -1);
  1366
+				}
1340 1367
 				break;
1341 1368
 		    }
1342 1369
 		    break;
@@ -1403,14 +1430,13 @@ static char* alignments[] = { "", " align=\"center\"", " align=\"left\"",
1403 1430
 typedef STRING(int) Istring;
1404 1431
 
1405 1432
 static int
1406  
-splat(Line *p, int leading_pipe, char *block, Istring align, int force, MMIOT *f)
  1433
+splat(Line *p, char *block, Istring align, int force, MMIOT *f)
1407 1434
 {
1408 1435
     int first,
1409 1436
 	idx = p->dle,
1410 1437
 	colno = 0;
1411 1438
 
1412 1439
 
1413  
-    if ( leading_pipe ) idx++;
1414 1440
     ___mkd_tidy(&p->text);
1415 1441
     if ( T(p->text)[S(p->text)-1] == '|' )
1416 1442
 	--S(p->text);
@@ -1430,7 +1456,7 @@ splat(Line *p, int leading_pipe, char *block, Istring align, int force, MMIOT *f
1430 1456
 	Qprintf(f, "<%s%s>",
1431 1457
 		   block,
1432 1458
 		   alignments[ (colno < S(align)) ? T(align)[colno] : a_NONE ]);
1433  
-	___mkd_reparse(T(p->text)+first, idx-first, 0, f);
  1459
+	___mkd_reparse(T(p->text)+first, idx-first, 0, f, "|");
1434 1460
 	Qprintf(f, "</%s>\n", block);
1435 1461
 	idx++;
1436 1462
 	colno++;
@@ -1452,20 +1478,27 @@ printtable(Paragraph *pp, MMIOT *f)
1452 1478
 
1453 1479
     Line *hdr, *dash, *body;
1454 1480
     Istring align;
1455  
-    int hcols,start,starts_with_pipe=0;
  1481
+    int hcols,start;
1456 1482
     char *p;
  1483
+    enum e_alignments it;
1457 1484
 
1458 1485
     hdr = pp->text;
1459 1486
     dash= hdr->next;
1460 1487
     body= dash->next;
1461 1488
 
1462  
-    starts_with_pipe = T(hdr->text)[hdr->dle] == '|';
  1489
+    if ( T(hdr->text)[hdr->dle] == '|' ) {
  1490
+	/* trim leading pipe off all lines
  1491
+	 */
  1492
+	Line *r;
  1493
+	for ( r = pp->text; r; r = r->next )
  1494
+	    r->dle ++;
  1495
+    }
1463 1496
 
1464  
-    /* first figure out cell alignments */
  1497
+    /* figure out cell alignments */
1465 1498
 
1466 1499
     CREATE(align);
1467 1500
 
1468  
-    for (p=T(dash->text), start=0; start < S(dash->text); ) {
  1501
+    for (p=T(dash->text), start=dash->dle; start < S(dash->text); ) {
1469 1502
 	char first, last;
1470 1503
 	int end;
1471 1504
 	
@@ -1478,14 +1511,16 @@ printtable(Paragraph *pp, MMIOT *f)
1478 1511
 		last = p[end];
1479 1512
 	    }
1480 1513
 	}
1481  
-	EXPAND(align) = ( first == ':' ) ? (( last == ':') ? a_CENTER : a_LEFT)
1482  
-					 : (( last == ':') ? a_RIGHT : a_NONE );
  1514
+	it = ( first == ':' ) ? (( last == ':') ? a_CENTER : a_LEFT)
  1515
+			      : (( last == ':') ? a_RIGHT : a_NONE );
  1516
+
  1517
+	EXPAND(align) = it;
1483 1518
 	start = 1+end;
1484 1519
     }
1485 1520
 
1486 1521
     Qstring("<table>\n", f);
1487 1522
     Qstring("<thead>\n", f);
1488  
-    hcols = splat(hdr, starts_with_pipe, "th", align, 0, f);
  1523
+    hcols = splat(hdr, "th", align, 0, f);
1489 1524
     Qstring("</thead>\n", f);
1490 1525
 
1491 1526
     if ( hcols < S(align) )
@@ -1496,7 +1531,7 @@ printtable(Paragraph *pp, MMIOT *f)
1496 1531
 
1497 1532
     Qstring("<tbody>\n", f);
1498 1533
     for ( ; body; body = body->next)
1499  
-	splat(body, starts_with_pipe, "td", align, 1, f);
  1534
+	splat(body, "td", align, 1, f);
1500 1535
     Qstring("</tbody>\n", f);
1501 1536
     Qstring("</table>\n", f);
1502 1537
 
@@ -1605,7 +1640,7 @@ definitionlist(Paragraph *p, MMIOT *f)
1605 1640
 	for ( ; p ; p = p->next) {
1606 1641
 	    for ( tag = p->text; tag; tag = tag->next ) {
1607 1642
 		Qstring("<dt>", f);
1608  
-		___mkd_reparse(T(tag->text), S(tag->text), 0, f);
  1643
+		___mkd_reparse(T(tag->text), S(tag->text), 0, f, 0);
1609 1644
 		Qstring("</dt>\n", f);
1610 1645
 	    }
1611 1646
 
100  discount-2.1.5a/github_flavoured.c
... ...
@@ -0,0 +1,100 @@
  1
+
  2
+/*
  3
+ * github_flavoured -- implement the obnoxious "returns are hard newlines"
  4
+ *                     feature in github flavoured markdown.
  5
+ *
  6
+ * Copyright (C) 2012 David L Parsons.
  7
+ * The redistribution terms are provided in the COPYRIGHT file that must
  8
+ * be distributed with this source code.
  9
+ */
  10
+#include "config.h"
  11
+#include <stdio.h>
  12
+#include <stdlib.h>
  13
+#include <ctype.h>
  14
+
  15
+#include "cstring.h"
  16
+#include "markdown.h"
  17
+#include "amalloc.h"
  18
+
  19
+/* build a Document from any old input.
  20
+ */
  21
+typedef int (*getc_func)(void*);
  22
+
  23
+Document *
  24
+gfm_populate(getc_func getc, void* ctx, int flags)
  25
+{
  26
+    Cstring line;
  27
+    Document *a = __mkd_new_Document();
  28
+    int c;
  29
+    int pandoc = 0;
  30
+
  31
+    if ( !a ) return 0;
  32
+
  33
+    a->tabstop = (flags & MKD_TABSTOP) ? 4 : TABSTOP;
  34
+
  35
+    CREATE(line);
  36
+
  37
+    while ( (c = (*getc)(ctx)) != EOF ) {
  38
+	if ( c == '\n' ) {
  39
+	    if ( pandoc != EOF && pandoc < 3 ) {
  40
+		if ( S(line) && (T(line)[0] == '%') )
  41
+		    pandoc++;
  42
+		else
  43
+		    pandoc = EOF;
  44
+	    }
  45
+            
  46
+            if (pandoc == EOF) {
  47
+		EXPAND(line) = ' ';
  48
+		EXPAND(line) = ' ';
  49
+	    }
  50
+	    __mkd_enqueue(a, &line);
  51
+	    S(line) = 0;
  52
+	}
  53
+	else if ( isprint(c) || isspace(c) || (c & 0x80) )
  54
+	    EXPAND(line) = c;
  55
+    }
  56
+
  57
+    if ( S(line) )
  58
+	__mkd_enqueue(a, &line);
  59
+
  60
+    DELETE(line);
  61
+
  62
+    if ( (pandoc == 3) && !(flags & (MKD_NOHEADER|MKD_STRICT)) ) {
  63
+	/* the first three lines started with %, so we have a header.
  64
+	 * clip the first three lines out of content and hang them
  65
+	 * off header.
  66
+	 */
  67
+	Line *headers = T(a->content);
  68
+
  69
+	a->title = headers;             __mkd_header_dle(a->title);
  70
+	a->author= headers->next;       __mkd_header_dle(a->author);
  71
+	a->date  = headers->next->next; __mkd_header_dle(a->date);
  72
+
  73
+	T(a->content) = headers->next->next->next;
  74
+    }
  75
+
  76
+    return a;
  77
+}
  78
+
  79
+
  80
+/* convert a block of text into a linked list
  81
+ */
  82
+Document *
  83
+gfm_string(const char *buf, int len, DWORD flags)
  84
+{
  85
+    struct string_stream about;
  86
+
  87
+    about.data = buf;
  88
+    about.size = len;
  89
+
  90
+    return gfm_populate((getc_func)__mkd_io_strget, &about, flags & INPUT_MASK);
  91
+}
  92
+
  93
+
  94
+/* convert a file into a linked list
  95
+ */
  96
+Document *
  97
+gfm_in(FILE *f, DWORD flags)
  98
+{
  99
+    return gfm_populate((getc_func)fgetc, f, flags & INPUT_MASK);
  100
+}
0  discount-2.1.2/html5.c → discount-2.1.5a/html5.c
File renamed without changes
31  discount-2.1.2/main.c → discount-2.1.5a/main.c
@@ -18,6 +18,7 @@
18 18
 #include "config.h"
19 19
 #include "amalloc.h"
20 20
 #include "pgm_options.h"
  21
+#include "tags.h"
21 22
 
22 23
 #if HAVE_LIBGEN_H
23 24
 #include <libgen.h>
@@ -59,7 +60,6 @@ complain(char *fmt, ...)
59 60
 }
60 61
 
61 62
 
62  
-float
63 63
 main(int argc, char **argv)
64 64
 {
65 65
     int opt;
@@ -67,9 +67,12 @@ main(int argc, char **argv)
67 67
     mkd_flag_t flags = 0;
68 68
     int debug = 0;
69 69
     int toc = 0;
  70
+    int content = 1;
70 71
     int version = 0;
71 72
     int with_html5 = 0;
  73
+    int styles = 0;
72 74
     int use_mkd_line = 0;
  75
+    int github_flavoured = 0;
73 76
     char *extra_footnote_prefix = 0;
74 77
     char *urlflags = 0;
75 78
     char *text = 0;
@@ -84,7 +87,7 @@ main(int argc, char **argv)
84 87
     pgm = basename(argv[0]);
85 88
     opterr = 1;
86 89
 
87  
-    while ( (opt=getopt(argc, argv, "5b:C:df:E:F:o:s:t:TV")) != EOF ) {
  90
+    while ( (opt=getopt(argc, argv, "5b:C:df:E:F:Gno:s:St:TV")) != EOF ) {
88 91
 	switch (opt) {
89 92
 	case '5':   with_html5 = 1;
90 93
 		    break;
@@ -110,13 +113,19 @@ main(int argc, char **argv)
110 113
 		    else if ( !set_flag(&flags, optarg) )
111 114
 			complain("unknown option <%s>", optarg);
112 115
 		    break;
  116
+	case 'G':   github_flavoured = 1;
  117
+		    break;
  118
+	case 'n':   content = 0;
  119
+		    break;
  120
+	case 's':   text = optarg;
  121
+		    break;
  122
+	case 'S':   styles = 1;
  123
+		    break;
113 124
 	case 't':   text = optarg;
114 125
 		    use_mkd_line = 1;
115 126
 		    break;
116 127
 	case 'T':   toc = 1;
117 128
 		    break;
118  
-	case 's':   text = optarg;
119  
-		    break;
120 129
 	case 'C':   extra_footnote_prefix = optarg;
121 130
 		    break;
122 131
 	case 'o':   if ( ofile ) {
@@ -155,7 +164,10 @@ main(int argc, char **argv)
155 164
 	rc = mkd_generateline( text, strlen(text), stdout, flags);
156 165
     else {
157 166
 	if ( text ) {
158  
-	    if ( (doc = mkd_string(text, strlen(text), flags)) == 0 ) {
  167
+	    doc = github_flavoured ? gfm_string(text, strlen(text), flags)
  168
+				   : mkd_string(text, strlen(text), flags) ;
  169
+
  170
+	    if ( !doc ) {
159 171
 		perror(text);
160 172
 		exit(1);
161 173
 	    }
@@ -165,7 +177,9 @@ main(int argc, char **argv)
165 177
 		perror(argv[0]);
166 178
 		exit(1);
167 179
 	    }
168  
-	    if ( (doc = mkd_in(stdin,flags)) == 0 ) {
  180
+
  181
+	    doc = github_flavoured ? gfm_in(stdin,flags) : mkd_in(stdin,flags);
  182
+	    if ( !doc ) {
169 183
 		perror(argc ? argv[0] : "stdin");
170 184
 		exit(1);
171 185
 	    }
@@ -185,9 +199,12 @@ main(int argc, char **argv)
185 199
 	    rc = 1;
186 200
 	    if ( mkd_compile(doc, flags) ) {
187 201
 		rc = 0;
  202
+		if ( styles )
  203
+		    mkd_generatecss(doc, stdout);
188 204
 		if ( toc )
189 205
 		    mkd_generatetoc(doc, stdout);
190  
-		mkd_generatehtml(doc, stdout);
  206
+		if ( content )
  207
+		    mkd_generatehtml(doc, stdout);
191 208
 		mkd_cleanup(doc);
192 209
 	    }
193 210
 	}
0  discount-2.1.2/makepage.1 → discount-2.1.5a/makepage.1
File renamed without changes
1  discount-2.1.2/makepage.c → discount-2.1.5a/makepage.c
@@ -22,7 +22,6 @@ basename(char *p)
22 22
 
23 23
 char *pgm = "makepage";
24 24
 
25  
-float
26 25
 main(argc, argv)
27 26
 int argc;
28 27
 char **argv;
14  discount-2.1.2/markdown.1 → discount-2.1.5a/markdown.1
@@ -15,7 +15,9 @@
15 15
 .Op Fl C Ar prefix
16 16
 .Op Fl F Pa bitmap
17 17
 .Op Fl f Ar flags
  18
+.Op Fl n
18 19
 .Op Fl o Pa file
  20
+.Op Fl S
19 21
 .Op Fl s Pa text
20 22
 .Op Fl t Pa text
21 23
 .Op Pa textfile
@@ -107,6 +109,8 @@ Allow alphabetic lists.
107 109
 Allow definition lists.
108 110
 .It Ar footnote
109 111
 Allow markdown extra-style footnotes.
  112
+.It Ar styles
  113
+Extract <style> blocks from the output.
110 114
 .El
111 115
 .Pp
112 116
 As an example, the option
@@ -123,6 +127,13 @@ described in
123 127
 .Xr markdown 3 
124 128
 (the flag values are defined in
125 129
 .Pa mkdio.h )
  130
+.It Fl n
  131
+Don't write generated html.
  132
+.It Fl o Pa file
  133
+Write the generated html to 
  134
+.Pa file .
  135
+.It Fl S
  136
+output <style> blocks.
126 137
 .It Fl V
127 138
 Show the version# and compile-time configuration data.
128 139
 .Pp
@@ -138,9 +149,6 @@ was configured to use the specified tabstop.
138 149
 .It Fl VV
139 150
 Show the version#, the compile-time configuration, and the
140 151
 run-time configuration.
141  
-.It Fl o Pa file
142  
-Write the generated html to 
143  
-.Pa file .
144 152
 .It Fl t Ar text
145 153
 Use
146 154
 .Xr mkd_text 3
0  discount-2.1.2/markdown.3 → discount-2.1.5a/markdown.3
File renamed without changes
0  discount-2.1.2/markdown.7 → discount-2.1.5a/markdown.7
File renamed without changes
42  discount-2.1.2/markdown.c → discount-2.1.5a/markdown.c
@@ -188,7 +188,8 @@ checkline(Line *l)
188 188
     int eol, i;
189 189
     int dashes = 0, spaces = 0,
190 190
 	equals = 0, underscores = 0,
191  
-	stars = 0, tildes = 0;
  191
+	stars = 0, tildes = 0,
  192
+	backticks = 0;
192 193
 
193 194
     l->flags |= CHECKED;
194 195
     l->kind = chk_text;
@@ -210,12 +211,15 @@ checkline(Line *l)
210 211
 	case '=':  equals = 1; break;
211 212
 	case '_':  underscores = 1; break;
212 213
 	case '*':  stars = 1; break;
  214
+#if WITH_FENCED_CODE
213 215
 	case '~':  tildes = 1; break;
  216
+	case '`':  backticks = 1; break;
  217
+#endif
214 218
 	default:   return;
215 219
 	}
216 220
     }
217 221
 
218  
-    if ( dashes + equals + underscores + stars + tildes > 1 )
  222
+    if ( dashes + equals + underscores + stars + tildes + backticks > 1 )