radiant 0.9.1 → 1.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of radiant might be problematic. Click here for more details.

Files changed (1514) hide show
  1. data/.gitignore +19 -0
  2. data/CHANGELOG +26 -0
  3. data/CONTRIBUTORS +18 -0
  4. data/Gemfile +3 -0
  5. data/app/controllers/admin/configuration_controller.rb +50 -0
  6. data/app/controllers/admin/page_fields_controller.rb +9 -0
  7. data/app/controllers/admin/pages_controller.rb +39 -8
  8. data/app/controllers/admin/preferences_controller.rb +1 -1
  9. data/app/controllers/admin/resource_controller.rb +10 -2
  10. data/app/controllers/admin/welcome_controller.rb +6 -1
  11. data/app/controllers/application_controller.rb +0 -1
  12. data/app/controllers/site_controller.rb +1 -1
  13. data/app/helpers/admin/configuration_helper.rb +80 -0
  14. data/app/helpers/admin/node_helper.rb +47 -1
  15. data/app/helpers/admin/pages_helper.rb +5 -7
  16. data/app/helpers/admin/preferences_helper.rb +1 -0
  17. data/app/helpers/admin/references_helper.rb +2 -3
  18. data/app/helpers/application_helper.rb +4 -3
  19. data/app/models/deprecated_tags.rb +77 -0
  20. data/app/models/file_not_found_page.rb +4 -0
  21. data/app/models/page.rb +75 -24
  22. data/app/models/page_field.rb +3 -0
  23. data/app/models/page_part.rb +0 -1
  24. data/app/models/radiant/config.rb +239 -38
  25. data/app/models/snippet.rb +4 -0
  26. data/app/models/standard_tags.rb +202 -156
  27. data/app/models/status.rb +9 -1
  28. data/app/models/text_filter.rb +12 -1
  29. data/app/models/user.rb +1 -2
  30. data/app/models/user_action_observer.rb +9 -3
  31. data/app/views/admin/configuration/edit.html.haml +38 -0
  32. data/app/views/admin/configuration/show.html.haml +58 -0
  33. data/app/views/admin/extensions/index.html.haml +2 -2
  34. data/app/views/admin/layouts/_form.html.haml +2 -2
  35. data/app/views/admin/layouts/index.html.haml +10 -10
  36. data/app/views/admin/layouts/remove.html.haml +1 -1
  37. data/app/views/admin/page_fields/_page_field.html.haml +12 -0
  38. data/app/views/admin/pages/_fields.html.haml +22 -5
  39. data/app/views/admin/pages/_meta_row.html.haml +5 -1
  40. data/app/views/admin/pages/_node.html.haml +10 -9
  41. data/app/views/admin/pages/_popups.html.haml +17 -4
  42. data/app/views/admin/pages/edit.html.haml +1 -1
  43. data/app/views/admin/pages/index.html.haml +5 -5
  44. data/app/views/admin/pages/remove.html.haml +1 -1
  45. data/app/views/admin/preferences/edit.html.haml +1 -1
  46. data/app/views/admin/references/filters.haml +1 -1
  47. data/app/views/admin/references/tags.haml +1 -1
  48. data/app/views/admin/snippets/_form.html.haml +2 -2
  49. data/app/views/admin/snippets/index.html.haml +11 -11
  50. data/app/views/admin/snippets/remove.html.haml +1 -1
  51. data/app/views/admin/users/_avatar.html.haml +3 -1
  52. data/app/views/admin/users/_form.html.haml +3 -3
  53. data/app/views/admin/users/_password_fields.html.haml +2 -2
  54. data/app/views/admin/users/index.html.haml +11 -11
  55. data/app/views/admin/users/remove.html.haml +1 -1
  56. data/app/views/admin/welcome/login.html.haml +1 -1
  57. data/app/views/layouts/application.html.haml +9 -14
  58. data/config/boot.rb +28 -11
  59. data/config/compass.config +18 -0
  60. data/config/environment.rb +10 -5
  61. data/config/environments/cucumber.rb +5 -5
  62. data/config/environments/test.rb +5 -5
  63. data/config/initializers/compass.rb +3 -0
  64. data/config/initializers/radiant_config.rb +17 -0
  65. data/config/locales/en.yml +61 -13
  66. data/config/locales/en_available_tags.yml +131 -39
  67. data/config/routes.rb +4 -6
  68. data/db/migrate/20100805154952_add_page_fields.rb +15 -0
  69. data/db/migrate/20100805155020_convert_page_metas.rb +15 -0
  70. data/db/migrate/20100810151922_add_field_name_index.rb +11 -0
  71. data/db/schema.rb +32 -7
  72. data/features/admin/configuration.feature +38 -0
  73. data/features/admin/pages_management.feature +2 -9
  74. data/features/admin/resource_pagination.feature +1 -1
  75. data/features/admin/snippets_management.feature +2 -1
  76. data/features/admin/user_permissions.feature +3 -4
  77. data/features/admin/user_preferences.feature +1 -1
  78. data/features/step_definitions/admin/admin_steps.rb +1 -1
  79. data/features/step_definitions/admin/content_negotiation_steps.rb +4 -0
  80. data/features/step_definitions/admin/pages_management_steps.rb +5 -1
  81. data/features/step_definitions/admin/pagination_steps.rb +2 -4
  82. data/features/step_definitions/page_serving_steps.rb +16 -0
  83. data/features/support/dataset.rb +7 -3
  84. data/features/support/datasets_loader.rb +3 -0
  85. data/features/support/env.rb +2 -0
  86. data/features/support/matchers.rb +3 -0
  87. data/features/support/paths.rb +2 -0
  88. data/lib/generators/extension/extension_generator.rb +6 -0
  89. data/lib/generators/extension/templates/README +4 -1
  90. data/lib/generators/extension/templates/RSpecRakefile +1 -28
  91. data/lib/generators/extension/templates/Rakefile +0 -17
  92. data/lib/generators/extension/templates/cucumber_datasets_loader.rb +3 -0
  93. data/lib/generators/extension/templates/cucumber_env.rb +1 -10
  94. data/lib/generators/extension/templates/extension.rb +3 -3
  95. data/lib/generators/extension/templates/gemspec.rb +24 -0
  96. data/lib/generators/extension/templates/lib.rb +2 -0
  97. data/lib/generators/extension/templates/radiant_config.rb +3 -0
  98. data/lib/generators/extension/templates/version.rb +3 -0
  99. data/lib/generators/instance/instance_generator.rb +3 -2
  100. data/lib/generators/instance/templates/instance_boot.rb +28 -10
  101. data/lib/generators/instance/templates/instance_environment.rb +10 -5
  102. data/lib/generators/instance/templates/instance_radiant_config.rb +16 -0
  103. data/lib/generators/language_extension/templates/lang.yml +11 -11
  104. data/lib/plugins/active_record_extensions/lib/active_record_extensions.rb +10 -0
  105. data/lib/plugins/object_extensions/lib/object_extensions.rb +3 -0
  106. data/lib/radiant.rb +4 -4
  107. data/lib/radiant/admin_ui.rb +58 -41
  108. data/lib/radiant/available_locales.rb +8 -8
  109. data/lib/radiant/cache.rb +1 -0
  110. data/lib/radiant/config/definition.rb +142 -0
  111. data/lib/radiant/extension.rb +20 -4
  112. data/lib/radiant/extension/script.rb +15 -15
  113. data/lib/radiant/extension_gem.rb +12 -0
  114. data/lib/radiant/extension_loader.rb +12 -5
  115. data/lib/radiant/extension_locator.rb +25 -0
  116. data/lib/radiant/extension_migrator.rb +3 -2
  117. data/lib/radiant/gem_dependency_fix.rb +21 -0
  118. data/lib/radiant/gem_locator.rb +28 -0
  119. data/lib/radiant/initializer.rb +74 -7
  120. data/lib/radiant/pagination/controller.rb +1 -0
  121. data/lib/radiant/setup.rb +19 -11
  122. data/lib/task_support.rb +14 -8
  123. data/lib/tasks/database.rake +2 -0
  124. data/lib/tasks/framework.rake +32 -15
  125. data/lib/tasks/prototype.rake +8 -11
  126. data/lib/tasks/release.rake +1 -0
  127. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n.jpg +0 -0
  128. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_icon.png +0 -0
  129. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_normal.jpg +0 -0
  130. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_thumbnail.png +0 -0
  131. data/public/flash/ZeroClipboard.swf +0 -0
  132. data/public/images/admin/assets/add.png +0 -0
  133. data/public/images/admin/assets/archive_icon.png +0 -0
  134. data/public/images/admin/assets/audio_icon.png +0 -0
  135. data/public/images/admin/assets/audio_thumbnail.png +0 -0
  136. data/public/images/admin/assets/c_icon.png +0 -0
  137. data/public/images/admin/assets/copy.png +0 -0
  138. data/public/images/admin/assets/css_icon.png +0 -0
  139. data/public/images/admin/assets/database_icon.png +0 -0
  140. data/public/images/admin/assets/delete.png +0 -0
  141. data/public/images/admin/assets/document_icon.png +0 -0
  142. data/public/images/admin/assets/document_thumbnail.png +0 -0
  143. data/public/images/admin/assets/flash_icon.png +0 -0
  144. data/public/images/admin/assets/flash_thumbnail.png +0 -0
  145. data/public/images/admin/assets/font_icon.png +0 -0
  146. data/public/images/admin/assets/gzip_icon.png +0 -0
  147. data/public/images/admin/assets/html_icon.png +0 -0
  148. data/public/images/admin/assets/image_icon.png +0 -0
  149. data/public/images/admin/assets/image_thumbnail.png +0 -0
  150. data/public/images/admin/assets/java_icon.png +0 -0
  151. data/public/images/admin/assets/page_edit.png +0 -0
  152. data/public/images/admin/assets/perl_icon.png +0 -0
  153. data/public/images/admin/assets/php_icon.png +0 -0
  154. data/public/images/admin/assets/presentation_icon.png +0 -0
  155. data/public/images/admin/assets/python_icon.png +0 -0
  156. data/public/images/admin/assets/reorder_assets.png +0 -0
  157. data/public/images/admin/assets/ruby_icon.png +0 -0
  158. data/public/images/admin/assets/script_icon.png +0 -0
  159. data/public/images/admin/assets/spreadsheet_icon.png +0 -0
  160. data/public/images/admin/assets/tar_icon.png +0 -0
  161. data/public/images/admin/assets/unknown_icon.png +0 -0
  162. data/public/images/admin/assets/unknown_thumbnail.png +0 -0
  163. data/public/images/admin/assets/video_icon.png +0 -0
  164. data/public/images/admin/assets/video_thumbnail.png +0 -0
  165. data/public/images/admin/assets/xml_icon.png +0 -0
  166. data/public/images/admin/assets/zip_icon.png +0 -0
  167. data/public/images/admin/avatar_64x64.png +0 -0
  168. data/public/images/admin/image.png +0 -0
  169. data/public/images/admin/javascript.png +0 -0
  170. data/public/images/admin/navigation_secondary_separator.gif +0 -0
  171. data/public/images/admin/plus_disabled.png +0 -0
  172. data/public/images/admin/search.png +0 -0
  173. data/public/images/admin/status_spinner.gif +0 -0
  174. data/public/images/admin/stylesheet.png +0 -0
  175. data/public/images/admin/upload.png +0 -0
  176. data/public/images/{radiant-badge-color.png → radiant/radiant-badge-color.png} +0 -0
  177. data/public/images/roasters/banner.jpg +0 -0
  178. data/public/images/roasters/closelabel.gif +0 -0
  179. data/public/images/roasters/comment.png +0 -0
  180. data/public/images/roasters/gallery1.jpg +0 -0
  181. data/public/images/roasters/gallery2.jpg +0 -0
  182. data/public/images/roasters/gallery3.jpg +0 -0
  183. data/public/images/roasters/gallery4.jpg +0 -0
  184. data/public/images/roasters/gift.gif +0 -0
  185. data/public/images/roasters/green.gif +0 -0
  186. data/public/images/roasters/nav-background.gif +0 -0
  187. data/public/images/roasters/nav-divider.gif +0 -0
  188. data/public/images/roasters/nextlabel.gif +0 -0
  189. data/public/images/roasters/open.gif +0 -0
  190. data/public/images/roasters/preview-1.jpg +0 -0
  191. data/public/images/roasters/preview.jpg +0 -0
  192. data/public/images/roasters/prevlabel.gif +0 -0
  193. data/public/images/roasters/prize.gif +0 -0
  194. data/public/images/roasters/recycle.gif +0 -0
  195. data/public/images/roasters/rss.gif +0 -0
  196. data/public/images/roasters/thumb-grinder.jpg +0 -0
  197. data/public/images/roasters/thumb-grower.jpg +0 -0
  198. data/public/images/roasters/thumb-roaster.jpg +0 -0
  199. data/public/images/roasters/truck.gif +0 -0
  200. data/public/javascripts/admin/application.js +11 -2
  201. data/public/javascripts/admin/codearea.js +4 -4
  202. data/public/javascripts/admin/cookie.js +1 -1
  203. data/public/javascripts/admin/dateinput.js +5 -5
  204. data/public/javascripts/admin/dropdown.js +216 -0
  205. data/public/javascripts/admin/page_preview.js +41 -0
  206. data/public/javascripts/admin/pagefield.js +54 -0
  207. data/public/javascripts/admin/popup.js +187 -64
  208. data/public/javascripts/admin/sitemap.js +2 -2
  209. data/public/javascripts/admin/status.js +13 -13
  210. data/public/javascripts/admin/tabcontrol.js +9 -7
  211. data/public/javascripts/admin/toggle.js +18 -18
  212. data/public/javascripts/admin/utility.js +5 -4
  213. data/public/loading-iframe.html +11 -0
  214. data/public/stylesheets/admin/base.css +1 -0
  215. data/public/stylesheets/admin/main.css +1 -1213
  216. data/public/stylesheets/admin/overrides.css +0 -1
  217. data/public/stylesheets/sass/admin/_base.sass +17 -0
  218. data/public/stylesheets/sass/admin/main.sass +21 -21
  219. data/public/stylesheets/sass/admin/modules/_boxes.sass +6 -0
  220. data/public/stylesheets/sass/admin/modules/_links.sass +6 -3
  221. data/public/stylesheets/sass/admin/partials/_actions.sass +51 -38
  222. data/public/stylesheets/sass/admin/partials/_avatars.sass +4 -4
  223. data/public/stylesheets/sass/admin/partials/_content.sass +41 -182
  224. data/public/stylesheets/sass/admin/partials/_dateinput.sass +5 -5
  225. data/public/stylesheets/sass/admin/partials/_deprecated.sass +31 -2
  226. data/public/stylesheets/sass/admin/partials/_dropdown.sass +28 -0
  227. data/public/stylesheets/sass/admin/partials/_forms.sass +40 -27
  228. data/public/stylesheets/sass/admin/partials/_header.sass +78 -76
  229. data/public/stylesheets/sass/admin/partials/_index.sass +147 -0
  230. data/public/stylesheets/sass/admin/partials/_popup.sass +116 -20
  231. data/public/stylesheets/sass/admin/partials/_tabcontrol.sass +5 -3
  232. data/public/stylesheets/sass/admin/partials/{_base.sass → _typography.sass} +4 -3
  233. data/public/stylesheets/sass/admin/partials/_validations.sass +16 -18
  234. data/radiant.gemspec +42 -0
  235. data/spec/controllers/admin/page_fields_controller_spec.rb +17 -0
  236. data/spec/controllers/admin/pages_controller_spec.rb +87 -6
  237. data/spec/controllers/admin/preferences_controller_spec.rb +1 -1
  238. data/spec/controllers/site_controller_spec.rb +4 -4
  239. data/spec/datasets/config_dataset.rb +3 -1
  240. data/spec/datasets/home_page_dataset.rb +1 -3
  241. data/spec/datasets/pages_dataset.rb +1 -1
  242. data/spec/datasets/users_dataset.rb +1 -1
  243. data/spec/fixtures/bad_settings.rb +5 -0
  244. data/spec/fixtures/invalid_config.yml +11 -0
  245. data/spec/fixtures/more_settings.rb +8 -0
  246. data/spec/fixtures/radiant_config.yml +2 -2
  247. data/spec/fixtures/settings.rb +5 -0
  248. data/spec/generators/extension_controller_generator_spec.rb +20 -18
  249. data/spec/generators/extension_generator_spec.rb +39 -17
  250. data/spec/generators/extension_generators_spec_helper.rb +10 -12
  251. data/spec/generators/extension_mailer_generator_spec.rb +15 -13
  252. data/spec/generators/extension_migration_generator_spec.rb +6 -5
  253. data/spec/generators/extension_model_generator_spec.rb +16 -14
  254. data/spec/generators/instance_generator_spec.rb +27 -20
  255. data/spec/helpers/admin/node_helper_spec.rb +57 -2
  256. data/spec/helpers/admin/pages_helper_spec.rb +4 -1
  257. data/spec/helpers/admin/references_helper_spec.rb +10 -1
  258. data/spec/helpers/application_helper_spec.rb +7 -2
  259. data/spec/lib/locator_spec.rb +41 -0
  260. data/spec/lib/login_system_spec.rb +6 -0
  261. data/spec/lib/radiant/admin_ui_spec.rb +12 -11
  262. data/spec/lib/radiant/config/definition_spec.rb +160 -0
  263. data/spec/lib/radiant/extension_loader_spec.rb +29 -6
  264. data/spec/lib/radiant/extension_migrator_spec.rb +11 -0
  265. data/spec/lib/radiant/extension_spec.rb +24 -4
  266. data/spec/lib/radiant/initializer_spec.rb +10 -0
  267. data/spec/lib/task_support_spec.rb +6 -0
  268. data/spec/matchers/render_matcher.rb +4 -4
  269. data/spec/models/deprecated_tags_spec.rb +85 -0
  270. data/spec/models/file_not_found_page_spec.rb +15 -11
  271. data/spec/models/page_part_spec.rb +0 -7
  272. data/spec/models/page_spec.rb +230 -174
  273. data/spec/models/radiant/config_spec.rb +38 -3
  274. data/spec/models/snippet_spec.rb +18 -0
  275. data/spec/models/standard_tags_spec.rb +175 -154
  276. data/spec/models/status_spec.rb +11 -0
  277. data/spec/models/text_filter_spec.rb +6 -2
  278. data/spec/models/user_spec.rb +0 -7
  279. data/test/fixtures/extensions/basic/basic_extension.rb +1 -6
  280. data/test/fixtures/extensions/basic/config/routes.rb +3 -0
  281. data/test/fixtures/extensions/unrouted/unrouted_extension.rb +2 -0
  282. data/{log/.keep → test/fixtures/gems/radiant-gem_ext-extension-0.0.0/app/views/dummy.haml} +0 -0
  283. data/vendor/extensions/archive/Rakefile +13 -24
  284. data/vendor/extensions/archive/app/models/archive_day_index_page.rb +4 -0
  285. data/vendor/extensions/archive/app/models/archive_finder.rb +2 -2
  286. data/vendor/extensions/archive/app/models/archive_month_index_page.rb +4 -0
  287. data/vendor/extensions/archive/app/models/archive_page.rb +50 -9
  288. data/vendor/extensions/archive/app/models/archive_year_index_page.rb +4 -0
  289. data/vendor/extensions/archive/archive_extension.rb +13 -12
  290. data/vendor/extensions/archive/config/initializers/radiant_config.rb +3 -0
  291. data/vendor/extensions/archive/config/locales/en.yml +3 -0
  292. data/vendor/extensions/archive/config/routes.rb +5 -0
  293. data/vendor/extensions/archive/cucumber.yml +1 -0
  294. data/vendor/extensions/archive/features/archive_content.feature +51 -0
  295. data/vendor/extensions/archive/features/step_definitions/web_steps.rb +7 -0
  296. data/vendor/extensions/archive/features/support/datasets_loader.rb +3 -0
  297. data/vendor/extensions/archive/features/support/env.rb +7 -0
  298. data/vendor/extensions/archive/features/support/matchers.rb +3 -0
  299. data/vendor/extensions/archive/features/support/paths.rb +14 -0
  300. data/vendor/extensions/archive/lib/archive_index_tags_and_methods.rb +28 -8
  301. data/vendor/extensions/archive/lib/radiant-archive-extension.rb +2 -0
  302. data/vendor/extensions/archive/lib/radiant-archive-extension/version.rb +3 -0
  303. data/vendor/extensions/archive/lib/tasks/archive_extension_tasks.rake +30 -3
  304. data/vendor/extensions/archive/radiant-archive-extension.gemspec +24 -0
  305. data/vendor/extensions/archive/spec/datasets/archive_dataset.rb +10 -6
  306. data/vendor/extensions/archive/spec/models/archive_day_index_page_spec.rb +13 -3
  307. data/vendor/extensions/archive/spec/models/archive_month_index_page_spec.rb +17 -3
  308. data/vendor/extensions/archive/spec/models/archive_page_spec.rb +31 -8
  309. data/vendor/extensions/archive/spec/models/archive_year_index_page_spec.rb +14 -3
  310. data/vendor/extensions/archive/spec/models/page_spec.rb +6 -0
  311. data/vendor/extensions/archive/tmp/cache/entity/d0/580097d24f3e7cfc7bf9706a0a3a3729a9de3e +6 -0
  312. data/vendor/extensions/archive/tmp/cache/meta/0e/da69d02186242cdfda62e46044566f2bc50f3a +0 -0
  313. data/vendor/extensions/assets/HELP_admin.markdown +69 -0
  314. data/vendor/extensions/assets/LICENSE +22 -0
  315. data/vendor/extensions/assets/README.md +230 -0
  316. data/vendor/extensions/assets/Rakefile +111 -0
  317. data/vendor/extensions/assets/VERSION +1 -0
  318. data/vendor/extensions/assets/app/controllers/admin/assets_controller.rb +54 -0
  319. data/vendor/extensions/assets/app/controllers/admin/page_attachments_controller.rb +45 -0
  320. data/vendor/extensions/assets/app/helpers/admin/assets_helper.rb +11 -0
  321. data/vendor/extensions/assets/app/models/asset.rb +161 -0
  322. data/vendor/extensions/assets/app/models/asset_tags.rb +378 -0
  323. data/vendor/extensions/assets/app/models/asset_type.rb +160 -0
  324. data/vendor/extensions/assets/app/models/old_page_attachment.rb +26 -0
  325. data/vendor/extensions/assets/app/models/page_attachment.rb +14 -0
  326. data/vendor/extensions/assets/app/views/admin/assets/_asset.html.haml +12 -0
  327. data/vendor/extensions/assets/app/views/admin/assets/_asset_table.html.haml +30 -0
  328. data/vendor/extensions/assets/app/views/admin/assets/_errors.html.haml +3 -0
  329. data/vendor/extensions/assets/app/views/admin/assets/_form.html.haml +20 -0
  330. data/vendor/extensions/assets/app/views/admin/assets/_page_assets.html.haml +12 -0
  331. data/vendor/extensions/assets/app/views/admin/assets/_search.html.haml +17 -0
  332. data/vendor/extensions/assets/app/views/admin/assets/_search_results.html.haml +17 -0
  333. data/vendor/extensions/assets/app/views/admin/assets/edit.html.haml +41 -0
  334. data/vendor/extensions/assets/app/views/admin/assets/index.html.haml +18 -0
  335. data/vendor/extensions/assets/app/views/admin/assets/new.html.haml +24 -0
  336. data/vendor/extensions/assets/app/views/admin/assets/remove.html.haml +16 -0
  337. data/vendor/extensions/assets/app/views/admin/configuration/_edit.html.haml +8 -0
  338. data/vendor/extensions/assets/app/views/admin/configuration/_show.html.haml +12 -0
  339. data/vendor/extensions/assets/app/views/admin/page_attachments/_attachment.html.haml +22 -0
  340. data/vendor/extensions/assets/app/views/admin/page_attachments/_new_attachment.html.haml +18 -0
  341. data/vendor/extensions/assets/app/views/admin/page_parts/_page_part.html.haml +20 -0
  342. data/vendor/extensions/assets/app/views/admin/pages/_asset_popups.html.haml +42 -0
  343. data/vendor/extensions/assets/app/views/admin/pages/_assets.html.haml +13 -0
  344. data/vendor/extensions/assets/app/views/admin/removed/_assets_bucket.html.haml +8 -0
  345. data/vendor/extensions/assets/app/views/admin/removed/_assets_container.html.haml +58 -0
  346. data/vendor/extensions/assets/app/views/admin/removed/_bucket.html.haml +11 -0
  347. data/vendor/extensions/assets/app/views/admin/removed/_bucket_asset.html.haml +9 -0
  348. data/vendor/extensions/assets/app/views/admin/removed/_show_bucket_link.html.haml +4 -0
  349. data/vendor/extensions/assets/app/views/admin/removed/_upload_to_page.html.haml +12 -0
  350. data/vendor/extensions/assets/app/views/admin/removed/bucket/_iframe.html.haml +1 -0
  351. data/vendor/extensions/assets/artwork/icons.png +0 -0
  352. data/vendor/extensions/assets/assets_extension.rb +86 -0
  353. data/vendor/extensions/assets/config/initializers/interpolation.rb +6 -0
  354. data/vendor/extensions/assets/config/initializers/radiant_config.rb +37 -0
  355. data/vendor/extensions/assets/config/locales/en.yml +105 -0
  356. data/vendor/extensions/assets/config/locales/nl.yml +105 -0
  357. data/vendor/extensions/assets/config/routes.rb +8 -0
  358. data/vendor/extensions/assets/db/migrate/001_create_assets.rb +12 -0
  359. data/vendor/extensions/assets/db/migrate/002_create_paperclip_attributes.rb +13 -0
  360. data/vendor/extensions/assets/db/migrate/003_create_user_observer.rb +13 -0
  361. data/vendor/extensions/assets/db/migrate/004_create_page_attachments.rb +19 -0
  362. data/vendor/extensions/assets/db/migrate/005_rename_users.rb +13 -0
  363. data/vendor/extensions/assets/db/migrate/20090316132151_disable_file_types.rb +20 -0
  364. data/vendor/extensions/assets/db/migrate/20110513205050_asset_uuid.rb +11 -0
  365. data/vendor/extensions/assets/lib/assets_admin_ui.rb +32 -0
  366. data/vendor/extensions/assets/lib/page_asset_associations.rb +13 -0
  367. data/vendor/extensions/assets/lib/paperclip/frame_grab.rb +39 -0
  368. data/vendor/extensions/assets/lib/tag_deprecation.rb +73 -0
  369. data/vendor/extensions/assets/lib/tasks/assets_extension_tasks.rake +123 -0
  370. data/vendor/extensions/assets/lib/tasks/paperclip_tasks.rake +79 -0
  371. data/vendor/extensions/assets/public/flash/ZeroClipboard.swf +0 -0
  372. data/vendor/extensions/assets/public/images/admin/assets/add.png +0 -0
  373. data/vendor/extensions/assets/public/images/admin/assets/archive_icon.png +0 -0
  374. data/vendor/extensions/assets/public/images/admin/assets/audio_icon.png +0 -0
  375. data/vendor/extensions/assets/public/images/admin/assets/audio_thumbnail.png +0 -0
  376. data/vendor/extensions/assets/public/images/admin/assets/c_icon.png +0 -0
  377. data/vendor/extensions/assets/public/images/admin/assets/copy.png +0 -0
  378. data/vendor/extensions/assets/public/images/admin/assets/css_icon.png +0 -0
  379. data/vendor/extensions/assets/public/images/admin/assets/database_icon.png +0 -0
  380. data/vendor/extensions/assets/public/images/admin/assets/delete.png +0 -0
  381. data/vendor/extensions/assets/public/images/admin/assets/document_icon.png +0 -0
  382. data/vendor/extensions/assets/public/images/admin/assets/document_thumbnail.png +0 -0
  383. data/vendor/extensions/assets/public/images/admin/assets/flash_icon.png +0 -0
  384. data/vendor/extensions/assets/public/images/admin/assets/flash_thumbnail.png +0 -0
  385. data/vendor/extensions/assets/public/images/admin/assets/font_icon.png +0 -0
  386. data/vendor/extensions/assets/public/images/admin/assets/gzip_icon.png +0 -0
  387. data/vendor/extensions/assets/public/images/admin/assets/html_icon.png +0 -0
  388. data/vendor/extensions/assets/public/images/admin/assets/image_icon.png +0 -0
  389. data/vendor/extensions/assets/public/images/admin/assets/image_thumbnail.png +0 -0
  390. data/vendor/extensions/assets/public/images/admin/assets/java_icon.png +0 -0
  391. data/vendor/extensions/assets/public/images/admin/assets/page_edit.png +0 -0
  392. data/vendor/extensions/assets/public/images/admin/assets/perl_icon.png +0 -0
  393. data/vendor/extensions/assets/public/images/admin/assets/php_icon.png +0 -0
  394. data/vendor/extensions/assets/public/images/admin/assets/presentation_icon.png +0 -0
  395. data/vendor/extensions/assets/public/images/admin/assets/python_icon.png +0 -0
  396. data/vendor/extensions/assets/public/images/admin/assets/reorder_assets.png +0 -0
  397. data/vendor/extensions/assets/public/images/admin/assets/ruby_icon.png +0 -0
  398. data/vendor/extensions/assets/public/images/admin/assets/script_icon.png +0 -0
  399. data/vendor/extensions/assets/public/images/admin/assets/spreadsheet_icon.png +0 -0
  400. data/vendor/extensions/assets/public/images/admin/assets/tar_icon.png +0 -0
  401. data/vendor/extensions/assets/public/images/admin/assets/unknown_icon.png +0 -0
  402. data/vendor/extensions/assets/public/images/admin/assets/unknown_thumbnail.png +0 -0
  403. data/vendor/extensions/assets/public/images/admin/assets/video_icon.png +0 -0
  404. data/vendor/extensions/assets/public/images/admin/assets/video_thumbnail.png +0 -0
  405. data/vendor/extensions/assets/public/images/admin/assets/xml_icon.png +0 -0
  406. data/vendor/extensions/assets/public/images/admin/assets/zip_icon.png +0 -0
  407. data/vendor/extensions/assets/public/javascripts/admin/assets.js +238 -0
  408. data/vendor/extensions/assets/public/stylesheets/sass/admin/assets.sass +203 -0
  409. data/vendor/extensions/assets/spec/controllers/admin/assets_controller_spec.rb +50 -0
  410. data/vendor/extensions/assets/spec/controllers/admin/page_attachment_controller_spec.rb +51 -0
  411. data/vendor/extensions/assets/spec/datasets/assets_dataset.rb +31 -0
  412. data/vendor/extensions/assets/spec/lib/asset_tags_spec.rb +9 -0
  413. data/vendor/extensions/assets/spec/lib/tag_deprecation_spec.rb +49 -0
  414. data/vendor/extensions/assets/spec/models/asset_spec.rb +71 -0
  415. data/vendor/extensions/assets/spec/models/asset_type_spec.rb +49 -0
  416. data/vendor/extensions/assets/spec/spec.opts +6 -0
  417. data/vendor/extensions/assets/spec/spec_helper.rb +36 -0
  418. data/vendor/extensions/assets/wireframes/edit-page-assets-2.bmml +453 -0
  419. data/vendor/extensions/assets/wireframes/edit-page-assets-2.png +0 -0
  420. data/vendor/extensions/assets/wireframes/edit-page-assets-3.bmml +454 -0
  421. data/vendor/extensions/assets/wireframes/edit-page-assets-3.png +0 -0
  422. data/vendor/extensions/assets/wireframes/edit-page-assets.bmml +433 -0
  423. data/vendor/extensions/assets/wireframes/edit-page-assets.png +0 -0
  424. data/vendor/extensions/assets/wireframes/edit-page.bmml +174 -0
  425. data/vendor/extensions/assets/wireframes/edit-page.png +0 -0
  426. data/vendor/extensions/debug/README +3 -0
  427. data/vendor/extensions/debug/Rakefile +136 -0
  428. data/{app → vendor/extensions/debug/app}/models/env_dump_page.rb +0 -0
  429. data/vendor/extensions/debug/config/locales/en.yml +3 -0
  430. data/vendor/extensions/debug/config/routes.rb +5 -0
  431. data/vendor/extensions/debug/debug_extension.rb +11 -0
  432. data/vendor/extensions/debug/lib/tasks/debug_extension_tasks.rake +55 -0
  433. data/{spec → vendor/extensions/debug/spec}/models/env_dump_page_spec.rb +0 -0
  434. data/vendor/extensions/debug/spec/spec.opts +6 -0
  435. data/vendor/extensions/debug/spec/spec_helper.rb +36 -0
  436. data/vendor/extensions/dutch_language_pack/config/locales/nl.yml +80 -29
  437. data/vendor/extensions/exporter/README +5 -0
  438. data/vendor/extensions/exporter/Rakefile +116 -0
  439. data/vendor/extensions/exporter/app/controllers/admin/export_controller.rb +5 -0
  440. data/vendor/extensions/exporter/app/models/radiant/exporter.rb +41 -0
  441. data/vendor/extensions/exporter/config/locales/en.yml +3 -0
  442. data/vendor/extensions/exporter/config/routes.rb +6 -0
  443. data/vendor/extensions/exporter/cucumber.yml +1 -0
  444. data/vendor/extensions/exporter/exporter_extension.rb +8 -0
  445. data/vendor/extensions/exporter/features/support/env.rb +16 -0
  446. data/vendor/extensions/exporter/features/support/paths.rb +14 -0
  447. data/vendor/extensions/exporter/lib/tasks/exporter_extension_tasks.rake +55 -0
  448. data/{spec → vendor/extensions/exporter/spec}/controllers/admin/export_controller_spec.rb +1 -1
  449. data/vendor/extensions/exporter/spec/models/radiant/exporter_spec.rb +29 -0
  450. data/vendor/extensions/exporter/spec/spec.opts +6 -0
  451. data/vendor/extensions/exporter/spec/spec_helper.rb +36 -0
  452. data/vendor/extensions/german_language_pack/config/locales/de.yml +52 -0
  453. data/vendor/extensions/japanese_language_pack/README +40 -1
  454. data/vendor/extensions/japanese_language_pack/config/locales/ja.yml +107 -71
  455. data/vendor/extensions/japanese_language_pack/config/locales/ja_available_tags.yml +327 -347
  456. data/vendor/extensions/japanese_language_pack/japanese_language_pack_extension.rb +3 -3
  457. data/vendor/extensions/markdown_filter/vendor/kramdown/CONTRIBUTERS +2 -1
  458. data/vendor/extensions/markdown_filter/vendor/kramdown/ChangeLog +1250 -0
  459. data/vendor/extensions/markdown_filter/vendor/kramdown/README +1 -1
  460. data/vendor/extensions/markdown_filter/vendor/kramdown/Rakefile +2 -2
  461. data/vendor/extensions/markdown_filter/vendor/kramdown/VERSION +1 -1
  462. data/vendor/extensions/markdown_filter/vendor/kramdown/bin/kramdown +5 -4
  463. data/vendor/extensions/markdown_filter/vendor/kramdown/data/kramdown/document.html +11 -2
  464. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/{default.less.css → default.scss.css} +18 -9
  465. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.template +11 -2
  466. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/documentation.page +1 -1
  467. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/index.page +37 -4
  468. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/quickref.page +2 -2
  469. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/syntax.page +281 -187
  470. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter.rb +1 -0
  471. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/html.rb +92 -90
  472. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/kramdown.rb +421 -0
  473. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/latex.rb +311 -289
  474. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/document.rb +10 -6
  475. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/options.rb +29 -15
  476. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/base.rb +0 -1
  477. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/html.rb +153 -41
  478. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown.rb +21 -3
  479. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/abbreviation.rb +1 -0
  480. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/attribute_list.rb +20 -12
  481. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/autolink.rb +11 -4
  482. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/block_boundary.rb +46 -0
  483. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/blockquote.rb +7 -3
  484. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/codeblock.rb +5 -3
  485. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/escaped_chars.rb +1 -1
  486. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/extension.rb +23 -8
  487. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/footnote.rb +3 -2
  488. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/header.rb +11 -11
  489. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html.rb +18 -16
  490. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html_entity.rb +2 -1
  491. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/link.rb +13 -10
  492. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/list.rb +48 -37
  493. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/math.rb +15 -4
  494. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/paragraph.rb +14 -3
  495. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/table.rb +17 -9
  496. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/typographic_symbol.rb +4 -4
  497. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils.rb +37 -0
  498. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/entities.rb +335 -0
  499. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/html.rb +75 -0
  500. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/ordered_hash.rb +79 -0
  501. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/version.rb +1 -1
  502. data/vendor/extensions/markdown_filter/vendor/kramdown/man/man1/kramdown.1 +60 -36
  503. data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb +1 -1
  504. data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb +66 -4
  505. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/02_eob/middle.html +0 -1
  506. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.html +5 -2
  507. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.text +3 -1
  508. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html +4 -5
  509. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html.19 +30 -0
  510. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.html +34 -0
  511. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.text +20 -0
  512. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.html +1 -0
  513. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.text +1 -0
  514. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/with_code_blocks.html +2 -2
  515. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.html +4 -0
  516. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.text +5 -0
  517. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.html +2 -0
  518. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.text +2 -0
  519. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/whitespace.html +2 -2
  520. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.html +6 -0
  521. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.text +5 -0
  522. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/error.html.19 +7 -0
  523. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.html +0 -2
  524. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.text +0 -2
  525. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.html +1 -3
  526. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.html +39 -0
  527. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.text +29 -0
  528. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.html +5 -3
  529. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.text +1 -0
  530. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.html +2 -2
  531. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.text +1 -1
  532. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.html +0 -13
  533. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.text +0 -7
  534. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.html +8 -31
  535. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.text +2 -15
  536. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.html +2 -2
  537. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.html +1 -1
  538. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.text +1 -1
  539. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.html +2 -0
  540. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.text +2 -0
  541. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_normal.html +2 -1
  542. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.html +40 -2
  543. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.text +42 -0
  544. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/typography.html.19 +1 -0
  545. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/invalid_html_1.html +2 -0
  546. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_raw.html +2 -2
  547. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_span.html +1 -1
  548. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html +2 -0
  549. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html.19 +64 -0
  550. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.text +2 -0
  551. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/auto_id_and_ial.html +1 -1
  552. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/simple.html +4 -4
  553. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.html +6 -3
  554. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.text +2 -1
  555. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.html +5 -1
  556. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.text +1 -1
  557. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.html +5 -1
  558. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.kramdown +20 -0
  559. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.latex +13 -0
  560. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.text +11 -1
  561. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.html +0 -3
  562. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.text +0 -6
  563. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.html +12 -0
  564. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.text +8 -0
  565. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/simple.html +2 -2
  566. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.html +5 -0
  567. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.text +6 -0
  568. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/header.text +1 -1
  569. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/no_table.text +1 -1
  570. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.html +78 -0
  571. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.text +22 -0
  572. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.html +11 -4
  573. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.text +10 -0
  574. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.html +33 -0
  575. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.options +1 -0
  576. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.text +16 -0
  577. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.html +24 -0
  578. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.options +1 -0
  579. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.text +16 -0
  580. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/encoding.html +1 -1
  581. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.html +2 -0
  582. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.text +2 -0
  583. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/image_in_a.html +3 -3
  584. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.html +8 -6
  585. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.text +2 -0
  586. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html +11 -5
  587. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html.19 +46 -0
  588. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.text +11 -5
  589. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.html +2 -1
  590. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.text +4 -0
  591. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html +3 -0
  592. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html.19 +35 -0
  593. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.text +5 -0
  594. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.html +1 -0
  595. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.text +1 -0
  596. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.html +3 -0
  597. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.latex +3 -4
  598. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.text +6 -0
  599. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/footnote_nr.latex +1 -5
  600. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/markers.latex +5 -14
  601. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.html +1 -1
  602. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.text +1 -1
  603. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.html +5 -3
  604. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.text +2 -0
  605. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.html +2 -0
  606. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.text +2 -0
  607. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/comment.html +5 -5
  608. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/ignored.html +1 -1
  609. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/line_breaks/normal.latex +12 -0
  610. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.html +1 -1
  611. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.options +1 -0
  612. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html +1 -0
  613. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html.19 +1 -0
  614. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.options +1 -0
  615. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.text +1 -0
  616. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.html +1 -0
  617. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.options +1 -0
  618. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.text +1 -0
  619. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.html +1 -0
  620. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.options +1 -0
  621. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.text +1 -0
  622. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.html +1 -0
  623. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.options +1 -0
  624. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.text +1 -0
  625. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html +1 -1
  626. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html.19 +18 -0
  627. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.text +1 -1
  628. data/vendor/extensions/russian_language_pack/README +3 -1
  629. data/vendor/extensions/russian_language_pack/config/locales/ru.yml +28 -19
  630. data/vendor/extensions/russian_language_pack/config/locales/ru_available_tags.yml +6 -8
  631. data/vendor/extensions/russian_language_pack/lib/tasks/i18n_ru_extension_tasks.rake +4 -4
  632. data/vendor/extensions/russian_language_pack/russian_language_pack_extension.rb +4 -4
  633. data/vendor/extensions/sheets/LICENSE +21 -0
  634. data/vendor/extensions/sheets/README.md +33 -0
  635. data/vendor/extensions/sheets/Rakefile +117 -0
  636. data/vendor/extensions/sheets/app/controllers/admin/scripts_controller.rb +13 -0
  637. data/vendor/extensions/sheets/app/controllers/admin/sheet_resource_controller.rb +54 -0
  638. data/vendor/extensions/sheets/app/controllers/admin/styles_controller.rb +13 -0
  639. data/vendor/extensions/sheets/app/helpers/admin/scripts_helper.rb +5 -0
  640. data/vendor/extensions/sheets/app/helpers/admin/styles_helper.rb +5 -0
  641. data/vendor/extensions/sheets/app/models/javascript_page.rb +16 -0
  642. data/vendor/extensions/sheets/app/models/sheet.rb +89 -0
  643. data/vendor/extensions/sheets/app/models/stylesheet_page.rb +16 -0
  644. data/vendor/extensions/sheets/app/views/admin/scripts/edit.html.haml +30 -0
  645. data/vendor/extensions/sheets/app/views/admin/scripts/index.html.haml +27 -0
  646. data/vendor/extensions/sheets/app/views/admin/scripts/new.html.haml +30 -0
  647. data/vendor/extensions/sheets/app/views/admin/sheets/_edit_scripts.html.haml +40 -0
  648. data/vendor/extensions/sheets/app/views/admin/sheets/_upload_script.html.haml +16 -0
  649. data/vendor/extensions/sheets/app/views/admin/styles/edit.html.haml +30 -0
  650. data/vendor/extensions/sheets/app/views/admin/styles/index.html.haml +31 -0
  651. data/vendor/extensions/sheets/app/views/admin/styles/new.html.haml +30 -0
  652. data/vendor/extensions/sheets/config/locales/en.yml +15 -0
  653. data/vendor/extensions/sheets/config/routes.rb +6 -0
  654. data/vendor/extensions/sheets/cucumber.yml +1 -0
  655. data/vendor/extensions/sheets/features/support/env.rb +16 -0
  656. data/vendor/extensions/sheets/features/support/paths.rb +14 -0
  657. data/vendor/extensions/sheets/lib/javascript_tags.rb +58 -0
  658. data/vendor/extensions/sheets/lib/radiant-sheets-extension.rb +2 -0
  659. data/vendor/extensions/sheets/lib/radiant-sheets-extension/version.rb +3 -0
  660. data/vendor/extensions/sheets/lib/sass_filter.rb +16 -0
  661. data/vendor/extensions/sheets/lib/stylesheet_tags.rb +61 -0
  662. data/vendor/extensions/sheets/lib/tasks/sheets_extension_tasks.rake +79 -0
  663. data/vendor/extensions/sheets/public/images/admin/javascript.png +0 -0
  664. data/vendor/extensions/sheets/public/images/admin/stylesheet.png +0 -0
  665. data/vendor/extensions/sheets/radiant-sheets-extension.gemspec +24 -0
  666. data/vendor/extensions/sheets/sass.html +82 -0
  667. data/vendor/extensions/sheets/sheets_extension.rb +88 -0
  668. data/vendor/extensions/sheets/spec/controllers/admin/scripts_controller_spec.rb +123 -0
  669. data/vendor/extensions/sheets/spec/controllers/admin/styles_controller_spec.rb +124 -0
  670. data/vendor/extensions/sheets/spec/datasets/javascripts_dataset.rb +10 -0
  671. data/vendor/extensions/sheets/spec/datasets/stylesheets_dataset.rb +15 -0
  672. data/vendor/extensions/sheets/spec/helpers/admin/scripts_helper_spec.rb +5 -0
  673. data/vendor/extensions/sheets/spec/helpers/admin/styles_helper_spec.rb +5 -0
  674. data/vendor/extensions/sheets/spec/lib/javascript_tags_spec.rb +36 -0
  675. data/vendor/extensions/sheets/spec/lib/stylesheet_tags_spec.rb +41 -0
  676. data/vendor/extensions/sheets/spec/models/javascript_page_spec.rb +80 -0
  677. data/vendor/extensions/sheets/spec/models/page_spec.rb +5 -0
  678. data/vendor/extensions/sheets/spec/models/stylesheet_page_spec.rb +80 -0
  679. data/vendor/extensions/sheets/spec/spec.opts +6 -0
  680. data/vendor/extensions/sheets/spec/spec_helper.rb +36 -0
  681. data/vendor/extensions/site_templates/README +3 -0
  682. data/vendor/extensions/site_templates/Rakefile +136 -0
  683. data/{db → vendor/extensions/site_templates/db}/templates/empty.yml +0 -0
  684. data/vendor/extensions/site_templates/db/templates/roasters.yml +7826 -0
  685. data/vendor/extensions/site_templates/db/templates/simple-blog.yml +251 -0
  686. data/vendor/extensions/site_templates/db/templates/styled-blog.yml +535 -0
  687. data/vendor/extensions/site_templates/lib/tasks/site_templates_extension_tasks.rake +55 -0
  688. data/vendor/extensions/site_templates/public/images/roasters/banner.jpg +0 -0
  689. data/vendor/extensions/site_templates/public/images/roasters/closelabel.gif +0 -0
  690. data/vendor/extensions/site_templates/public/images/roasters/comment.png +0 -0
  691. data/vendor/extensions/site_templates/public/images/roasters/gallery1.jpg +0 -0
  692. data/vendor/extensions/site_templates/public/images/roasters/gallery2.jpg +0 -0
  693. data/vendor/extensions/site_templates/public/images/roasters/gallery3.jpg +0 -0
  694. data/vendor/extensions/site_templates/public/images/roasters/gallery4.jpg +0 -0
  695. data/vendor/extensions/site_templates/public/images/roasters/gift.gif +0 -0
  696. data/vendor/extensions/site_templates/public/images/roasters/green.gif +0 -0
  697. data/vendor/extensions/site_templates/public/images/roasters/nav-background.gif +0 -0
  698. data/vendor/extensions/site_templates/public/images/roasters/nav-divider.gif +0 -0
  699. data/vendor/extensions/site_templates/public/images/roasters/nextlabel.gif +0 -0
  700. data/vendor/extensions/site_templates/public/images/roasters/open.gif +0 -0
  701. data/vendor/extensions/site_templates/public/images/roasters/preview-1.jpg +0 -0
  702. data/vendor/extensions/site_templates/public/images/roasters/preview.jpg +0 -0
  703. data/vendor/extensions/site_templates/public/images/roasters/prevlabel.gif +0 -0
  704. data/vendor/extensions/site_templates/public/images/roasters/prize.gif +0 -0
  705. data/vendor/extensions/site_templates/public/images/roasters/recycle.gif +0 -0
  706. data/vendor/extensions/site_templates/public/images/roasters/rss.gif +0 -0
  707. data/vendor/extensions/site_templates/public/images/roasters/thumb-grinder.jpg +0 -0
  708. data/vendor/extensions/site_templates/public/images/roasters/thumb-grower.jpg +0 -0
  709. data/vendor/extensions/site_templates/public/images/roasters/thumb-roaster.jpg +0 -0
  710. data/vendor/extensions/site_templates/public/images/roasters/truck.gif +0 -0
  711. data/vendor/extensions/site_templates/site_templates_extension.rb +8 -0
  712. data/vendor/extensions/textile_filter/textile.html +2 -2
  713. data/vendor/plugins/dataset/lib/dataset.rb +2 -2
  714. data/vendor/plugins/dataset/plugit/descriptor.rb +25 -0
  715. data/vendor/plugins/haml/README.md +95 -154
  716. data/vendor/plugins/haml/Rakefile +104 -91
  717. data/vendor/plugins/haml/TODO +26 -20
  718. data/vendor/plugins/haml/VERSION +1 -1
  719. data/vendor/plugins/haml/VERSION_NAME +1 -1
  720. data/vendor/plugins/haml/bin/css2sass +7 -1
  721. data/vendor/plugins/haml/bin/sass-convert +7 -0
  722. data/vendor/plugins/haml/doc-src/FAQ.md +16 -4
  723. data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md +536 -1
  724. data/vendor/plugins/haml/doc-src/HAML_REFERENCE.md +176 -16
  725. data/vendor/plugins/haml/doc-src/INDENTED_SYNTAX.md +210 -0
  726. data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md +1159 -0
  727. data/vendor/plugins/haml/doc-src/SASS_REFERENCE.md +1163 -633
  728. data/vendor/plugins/haml/doc-src/SCSS_FOR_SASS_USERS.md +155 -0
  729. data/vendor/plugins/haml/ext/extconf.rb +10 -0
  730. data/vendor/plugins/haml/extra/haml-mode.el +36 -34
  731. data/vendor/plugins/haml/extra/sass-mode.el +10 -9
  732. data/vendor/plugins/haml/haml.gemspec +8 -33
  733. data/vendor/plugins/haml/init.rbc +404 -0
  734. data/vendor/plugins/haml/lib/haml.rb +5 -2
  735. data/vendor/plugins/haml/lib/haml.rbc +569 -0
  736. data/vendor/plugins/haml/lib/haml/buffer.rb +22 -4
  737. data/vendor/plugins/haml/lib/haml/buffer.rbc +4048 -0
  738. data/vendor/plugins/haml/lib/haml/engine.rb +13 -4
  739. data/vendor/plugins/haml/lib/haml/engine.rbc +3852 -0
  740. data/vendor/plugins/haml/lib/haml/error.rbc +339 -0
  741. data/vendor/plugins/haml/lib/haml/exec.rb +456 -64
  742. data/vendor/plugins/haml/lib/haml/filters.rb +19 -1
  743. data/vendor/plugins/haml/lib/haml/filters.rbc +5617 -0
  744. data/vendor/plugins/haml/lib/haml/helpers.rb +40 -19
  745. data/vendor/plugins/haml/lib/haml/helpers.rbc +7086 -0
  746. data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rbc +522 -0
  747. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +38 -12
  748. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rbc +5515 -0
  749. data/vendor/plugins/haml/lib/haml/helpers/xss_mods.rb +13 -2
  750. data/vendor/plugins/haml/lib/haml/html.rb +209 -49
  751. data/vendor/plugins/haml/lib/haml/html/erb.rb +141 -0
  752. data/vendor/plugins/haml/lib/haml/precompiler.rb +130 -89
  753. data/vendor/plugins/haml/lib/haml/precompiler.rbc +22247 -0
  754. data/vendor/plugins/haml/lib/haml/railtie.rb +16 -13
  755. data/vendor/plugins/haml/lib/haml/railtie.rbc +409 -0
  756. data/vendor/plugins/haml/lib/haml/root.rb +7 -0
  757. data/vendor/plugins/haml/lib/haml/root.rbc +160 -0
  758. data/vendor/plugins/haml/lib/haml/shared.rbc +1137 -0
  759. data/vendor/plugins/haml/lib/haml/template.rb +13 -12
  760. data/vendor/plugins/haml/lib/haml/template.rbc +1838 -0
  761. data/vendor/plugins/haml/lib/haml/template/options.rb +16 -0
  762. data/vendor/plugins/haml/lib/haml/template/options.rbc +235 -0
  763. data/vendor/plugins/haml/lib/haml/template/plugin.rb +18 -6
  764. data/vendor/plugins/haml/lib/haml/template/plugin.rbc +2720 -0
  765. data/vendor/plugins/haml/lib/haml/util.rb +483 -44
  766. data/vendor/plugins/haml/lib/haml/util.rbc +12059 -0
  767. data/vendor/plugins/haml/lib/haml/util/subset_map.rb +101 -0
  768. data/vendor/plugins/haml/lib/haml/util/subset_map.rbc +1316 -0
  769. data/vendor/plugins/haml/lib/haml/version.rb +25 -2
  770. data/vendor/plugins/haml/lib/haml/version.rbc +1671 -0
  771. data/vendor/plugins/haml/lib/sass.rb +7 -2
  772. data/vendor/plugins/haml/lib/sass.rbc +492 -0
  773. data/vendor/plugins/haml/lib/sass/callbacks.rb +52 -0
  774. data/vendor/plugins/haml/lib/sass/callbacks.rbc +388 -0
  775. data/vendor/plugins/haml/lib/sass/css.rb +86 -196
  776. data/vendor/plugins/haml/lib/sass/engine.rb +304 -99
  777. data/vendor/plugins/haml/lib/sass/engine.rbc +17020 -0
  778. data/vendor/plugins/haml/lib/sass/environment.rb +67 -3
  779. data/vendor/plugins/haml/lib/sass/environment.rbc +1751 -0
  780. data/vendor/plugins/haml/lib/sass/error.rb +166 -25
  781. data/vendor/plugins/haml/lib/sass/error.rbc +2801 -0
  782. data/vendor/plugins/haml/lib/sass/files.rb +43 -38
  783. data/vendor/plugins/haml/lib/sass/files.rbc +3118 -0
  784. data/vendor/plugins/haml/lib/sass/less.rb +382 -0
  785. data/vendor/plugins/haml/lib/sass/plugin.rb +198 -150
  786. data/vendor/plugins/haml/lib/sass/plugin.rbc +4356 -0
  787. data/vendor/plugins/haml/lib/sass/plugin/configuration.rb +221 -0
  788. data/vendor/plugins/haml/lib/sass/plugin/configuration.rbc +1343 -0
  789. data/vendor/plugins/haml/lib/sass/plugin/generic.rb +15 -0
  790. data/vendor/plugins/haml/lib/sass/plugin/merb.rb +8 -20
  791. data/vendor/plugins/haml/lib/sass/plugin/rack.rb +2 -20
  792. data/vendor/plugins/haml/lib/sass/plugin/rack.rbc +446 -0
  793. data/vendor/plugins/haml/lib/sass/plugin/rails.rb +16 -9
  794. data/vendor/plugins/haml/lib/sass/plugin/rails.rbc +879 -0
  795. data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rb +123 -0
  796. data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rbc +2019 -0
  797. data/vendor/plugins/haml/lib/sass/repl.rb +1 -1
  798. data/vendor/plugins/haml/lib/sass/script.rb +32 -31
  799. data/vendor/plugins/haml/lib/sass/script.rbc +1188 -0
  800. data/vendor/plugins/haml/lib/sass/script/bool.rb +2 -1
  801. data/vendor/plugins/haml/lib/sass/script/bool.rbc +366 -0
  802. data/vendor/plugins/haml/lib/sass/script/color.rb +295 -26
  803. data/vendor/plugins/haml/lib/sass/script/color.rbc +8148 -0
  804. data/vendor/plugins/haml/lib/sass/script/css_lexer.rb +29 -0
  805. data/vendor/plugins/haml/lib/sass/script/css_lexer.rbc +809 -0
  806. data/vendor/plugins/haml/lib/sass/script/css_parser.rb +31 -0
  807. data/vendor/plugins/haml/lib/sass/script/css_parser.rbc +628 -0
  808. data/vendor/plugins/haml/lib/sass/script/funcall.rb +33 -6
  809. data/vendor/plugins/haml/lib/sass/script/funcall.rbc +1805 -0
  810. data/vendor/plugins/haml/lib/sass/script/functions.rb +637 -33
  811. data/vendor/plugins/haml/lib/sass/script/functions.rbc +8418 -0
  812. data/vendor/plugins/haml/lib/sass/script/interpolation.rb +70 -0
  813. data/vendor/plugins/haml/lib/sass/script/interpolation.rbc +1225 -0
  814. data/vendor/plugins/haml/lib/sass/script/lexer.rb +200 -57
  815. data/vendor/plugins/haml/lib/sass/script/lexer.rbc +7231 -0
  816. data/vendor/plugins/haml/lib/sass/script/literal.rb +69 -10
  817. data/vendor/plugins/haml/lib/sass/script/literal.rbc +3365 -0
  818. data/vendor/plugins/haml/lib/sass/script/node.rb +99 -1
  819. data/vendor/plugins/haml/lib/sass/script/node.rbc +1418 -0
  820. data/vendor/plugins/haml/lib/sass/script/number.rb +64 -24
  821. data/vendor/plugins/haml/lib/sass/script/number.rbc +6024 -0
  822. data/vendor/plugins/haml/lib/sass/script/operation.rb +53 -3
  823. data/vendor/plugins/haml/lib/sass/script/operation.rbc +1856 -0
  824. data/vendor/plugins/haml/lib/sass/script/parser.rb +229 -50
  825. data/vendor/plugins/haml/lib/sass/script/parser.rbc +8418 -0
  826. data/vendor/plugins/haml/lib/sass/script/string.rb +57 -2
  827. data/vendor/plugins/haml/lib/sass/script/string.rbc +1357 -0
  828. data/vendor/plugins/haml/lib/sass/script/string_interpolation.rb +93 -0
  829. data/vendor/plugins/haml/lib/sass/script/string_interpolation.rbc +1643 -0
  830. data/vendor/plugins/haml/lib/sass/script/unary_operation.rb +25 -2
  831. data/vendor/plugins/haml/lib/sass/script/unary_operation.rbc +1144 -0
  832. data/vendor/plugins/haml/lib/sass/script/variable.rb +22 -5
  833. data/vendor/plugins/haml/lib/sass/script/variable.rbc +844 -0
  834. data/vendor/plugins/haml/lib/sass/scss.rb +17 -0
  835. data/vendor/plugins/haml/lib/sass/scss.rbc +242 -0
  836. data/vendor/plugins/haml/lib/sass/scss/css_parser.rb +46 -0
  837. data/vendor/plugins/haml/lib/sass/scss/css_parser.rbc +1106 -0
  838. data/vendor/plugins/haml/lib/sass/scss/parser.rb +846 -0
  839. data/vendor/plugins/haml/lib/sass/scss/parser.rbc +19348 -0
  840. data/vendor/plugins/haml/lib/sass/scss/rx.rb +126 -0
  841. data/vendor/plugins/haml/lib/sass/scss/rx.rbc +2849 -0
  842. data/vendor/plugins/haml/lib/sass/scss/sass_parser.rb +11 -0
  843. data/vendor/plugins/haml/lib/sass/scss/sass_parser.rbc +287 -0
  844. data/vendor/plugins/haml/lib/sass/scss/script_lexer.rb +15 -0
  845. data/vendor/plugins/haml/lib/sass/scss/script_lexer.rbc +439 -0
  846. data/vendor/plugins/haml/lib/sass/scss/script_parser.rb +25 -0
  847. data/vendor/plugins/haml/lib/sass/scss/script_parser.rbc +482 -0
  848. data/vendor/plugins/haml/lib/sass/scss/static_parser.rb +40 -0
  849. data/vendor/plugins/haml/lib/sass/scss/static_parser.rbc +971 -0
  850. data/vendor/plugins/haml/lib/sass/selector.rb +361 -0
  851. data/vendor/plugins/haml/lib/sass/selector.rbc +4193 -0
  852. data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rb +62 -0
  853. data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rbc +798 -0
  854. data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rb +82 -0
  855. data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rbc +1814 -0
  856. data/vendor/plugins/haml/lib/sass/selector/sequence.rb +237 -0
  857. data/vendor/plugins/haml/lib/sass/selector/sequence.rbc +4928 -0
  858. data/vendor/plugins/haml/lib/sass/selector/simple.rb +113 -0
  859. data/vendor/plugins/haml/lib/sass/selector/simple.rbc +1553 -0
  860. data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rb +136 -0
  861. data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rbc +2346 -0
  862. data/vendor/plugins/haml/lib/sass/tree/charset_node.rb +37 -0
  863. data/vendor/plugins/haml/lib/sass/tree/charset_node.rbc +606 -0
  864. data/vendor/plugins/haml/lib/sass/tree/comment_node.rb +71 -27
  865. data/vendor/plugins/haml/lib/sass/tree/comment_node.rbc +2397 -0
  866. data/vendor/plugins/haml/lib/sass/tree/debug_node.rb +8 -2
  867. data/vendor/plugins/haml/lib/sass/tree/debug_node.rbc +740 -0
  868. data/vendor/plugins/haml/lib/sass/tree/directive_node.rb +44 -37
  869. data/vendor/plugins/haml/lib/sass/tree/directive_node.rbc +1302 -0
  870. data/vendor/plugins/haml/lib/sass/tree/extend_node.rb +65 -0
  871. data/vendor/plugins/haml/lib/sass/tree/extend_node.rbc +1276 -0
  872. data/vendor/plugins/haml/lib/sass/tree/for_node.rb +19 -0
  873. data/vendor/plugins/haml/lib/sass/tree/for_node.rbc +1145 -0
  874. data/vendor/plugins/haml/lib/sass/tree/if_node.rb +26 -0
  875. data/vendor/plugins/haml/lib/sass/tree/if_node.rbc +1119 -0
  876. data/vendor/plugins/haml/lib/sass/tree/import_node.rb +64 -27
  877. data/vendor/plugins/haml/lib/sass/tree/import_node.rbc +2242 -0
  878. data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rb +31 -0
  879. data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rbc +1001 -0
  880. data/vendor/plugins/haml/lib/sass/tree/mixin_node.rb +82 -7
  881. data/vendor/plugins/haml/lib/sass/tree/mixin_node.rbc +3355 -0
  882. data/vendor/plugins/haml/lib/sass/tree/node.rb +291 -77
  883. data/vendor/plugins/haml/lib/sass/tree/node.rbc +5533 -0
  884. data/vendor/plugins/haml/lib/sass/tree/prop_node.rb +157 -58
  885. data/vendor/plugins/haml/lib/sass/tree/prop_node.rbc +3949 -0
  886. data/vendor/plugins/haml/lib/sass/tree/root_node.rb +157 -0
  887. data/vendor/plugins/haml/lib/sass/tree/root_node.rbc +3112 -0
  888. data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +178 -137
  889. data/vendor/plugins/haml/lib/sass/tree/rule_node.rbc +5636 -0
  890. data/vendor/plugins/haml/lib/sass/tree/variable_node.rb +10 -5
  891. data/vendor/plugins/haml/lib/sass/tree/variable_node.rbc +845 -0
  892. data/vendor/plugins/haml/lib/sass/tree/warn_node.rb +42 -0
  893. data/vendor/plugins/haml/lib/sass/tree/warn_node.rbc +1043 -0
  894. data/vendor/plugins/haml/lib/sass/tree/while_node.rb +17 -0
  895. data/vendor/plugins/haml/lib/sass/tree/while_node.rbc +722 -0
  896. data/vendor/plugins/haml/test/benchmark.rb +5 -5
  897. data/vendor/plugins/haml/test/haml/engine_test.rb +530 -19
  898. data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_1.rhtml → erb/_av_partial_1.erb} +1 -1
  899. data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_2.rhtml → erb/_av_partial_2.erb} +1 -1
  900. data/vendor/plugins/haml/test/haml/{rhtml/action_view.rhtml → erb/action_view.erb} +1 -1
  901. data/vendor/plugins/haml/test/haml/{rhtml/standard.rhtml → erb/standard.erb} +0 -0
  902. data/vendor/plugins/haml/test/haml/helper_test.rb +124 -7
  903. data/vendor/plugins/haml/test/haml/html2haml/erb_tests.rb +426 -0
  904. data/vendor/plugins/haml/test/haml/html2haml_test.rb +250 -66
  905. data/vendor/plugins/haml/test/haml/results/filters.xhtml +1 -1
  906. data/vendor/plugins/haml/test/haml/results/helpers.xhtml +0 -23
  907. data/vendor/plugins/haml/test/haml/results/just_stuff.xhtml +2 -0
  908. data/vendor/plugins/haml/test/haml/spec/LICENSE +14 -0
  909. data/vendor/plugins/haml/test/haml/spec/README.md +106 -0
  910. data/vendor/plugins/haml/test/haml/spec/lua_haml_spec.lua +38 -0
  911. data/vendor/plugins/haml/test/haml/spec/perl_haml_test.pl +81 -0
  912. data/vendor/plugins/haml/test/haml/spec/ruby_haml_test.rb +19 -0
  913. data/vendor/plugins/haml/test/haml/spec/tests.json +603 -0
  914. data/vendor/plugins/haml/test/haml/spec_test.rb +44 -0
  915. data/vendor/plugins/haml/test/haml/template_test.rb +33 -3
  916. data/vendor/plugins/haml/test/haml/templates/helpers.haml +0 -66
  917. data/vendor/plugins/haml/test/haml/templates/just_stuff.haml +2 -0
  918. data/vendor/plugins/haml/test/haml/util/subset_map_test.rb +91 -0
  919. data/vendor/plugins/haml/test/haml/util_test.rb +161 -0
  920. data/vendor/plugins/haml/test/linked_rails.rb +22 -1
  921. data/vendor/plugins/haml/test/sass/callbacks_test.rb +61 -0
  922. data/vendor/plugins/haml/test/sass/conversion_test.rb +1218 -0
  923. data/vendor/plugins/haml/test/sass/css2sass_test.rb +130 -18
  924. data/vendor/plugins/haml/test/sass/data/hsl-rgb.txt +319 -0
  925. data/vendor/plugins/haml/test/sass/engine_test.rb +1427 -139
  926. data/vendor/plugins/haml/test/sass/extend_test.rb +1348 -0
  927. data/vendor/plugins/haml/test/sass/functions_test.rb +429 -47
  928. data/vendor/plugins/haml/test/sass/less_conversion_test.rb +653 -0
  929. data/vendor/plugins/haml/test/sass/more_results/more_import.css +1 -1
  930. data/vendor/plugins/haml/test/sass/more_templates/more_import.sass +3 -3
  931. data/vendor/plugins/haml/test/sass/plugin_test.rb +246 -56
  932. data/vendor/plugins/haml/test/sass/results/compact.css +1 -1
  933. data/vendor/plugins/haml/test/sass/results/complex.css +5 -6
  934. data/vendor/plugins/haml/test/sass/results/compressed.css +1 -1
  935. data/vendor/plugins/haml/test/sass/results/expanded.css +1 -1
  936. data/vendor/plugins/haml/test/sass/results/import.css +3 -1
  937. data/vendor/plugins/haml/test/sass/results/import_charset.css +4 -0
  938. data/vendor/plugins/haml/test/sass/results/import_charset_1_8.css +4 -0
  939. data/vendor/plugins/haml/test/sass/results/import_charset_ibm866.css +4 -0
  940. data/vendor/plugins/haml/test/sass/results/mixins.css +12 -12
  941. data/vendor/plugins/haml/test/sass/results/nested.css +1 -1
  942. data/vendor/plugins/haml/test/sass/results/options.css +1 -0
  943. data/vendor/plugins/haml/test/sass/results/parent_ref.css +4 -4
  944. data/vendor/plugins/haml/test/sass/results/script.css +4 -4
  945. data/vendor/plugins/haml/test/sass/results/scss_import.css +31 -0
  946. data/vendor/plugins/haml/test/sass/results/scss_importee.css +2 -0
  947. data/vendor/plugins/haml/test/sass/results/warn.css +0 -0
  948. data/vendor/plugins/haml/test/sass/results/warn_imported.css +0 -0
  949. data/vendor/plugins/haml/test/sass/script_conversion_test.rb +314 -0
  950. data/vendor/plugins/haml/test/sass/script_test.rb +281 -78
  951. data/vendor/plugins/haml/test/sass/scss/css_test.rb +916 -0
  952. data/vendor/plugins/haml/test/sass/scss/rx_test.rb +156 -0
  953. data/vendor/plugins/haml/test/sass/scss/scss_test.rb +1088 -0
  954. data/vendor/plugins/haml/test/sass/scss/test_helper.rb +37 -0
  955. data/vendor/plugins/haml/test/sass/templates/_imported_charset_ibm866.sass +4 -0
  956. data/vendor/plugins/haml/test/sass/templates/_imported_charset_utf8.sass +4 -0
  957. data/vendor/plugins/haml/test/sass/templates/alt.sass +2 -2
  958. data/vendor/plugins/haml/test/sass/templates/basic.sass +1 -1
  959. data/vendor/plugins/haml/test/sass/templates/bork1.sass +2 -0
  960. data/vendor/plugins/haml/test/sass/templates/bork3.sass +2 -0
  961. data/vendor/plugins/haml/test/sass/templates/bork4.sass +2 -0
  962. data/vendor/plugins/haml/test/sass/templates/complex.sass +0 -2
  963. data/vendor/plugins/haml/test/sass/templates/import.sass +5 -4
  964. data/vendor/plugins/haml/test/sass/templates/import_charset.sass +7 -0
  965. data/vendor/plugins/haml/test/sass/templates/import_charset_1_8.sass +4 -0
  966. data/vendor/plugins/haml/test/sass/templates/import_charset_ibm866.sass +9 -0
  967. data/vendor/plugins/haml/test/sass/templates/importee.less +2 -0
  968. data/vendor/plugins/haml/test/sass/templates/importee.sass +3 -3
  969. data/vendor/plugins/haml/test/sass/templates/line_numbers.sass +1 -1
  970. data/vendor/plugins/haml/test/sass/templates/mixin_bork.sass +5 -0
  971. data/vendor/plugins/haml/test/sass/templates/mixins.sass +2 -2
  972. data/vendor/plugins/haml/test/sass/templates/nested_bork1.sass +2 -0
  973. data/vendor/plugins/haml/test/sass/templates/nested_bork2.sass +2 -0
  974. data/vendor/plugins/haml/test/sass/templates/nested_bork3.sass +2 -0
  975. data/vendor/plugins/haml/test/sass/templates/nested_bork4.sass +2 -0
  976. data/vendor/plugins/haml/test/sass/templates/nested_mixin_bork.sass +6 -0
  977. data/vendor/plugins/haml/test/sass/templates/options.sass +2 -0
  978. data/vendor/plugins/haml/test/sass/templates/parent_ref.sass +2 -2
  979. data/vendor/plugins/haml/test/sass/templates/script.sass +69 -69
  980. data/vendor/plugins/haml/test/sass/templates/scss_import.scss +11 -0
  981. data/vendor/plugins/haml/test/sass/templates/scss_importee.scss +1 -0
  982. data/vendor/plugins/haml/test/sass/templates/units.sass +10 -10
  983. data/vendor/plugins/haml/test/sass/templates/warn.sass +3 -0
  984. data/vendor/plugins/haml/test/sass/templates/warn_imported.sass +4 -0
  985. data/vendor/plugins/haml/test/test_helper.rb +52 -4
  986. data/vendor/plugins/haml/vendor/fssm/LICENSE +20 -0
  987. data/vendor/plugins/haml/vendor/fssm/README.markdown +55 -0
  988. data/vendor/plugins/haml/vendor/fssm/Rakefile +59 -0
  989. data/vendor/plugins/haml/vendor/fssm/VERSION.yml +5 -0
  990. data/vendor/plugins/haml/vendor/fssm/example.rb +9 -0
  991. data/vendor/plugins/haml/vendor/fssm/fssm.gemspec +77 -0
  992. data/vendor/plugins/haml/vendor/fssm/lib/fssm.rb +33 -0
  993. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/fsevents.rb +36 -0
  994. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/inotify.rb +26 -0
  995. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/polling.rb +25 -0
  996. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +131 -0
  997. data/vendor/plugins/haml/vendor/fssm/lib/fssm/monitor.rb +26 -0
  998. data/vendor/plugins/haml/vendor/fssm/lib/fssm/path.rb +91 -0
  999. data/vendor/plugins/haml/vendor/fssm/lib/fssm/pathname.rb +502 -0
  1000. data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/directory.rb +57 -0
  1001. data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/file.rb +24 -0
  1002. data/vendor/plugins/haml/vendor/fssm/lib/fssm/support.rb +63 -0
  1003. data/vendor/plugins/haml/vendor/fssm/lib/fssm/tree.rb +176 -0
  1004. data/vendor/plugins/haml/vendor/fssm/profile/prof-cache.rb +40 -0
  1005. data/vendor/plugins/haml/vendor/fssm/profile/prof-fssm-pathname.html +1231 -0
  1006. data/vendor/plugins/haml/vendor/fssm/profile/prof-pathname.rb +68 -0
  1007. data/vendor/plugins/haml/vendor/fssm/profile/prof-plain-pathname.html +988 -0
  1008. data/vendor/plugins/haml/vendor/fssm/profile/prof.html +2379 -0
  1009. data/vendor/plugins/haml/vendor/fssm/spec/path_spec.rb +75 -0
  1010. data/vendor/plugins/haml/vendor/fssm/spec/root/duck/quack.txt +0 -0
  1011. data/vendor/plugins/haml/vendor/fssm/spec/root/file.css +0 -0
  1012. data/vendor/plugins/haml/vendor/fssm/spec/root/file.rb +0 -0
  1013. data/vendor/plugins/haml/vendor/fssm/spec/root/file.yml +0 -0
  1014. data/vendor/plugins/haml/vendor/fssm/spec/root/moo/cow.txt +0 -0
  1015. data/vendor/plugins/haml/vendor/fssm/spec/spec_helper.rb +14 -0
  1016. data/vendor/plugins/haml/yard/callbacks.rb +29 -0
  1017. data/vendor/plugins/haml/yard/default/fulldoc/html/css/common.sass +5 -1
  1018. data/vendor/rails/Rakefile +83 -0
  1019. data/vendor/rails/actionmailer/CHANGELOG +3 -4
  1020. data/vendor/rails/actionmailer/Rakefile +1 -1
  1021. data/vendor/rails/actionmailer/lib/action_mailer/base.rb +34 -1
  1022. data/vendor/rails/actionmailer/lib/action_mailer/helpers.rb +1 -1
  1023. data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
  1024. data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak +1 -0
  1025. data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~ +10 -0
  1026. data/vendor/rails/actionpack/CHANGELOG +11 -0
  1027. data/vendor/rails/actionpack/Rakefile +1 -1
  1028. data/vendor/rails/actionpack/lib/action_controller/base.rb +4 -2
  1029. data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb +1 -1
  1030. data/vendor/rails/actionpack/lib/action_controller/cookies.rb +8 -2
  1031. data/vendor/rails/actionpack/lib/action_controller/integration.rb +19 -7
  1032. data/vendor/rails/actionpack/lib/action_controller/request.rb +2 -2
  1033. data/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb +9 -6
  1034. data/vendor/rails/actionpack/lib/action_controller/rescue.rb +2 -2
  1035. data/vendor/rails/actionpack/lib/action_controller/resources.rb +1 -1
  1036. data/vendor/rails/actionpack/lib/action_controller/routing.rb +1 -1
  1037. data/vendor/rails/actionpack/lib/action_controller/routing/route.rb +3 -3
  1038. data/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +143 -55
  1039. data/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +48 -35
  1040. data/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb +10 -1
  1041. data/vendor/rails/actionpack/lib/action_controller/test_process.rb +1 -1
  1042. data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +11 -1
  1043. data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
  1044. data/vendor/rails/actionpack/lib/action_view/helpers.rb +2 -0
  1045. data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +1 -0
  1046. data/vendor/rails/actionpack/lib/action_view/helpers/csrf_helper.rb +14 -0
  1047. data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +21 -14
  1048. data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +1 -1
  1049. data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +1 -1
  1050. data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +3 -3
  1051. data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +27 -17
  1052. data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +2 -1
  1053. data/vendor/rails/actionpack/lib/action_view/locale/en.yml +14 -14
  1054. data/vendor/rails/actionpack/lib/action_view/renderable_partial.rb +7 -1
  1055. data/vendor/rails/actionpack/lib/action_view/template.rb +2 -2
  1056. data/vendor/rails/actionpack/test/abstract_unit.rb +17 -0
  1057. data/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb +65 -18
  1058. data/vendor/rails/actionpack/test/controller/cookie_test.rb +38 -0
  1059. data/vendor/rails/actionpack/test/controller/integration_test.rb +44 -0
  1060. data/vendor/rails/actionpack/test/controller/reloader_test.rb +1 -0
  1061. data/vendor/rails/actionpack/test/controller/render_test.rb +12 -0
  1062. data/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb +15 -0
  1063. data/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb +92 -124
  1064. data/vendor/rails/actionpack/test/controller/rescue_test.rb +5 -6
  1065. data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +101 -7
  1066. data/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb +71 -11
  1067. data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +9 -3
  1068. data/vendor/rails/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb +10 -0
  1069. data/vendor/rails/actionpack/test/fixtures/test/hello_world.erb~ +1 -0
  1070. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.en.html.erb~ +1 -0
  1071. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.erb~ +1 -0
  1072. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.html.erb~ +1 -0
  1073. data/vendor/rails/actionpack/test/template/form_options_helper_test.rb +4 -0
  1074. data/vendor/rails/actionpack/test/template/text_helper_test.rb +47 -18
  1075. data/vendor/rails/actionpack/test/template/url_helper_test.rb +4 -4
  1076. data/vendor/rails/activemodel/CHANGES +12 -0
  1077. data/vendor/rails/activemodel/README +21 -0
  1078. data/vendor/rails/activemodel/Rakefile +24 -0
  1079. data/vendor/rails/activemodel/lib/active_model.rb +5 -0
  1080. data/vendor/rails/activemodel/lib/active_model/base.rb +8 -0
  1081. data/vendor/rails/activemodel/lib/active_model/callbacks.rb +7 -0
  1082. data/vendor/rails/activemodel/lib/active_model/core.rb +7 -0
  1083. data/vendor/rails/activemodel/lib/active_model/deprecated_error_methods.rb +38 -0
  1084. data/vendor/rails/activemodel/lib/active_model/errors.rb +82 -0
  1085. data/vendor/rails/activemodel/lib/active_model/observing.rb +98 -0
  1086. data/vendor/rails/activemodel/lib/active_model/state_machine.rb +68 -0
  1087. data/vendor/rails/activemodel/lib/active_model/state_machine/event.rb +64 -0
  1088. data/vendor/rails/activemodel/lib/active_model/state_machine/machine.rb +78 -0
  1089. data/vendor/rails/activemodel/lib/active_model/state_machine/state.rb +47 -0
  1090. data/vendor/rails/activemodel/lib/active_model/state_machine/state_transition.rb +40 -0
  1091. data/vendor/rails/activemodel/lib/active_model/validations.rb +126 -0
  1092. data/vendor/rails/activemodel/lib/active_model/validations/acceptance.rb +45 -0
  1093. data/vendor/rails/activemodel/lib/active_model/validations/associated.rb +46 -0
  1094. data/vendor/rails/activemodel/lib/active_model/validations/confirmation.rb +44 -0
  1095. data/vendor/rails/activemodel/lib/active_model/validations/exclusion.rb +37 -0
  1096. data/vendor/rails/activemodel/lib/active_model/validations/format.rb +39 -0
  1097. data/vendor/rails/activemodel/lib/active_model/validations/inclusion.rb +37 -0
  1098. data/vendor/rails/activemodel/lib/active_model/validations/length.rb +95 -0
  1099. data/vendor/rails/activemodel/lib/active_model/validations/numericality.rb +80 -0
  1100. data/vendor/rails/activemodel/lib/active_model/validations/presence.rb +42 -0
  1101. data/vendor/rails/activemodel/lib/active_model/validations/uniqueness.rb +104 -0
  1102. data/vendor/rails/activemodel/test/observing_test.rb +121 -0
  1103. data/vendor/rails/activemodel/test/state_machine/event_test.rb +49 -0
  1104. data/vendor/rails/activemodel/test/state_machine/machine_test.rb +43 -0
  1105. data/vendor/rails/activemodel/test/state_machine/state_test.rb +72 -0
  1106. data/vendor/rails/activemodel/test/state_machine/state_transition_test.rb +84 -0
  1107. data/vendor/rails/activemodel/test/state_machine_test.rb +312 -0
  1108. data/vendor/rails/activemodel/test/test_helper.rb +21 -0
  1109. data/vendor/rails/activerecord/CHANGELOG +5 -2
  1110. data/vendor/rails/activerecord/MIT-LICENSE +20 -0
  1111. data/vendor/rails/activerecord/Rakefile +1 -1
  1112. data/vendor/rails/activerecord/examples/performance.rb +39 -3
  1113. data/vendor/rails/activerecord/lib/active_record/association_preload.rb +12 -2
  1114. data/vendor/rails/activerecord/lib/active_record/associations.rb +1 -1
  1115. data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +60 -6
  1116. data/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +0 -4
  1117. data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +2 -2
  1118. data/vendor/rails/activerecord/lib/active_record/base.rb +28 -16
  1119. data/vendor/rails/activerecord/lib/active_record/calculations.rb +19 -12
  1120. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +1 -1
  1121. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +3 -1
  1122. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +6 -0
  1123. data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +2 -0
  1124. data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +1 -1
  1125. data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +2 -1
  1126. data/vendor/rails/activerecord/lib/active_record/dirty.rb +1 -1
  1127. data/vendor/rails/activerecord/lib/active_record/locale/en.yml +11 -11
  1128. data/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb +1 -0
  1129. data/vendor/rails/activerecord/lib/active_record/migration.rb +1 -1
  1130. data/vendor/rails/activerecord/lib/active_record/named_scope.rb +15 -10
  1131. data/vendor/rails/activerecord/lib/active_record/serialization.rb +1 -1
  1132. data/vendor/rails/activerecord/lib/active_record/session_store.rb +9 -1
  1133. data/vendor/rails/activerecord/lib/active_record/validations.rb +12 -12
  1134. data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
  1135. data/vendor/rails/activerecord/test/cases/adapter_test.rb +7 -8
  1136. data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +7 -7
  1137. data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_polymorphic_include.rb +19 -0
  1138. data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +12 -0
  1139. data/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +5 -0
  1140. data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +108 -4
  1141. data/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +14 -0
  1142. data/vendor/rails/activerecord/test/cases/associations_test.rb +10 -0
  1143. data/vendor/rails/activerecord/test/cases/base_test.rb +35 -75
  1144. data/vendor/rails/activerecord/test/cases/calculations_test.rb +13 -0
  1145. data/vendor/rails/activerecord/test/cases/connection_test_mysql.rb +1 -0
  1146. data/vendor/rails/activerecord/test/cases/counter_cache_test.rb +84 -0
  1147. data/vendor/rails/activerecord/test/cases/locking_test.rb +2 -1
  1148. data/vendor/rails/activerecord/test/cases/migration_test.rb +11 -0
  1149. data/vendor/rails/activerecord/test/cases/named_scope_test.rb +12 -1
  1150. data/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +28 -1
  1151. data/vendor/rails/activerecord/test/cases/reflection_test.rb +5 -5
  1152. data/vendor/rails/activerecord/test/cases/sp_test_mysql.rb +16 -0
  1153. data/vendor/rails/activerecord/test/cases/transactions_test.rb +22 -1
  1154. data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +12 -12
  1155. data/vendor/rails/activerecord/test/cases/validations_test.rb +42 -30
  1156. data/vendor/rails/activerecord/test/fixtures/polymorphic_designs.yml +19 -0
  1157. data/vendor/rails/activerecord/test/fixtures/polymorphic_prices.yml +19 -0
  1158. data/vendor/rails/activerecord/test/fixtures/tees.yml +4 -0
  1159. data/vendor/rails/activerecord/test/fixtures/ties.yml +4 -0
  1160. data/vendor/rails/activerecord/test/models/author.rb +2 -0
  1161. data/vendor/rails/activerecord/test/models/company.rb +2 -0
  1162. data/vendor/rails/activerecord/test/models/event_author.rb +3 -0
  1163. data/vendor/rails/activerecord/test/models/pirate.rb +2 -2
  1164. data/vendor/rails/activerecord/test/models/polymorphic_design.rb +3 -0
  1165. data/vendor/rails/activerecord/test/models/polymorphic_price.rb +3 -0
  1166. data/vendor/rails/activerecord/test/models/post.rb +2 -0
  1167. data/vendor/rails/activerecord/test/models/tee.rb +4 -0
  1168. data/vendor/rails/activerecord/test/models/tie.rb +4 -0
  1169. data/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb +7 -0
  1170. data/vendor/rails/activerecord/test/schema/schema.rb +16 -0
  1171. data/vendor/rails/activeresource/CHANGELOG +3 -4
  1172. data/vendor/rails/activeresource/MIT-LICENSE +20 -0
  1173. data/vendor/rails/activeresource/Rakefile +1 -1
  1174. data/vendor/rails/activeresource/lib/active_resource/http_mock.rb +104 -9
  1175. data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
  1176. data/vendor/rails/activeresource/test/http_mock_test.rb +155 -0
  1177. data/vendor/rails/activesupport/CHANGELOG +16 -0
  1178. data/vendor/rails/activesupport/MIT-LICENSE +20 -0
  1179. data/vendor/rails/activesupport/Rakefile +175 -0
  1180. data/vendor/rails/activesupport/bin/generate_tables +147 -0
  1181. data/vendor/rails/activesupport/install.rb +30 -0
  1182. data/vendor/rails/activesupport/lib/active_support/basic_object.rb +7 -10
  1183. data/vendor/rails/activesupport/lib/active_support/buffered_logger.rb +2 -0
  1184. data/vendor/rails/activesupport/lib/active_support/core_ext/array/grouping.rb +1 -1
  1185. data/vendor/rails/activesupport/lib/active_support/core_ext/array/random_access.rb +24 -4
  1186. data/vendor/rails/activesupport/lib/active_support/core_ext/class.rb +1 -0
  1187. data/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute.rb +67 -0
  1188. data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +1 -1
  1189. data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb +13 -0
  1190. data/vendor/rails/activesupport/lib/active_support/core_ext/module/remove_method.rb +6 -0
  1191. data/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb +3 -0
  1192. data/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb +1 -1
  1193. data/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb +0 -11
  1194. data/vendor/rails/activesupport/lib/active_support/dependencies.rb +38 -12
  1195. data/vendor/rails/activesupport/lib/active_support/deprecation.rb +7 -0
  1196. data/vendor/rails/activesupport/lib/active_support/json/backends/yajl.rb +1 -1
  1197. data/vendor/rails/activesupport/lib/active_support/locale/en.yml +4 -1
  1198. data/vendor/rails/activesupport/lib/active_support/memoizable.rb +2 -0
  1199. data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +6 -0
  1200. data/vendor/rails/activesupport/lib/active_support/testing/performance.rb +1 -1
  1201. data/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb +2 -2
  1202. data/vendor/rails/activesupport/lib/active_support/values/time_zone.rb +5 -1
  1203. data/vendor/rails/activesupport/lib/active_support/vendor.rb +2 -2
  1204. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n.rb +92 -105
  1205. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend.rb +5 -4
  1206. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb +61 -0
  1207. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/missing.rb +4 -6
  1208. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/store_procs.rb +0 -0
  1209. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/translation.rb +8 -3
  1210. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/base.rb +55 -84
  1211. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cache.rb +1 -0
  1212. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cascade.rb +0 -1
  1213. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/chain.rb +3 -1
  1214. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cldr.rb +0 -0
  1215. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/fallbacks.rb +0 -0
  1216. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb +113 -0
  1217. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/gettext.rb +0 -0
  1218. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/interpolation_compiler.rb +8 -4
  1219. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb +102 -0
  1220. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb +48 -0
  1221. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/metadata.rb +5 -13
  1222. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/pluralization.rb +0 -0
  1223. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb +87 -0
  1224. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb +98 -0
  1225. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb +84 -0
  1226. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb +28 -0
  1227. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/core_ext/string/interpolate.rb +3 -4
  1228. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/exceptions.rb +0 -0
  1229. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext.rb +2 -0
  1230. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7/i18n/helpers/gettext.rb → i18n-0.4.1/i18n/gettext/helpers.rb} +2 -2
  1231. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext/po_parser.rb +7 -7
  1232. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale.rb +0 -0
  1233. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/fallbacks.rb +0 -0
  1234. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag.rb +0 -0
  1235. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/parents.rb +0 -0
  1236. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/rfc4646.rb +0 -0
  1237. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/simple.rb +0 -0
  1238. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb +3 -0
  1239. data/vendor/rails/activesupport/lib/active_support/version.rb +1 -1
  1240. data/vendor/rails/activesupport/lib/active_support/whiny_nil.rb +1 -1
  1241. data/vendor/rails/activesupport/test/abstract_unit.rb +37 -0
  1242. data/vendor/rails/activesupport/test/autoloading_fixtures/a/b.rb +2 -0
  1243. data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/d.rb +2 -0
  1244. data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/e/f.rb +2 -0
  1245. data/vendor/rails/activesupport/test/autoloading_fixtures/application.rb +1 -0
  1246. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder.rb +3 -0
  1247. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb +3 -0
  1248. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb +2 -0
  1249. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb +7 -0
  1250. data/vendor/rails/activesupport/test/autoloading_fixtures/conflict.rb +1 -0
  1251. data/vendor/rails/activesupport/test/autoloading_fixtures/counting_loader.rb +5 -0
  1252. data/vendor/rails/activesupport/test/autoloading_fixtures/cross_site_dependency.rb +2 -0
  1253. data/vendor/rails/activesupport/test/autoloading_fixtures/e.rb +2 -0
  1254. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb +2 -0
  1255. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb +4 -0
  1256. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb +2 -0
  1257. data/vendor/rails/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb +1 -0
  1258. data/vendor/rails/activesupport/test/autoloading_fixtures/multiple_constant_file.rb +2 -0
  1259. data/vendor/rails/activesupport/test/autoloading_fixtures/raises_name_error.rb +3 -0
  1260. data/vendor/rails/activesupport/test/autoloading_fixtures/raises_no_method_error.rb +3 -0
  1261. data/vendor/rails/activesupport/test/buffered_logger_test.rb +146 -0
  1262. data/vendor/rails/activesupport/test/caching_test.rb +355 -0
  1263. data/vendor/rails/activesupport/test/callbacks_test.rb +188 -0
  1264. data/vendor/rails/activesupport/test/clean_backtrace_test.rb +47 -0
  1265. data/vendor/rails/activesupport/test/clean_logger_test.rb +57 -0
  1266. data/vendor/rails/activesupport/test/core_ext/array_ext_test.rb +394 -0
  1267. data/vendor/rails/activesupport/test/core_ext/base64_ext_test.rb +8 -0
  1268. data/vendor/rails/activesupport/test/core_ext/bigdecimal.rb +10 -0
  1269. data/vendor/rails/activesupport/test/core_ext/blank_test.rb +21 -0
  1270. data/vendor/rails/activesupport/test/core_ext/cgi_ext_test.rb +14 -0
  1271. data/vendor/rails/activesupport/test/core_ext/class/attribute_accessor_test.rb +38 -0
  1272. data/vendor/rails/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb +224 -0
  1273. data/vendor/rails/activesupport/test/core_ext/class/delegating_attributes_test.rb +115 -0
  1274. data/vendor/rails/activesupport/test/core_ext/class_test.rb +46 -0
  1275. data/vendor/rails/activesupport/test/core_ext/date_ext_test.rb +286 -0
  1276. data/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb +363 -0
  1277. data/vendor/rails/activesupport/test/core_ext/duplicable_test.rb +22 -0
  1278. data/vendor/rails/activesupport/test/core_ext/duration_test.rb +121 -0
  1279. data/vendor/rails/activesupport/test/core_ext/enumerable_test.rb +102 -0
  1280. data/vendor/rails/activesupport/test/core_ext/exception_test.rb +68 -0
  1281. data/vendor/rails/activesupport/test/core_ext/file_test.rb +67 -0
  1282. data/vendor/rails/activesupport/test/core_ext/float_ext_test.rb +25 -0
  1283. data/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb +1016 -0
  1284. data/vendor/rails/activesupport/test/core_ext/integer_ext_test.rb +37 -0
  1285. data/vendor/rails/activesupport/test/core_ext/kernel_test.rb +43 -0
  1286. data/vendor/rails/activesupport/test/core_ext/load_error_test.rb +16 -0
  1287. data/vendor/rails/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb +30 -0
  1288. data/vendor/rails/activesupport/test/core_ext/module/attr_internal_test.rb +52 -0
  1289. data/vendor/rails/activesupport/test/core_ext/module/attribute_accessor_test.rb +39 -0
  1290. data/vendor/rails/activesupport/test/core_ext/module/attribute_aliasing_test.rb +58 -0
  1291. data/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb +27 -0
  1292. data/vendor/rails/activesupport/test/core_ext/module/synchronization_test.rb +86 -0
  1293. data/vendor/rails/activesupport/test/core_ext/module_test.rb +363 -0
  1294. data/vendor/rails/activesupport/test/core_ext/name_error_test.rb +20 -0
  1295. data/vendor/rails/activesupport/test/core_ext/numeric_ext_test.rb +168 -0
  1296. data/vendor/rails/activesupport/test/core_ext/object_and_class_ext_test.rb +294 -0
  1297. data/vendor/rails/activesupport/test/core_ext/object_ext_test.rb +8 -0
  1298. data/vendor/rails/activesupport/test/core_ext/pathname_test.rb +9 -0
  1299. data/vendor/rails/activesupport/test/core_ext/proc_test.rb +11 -0
  1300. data/vendor/rails/activesupport/test/core_ext/range_ext_test.rb +63 -0
  1301. data/vendor/rails/activesupport/test/core_ext/string_ext_test.rb +402 -0
  1302. data/vendor/rails/activesupport/test/core_ext/symbol_test.rb +9 -0
  1303. data/vendor/rails/activesupport/test/core_ext/time_ext_test.rb +771 -0
  1304. data/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb +851 -0
  1305. data/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb +12 -0
  1306. data/vendor/rails/activesupport/test/dependencies/check_warnings.rb +2 -0
  1307. data/vendor/rails/activesupport/test/dependencies/conflict.rb +1 -0
  1308. data/vendor/rails/activesupport/test/dependencies/cross_site_depender.rb +3 -0
  1309. data/vendor/rails/activesupport/test/dependencies/mutual_one.rb +4 -0
  1310. data/vendor/rails/activesupport/test/dependencies/mutual_two.rb +4 -0
  1311. data/vendor/rails/activesupport/test/dependencies/raises_exception.rb +3 -0
  1312. data/vendor/rails/activesupport/test/dependencies/requires_nonexistent0.rb +1 -0
  1313. data/vendor/rails/activesupport/test/dependencies/requires_nonexistent1.rb +1 -0
  1314. data/vendor/rails/activesupport/test/dependencies/service_one.rb +5 -0
  1315. data/vendor/rails/activesupport/test/dependencies/service_two.rb +2 -0
  1316. data/vendor/rails/activesupport/test/dependencies_test.rb +789 -0
  1317. data/vendor/rails/activesupport/test/deprecation/proxy_wrappers_test.rb +22 -0
  1318. data/vendor/rails/activesupport/test/deprecation_test.rb +167 -0
  1319. data/vendor/rails/activesupport/test/empty_bool.rb +7 -0
  1320. data/vendor/rails/activesupport/test/flush_cache_on_private_memoization_test.rb +43 -0
  1321. data/vendor/rails/activesupport/test/gzip_test.rb +7 -0
  1322. data/vendor/rails/activesupport/test/i18n_test.rb +98 -0
  1323. data/vendor/rails/activesupport/test/inflector_test.rb +298 -0
  1324. data/vendor/rails/activesupport/test/inflector_test_cases.rb +262 -0
  1325. data/vendor/rails/activesupport/test/json/decoding_test.rb +79 -0
  1326. data/vendor/rails/activesupport/test/json/encoding_test.rb +162 -0
  1327. data/vendor/rails/activesupport/test/memoizable_test.rb +261 -0
  1328. data/vendor/rails/activesupport/test/message_encryptor_test.rb +55 -0
  1329. data/vendor/rails/activesupport/test/message_verifier_test.rb +31 -0
  1330. data/vendor/rails/activesupport/test/multibyte_chars_test.rb +606 -0
  1331. data/vendor/rails/activesupport/test/multibyte_conformance.rb +129 -0
  1332. data/vendor/rails/activesupport/test/multibyte_test_helpers.rb +19 -0
  1333. data/vendor/rails/activesupport/test/multibyte_unicode_database_test.rb +22 -0
  1334. data/vendor/rails/activesupport/test/multibyte_utils_test.rb +137 -0
  1335. data/vendor/rails/activesupport/test/option_merger_test.rb +85 -0
  1336. data/vendor/rails/activesupport/test/ordered_hash_test.rb +237 -0
  1337. data/vendor/rails/activesupport/test/ordered_options_test.rb +53 -0
  1338. data/vendor/rails/activesupport/test/rescuable_test.rb +75 -0
  1339. data/vendor/rails/activesupport/test/safe_buffer_test.rb +36 -0
  1340. data/vendor/rails/activesupport/test/secure_random_test.rb +19 -0
  1341. data/vendor/rails/activesupport/test/string_inquirer_test.rb +15 -0
  1342. data/vendor/rails/activesupport/test/test_case_test.rb +57 -0
  1343. data/vendor/rails/activesupport/test/test_test.rb +188 -0
  1344. data/vendor/rails/activesupport/test/time_zone_test.rb +285 -0
  1345. data/vendor/rails/activesupport/test/whiny_nil_test.rb +50 -0
  1346. data/vendor/rails/activesupport/test/xml_mini/jdom_engine_test.rb +153 -0
  1347. data/vendor/rails/activesupport/test/xml_mini/libxml_engine_test.rb +204 -0
  1348. data/vendor/rails/activesupport/test/xml_mini/libxmlsax_engine_test.rb +181 -0
  1349. data/vendor/rails/activesupport/test/xml_mini/nokogiri_engine_test.rb +204 -0
  1350. data/vendor/rails/activesupport/test/xml_mini/nokogirisax_engine_test.rb +217 -0
  1351. data/vendor/rails/activesupport/test/xml_mini/rexml_engine_test.rb +15 -0
  1352. data/vendor/rails/railties/CHANGELOG +7 -2
  1353. data/vendor/rails/railties/Rakefile +6 -7
  1354. data/vendor/rails/railties/builtin/rails_info/rails/info.rb +1 -1
  1355. data/vendor/rails/railties/environments/boot.rb +6 -2
  1356. data/vendor/rails/railties/environments/environment.rb +1 -1
  1357. data/vendor/rails/railties/guides/rails_guides.rb +13 -24
  1358. data/vendor/rails/railties/guides/rails_guides/generator.rb +169 -49
  1359. data/vendor/rails/railties/guides/rails_guides/indexer.rb +24 -11
  1360. data/vendor/rails/railties/guides/rails_guides/levenshtein.rb +31 -0
  1361. data/vendor/rails/railties/guides/source/action_mailer_basics.textile +29 -12
  1362. data/vendor/rails/railties/guides/source/{credits.erb.textile → credits.html.erb} +4 -4
  1363. data/vendor/rails/railties/guides/source/{index.erb.textile → index.html.erb} +13 -12
  1364. data/vendor/rails/railties/guides/source/plugins.textile +1 -1
  1365. data/vendor/rails/railties/guides/source/security.textile +1 -1
  1366. data/vendor/rails/railties/lib/initializer.rb +44 -20
  1367. data/vendor/rails/railties/lib/rails/gem_dependency.rb +4 -2
  1368. data/vendor/rails/railties/lib/rails/plugin.rb +1 -1
  1369. data/vendor/rails/railties/lib/rails/plugin/loader.rb +3 -3
  1370. data/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +2 -2
  1371. data/vendor/rails/railties/lib/rails/version.rb +1 -1
  1372. data/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb +18 -0
  1373. data/vendor/rails/railties/lib/rails_generator/generators/components/migration/migration_generator.rb +1 -1
  1374. data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/test_helper.rb +2 -1
  1375. data/vendor/rails/railties/lib/tasks/databases.rake +9 -9
  1376. data/vendor/rails/railties/lib/tasks/tmp.rake +37 -0
  1377. data/vendor/rails/railties/test/abstract_unit.rb +27 -0
  1378. data/vendor/rails/railties/test/backtrace_cleaner_test.rb +61 -0
  1379. data/vendor/rails/railties/test/boot_test.rb +178 -0
  1380. data/vendor/rails/railties/test/console_app_test.rb +42 -0
  1381. data/vendor/rails/railties/test/fcgi_dispatcher_test.rb +266 -0
  1382. data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/about.yml +1 -0
  1383. data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb +1 -0
  1384. data/vendor/rails/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb +1 -0
  1385. data/vendor/rails/railties/test/fixtures/eager/zoo.rb +3 -0
  1386. data/vendor/rails/railties/test/fixtures/eager/zoo/reptile_house.rb +2 -0
  1387. data/vendor/rails/railties/test/fixtures/environment_with_constant.rb +1 -0
  1388. data/vendor/rails/railties/test/fixtures/lib/generators/missing_class/missing_class_generator.rb +0 -0
  1389. data/vendor/rails/railties/test/fixtures/lib/generators/working/working_generator.rb +2 -0
  1390. data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +5 -0
  1391. data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +5 -0
  1392. data/vendor/rails/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb +5 -0
  1393. data/vendor/rails/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb +5 -0
  1394. data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb +7 -0
  1395. data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb +7 -0
  1396. data/vendor/rails/railties/test/fixtures/plugins/alternate/a/generators/a_generator/a_generator.rb +4 -0
  1397. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/init.rb +1 -0
  1398. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb +2 -0
  1399. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/rails/init.rb +7 -0
  1400. data/vendor/rails/railties/test/fixtures/plugins/default/plugin_with_no_lib_dir/init.rb +0 -0
  1401. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/about.yml +2 -0
  1402. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/generators/stubby_generator/stubby_generator.rb +4 -0
  1403. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/init.rb +7 -0
  1404. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/lib/stubby_mixin.rb +2 -0
  1405. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/controllers/engine_controller.rb +2 -0
  1406. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb +9 -0
  1407. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/models/engine_model.rb +2 -0
  1408. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml +2 -0
  1409. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/routes.rb +3 -0
  1410. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/init.rb +3 -0
  1411. data/vendor/rails/railties/test/fixtures/public/foo/bar.html +1 -0
  1412. data/vendor/rails/railties/test/fixtures/public/foo/index.html +1 -0
  1413. data/vendor/rails/railties/test/fixtures/public/index.html +1 -0
  1414. data/vendor/rails/railties/test/gem_dependency_test.rb +227 -0
  1415. data/vendor/rails/railties/test/generator_lookup_test.rb +40 -0
  1416. data/vendor/rails/railties/test/generators/generated_attribute_test.rb +38 -0
  1417. data/vendor/rails/railties/test/generators/generator_test_helper.rb +322 -0
  1418. data/vendor/rails/railties/test/generators/rails_controller_generator_test.rb +44 -0
  1419. data/vendor/rails/railties/test/generators/rails_helper_generator_test.rb +36 -0
  1420. data/vendor/rails/railties/test/generators/rails_mailer_generator_test.rb +29 -0
  1421. data/vendor/rails/railties/test/generators/rails_model_generator_test.rb +96 -0
  1422. data/vendor/rails/railties/test/generators/rails_resource_generator_test.rb +29 -0
  1423. data/vendor/rails/railties/test/generators/rails_scaffold_generator_test.rb +151 -0
  1424. data/vendor/rails/railties/test/generators/rails_template_runner_test.rb +216 -0
  1425. data/vendor/rails/railties/test/initializer_test.rb +437 -0
  1426. data/vendor/rails/railties/test/metal_test.rb +72 -0
  1427. data/vendor/rails/railties/test/mocks/routes.rb +6 -0
  1428. data/vendor/rails/railties/test/plugin_loader_test.rb +172 -0
  1429. data/vendor/rails/railties/test/plugin_locator_test.rb +62 -0
  1430. data/vendor/rails/railties/test/plugin_test.rb +162 -0
  1431. data/vendor/rails/railties/test/plugin_test_helper.rb +29 -0
  1432. data/vendor/rails/railties/test/rack_static_test.rb +47 -0
  1433. data/vendor/rails/railties/test/rails_generator_test.rb +145 -0
  1434. data/vendor/rails/railties/test/rails_info_controller_test.rb +52 -0
  1435. data/vendor/rails/railties/test/rails_info_test.rb +99 -0
  1436. data/vendor/rails/railties/test/secret_key_generation_test.rb +38 -0
  1437. data/vendor/rails/railties/test/vendor/gems/dummy-gem-a-0.4.0/lib/dummy-gem-a.rb +1 -0
  1438. data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.4.0/lib/dummy-gem-b.rb +1 -0
  1439. data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.6.0/lib/dummy-gem-b.rb +1 -0
  1440. data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.4.0/lib/dummy-gem-c.rb +1 -0
  1441. data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.6.0/lib/dummy-gem-c.rb +1 -0
  1442. data/vendor/rails/railties/test/vendor/gems/dummy-gem-d-1.0.0/lib/dummy-gem-d.rb +1 -0
  1443. data/vendor/rails/railties/test/vendor/gems/dummy-gem-e-1.0.0/lib/dummy-gem-e.rb +1 -0
  1444. data/vendor/rails/railties/test/vendor/gems/dummy-gem-f-1.0.0/lib/dummy-gem-f.rb +1 -0
  1445. data/vendor/rails/railties/test/vendor/gems/dummy-gem-g-1.0.0/lib/dummy-gem-g.rb +1 -0
  1446. data/vendor/rails/railties/test/vendor/gems/dummy-gem-h-1.0.0/lib/dummy-gem-h.rb +1 -0
  1447. data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/ext/dummy-gem-i/Makefile +0 -0
  1448. data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/lib/dummy-gem-i.rb +1 -0
  1449. data/vendor/rails/railties/test/vendor/gems/dummy-gem-j-1.0.0/lib/dummy-gem-j.rb +1 -0
  1450. data/vendor/rails/railties/test/vendor/gems/dummy-gem-k-1.0.0/lib/dummy-gem-k.rb +1 -0
  1451. data/vendor/rails/railties/test/vendor/gems/dummy-gem-l-1.0.0-x86-mswin32/lib/dummy-gem-l.rb +1 -0
  1452. metadata +1156 -125
  1453. data/app/controllers/admin/export_controller.rb +0 -5
  1454. data/app/helpers/admin/abstract_model_helper.rb +0 -2
  1455. data/app/models/radiant/exporter.rb +0 -11
  1456. data/db/templates/roasters.yml +0 -1210
  1457. data/db/templates/simple-blog.yml +0 -197
  1458. data/db/templates/styled-blog.yml +0 -472
  1459. data/lib/radiant/legacy_routes.rb +0 -72
  1460. data/public/images/admin/buttons_background.png +0 -0
  1461. data/public/images/admin/login_shadow.png +0 -0
  1462. data/public/images/admin/navigation_background.gif +0 -0
  1463. data/public/images/admin/navigation_secondary_background.png +0 -0
  1464. data/public/images/admin/navigation_shadow.png +0 -0
  1465. data/public/images/admin/navigation_tabs.png +0 -0
  1466. data/public/images/admin/new_homepage.png +0 -0
  1467. data/public/images/admin/new_layout.png +0 -0
  1468. data/public/images/admin/new_snippet.png +0 -0
  1469. data/public/images/admin/new_user.png +0 -0
  1470. data/public/images/admin/shadow.png +0 -0
  1471. data/public/images/admin/shadow_grey.png +0 -0
  1472. data/public/images/admin/spacer.gif +0 -0
  1473. data/public/images/admin/vertical_tan_gradient.png +0 -0
  1474. data/public/images/admin/view_site.png +0 -0
  1475. data/public/stylesheets/sass/admin/modules/_grid.sass +0 -56
  1476. data/public/stylesheets/sass/admin/modules/_opacity.sass +0 -7
  1477. data/public/stylesheets/sass/admin/modules/_rounded.sass +0 -41
  1478. data/public/stylesheets/sass/admin/modules/_shadow.sass +0 -9
  1479. data/public/stylesheets/sass/admin/partials/_reset.sass +0 -36
  1480. data/rerun.txt +0 -1
  1481. data/spec/helpers/admin/abstract_model_helper_spec.rb +0 -4
  1482. data/spec/lib/radiant/legacy_routes_spec.rb +0 -14
  1483. data/spec/models/radiant/exporter_spec.rb +0 -25
  1484. data/vendor/extensions/archive/test/fixtures/pages.yml +0 -397
  1485. data/vendor/extensions/archive/test/functional/archive_extension_test.rb +0 -16
  1486. data/vendor/extensions/archive/test/helpers/archive_index_test_helper.rb +0 -37
  1487. data/vendor/extensions/archive/test/test_helper.rb +0 -26
  1488. data/vendor/extensions/archive/test/unit/archive_day_index_page_test.rb +0 -22
  1489. data/vendor/extensions/archive/test/unit/archive_month_index_page_test.rb +0 -22
  1490. data/vendor/extensions/archive/test/unit/archive_page_test.rb +0 -40
  1491. data/vendor/extensions/archive/test/unit/archive_year_index_page_test.rb +0 -22
  1492. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.html +0 -8
  1493. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.text +0 -4
  1494. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.html +0 -1
  1495. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.options +0 -1
  1496. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.text +0 -1
  1497. data/vendor/plugins/haml/test/sass/templates/bork.sass +0 -2
  1498. data/vendor/rails/activerecord/examples/performance.sql +0 -85
  1499. data/vendor/rails/activerecord/test/cases/encoding_test.rb +0 -6
  1500. data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite +0 -0
  1501. data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 +0 -0
  1502. data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite +0 -0
  1503. data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 +0 -0
  1504. data/vendor/rails/activeresource/test/debug.log +0 -80350
  1505. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb +0 -66
  1506. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb +0 -69
  1507. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb +0 -68
  1508. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/links.rb +0 -34
  1509. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/simple.rb +0 -22
  1510. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/except.rb +0 -8
  1511. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/slice.rb +0 -8
  1512. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/object/meta_class.rb +0 -5
  1513. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/helpers.rb +0 -5
  1514. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/version.rb +0 -3
