X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=doc%2FBBCode.md;h=ea6fa8e2b72356795469174b42b6cbe7d79b4689;hb=c8d5b6e0c6c96e27c4c8320346e91ac767b4f989;hp=946c61f247402448427399d479465cb66e00193d;hpb=85c8bf022841fb53a42e012d2e90dd23f56df2ab;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index 946c61f247..ea6fa8e2b7 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -65,13 +65,17 @@ table.bbcodes > * > tr > th {
Friendica |
- [img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img] |
- |
+ [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img] |
+ |
- [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
+ | [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]The Friendica Logo[/img] |
+ |
+
+
+ [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]
Note: provided height is simply discarded. |
- |
+ |
[size=xx-small]small text[/size] |
@@ -109,17 +113,17 @@ table.bbcodes > * > tr > th {
[bookmark]http://friendi.ca[/bookmark]
#^[url]http://friendi.ca[/url] |
- |
+ |
[bookmark=http://friendi.ca]Bookmark[/bookmark]
#^[url=http://friendi.ca]Bookmark[/url]
#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url] |
- |
+ |
[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url] |
- Diaspora post with GUID |
+ Diaspora post with GUID |
#Friendica |
@@ -187,7 +191,7 @@ code
You should not read any further if you want to be surprised.
Click to open/close
There is a happy end.
-
+
@@ -198,7 +202,7 @@ code
Author wrote:
Click to open/close
Spoiler quote
-
+
@@ -498,10 +502,6 @@ You can embed video, audio and more in a message.
[embed]URL[/embed] |
Embed OEmbed rich content. |
-
- [iframe]URL[/iframe] |
- General embed, iframe size is limited by the theme size for video players. |
-
[url]*url*[/url] |
If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
@@ -598,6 +598,9 @@ While taking pictures in the woods I had a really strange encounter... |
The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, Wordpress or Pump.io.
For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
+For postings that are delivered via ActivityPub, the text from the abstract is placed in the summary field.
+On Mastodon this field is used for the content warning.
+
## Special
@@ -606,15 +609,34 @@ For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU
Result |
- If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+ | If you need to put literal BBCode in a message, [noparse], [nobb] or [pre] blocks prevent BBCode conversion:
- [noparse][b]bold[/b][/noparse]
- [nobb][b]bold[/b][/nobb]
- [pre][b]bold[/b][/pre]
+ Note: [code] has priority over [noparse], [nobb] and [pre] which makes them display as BBCode tags in code blocks instead of being removed.
+ [code] blocks inside [noparse] will still be converted to a code block.
|
[b]bold[/b] |
+
+ Additionally, [noparse] and [pre] blocks prevent mention and hashtag conversion to links:
+
+ - [noparse]@user@domain.tld #hashtag[/noparse]
+ - [pre]@user@domain.tld #hashtag[/pre]
+
+ |
+ @user@domain.tld #hashtag |
+
+
+ Additionally, [pre] blocks preserve spaces:
+
+ |
+ Spaces |
+
[nosmile] is used to disable smilies on a post by post basis
@@ -623,15 +645,15 @@ For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU
| ;-) :-O |
- Custom inline styles
+ | Custom block styles
[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style] |
- You can change all the CSS properties of this block. |
+ You can change all the CSS properties of this block. |
- Custom class block
+ | Custom inline styles
-[class=custom]If the class exists, this block will have the custom class style applied.[/class] |
- <span class="custom">If the class exists, this block will have the custom class style applied.</span> |
+You can change all the [style=text-shadow: 0 0 4px #CC0000;]CSS properties[/style] of this inline text.
+ You can change all the CSS properties of this inline text. |