Skip to content

Commit

Permalink
docs + images + fix nojs README + fixed open image autodetection
Browse files Browse the repository at this point in the history
  • Loading branch information
lmorg committed Jun 25, 2024
1 parent fe75c91 commit 094dc7c
Show file tree
Hide file tree
Showing 20 changed files with 45 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
version = "%d.%d.%d"
Major = 6
Minor = 1
Revision = 8210
Revision = 8220
)

// Copyright is the copyright owner string
Expand Down
18 changes: 9 additions & 9 deletions config/defaults/profile_any.mx
Original file line number Diff line number Diff line change
Expand Up @@ -688,21 +688,21 @@ openagent set image {

if { $mode == "auto" } {
switch {
case { $TMUX } { mode = compatible }
case { $MXTTY } { mode = mxtty }
case { $ITERM_PROFILE } { mode = iterm }
case { $TERM_PROGRAM == "iTerm.app" } { mode = iterm }
case { $KITTY_WINDOW_ID } { mode = kitty }
case { $TERM == "xterm-kitty" } { mode = kitty }
case { $TERMINOLOGY } { mode = terminology }
catch { mode = compatible }
case { $TMUX } { $mode = "compatible" }
case { $MXTTY } { $mode = "mxtty" }
case { $ITERM_PROFILE } { $mode = "iterm" }
case { $TERM_PROGRAM == "iTerm.app" } { $mode = "iterm" }
case { $KITTY_WINDOW_ID } { $mode = "kitty" }
case { $TERM == "xterm-kitty" } { $mode = "kitty" }
case { $TERMINOLOGY } { $mode = "terminology" }
catch { $mode = "compatible" }
}
}

# If Kitty but running inside a screen / tmux session, fallback to compatible.
# We do this because tmux doesn't support reporting screen sizes via the TIOCGWINSZ ioctl.
if { $mode == "kitty" && $TERM == "screen" } {
set mode=compatible
$mode = "compatible"
}

switch $mode {
Expand Down
2 changes: 2 additions & 0 deletions docs/changelog/v6.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ Features marked as **EXPERIMENTAL** are provided without assurances of future br
* readline: include errors in preview

* profile: `openagent` for `image` data type wasn't passing path to image correctly

* profile: `openagent` for `image` data type wasn't autodetecting shell correctly

* profile: `openagent` default profile included references to deprecated maths lib

Expand Down
6 changes: 6 additions & 0 deletions docs/integrations/iterm2.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ terminal. Normally that would be a blocky "pixellated" representation using
block characters. But if you're running iTerm2, Murex will automatically switch
to iTerm2's ANSI escape sequences to render those images beautifully.

For example:

```
open https://murex.rocks/git-autocomplete.png
```

## See Also

* [Kitty Integrations](../integrations/kitty.md):
Expand Down
2 changes: 2 additions & 0 deletions docs/integrations/kitty.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ terminal. Normally that would be a blocky "pixellated" representation using
block characters. But if you're running Kitty, Murex will automatically switch
to Kitty's ANSI escape sequences to render those images beautifully.

![opening an image in Kitty](https://nojs.murex/rocks/images/screenshot-kitty-open.png)

## See Also

* [Terminology Integrations](../integrations/terminology.md):
Expand Down
2 changes: 2 additions & 0 deletions docs/integrations/terminology.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ block characters. But if you're running Terminology, Murex will automatically
switch to Terminology's ANSI escape sequences to render those images
beautifully.

![opening an image in Kitty](https://nojs.murex/rocks/images/screenshot-terminology-open.png)

## See Also

* [Kitty Integrations](../integrations/kitty.md):
Expand Down
2 changes: 2 additions & 0 deletions gen/changelog/v6.1.inc.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ Features marked as **EXPERIMENTAL** are provided without assurances of future br
* readline: include errors in preview

* profile: `openagent` for `image` data type wasn't passing path to image correctly

* profile: `openagent` for `image` data type wasn't autodetecting shell correctly

* profile: `openagent` default profile included references to deprecated maths lib

Expand Down
6 changes: 6 additions & 0 deletions gen/integrations/iterm2_doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
terminal. Normally that would be a blocky "pixellated" representation using
block characters. But if you're running iTerm2, Murex will automatically switch
to iTerm2's ANSI escape sequences to render those images beautifully.
For example:
```
open https://murex.rocks/git-autocomplete.png
```
Synonyms:
Related:
- open
Expand Down
2 changes: 2 additions & 0 deletions gen/integrations/kitty_doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
terminal. Normally that would be a blocky "pixellated" representation using
block characters. But if you're running Kitty, Murex will automatically switch
to Kitty's ANSI escape sequences to render those images beautifully.
![opening an image in Kitty](https://nojs.murex/rocks/images/screenshot-kitty-open.png)
Synonyms:
Related:
- open
Expand Down
2 changes: 2 additions & 0 deletions gen/integrations/terminology_doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
block characters. But if you're running Terminology, Murex will automatically
switch to Terminology's ANSI escape sequences to render those images
beautifully.
![opening an image in Kitty](https://nojs.murex/rocks/images/screenshot-terminology-open.png)
Synonyms:
Related:
- open
Expand Down
10 changes: 8 additions & 2 deletions gen/user-guide/hint-text-overview.inc.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ to be used if you want it while keeping out of the way when you don't want it.

{{ if env "DOCGEN_TARGET=vuepress" }}
<!-- markdownlint-disable -->
<img src="/screenshot-hint-text-rsync.png?v={{ env "COMMITHASHSHORT" }}" class="centre-image"/>
<img src="/screenshot-hint-text-egrep.png?v={{ env "COMMITHASHSHORT" }}" class="centre-image"/>
<figure>
<img src="/screenshot-hint-text-rsync.png?v={{ env "COMMITHASHSHORT" }}" class="centre-image"/>
<figcaption>`rsync` flag, with example, pulled from `man` pages ({{link "read more" "man-pages"}})</figcaption>
</figure>
<figure>
<img src="/screenshot-hint-text-egrep.png?v={{ env "COMMITHASHSHORT" }}" class="centre-image"/>
<figcaption>`egrep` is an {{link "alias" "alias"}} so also show the destination command</figcaption>
</figure>
<!-- markdownlint-restore -->
{{ end }}
2 changes: 1 addition & 1 deletion gen/website/find-exec.mx
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
#catch {
# err "Could not write $filename ($title)"
# exit 1
#}
#}
Binary file added images/blog/split_personalities/conflict.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/blog/split_personalities/new.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/blog/split_personalities/old.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/blog/split_personalities/thompson.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/screenshot-kitty-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/screenshot-terminology-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions test/ci-website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ done
find docs -name "*.md" -exec murex gen/website/find-exec.mx {} \;

sed -i '0,/<img src/s//<img class="no-border" src/;
0,/<img src/s//<img class="no-border" src/;
0,/<img src/s//<img class="no-border" src/;
0,/<img src/s//<img class="no-border" src/;' \
README.html
Expand Down
2 changes: 1 addition & 1 deletion version.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 094dc7c

Please sign in to comment.