@@ -21,7 +21,7 @@ kramdown has a basic *Cloth API, so using kramdown is as easy as
21
21
  Just clone the git repository as described in doc/installation.page you are good to go. You probably
22
22
  want to install `rake` so that you can use the provided rake tasks. Aside from that:
23
23
 
24
- * The `tidy` binary needs to be installed for the html-to-html tests to work.
24
+ * The `tidy` binary needs to be installed for the automatically derived tests to work.
25
25
  * The `latex` binary needs to be installed for the latex-compilation tests to work.
26
26
 
27
27
 
@@ -236,7 +236,7 @@ EOF
236
236
 
237
237
  desc "Upload the website to Rubyforge"
238
238
  task :publish_website => ['doc'] do
239
- sh "rsync -avc --delete --exclude 'wiki' --exclude 'robots.txt' htmldoc/ gettalong@rubyforge.org:/var/www/gforge-projects/kramdown/"
239
+ sh "rsync -avc --delete --exclude 'wiki' --exclude 'js/jsMath' --exclude 'robots.txt' htmldoc/ gettalong@rubyforge.org:/var/www/gforge-projects/kramdown/"
240
240
  end
241
241
 
242
242
 
@@ -306,7 +306,7 @@ if defined? Webgen
306
306
  lines = term.desc.split(/\n/)
