Skip to content

Commit

Permalink
Render bullet lists mixed with callouts (#1135)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfairh authored Nov 27, 2019
1 parent 07b7ab0 commit 96429f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

##### Bug Fixes

* None.
* Render bullet lists correctly when followed by a callout.
[John Fairhurst](https://github.com/johnfairh)
[#785](https://github.com/realm/jazzy/issues/785)

## 0.12.0

Expand Down
6 changes: 3 additions & 3 deletions lib/jazzy/jazzy_markdown.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,21 @@ def list_item(text, _list_type)

def render_aside(type, text)
<<-HTML
<div class="aside aside-#{type.underscore.tr('_', '-')}">
</ul><div class="aside aside-#{type.underscore.tr('_', '-')}">
<p class="aside-title">#{type.underscore.humanize}</p>
#{text}
</div>
</div><ul>
HTML
end

def list(text, list_type)
elided = text.gsub!(ELIDED_LI_TOKEN, '')
return if text =~ /\A\s*\Z/ && elided
return text if text =~ /class="aside-title"/
str = "\n"
str << (list_type == :ordered ? "<ol>\n" : "<ul>\n")
str << text
str << (list_type == :ordered ? "</ol>\n" : "</ul>\n")
str.gsub(%r{\n?<ul>\n<\/ul>}, '')
end

def block_code(code, language)
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 77 files
+3 −6 document_realm_objc/after/docs/Classes.html
+1 −2 document_realm_objc/after/docs/Classes/RLMArray.html
+7 −14 document_realm_objc/after/docs/Classes/RLMRealm.html
+2 −4 document_realm_objc/after/docs/Classes/RLMSyncCredentials.html
+2 −4 document_realm_objc/after/docs/Classes/RLMSyncUser.html
+3 −6 document_realm_objc/after/docs/Classes/RLMThreadSafeReference.html
+1 −2 document_realm_objc/after/docs/Enums/RLMSyncError.html
+3 −6 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes.html
+1 −2 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMArray.html
+7 −14 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMRealm.html
+2 −4 ...ent_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMSyncCredentials.html
+2 −4 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMSyncUser.html
+3 −6 ...realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Classes/RLMThreadSafeReference.html
+1 −2 document_realm_objc/after/docs/docsets/Realm.docset/Contents/Resources/Documents/Enums/RLMSyncError.html
+3 −6 document_realm_swift/after/docs/Classes.html
+1 −2 document_realm_swift/after/docs/Classes/AnyRealmCollection.html
+1 −2 document_realm_swift/after/docs/Classes/LinkingObjects.html
+8 −16 document_realm_swift/after/docs/Classes/List.html
+6 −12 document_realm_swift/after/docs/Classes/Realm.html
+1 −2 document_realm_swift/after/docs/Classes/Results.html
+3 −6 document_realm_swift/after/docs/Classes/ThreadSafeReference.html
+2 −4 document_realm_swift/after/docs/Extensions/SyncError.html
+4 −8 document_realm_swift/after/docs/Extensions/SyncUser.html
+1 −2 document_realm_swift/after/docs/Protocols/RealmCollection.html
+1 −2 document_realm_swift/after/docs/Structs/SyncConfiguration.html
+1 −2 document_realm_swift/after/docs/Typealiases.html
+3 −6 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes.html
+1 −2 ...alm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/AnyRealmCollection.html
+1 −2 ...t_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/LinkingObjects.html
+8 −16 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/List.html
+6 −12 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/Realm.html
+1 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/Results.html
+3 −6 ...lm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/ThreadSafeReference.html
+2 −4 ...ent_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Extensions/SyncError.html
+4 −8 ...ment_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Extensions/SyncUser.html
+1 −2 ...ealm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Protocols/RealmCollection.html
+1 −2 ...ealm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Structs/SyncConfiguration.html
+1 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Typealiases.html
+1 −2 document_siesta/after/api-docs/Caching.html
+4 −8 document_siesta/after/api-docs/Classes/Resource.html
+4 −8 document_siesta/after/api-docs/Classes/Service.html
+2 −4 document_siesta/after/api-docs/Protocols/ConfigurationPatternConvertible.html
+1 −2 document_siesta/after/api-docs/Protocols/EntityCache.html
+1 −2 document_siesta/after/api-docs/Protocols/Request.html
+1 −2 document_siesta/after/api-docs/Protocols/RequestCompletionHandler.html
+1 −2 document_siesta/after/api-docs/Protocols/TypedContentAccessors.html
+2 −4 document_siesta/after/api-docs/Resources.html
+3 −1 document_siesta/after/api-docs/Response Pipeline.html
+2 −4 document_siesta/after/api-docs/Structs/Configuration.html
+1 −2 document_siesta/after/api-docs/Structs/Entity.html
+1 −2 document_siesta/after/api-docs/Structs/Pipeline.html
+3 −1 document_siesta/after/api-docs/Structs/PipelineStage.html
+1 −2 document_siesta/after/api-docs/Structs/ResponseContentTransformer.html
+1 −2 document_siesta/after/api-docs/Structs/ResponseContentTransformer/InputTypeMismatchAction.html
+1 −2 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Caching.html
+4 −8 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Classes/Resource.html
+4 −8 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Classes/Service.html
+2 −4 .../api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Protocols/ConfigurationPatternConvertible.html
+1 −2 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Protocols/EntityCache.html
+1 −2 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Protocols/Request.html
+1 −2 ...a/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Protocols/RequestCompletionHandler.html
+1 −2 ...esta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Protocols/TypedContentAccessors.html
+2 −4 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Resources.html
+3 −1 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Response Pipeline.html
+2 −4 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Structs/Configuration.html
+1 −2 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Structs/Entity.html
+1 −2 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Structs/Pipeline.html
+3 −1 document_siesta/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Structs/PipelineStage.html
+1 −2 ...a/after/api-docs/docsets/Siesta.docset/Contents/Resources/Documents/Structs/ResponseContentTransformer.html
+1 −2 .../Siesta.docset/Contents/Resources/Documents/Structs/ResponseContentTransformer/InputTypeMismatchAction.html
+38 −0 misc_jazzy_features/after/docs/Classes/MiscMarkdown.html
+38 −0 ...features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/Classes/MiscMarkdown.html
+1 −1 misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/search.json
+44 −43 misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/docSet.dsidx.csv
+1 −1 misc_jazzy_features/after/docs/search.json
+2 −2 misc_jazzy_features/after/execution_output.txt
+8 −0 misc_jazzy_features/before/MiscJazzyFeatures/MiscMarkdown.swift

0 comments on commit 96429f6

Please sign in to comment.