307
307
  first = lines.shift
308
308
  rest = lines[0..-2].collect {|l| " " + l}.join("\n")
309
- "`#{term.name}`\n: #{first}\n#{rest}"
309
+ "`#{term.name}`\n: #{first}\n#{rest}\n\n"
310
310
  end.join("\n")
311
311
  end
312
312
 
@@ -1 +1 @@
1
- 0.8.0
1
+ 0.11.0
@@ -34,8 +34,8 @@ OptionParser.new do |opts|
34
34
  opts.separator "Command line options:"
35
35
  opts.separator ""
36
36
 
37
- opts.on("-i", "--input ARG", "Specify the input format: kramdown (default)") {|v| options[:input] = v}
38
- opts.on("-o", "--ouput ARG", "Specify the output format: html (default) or latex") {|v| format = v}
37
+ opts.on("-i", "--input ARG", "Specify the input format: kramdown (default) or html") {|v| options[:input] = v}
38
+ opts.on("-o", "--ouput ARG", "Specify the output format: html (default), kramdown or latex") {|v| format = v}
39
39
 
40
40
  opts.on("-v", "--version", "Show the version of kramdown") do
41
41
  puts Kramdown::VERSION
@@ -51,13 +51,14 @@ OptionParser.new do |opts|
51
51
  opts.separator ""
52
52
 
53
53
  Kramdown::Options.definitions.each do |n, definition|
54
+ no = n.to_s.tr('_', '-')
54
55
  if definition.type == Kramdown::Options::Boolean
55
- opts.on("--[no-]#{n}") {|v| options[n] = Kramdown::Options.parse(n, v)}
56
+ opts.on("--[no-]#{no}") {|v| options[n] = Kramdown::Options.parse(n, v)}
56
57
  else
57
58
  next if definition.type == Object
58
59
  type = definition.type
59
60
  type = String if type == Symbol
60
- opts.on("--#{n} ARG", type) {|v| options[n] = Kramdown::Options.parse(n, v)}
61
+ opts.on("--#{no} ARG", type) {|v| options[n] = Kramdown::Options.parse(n, v)}
61
62
  end
62
63
 
63
64
  definition.desc.split(/\n/).each do |line|
@@ -1,7 +1,16 @@
1
1
  <html>
2
2
  <head>
3
- <title></title>
4
- <meta name="generator" content="kramdown <%= Kramdown::VERSION %>" />
3
+ <%
4
+ extend ::Kramdown::Utils::HTML
5
+ title = ''
6
+ h = @doc.tree.children.find {|c| c.type == :header}
7
+ if h
8
+ collector = lambda {|c| c.children.collect {|cc| cc.type == :text ? escape_html(cc.value, :text) : collector.call(cc)}.join('')}
9
+ title = collector.call(h)
10
+ end
11
+ %>
12
+ <title><%= title %></title>
13
+ <meta name="generator" content="kramdown <%= ::Kramdown::VERSION %>" />
5
14
  </head>
6
15
  <body>
7
16
  <%= @body %>
@@ -1,5 +1,5 @@
1
- @text-color: #354146;
2
- @link-color: #1666A3;
1
+ $text-color: #354146;
2
+ $link-color: #1666A3;
3
3
 
4
4
  * {
5
5
  padding: 0;
@@ -29,10 +29,11 @@ body, table, code {
29
29
  background: #364147;
30
30
  background-image: -moz-linear-gradient(top, rgba(54,65,71,1), rgba(81,92,96,1));
31
31
  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(54,65,71,1)), to(rgba(81,92,96,1)));
32
+ position: relative;
32
33
  }
33
34
 
34
35
  #header {
35
- .with-margin;
36
+ @extend .with-margin;
36
37
 
37
38
  position: relative;
38
39
  padding: 0 0 0 30px;
@@ -57,6 +58,11 @@ body, table, code {
57
58
  }
58
59
  }
59
60
 
61
+ #donation {
62
+ position: absolute;
63
+ right: 10px;
64
+ bottom: 5px;
65
+ }
60
66
 
61
67
  /* menu */
62
68
  #fullnav {
@@ -66,7 +72,7 @@ body, table, code {
66
72
  }
67
73
 
68
74
  #nav {
69
- .with-margin;
75
+ @extend .with-margin;
70
76
 
71
77
  ul {
72
78
  height: 40px;
@@ -120,7 +126,8 @@ body, table, code {
120
126
  }
121
127
 
122
128
  #intro {
123
- .with-margin;
129
+ @extend .with-margin;
130
+
124
131
  background: #e6e8e9;
125
132
  height: auto;
126
133
 
@@ -133,7 +140,7 @@ body, table, code {
133
140
  }
134
141
 
135
142
  a {
136
- color: @link-color;
143
+ color: $link-color;
137
144
  background-color: inherit;
138
145
  text-decoration: underline;
139
146
  }
@@ -146,7 +153,8 @@ body, table, code {
146
153
 
147
154
  /* content */
148
155
  #container {
149
- .with-margin;
156
+ @extend .with-margin;
157
+
150
158
  position: relative;
151
159
  clear: both;
152
160
  background-color: #fff;
@@ -154,7 +162,7 @@ body, table, code {
154
162
  background-image: -webkit-gradient(linear, 0 0, 0 200, from(#eee), to(#fff));
155
163
 
156
164
  a {
157
- color: @link-color;
165
+ color: $link-color;
158
166
  background-color: inherit;
159
167
  text-decoration: underline;
160
168
  }
@@ -462,7 +470,8 @@ body, table, code {
462
470
 
463
471
  /* footer */
464
472
  #footer {
465
- .with-margin;
473
+ @extend .with-margin;
474
+
466
475
  clear: both;
467
476
  margin-top: 20px;
468
477
  padding: 5px 20px 30px;
@@ -3,12 +3,12 @@
3
3
  <head>
4
4
  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
5
5
  <meta name="author" content="Thomas Leitner" />
6
- <meta name="copyright" content="2009 Thomas Leitner" />
6
+ <meta name="copyright" content="2009-2010 Thomas Leitner" />
7
7
  <meta name="description" content="kramdown is a fast, pure-Ruby Markdown-superset converter" />
8
8
  <meta name="keywords" content="ruby, kramdown, markdown, text markup" />
9
9
  <link href="{relocatable: default.css}" type="text/css" rel="stylesheet" media="screen,projection" />
10
10
  <link href="{relocatable: news.atom}" type="application/atom+xml" rel="alternate" />
11
- <script src="{relocatable: js/jsMath/easy/load.js}" type="text/javascript"></script>
11
+ <script src="http://kramdown.rubyforge.org/js/jsMath/easy/load.js" type="text/javascript"></script>
12
12
  <title>{title:} | kramdown</title>
13
13
  </head>
14
14
  <body>
@@ -16,6 +16,15 @@
16
16
  <div id="header">
17
17
  <h1 id="logo"><a href="{relocatable: /}" title="Homepage">kramdown <span class='slogan'>fast, pure-Ruby Markdown-superset converter</span></a></h1>
18
18
  </div>
19
+ <div id="donation">
20
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
21
+ <input type="hidden" name="cmd" value="_s-xclick" />
22
+ <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHJwYJKoZIhvcNAQcEoIIHGDCCBxQCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYDA8HEgfduoLW7LANqmfG9shb8sk23qWHt1vJ65J7bcOHFW1Hw/aZV7O2Xf2hRtVmHBQemuFBMVCLFFYn1Tj667ay65xPWrbtNdOcxJ6diwwVcrxMJ/EyS7niUKuTfujgmq5ra9CgNy84WSa0Cw/sWSMrK6XMX9brALPBcKbB003TELMAkGBSsOAwIaBQAwgaQGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQITt+KFiwA4NOAgYBJEwBt4G0KjfWMn428qsUqj7nBGl9dhhOT9FsHPoKHm5lmzadeIhtu7vPwqaH5cZAbE/nZBhkV9/MdgWCt9kMkDLD4Jq+TGLa4RDK+ltxErnPNgr9TYvBOGPAoYTXvA12w+KUewhV1cB/gSdz43oHrBPAyO6x4ZWUhndD2+yqZhKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEwMDcxOTA2MzUwOVowIwYJKoZIhvcNAQkEMRYEFBdLGCmffPW6PMR/W24T+7ktQe1iMA0GCSqGSIb3DQEBAQUABIGAdn5PO7OJuHq/YpWaWKkJMDNhCqAyRyWpaM4LMQXzyA+ADoKvPnpgHrCdJpvB01L/Wk2apJ59CpB7iFerXh6QRgX85lE6HFl3C+GDRikabulgIn0F/1SMeUuvuRZ8g//Z3xcktOzdchB65K2LyUowAV8rpeWGmt8JFNwOZbeqcmw=-----END PKCS7-----
23
+ " />
24
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
25
+ <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
26
+ </form>
27
+ </div>
19
28
  </div>
20
29
  <div id="fullnav">
21
30
  <div id="nav">
@@ -10,7 +10,7 @@ HTML. However, due to its modular architecture it is able to support additional
10
10
  formats. The following input and output formats are currently supported:
11
11
 
12
12
  * Input: [kramdown](parser/kramdown.html) (a superset of Markdown), [html](parser/html.html)
13
- * Output: [HTML](converter/html.html), [LaTeX](converter/latex.html)
13
+ * Output: [HTML](converter/html.html), [LaTeX](converter/latex.html), [kramdown](converter/kramdown.html)
14
14
 
15
15
 
16
16
  ## Usage
@@ -8,8 +8,42 @@ sort_info: 1
8
8
  If you want to get started with kramdown, have a look at the [installation page](installation.html)
9
9
  to see how you can install it on your system. Then look through the
10
10
  [documentation](documentation.html) for finding information about how to actually use kramdown and
11
- what parsers/converters it supports. The [syntax](syntax.html) provides a detailed description of
12
- the superset of Markdown which kramdown supports.
11
+ its parsers/converters. The [syntax](syntax.html) provides a detailed description of the superset of
12
+ Markdown which kramdown supports.
13
+
14
+ {tikz:: path: overview.png
15
+ img_attr: {style: 'background:transparent'}
16
+ libraries: [mindmap, trees, arrows]
17
+ transparent: true
18
+ resolution: 300 100
19
+ opts: |
20
+ mindmap, concept color=black, text=white,
21
+ root concept/.append style={font=\Large},
22
+ level 1 concept/.append style={font=\Large, minimum size=2.6cm},
23
+ level 2 concept/.append style={font=\Large},
24
+ }
25
+ \node[concept, font=\Large] (lib) {kramdown's internal representation}
26
+ child[concept color=orange, grow=150, ->] {node[concept] (i-kramdown) {kramdown}}
27
+ child[concept color=orange, grow=210] {node[concept] (i-html) {HTML}}
28
+ child[concept color=green!50!black, grow=40] {node[concept] (o-html) {HTML}}
29
+ child[concept color=green!50!black, grow=0] {node[concept] (o-kramdown) {kramdown}}
30
+ child[concept color=green!50!black, grow=-45] {
31
+ node[concept] (o-latex) {\LaTeX}
32
+ child[grow=0] {
33
+ node[concept] (o-latex-pdf) {PDF}
34
+ }
35
+ }
36
+ child[concept color=green!50!black, grow=-45] {node[concept] {\LaTeX}}
37
+ ;
38
+ \draw [dash pattern=on 0pt off 2pt,line width=5pt,arrows=-angle 60,shorten >=15pt,shorten <=10pt,color=orange]
39
+ (i-kramdown) edge(lib)
40
+ (i-html) edge (lib);
41
+ \draw [dash pattern=on 0pt off 2pt,line width=5pt,arrows=-angle 60,shorten >=10pt,shorten <=15pt,color=green!50!black]
42
+ (lib) edge(o-html)
43
+ (lib) edge (o-kramdown)
44
+ (lib) edge (o-latex);
45
+ {tikz}
46
+ {: style="text-align: center"}
13
47
 
14
48
 
15
49
  ## Bugs, Forums, Mailing Lists
@@ -38,7 +72,6 @@ Markdown implementations because kramdown borrowed many ideas from existing pack
38
72
 
39
73
  [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
40
74
  [Maruku]: http://maruku.rubyforge.org
41
- [RedCloth]: http://whytheluckystiff.net/ruby/redcloth/
42
75
  [BlueCloth]: http://www.deveiate.org/projects/BlueCloth
43
76
 
44
77
 
@@ -55,7 +88,7 @@ It is probably the fastest pure-Ruby Markdown converter available (June 2010), b
55
88
  than [Maruku] and about 9x faster than [BlueFeather].
56
89
 
57
90
  <p class="a-center">
58
- The latest version of kramdown is <b>0.8.0</b> and it was released on <b>2010-06-08</b>.
91
+ The latest version of kramdown is <b>0.11.0</b> and it was released on <b>2010-10-01</b>.
59
92
  </p>
60
93
 
61
94
  [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
@@ -310,7 +310,7 @@ This can contain only *span* level elements.
310
310
 
311
311
  ## Block Attributes
312
312
 
313
- {kdlink: {oid: block-inline-attribute-lists, part: "block IALs"}}
313
+ {kdlink: {oid: block-ials, part: "block IALs"}}
314
314
  {kdlink: {oid: attribute-list-definitions, part: "ALDs"}}
315
315
 
316
316
  You can assign any attribute to a block level element. Just directly follow the block with a *block
@@ -553,7 +553,7 @@ red</span>.
553
553
 
554
554
  ## Inline Attributes
555
555
 
556
- {kdlink: {oid: span-inline-attribute-lists, part: "span IALs"}}
556
+ {kdlink: {oid: span-ials, part: "span IALs"}}
557
557
 
558
558
  As with a block level element you can assign any attribute to a span level elements using a *span
559
559
  inline attribute list* (or short: span IAL). A span IAL has the same syntax as a block IAL and must
@@ -26,8 +26,9 @@ document is converted.
26
26
  ## Source Text Formatting
27
27
 
28
28
  A kramdown document may be in any encoding, for example ASCII, UTF-8 or ISO-8859-1, and the output
29
- will have the same encoding as the source. The document consists of two types of elements, block
30
- level elements and span level elements:
29
+ will have the same encoding as the source.
30
+
31
+ The document consists of two types of elements, block level elements and span level elements:
31
32
 
32
33
  * Block level elements define the main structure of the content, for example, what part of the text
33
34
  should be a paragraph, a list, a blockquote and so on.
@@ -43,6 +44,32 @@ beginning of a kramdown document opens up the default indentation level which be
43
44
  column of the text.
44
45
 
45
46
 
47
+ ## Line Wrapping
48
+
49
+ Some lightweight markup syntax don't work well in environments where lines are hard-wrapped. For
50
+ example, this is the case with many email programs. Therefore kramdown allows content like
51
+ paragraphs or blockquotes to be hard-wrapped, i.e. broken across lines. This is sometimes referred
52
+ to as "lazy syntax" since the indentation or line prefix required for the first line of content is
53
+ not required for the consecutive lines.
54
+
55
+ Block level elements that support line wrapping always end when one of the following conditions is
56
+ encountered:
57
+
58
+ * a [blank line](#blank-lines), an [EOB marker line](#eob-marker), a [block IAL](#block-ials) or the
59
+ end of the document (i.e. a [block boundary](#block-boundaries)),
60
+
61
+ * or an [HTML block](#html-blocks).
62
+
63
+ Line wrapping is allowed throughout a kramdown document. There is one exception, however:
64
+ [headers](#headers) may not be wrapped across lines. This is not an issue in most situations since
65
+ headers normally fit on one line. If a header text gets too long for one line, use HTML syntax
66
+ instead.
67
+
68
+ **Note** that it is **NOT** recommended to use lazy syntax to write a kramdown document. The
69
+ flexibility that the kramdown syntax offers due to the issue of line wrapping hinders readability
70
+ and should therefore not be used.
71
+
72
+
46
73
  ### Usage of Tabs
47
74
 
48
75
  kramdown assumes that tab stops are set at multiples of four. This is especially important when
@@ -58,7 +85,7 @@ when converting a kramdown document to HTML one needs to take care of the charac
58
85
  depending on the output format.
59
86
 
60
87
  This means, for example, that you can just use `<`, `>` and `&` in a kramdown document and need not
61
- think about when to use their HTML entity counterparts. However, if you *do use* HTML entitys or
88
+ think about when to use their HTML entity counterparts. However, if you *do use* HTML entities or
62
89
  HTML tags which use one of the characters, the result will be correct nonetheless!
63
90
 
64
91
  Since kramdown also uses some characters to mark-up the text, there needs to be a way to escape
@@ -75,6 +102,7 @@ Following is a list of all the characters (character sequences) that can be esca
75
102
  _ underscore
76
103
  + plus
77
104
  - minus
105
+ = equal sign
78
106
  ` backtick
79
107
  ()[]{} left and right parens/brackets/braces
80
108
  # hash
@@ -88,6 +116,21 @@ Following is a list of all the characters (character sequences) that can be esca
88
116
  $ dollar sign
89
117
 
90
118
 
119
+ ## Block Boundaries
120
+
121
+ Some block level elements have to start and/or end on so called block boundaries, as stated in their
122
+ documentation. There are two cases where block boundaries come into play:
123
+
124
+ * If a block level element has to start on a block boundary, it has to be preceded by either a
125
+ [blank line](#blank-lines), an [EOB marker](#eob-marker), a [block IAL](#block-ials) or it has to
126
+ be the first element.
127
+
128
+ * If a block level element has to end on a block boundary, it has to be followed by either a [blank
129
+ line](#blank-lines), an [EOB marker](#eob-marker), a [block IAL](#block-ials) or it has to be the
130
+ last element.
131
+
132
+
133
+
91
134
  # Structural Elements
92
135
 
93
136
  All structural elements are block level elements and they are used to structure the content. They
@@ -98,30 +141,36 @@ can mark up some text as, for example, a simple paragraph, a quote or as a list
98
141
 
99
142
  Any line that just contains white space characters such as spaces and tabs is considered a blank
100
143
  line by kramdown. One or more consecutive blank lines are handled as one empty blank line. Blank
101
- lines are mostly used to visually separate block level elements from each other and in this case
102
- they don't have semantic meaning. However, there are some cases where blank lines do have a semantic
103
- meaning:
144
+ lines are used to separate block level elements from each other and in this case they don't have
145
+ semantic meaning. However, there are some cases where blank lines do have a semantic meaning:
104
146
 
105
- * When used in paragraphs -- see the [paragraphs section](#paragraphs)
106
147
  * When used in headers -- see the [headers section](#headers)
148
+ * When used in code blocks -- see the [code blocks section](#code-blocks)
107
149
  * When used in lists -- see the [lists section](#lists)
150
+ * When used in math blocks -- see the [math blocks section](#math-blocks)
151
+ * When used for elements that have to start/end on [block boundaries](#block-boundaries)
108
152
 
109
153
 
110
154
  ## Paragraphs
111
155
 
112
156
  Paragraphs are the most used block level elements. One or more consecutive lines of text are
113
- interpreted as one paragraph. Every line of a paragraph may be indented up to three spaces. You can
114
- separate two consecutive paragraphs from each other by using one or more blank lines. Notice that a
115
- line break in the source does not mean a line break in the output! If you want to have an explicit
116
- line break (i.e. a `<br />` tag) you need to end a line with two or more spaces or two backslashes!
117
- Note, however, that a line break on the last text line of a paragraph is not possible and will be
118
- ignored. Leading and trailing spaces will be stripped from the paragraph text.
157
+ interpreted as one paragraph. The first line of a paragraph may be indented up to three spaces, the
158
+ other lines can have any amount of indentation because paragraphs support [line
159
+ wrapping](#line-wrapping). In addition to the rules outlined in the section about line wrapping, a
160
+ paragraph ends when a [definition list line](#definition-lists) is encountered.
161
+
162
+ You can separate two consecutive paragraphs from each other by using one or more blank lines. Notice
163
+ that a line break in the source does not mean a line break in the output (due to the [lazy
164
+ syntax](#line-wrapping))!. If you want to have an explicit line break (i.e. a `<br />` tag) you need
165
+ to end a line with two or more spaces or two backslashes! Note, however, that a line break on the
166
+ last text line of a paragraph is not possible and will be ignored. Leading and trailing spaces will
167
+ be stripped from the paragraph text.
119
168
 
120
169
  The following gives you an example of how paragraphs look like:
121
170
 
122
171
  This para line starts at the first column. However,
123
- the lines can be indented up to three spaces.
124
- The para continues here.
172
+ the following lines can be indented any number of spaces/tabs.
173
+ The para continues here.
125
174
 
126
175
  This is another paragraph, not connected to the above one. But
127
176
  with a hard line break. \\
@@ -136,12 +185,12 @@ single document.
136
185
 
137
186
  ### Setext Style
138
187
 
139
- Setext style headers are specified by a [blank line](#blank-lines) (except at the beginning of a
140
- document), followed by a line of text (the header text) and a line with only equal signs (for a
141
- first level header) or dashes (for a second level header). The header text may be indented up to
142
- three spaces but any leading or trailing spaces are stripped from the header text. The amount of
143
- equal signs or dashes is not significant, just one is enough but more may look better. The equal
144
- signs or dashes have to begin at the first column. For example:
188
+ Setext style headers have to start on a [block boundary](#block-boundaries) with a line of text (the
189
+ header text) and a line with only equal signs (for a first level header) or dashes (for a second
190
+ level header). The header text may be indented up to three spaces but any leading or trailing spaces
191
+ are stripped from the header text. The amount of equal signs or dashes is not significant, just one
192
+ is enough but more may look better. The equal signs or dashes have to begin at the first column. For
193
+ example:
145
194
 
146
195
  First level header
147
196
  ==================
@@ -152,7 +201,8 @@ signs or dashes have to begin at the first column. For example:
152
201
  Other first level header
153
202
  =
154
203
 
155
- As mentioned you need to insert a blank line before (but not necessarily after) a Setext header:
204
+ Since Setext headers start on block boundaries, this means in most situations that they have to be
205
+ preceded by a blank line. However, blank lines are not necessary after a Setext header:
156
206
 
157
207
  This is a normal
158
208
  paragraph.
@@ -167,7 +217,7 @@ As mentioned you need to insert a blank line before (but not necessarily after)
167
217
  ------------
168
218
 
169
219
  However, it is generally a good idea to also use a blank line after a Setext header because it looks
170
- more appropriate.
220
+ more appropriate and eases reading of the document.
171
221
 
172
222
  > The original Markdown syntax allows one to omit the blank line before a Setext header. However,
173
223
  > this leads to ambiguities and makes reading the document harder than necessary. Therefore it is
@@ -186,13 +236,12 @@ the case. The general rule is that Setext headers are processed before horizonta
186
236
 
187
237
  ### atx Style
188
238
 
189
- atx style headers are specified by a [blank line](#blank-lines) (except at the beginning of a
190
- document), followed by a line with one or more hash characters and then the header text. No spaces
191
- are allowed before the hash characters. The number of hash characters specifies the heading level:
192
- one hash character gives you a first level heading, two a second level heading and so on until the
193
- maximum of six hash characters for a sixth level heading. You may optionally use any number of
194
- hashes at the end of the line to close the header. Any leading or trailing spaces are stripped from
195
- the header text. For example:
239
+ atx style headers have to start on a [block boundary](#block-boundaries) with a line that contains
240
+ one or more hash characters and then the header text. No spaces are allowed before the hash
241
+ characters. The number of hash characters specifies the heading level: one hash character gives you
242
+ a first level heading, two a second level heading and so on until the maximum of six hash characters
243
+ for a sixth level heading. You may optionally use any number of hashes at the end of the line to
244
+ close the header. Any leading or trailing spaces are stripped from the header text. For example:
196
245
 
197
246
  # First level header
198
247
 
@@ -226,20 +275,25 @@ trailing hashes. For example:
226
275
  ## Blockquotes
227
276
 
228
277
  A blockquote is started using the `>` marker followed by an optional space and the content of the
229
- blockquote. The marker itself may be indented up to three spaces. All following lines that are also
230
- started with the blockquote marker belong to the blockquote. The contents of a blockquote are block
231
- level elements. This means that if you are just using text as content that it will be wrapped in a
232
- paragraph. For example, the following gives you one blockquote with two paragraphs in it:
278
+ blockquote. The marker itself may be indented up to three spaces. All following lines, whether they
279
+ are started with the blockquote marker or just contain text, belong to the blockquote because
280
+ blockquotes support [line wrapping](#line-wrapping).
281
+
282
+ The contents of a blockquote are block level elements. This means that if you are just using text as
283
+ content that it will be wrapped in a paragraph. For example, the following gives you one blockquote
284
+ with two paragraphs in it:
233
285
 
234
286
  > This is a blockquote.
235
- >on multiple lines.
287
+ > on multiple lines
288
+ that may be lazy.
236
289
  >
237
290
  > This is the second paragraph.
238
291
 
239
292
  Since the contents of a blockquote are block level elements, you can nest blockquotes and use other
240
- block level elements:
293
+ block level elements (this is also the reason why blockquotes need to support line wrapping):
241
294
 
242
295
  > This is a paragraph.
296
+ >
243
297
  > > A nested blockquote.
244
298
  >
245
299
  > ## Headers work
@@ -256,17 +310,16 @@ will have to be indented with five spaces or one space and one tab, like this:
256
310
  >
257
311
  > ruby -e 'puts :works'
258
312
 
259
- > The original Markdown syntax allowed "lazy" blockquotes, i.e. blockquotes where only the first line
260
- > needs a blockquote marker. This is disallowed in kramdown, you always need to use a blockquote
261
- > marker! The rational behind this is that most email programs and good text editors put the `>`
262
- > maker automatically before every quoted line and that things like the following work like
263
- > expected:
264
- >
265
- > > > This is some quoted text.
266
- > > > Spanning multiple lines.
267
- > > This is the answer to the quoted text above.
268
- > This is just a normal paragraph, with the answer to the above.
269
- {: .markdown-difference}
313
+ [Line wrapping](#line-wrapping) allows one to be lazy but hinders readability and should therefore
314
+ be avoided, especially with blockquotes. Here is an example of using blockquotes with line wrapping:
315
+
316
+ > This is a paragraph inside
317
+ a blockquote.
318
+ >
319
+ > > This is a nested paragraph
320
+ that continues here
321
+ > and here
322
+ > > and here
270
323
 
271
324
 
272
325
  ## Code Blocks
@@ -274,12 +327,19 @@ will have to be indented with five spaces or one space and one tab, like this:
274
327
  Code blocks can be used to represent verbatim text like markup, HTML or a program fragment because
275
328
  no syntax is parsed within a code block.
276
329
 
277
- ### Standard Code Block
330
+ ### Standard Code Blocks
278
331
 
279
332
  A code block can be started by using four spaces or one tab and then the text of the code block. All
280
- following lines that adhere to this syntax belong to the same code block. The indentation (four
281
- spaces or one tab) is stripped from the text. Note that blank lines don't separate consecutive code
282
- blocks:
333
+ following lines containing text, whether they adhere to this syntax or not, belong to the code block
334
+ because code blocks support [line wrapping](#line-wrapping)). A wrapped code line is automatically
335
+ appended to the preceding code line by substituting the line break with a space character. The
336
+ indentation (four spaces or one tab) is stripped from each line of the code block.
337
+
338
+ > The original Markdown syntax does not allow line wrapping in code blocks.
339
+ {: .markdown-difference}
340
+
341
+ Note that consecutive code blocks that are only separate by [blank lines](#blank-lines) are merged
342
+ together into one code block:
283
343
 
284
344
  Here comes some code
285
345
 
@@ -292,7 +352,7 @@ marker](#eob-marker) to separate the two:
292
352
  ^
293
353
  This one is separate.
294
354
 
295
- ### Fenced Code Block
355
+ ### Fenced Code Blocks
296
356
 
297
357
  > This alternative syntax is not part of the original Markdown syntax. The idea and syntax comes
298
358
  > from the [PHP Markdown Extra] package.
@@ -358,22 +418,36 @@ The following gives you an unordered list and an ordered list:
358
418
  The first list marker in a list may be indented up to three spaces. The column number of the first
359
419
  non-space character which appears after the list item marker on the same line specifies the
360
420
  indentation that has to be used for the following lines of content of the list item. If there is no
361
- such character, the indentation that needs to be used is four spaces or one tab. If a line does not
362
- have the needed amount of indentation, it is not treated as list item content. The indentation is
363
- stripped from the content and the content (note that the content naturally also contains the content
364
- of the line with the item marker) is processed as text containing block level elements. All other
365
- list markers in the list may be indented up to three spaces or the number of spaces used for the
366
- indentation of the last list item minus one, whichever number is smaller. For example:
421
+ such character, the indentation that needs to be used is four spaces or one tab. Indented lines may
422
+ be followed by lines containg text with any amount of indentation due to [line
423
+ wrapping](#line-wrapping). Note, however, that in addition to the rules outlined in the section
424
+ about line wrapping, a list item also ends when a line with another list item marker is encountered
425
+ -- see the next paragraph.
426
+
427
+ The indentation is stripped from the content and the content (note that the content naturally also
428
+ contains the content of the line with the item marker) is processed as text containing block level
429
+ elements. All other list markers in the list may be indented up to three spaces or the number of
430
+ spaces used for the indentation of the last list item minus one, whichever number is smaller. For
431
+ example:
367
432
 
368
433
  * This is the first line. Since the first non-space characters appears in column 3, all other
369
- lines have to be indented 2 spaces so that the first characters align. This tells kramdown
370
- that the lines belong to the list item.
434
+ indented lines have to be indented 2 spaces.
435
+ However, one could be lazy and not indent a line but this is not recommened.
371
436
  * This is the another item of the list. It uses a different number of spaces for
372
- indentation which is okay but should generally be avoided.
373
- * The list item marker is indented 3 spaces which is allowed but should also be avoided.
437
+ indentation which is okay but should generally be avoided.
438
+ * The list item marker is indented 3 spaces which is allowed but should also be avoided and
439
+ starts the third list item. Note that the lazy line in the second list item may make you
440
+ believe that this is a sub-list which it isn't! So avoid being lazy!
374
441
 
375
442
  So, while the above is possible and creates one list with three items, it is not advised to use
376
- different (marker and list content) indents for same level list items!
443
+ different (marker and list content) indents for same level list items as well as lazy indentation!
444
+ It is much better to write such a list in the following way:
445
+
446
+ * This is the first list item bla blabla blabla blabla blabla blabla blabla blabla blabla blabla
447
+ blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla
448
+ blabla blabla blabla bla
449
+ * This is the another item of the list. bla blabla blabla blabla blabla blabla blabla blabla
450
+ blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla blabla bla
377
451
 
378
452
  > The original Markdown syntax also allows you to indent the marker, however, the behaviour of what
379
453
  > happens with the list items is not clearly specified and may surprise you.
@@ -388,9 +462,9 @@ example:
388
462
  * Using a tab to indent this line, the tab only counts as three spaces and therefore the
389
463
  overall indentation is four spaces.
390
464
 
391
- 1. The tab after the marker counts here as two spaces. Since the indentation of the marker
392
- is three spaces and the marker itself takes two characters, the overall indentation
393
- needed for the following lines is eight spaces or two tabs.
465
+ 1. The tab after the marker counts here as three spaces. Since the indentation of the
466
+ marker is three spaces and the marker itself takes two characters, the overall
467
+ indentation needed for the following lines is eight spaces or two tabs.
394
468
 
395
469
  It is clear that you might get unexpected results if you mix tabs and spaces or if you don't have
396
470
  the tab stops set to multiples of four in your editor! Therefore this should be avoided!
@@ -443,6 +517,7 @@ Since the content of a list item can contain block level elements, you can do th
443
517
  A second paragraph
444
518
 
445
519
  * nested list
520
+
446
521
  > blockquote
447
522
 
448
523
  * Second item
@@ -469,17 +544,6 @@ Note that the list marker needs to be followed with at least one space or tab! O
469
544
  not recognized as the start of a list item but interpreted as a paragraph containing the list
470
545
  marker.
471
546
 
472
- > The original Markdown syntax allows you to be lazy when you just use text for a list item. So the
473
- > following is possible with Markdown:
474
- >
475
- > * First list item
476
- > continued here
477
- > * Second list item
478
- > continued here.
479
- >
480
- > This kind of syntax is disallowed in kramdown.
481
- {: .markdown-difference}
482
-
483
547
  If you want to have one list directly after another one (both with the same list type, i.e. ordered
484
548
  or unordered), you need to use an EOB marker to separate the two:
485
549
 
@@ -487,16 +551,9 @@ or unordered), you need to use an EOB marker to separate the two:
487
551
  ^
488
552
  * List two
489
553
 
490
- It is possible that a line gets parsed as ordered or unordered list although it shouldn't. This
491
- would be the case in the following example:
492
-
493
- I have read the book
494
- 1984. It was great
495
- - others say that, too!
496
-
497
- Therefore you have to insert a blank line after a paragraph if you want to follow the paragraph with
498
- a list. The only exception to this rule is when you want to create a compact nested list, i.e. a
499
- list where the text is not wrapped in paragraphs:
554
+ Since paragraphs support [line wrapping](#line-wrapping), it would usually not be possible to create
555
+ compact nested list, i.e. a list where the text is not wrapped in paragraphs because there is no
556
+ blank line but a sub list after it:
500
557
 
501
558
  * This is just text.
502
559
  * this is a sub list item
@@ -505,9 +562,11 @@ list where the text is not wrapped in paragraphs:
505
562
  spanning two lines
506
563
  * this is a nested list item.
507
564
 
508
- Another way to remedy the problem with the list item marker appearing in plain text is by escaping
509
- the period in an ordered list or the list item marker in an unordered list (this is especially
510
- useful when the paragraph starts with something looking like a list item marker):
565
+ However, this is an often used syntax and is therefore support by kramdown.
566
+
567
+ If you want to start a paragraph with something that looks like a list item marker, you need to
568
+ escape it. This is done by escaping the period in an ordered list or the list item marker in an
569
+ unordered list:
511
570
 
512
571
  1984\. It was great
513
572
  \- others say that, too!
@@ -530,8 +589,9 @@ after the list item marker:
530
589
  Definition lists allow you to assign one or more definitions to one or more terms.
531
590
 
532
591
  A definition list is started when a normal paragraph is followed by a line with a definition marker
533
- (a colon which may be optionally indented up to three spaces), then at least one tab or one space
534
- and then the first part of the definition. The line with the definition marker may optionally be
592
+ (a colon which may be optionally indented up to three spaces), then at least one tab or one space,
593
+ optionally followed by an [IAL](#inline-attribute-lists) that should be applied to the list item and
594
+ then the first part of the definition. The line with the definition marker may optionally be
535
595
  separated from the preceding paragraph by a blank line. The leading tabs or spaces are stripped away
536
596
  from this first line of the definition to allow for a nice alignment with the following definition
537
597
  content. Each line of the preceding paragraph is taken to be a term and the lines separately parsed
@@ -547,26 +607,29 @@ The following is a simple definition list:
547
607
 
548
608
  The column number of the first non-space character which appears after a definition marker on the
549
609
  same line specifies the indentation that has to be used for the following lines of the definition.
550
- If there is no such character, the indentation that needs to be used is four spaces or one tab. If
551
- one of the following lines does not have the needed amount of indentation, it is not treated as part
552
- of the definition. The indentation is stripped from the definition and it (note that the definition
553
- naturally also contains the content of the line with the definition marker) is processed as text
554
- containing block level elements. If there is more than one definition, all other definition markers
555
- for the term may be indented up to three spaces or the number of spaces used for the indentation of
556
- the last definition minus one, whichever number is smaller. For example:
610
+ If there is no such character, the indentation that needs to be used is four spaces or one tab.
611
+ Indented lines may be followed by lines containg text with any amount of indentation due to [line
612
+ wrapping](#line-wrapping). Note, however, that in addition to the rules outlined in the section
613
+ about line wrapping, a list item also ends when a line with another definition marker is encountered.
614
+
615
+ The indentation is stripped from the definition and it (note that the definition naturally also
616
+ contains the content of the line with the definition marker) is processed as text containing block
617
+ level elements. If there is more than one definition, all other definition markers for the term may
618
+ be indented up to three spaces or the number of spaces used for the indentation of the last
619
+ definition minus one, whichever number is smaller. For example:
557
620
 
558
621
  definition term 1
559
622
  definition term 2
560
623
  : This is the first line. Since the first non-space characters appears in column 3, all other
561
- lines have to be indented 2 spaces so that they first characters align. This tells kramdown
562
- that the lines belong to the definition.
624
+ lines have to be indented 2 spaces (or lazy syntax may be used after an indented line). This
625
+ tells kramdown that the lines belong to the definition.
563
626
  : This is the another definition for the same term. It uses a different number of spaces
564
627
  for indentation which is okay but should generally be avoided.
565
628
  : The definition marker is indented 3 spaces which is allowed but should also be avoided.
566
629
 
567
630
  So, while the above is possible and creates a definition list with two terms and three definitions
568
631
  for them, it is not advised to use different (definition marker and definition) indents in the same
569
- definition list!
632
+ definition list as well as lazy indentation!
570
633
 
571
634
  The definition for a term is made up of text and/or block level elements. If a definition is *not*
572
635
  preceded by a blank line, the first part of the definition will just be text if it would be a
@@ -594,13 +657,19 @@ Sometimes one wants to include simple tabular data in a kramdown document for wh
594
657
  full-blown HTML table is just too much. kramdown supports this with a simple syntax for ASCII
595
658
  tables.
596
659
 
597
- There are three different text line types that can be used in a table:
660
+ Tables can be created with or without a leading pipe character: If the first line of a table
661
+ contains a pipe character at the start of the line (optionally indented up to three spaces), then
662
+ all leading pipe characters (i.e. pipe characters that are only preceded by whitespace) are ignored
663
+ on all table lines. Otherwise they are not ignored and count when dividing a table line into table
664
+ cells.
665
+
666
+ There are four different line types that can be used in a table:
598
667
 
599
668
  * *Table rows* define the content of a table.
600
669
 
601
- A table row is started with a pipe character, optionally indented up to three spaces, and then the
602
- text of the first table cell. Subsequent table cells consist of a pipe character followed by the
603
- cell text. One may optionally use a pipe character at the the end of a table row line.
670
+ A table row is any line that contains at least one pipe character and is not identified as any
671
+ other type of table line! The table row is divided into indivdual table cells by pipe characters.
672
+ An optional trailing pipe character is ignored.
604
673
 
605
674
  Header rows, footer rows and normal rows are all done using these table rows. Table cells can only
606
675
  contain a single line of text, no multiline text is supported. The text of a table cell is parsed
@@ -612,13 +681,14 @@ There are three different text line types that can be used in a table:
612
681
  | First cell|Second cell|Third cell
613
682
  | First | Second | Third |
614
683
 
684
+ First | Second | | Fourth |
685
+
615
686
  * *Separator lines* are used to split the table body into multiple body parts.
616
687
 
617
- A separator line is started with a pipe or plus character, optionally indented up to three spaces,
618
- followed by an optional space, an optional colon, a dash and then any number and combination of
619
- pipes, dashes, pluses, colons and spaces. The pipe and plus characters can be used to visually
620
- separate columns although this is not needed. Multiple separator lines after another are treated
621
- as one separator line.
688
+ A separator line is any line that contains only pipes, dashes, pluses, colons and spaces and which
689
+ contains at least one dash and one pipe character. The pipe and plus characters can be used to
690
+ visually separate columns although this is not needed. Multiple separator lines after another are
691
+ treated as one separator line.
622
692
 
623
693
  Here are some example separator lines:
624
694
 
@@ -627,6 +697,7 @@ There are three different text line types that can be used in a table:
627
697
  |---------|
628
698
  |-
629
699
  | :-----: |
700
+ -|-
630
701
 
631
702
  * The first separator line after at least one table row is treated specially, namely as *header
632
703
  separator line*. It is used to demarcate header rows from normal table rows and/or to set column
@@ -647,6 +718,7 @@ There are three different text line types that can be used in a table:
647
718
  |---+---+---|
648
719
  + :-: |:------| ---:|
649
720
  | :-: :- -: -
721
+ :-: | :-
650
722
 
651
723
  * A *footer separator line* is used to demarcate footer rows from normal table rows. All table rows
652
724
  below the footer separator line are considered to be footer rows.
@@ -676,12 +748,20 @@ Given the above components, a table is specified by
676
748
  * optionally followed by a footer separator line and zero, one or more table rows and
677
749
  * an optional trailing separator line.
678
750
 
751
+ Also note
752
+
753
+ * that the first line of a table must not have more than three spaces of indentation before the
754
+ first none space character,
755
+ * that each line of a table needs to have at least one not escaped pipe character so that kramdown
756
+ recognizes it as a line belonging to the table and
757
+ * that tables have to start and end on [block boundaries](#block-boundaries)!
758
+
679
759
  > The table syntax differs from the one used in [PHP Markdown Extra] as follows:
680
760
  >
681
- > * kramdown tables have to begin with a pipe character, this is optional in [PHP Markdown Extra].
682
761
  > * kramdown tables do not need to have a table header.
683
762
  > * kramdown tables can be structured using separator lines.
684
763
  > * kramdown tables can contain a table footer.
764
+ > * kramdown tables need to be separted from other block level elements.
685
765
  {: .markdown-difference}
686
766
 
687
767
  Here is an example for a kramdown table with a table header row, two table bodies and a table footer
@@ -740,11 +820,12 @@ three spaces. The following examples show different possibilities to create a ho
740
820
 
741
821
  kramdown has built-in support for block and span level mathematics written in LaTeX.
742
822
 
743
- A math block is started using two dollar signs, optionally indented up to three spaces. The math
744
- block continues until the next two dollar signs (which may be on the same line or on one of the next
745
- lines) that appear at the end of a line, i.e. they may only be followed by whitespace characters.
746
- The content of a math block has to be valid LaTeX math. It is always wrapped inside a
747
- `\begin{displaymath}...\end{displaymath}` enviroment except if it begins with a `\begin` statement.
823
+ A math block needs to start and end on [block boundaries](#block-boundaries). It is started using
824
+ two dollar signs, optionally indented up to three spaces. The math block continues until the next
825
+ two dollar signs (which may be on the same line or on one of the next lines) that appear at the end
826
+ of a line, i.e. they may only be followed by whitespace characters. The content of a math block has
827
+ to be valid LaTeX math. It is always wrapped inside a `\begin{displaymath}...\end{displaymath}`
828
+ enviroment except if it begins with a `\begin` statement.
748
829
 
749
830
  The following kramdown fragment
750
831
 
@@ -867,7 +948,7 @@ Parse as raw HTML block
867
948
 
868
949
  Parse as block level elements
869
950
  :
870
- applet button blockquote colgroup dd div dl fieldset form iframe li
951
+ applet button blockquote body colgroup dd div dl fieldset form iframe li
871
952
  map noscript object ol table tbody thead tfoot tr td ul
872
953
 
873
954
  Parse as span level elements
@@ -953,8 +1034,8 @@ comments is not processed:
953
1034
 
954
1035
  # Text Markup
955
1036
 
956
- These elements are used inside block level elements to markup text fragments. For example, one can
957
- easily create links or apply emphasis to certain text parts.
1037
+ These elements are all span level elements and used inside block level elements to markup text
1038
+ fragments. For example, one can easily create links or apply emphasis to certain text parts.
958
1039
 
959
1040
  Note that empty span level elements are not converted to empty HTML tags but are copied as-is to the
960
1041
  output.
@@ -984,13 +1065,13 @@ As the wording suggests, inline links provide all information inline in the text
984
1065
  style links only provide the link text in the text flow and everything else is defined
985
1066
  elsewhere. This also allows you to reuse link definitions.
986
1067
 
987
- An inline style link can be created by surrounding the link text with square brackets, followed
988
- immediately by the link URL (and an optional title in single or double quotes preceded by at least
989
- one space) in normal parentheses. For example:
1068
+ An inline style link can be created by surrounding the link text which must contain at least one
1069
+ character with square brackets, followed immediately by the link URL (and an optional title in
1070
+ single or double quotes preceded by at least one space) in normal parentheses. For example:
990
1071
 
991
1072
  This is [a link](http://rubyforge.org) to a page.
992
1073
  A [link](../test "local URI") can also have a title.
993
- And [spaces](<link with spaces.html>)!
1074
+ And [spaces](link with spaces.html)!
994
1075
 
995
1076
  Notes:
996
1077
 
@@ -998,10 +1079,9 @@ Notes:
998
1079
  However, if you use square brackets within the link text, you have to either properly nest them or
999
1080
  to escape them. It is not possible to create nested links!
1000
1081
 
1001
- * The link URL must not contain any spaces and it has to contain properly nested parentheses if no
1002
- title is specified, or the link URL must be contained in angle brackets (then spaces and
1003
- incorrectly nested parentheses are allowed). There must not be any spaces before the link URL, and
1004
- if no title is specified, no spaces are allowed between the link URL and the closing parenthesis.
1082
+ * The link URL must not contain single or double quotes and it has to contain properly nested
1083
+ parentheses if no title is specified, or the link URL must be contained in angle brackets
1084
+ (incorrectly nested parentheses are allowed).
1005
1085
 
1006
1086
  * The link title may not contain its delimiters and may not be empty.
1007
1087
 
@@ -1029,15 +1109,15 @@ definition looks like this:
1029
1109
 
1030
1110
  [linkid]: http://www.example.com/ "Optional Title"
1031
1111
 
1032
- > Link definitions are, despite being described here, block level elements.
1112
+ > Link definitions are, despite being described here, non-content block level elements.
1033
1113
  {: .information}
1034
1114
 
1035
1115
  The link definition has the following structure:
1036
1116
 
1037
1117
  * The link identifier in square brackets, optionally indented up to three spaces,
1038
1118
  * then a colon and one or more spaces/tabs,
1039
- * then the link URL which must not contain any spaces or a left angle bracket, the link URL which may
1040
- contain spaces and a right angle bracket,
1119
+ * then the link URL which must not contain any single or double quotes and which must contain at
1120
+ least one non-space character, or a left angle bracket, the link URL and a right angle bracket,
1041
1121
  * then optionally the title in single or double quotes, separated from the link URL by one or more
1042
1122
  spaces or on the next line by itself indented any number of spaces/tabs.
1043
1123
 
@@ -1049,11 +1129,13 @@ The link definition has the following structure:
1049
1129
 
1050
1130
  Images can be specified via a syntax that is similar to the one used by links. The difference is
1051
1131
  that you have to use an exclamation mark before the first square bracket and that the link text of a
1052
- normal link becomes the alternative text of the image link. As with normal links, image links can be
1053
- written inline or reference style. For example:
1132
+ normal link, which may also be the empty string in case of image links, becomes the alternative text
1133
+ of the image link. As with normal links, image links can be written inline or reference style. For
1134
+ example:
1054
1135
 
1055
1136
  Here comes a ![smiley](../images/smiley.png)! And here
1056
1137
  ![too](../images/other.png 'Title text'). Or ![here].
1138
+ With empty alt text ![](see.jpg)
1057
1139
 
1058
1140
  The link definition for images is exactly the same as the link definition for normal links.
1059
1141
 
@@ -1203,10 +1285,11 @@ A footnote definition is used to define the content of a footnote and has the fo
1203
1285
  * The footnote name in square brackets, optionally indented up to three spaces,
1204
1286
  * then a colon and one or more optional spaces,
1205
1287
  * then the text of the footnote
1206
- * and optionally more text on the following lines which have have to be indented by four spaces or
1207
- one tab (like with list items).
1288
+ * and optionally more text on the following lines which have to follow the syntax for [standard code
1289
+ blocks](#standard-code-blocks) (the leading four spaces/one tab are naturally stripped from the
1290
+ text)
1208
1291
 
1209
- > Footnote definitions are, despite being described here, block level elements.
1292
+ > Footnote definitions are, despite being described here, non-content block level elements.
1210
1293
  {: .information}
1211
1294
 
1212
1295
  The whole footnote content is treated like block level text and can therefore contain any valid
@@ -1230,8 +1313,8 @@ Here are some example footnote definitions:
1230
1313
 
1231
1314
  It does not matter where you put a footnote definition in a kramdown document; the content of all
1232
1315
  referenced footnote definitions will be placed at the end of the kramdown document. Not referenced
1233
- foot note definitions are ignored. If more than one footnote definitions have the same footnote
1234
- name, all footnote definitions but the last are ignored.
1316
+ footnote definitions are ignored. If more than one footnote definitions have the same footnote name,
1317
+ all footnote definitions but the last are ignored.
1235
1318
 
1236
1319
 
1237
1320
  ## Abbreviations
@@ -1263,7 +1346,7 @@ Here are some examples:
1263
1346
  *[another language]: It's called Markdown
1264
1347
  *[HTML]: HyperTextMarkupLanguage
1265
1348
 
1266
- > Abbreviation definitions are, despite being described here, block level elements.
1349
+ > Abbreviation definitions are, despite being described here, non-content block level elements.
1267
1350
  {: .information}
1268
1351
 
1269
1352
 
@@ -1282,16 +1365,24 @@ kramdown converts the following plain ASCII character into their corresponding t
1282
1365
  * `>>` will become a right guillemet (like this >>) -- an optional leading space will become a
1283
1366
  non-breakable space
1284
1367
 
1285
- It also replaces normal single `'` and double quotes `"` with "fancy quotes". There *may* be times
1286
- when kramdown falsely replace the quotes. If this is the case, just \'escape\" the quotes and they
1287
- won't be replaced with fancy ones.
1368
+ The parser also replaces normal single `'` and double quotes `"` with "fancy quotes". There *may* be
1369
+ times when kramdown falsely replace the quotes. If this is the case, just \'escape\" the quotes and
1370
+ they won't be replaced with fancy ones.
1371
+
1288
1372
 
1289
1373
 
1374
+ # Non-content elements
1290
1375
 
1291
- # Other Markup
1376
+ This section describes the non-content elements that are used in kramdown documents, i.e. elements
1377
+ that don't provide content for the document but have other uses such as separating block level
1378
+ elements or attaching attributes to elements.
1292
1379
 
1293
- This section describes markup that is not widely used in kramdown documents but which are sometimes
1294
- needed nonetheless.
1380
+ Three non-content block level elements are not described here because they fit better where they
1381
+ are:
1382
+
1383
+ * [link definitions](#link-definitions)
1384
+ * [footnote definitions](#footnotes)
1385
+ * [abbreviation definition](#abbreviations)
1295
1386
 
1296
1387
 
1297
1388
  ## End-Of-Block Marker {#eob-marker}
@@ -1329,10 +1420,9 @@ By using an EOB marker, you can make two lists with one item each:
1329
1420
 
1330
1421
  This is an implementation of [Maruku]'s feature for adding attributes to block and span level
1331
1422
  elements (the naming is also taken from Maruku). This block level element is used to define
1332
- attributes which can be referenced later. The [Block Inline Attribute
1333
- List](#block-inline-attribute-lists) is used to attach attributes to a block level element and the
1334
- [Span Inline Attribute List](#span-inline-attribute-lists) is used to attach attributes to a span
1335
- level element.
1423
+ attributes which can be referenced later. The [Block Inline Attribute List](#block-ials) is used to
1424
+ attach attributes to a block level element and the [Span Inline Attribute List](#span-ials) is used
1425
+ to attach attributes to a span level element.
1336
1426
 
1337
1427
  Following are some examples of attribute list definitions (ALDs) and afterwards comes the syntax
1338
1428
  explanation:
@@ -1349,45 +1439,46 @@ An ALD line has the following structure:
1349
1439
  character except a not escaped closing brace),
1350
1440
  * followed by a closing brace and optional spaces until the end of the line.
1351
1441
 
1352
- The reference name needs to start with a word character or a digit, optionally followed by other word
1353
- characters, digits or dashes.
1442
+ The reference name needs to start with a word character or a digit, optionally followed by other
1443
+ word characters, digits or dashes.
1354
1444
 
1355
1445
  There are four different types of attribute definitions which have to be separated by one or more
1356
1446
  spaces:
1357
1447
 
1358
1448
  references
1359
1449
 
1360
- : This must be a valid reference name. It is used to reference an other ALD so that the attributes
1361
- of the other ALD are also included in this one. The reference name is ignored when collecting the
1362
- attributes if no attribute definition list with this reference name exists. For example, a
1363
- simple reference looks like `id`.
1450
+ : This must be a valid reference name. It is used to reference an other ALD so that the attributes
1451
+ of the other ALD are also included in this one. The reference name is ignored when collecting the
1452
+ attributes if no attribute definition list with this reference name exists. For example, a simple
1453
+ reference looks like `id`.
1364
1454
 
1365
1455
  key-value pairs
1366
1456
 
1367
- : A key-value pair is defined by a key name, which must follow the rules for reference names, then
1368
- an equal sign and then the value in single or double quotes. If you need to use the value
1369
- delimiter (a single or a double quote) inside the value, you need to escape it with a backslash.
1370
- Key-value pairs can be used to specify arbitrary attributes for block or span level elements. For
1371
- example, a key-value pair looks like `key1="bef \"quoted\" aft"` or `title='This is a title'`.
1457
+ : A key-value pair is defined by a key name, which must follow the rules for reference names, then
1458
+ an equal sign and then the value in single or double quotes. If you need to use the value
1459
+ delimiter (a single or a double quote) inside the value, you need to escape it with a backslash.
1460
+ Key-value pairs can be used to specify arbitrary attributes for block or span level elements. For
1461
+ example, a key-value pair looks like `key1="bef \"quoted\" aft"` or `title='This is a title'`.
1372
1462
 
1373
1463
  ID name
1374
1464
 
1375
- : An ID name is defined by using a hash and then the identifier name which must follow the rules
1376
- for reference names. This is a short hand for the key-value pair `id="IDNAME"` since this is
1377
- often used. The ID name specifies the unique ID of a block or span level element. For example,
1378
- an ID name looks like `#myid`.
1465
+ : An ID name is defined by using a hash and then the identifier name which needs to start with a
1466
+ word character or a digit, optionally followed by other word characters, digits, dashes or colons.
1467
+ This is a short hand for the key-value pair `id="IDNAME"` since this is often used. The ID name
1468
+ specifies the unique ID of a block or span level element. For example, an ID name looks like
1469
+ `#myid`.
1379
1470
 
1380
1471
  class names
1381
1472
 
1382
- : A class name is defined by using a dot and then the class name. This is (almost, but not quite)
1383
- a short hand for the key-value pair `class="class-name"`. Almost because it actually means that
1384
- the class name should be appended to the current value of the `class` attribute. The following
1385
- ALDs are all equivalent:
1473
+ : A class name is defined by using a dot and then the class name. This is (almost, but not quite) a
1474
+ short hand for the key-value pair `class="class-name"`. Almost because it actually means that the
1475
+ class name should be appended to the current value of the `class` attribute. The following ALDs
1476
+ are all equivalent:
1386
1477
 
1387
- {:id: .cls1 .cls2}
1388
- {:id: class="cls1" .cls2}
1389
- {:id: class="something" class="cls1" .cls2}
1390
- {:id: class="cls1 cls2}
1478
+ {:id: .cls1 .cls2}
1479
+ {:id: class="cls1" .cls2}
1480
+ {:id: class="something" class="cls1" .cls2}
1481
+ {:id: class="cls1 cls2}
1391
1482
 
1392
1483
  As can be seen from the example of the class names, attributes that are defined earlier are
1393
1484
  overwritten by ones with the same name defined later. Also, everything in the attribute definitions
@@ -1401,7 +1492,7 @@ ALDs are processed like they are defined in one ALD.
1401
1492
 
1402
1493
  These elements are used to attach attributes to another element.
1403
1494
 
1404
- ### Block Inline Attribute Lists
1495
+ ### Block Inline Attribute Lists {#block-ials}
1405
1496
 
1406
1497
  > This syntax feature is not part of the original Markdown syntax. The idea and syntax comes from
1407
1498
  > the [Maruku] package.
@@ -1429,17 +1520,17 @@ Here are some examples for block IALs:
1429
1520
  {:.ruby}
1430
1521
  Some code here
1431
1522
 
1432
- ### Span Inline Attribute Lists
1523
+ ### Span Inline Attribute Lists {#span-ials}
1433
1524
 
1434
1525
  > This syntax feature is not part of the original Markdown syntax. The idea and syntax comes from
1435
1526
  > the [Maruku] package.
1436
1527
  {: .markdown-difference}
1437
1528
 
1438
- This is a version of the [block inline attribute list](#block-inline-attribute-lists) for span level
1439
- elements. It has the same structure as the block IAL except that leading and trailing spaces are not
1440
- allowed. A span IAL (or two or more span IALs) has to be put directly after the span level element
1441
- to which it should be applied, no additional character is allowed between, otherwise it is ignored
1442
- and only removed from the output.
1529
+ This is a version of the [block inline attribute list](#block-ials) for span level elements. It has
1530
+ the same structure as the block IAL except that leading and trailing spaces are not allowed. A span
1531
+ IAL (or two or more span IALs) has to be put directly after the span level element to which it
1532
+ should be applied, no additional character is allowed between, otherwise it is ignored and only
1533
+ removed from the output.
1443
1534
 
1444
1535
  Here are some examples for span IALs:
1445
1536
 
@@ -1470,7 +1561,7 @@ Here are some examples of how to specify extensions and afterwards is the syntax
1470
1561
  An extension can be specified with or without a body. Therefore there exist a start and an end tag
1471
1562
  for extensions. The start tag has the following structure:
1472
1563
 
1473
- * an left brace,
1564
+ * a left brace,
1474
1565
  * followed by two colons and the extension name,
1475
1566
  * optionally followed by a space and attribute definitions (allowed characters are backslash-escaped
1476
1567
  closing braces or any character except a not escaped closing brace -- same as with ALDs),
@@ -1502,19 +1593,22 @@ The following extensions can be used with kramdown:
1502
1593
 
1503
1594
  `comment`
1504
1595
 
1505
- : Treat the body text as a comment which does not show in the output.
1596
+ : Treat the body text as a comment which does not show in the output.
1506
1597
 
1507
1598
  `nomarkdown`
1508
1599
 
1509
- : Don't process the body with kramdown but output it as-is.
1600
+ : Don't process the body with kramdown but output it as-is. The attribute `type` specifies which
1601
+ converters should output the body: if the attribute is missing, all converters should output it.
1602
+ Otherwise the attribute value has to be a space separated list of converter names and these
1603
+ converters should output the body.
1510
1604
 
1511
1605
  `options`
1512
1606
 
1513
- : Should be used without a body since the body is ignored. Is used for setting the global options
1514
- for the kramdown processor (for example, to disable automatic header ID generation). Note that
1515
- options that are used by the parser are immediately effective whereas all other options are not!
1516
- This means, for example, that it is not possible to set converter options only for some part of
1517
- a kramdown document.
1607
+ : Should be used without a body since the body is ignored. Is used for setting the global options
1608
+ for the kramdown processor (for example, to disable automatic header ID generation). Note that
1609
+ options that are used by the parser are immediately effective whereas all other options are not!
1610
+ This means, for example, that it is not possible to set converter options only for some part of a
1611
+ kramdown document.
1518
1612
 
1519
1613
 
1520
1614