Skip to content

Commit fce0b52

Browse files
mipmipmipmip
authored
Merge branch 'andmarti1424:main' into main
2 parents bd71396 + 0ef889d commit fce0b52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+984
-706
lines changed

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# These are supported funding model platforms
22

3-
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
43
patreon: user?u=51340616
4+
custom: ['https://www.paypal.com/donate/buttons/manage/GEM73DW4VE9LW']
5+
ko_fi: andmarti1424
6+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
57
open_collective: # Replace with a single Open Collective username
6-
ko_fi: # Replace with a single Ko-fi username
78
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
89
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
910
liberapay: # Replace with a single Liberapay username
1011
issuehunt: # Replace with a single IssueHunt username
1112
otechie: # Replace with a single Otechie username
12-
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
1313

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: CI
2+
run-name: continuous integration
3+
4+
on:
5+
push:
6+
branches: [ "main" ]
7+
pull_request:
8+
branches: [ "main" ]
9+
10+
jobs:
11+
test:
12+
strategy:
13+
matrix:
14+
#os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
15+
os: [ubuntu-latest]
16+
#cc: [gcc, clang]
17+
cc: [gcc]
18+
runs-on: ${{ matrix.os }}
19+
steps:
20+
- uses: actions/checkout@v4
21+
- run: sudo apt update && sudo apt install -y valgrind bison
22+
- run: make -C src
23+
env:
24+
CC: ${{ matrix.cc }}
25+
- run: cd ./tests && ./run_all_tests.sh
26+
shell: bash
27+
env:
28+
CC: ${{ matrix.cc }}
29+

‎CHANGES‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,45 @@
11
CHANGES FILE
22
------------
33

4+
Please open a discussion on GitHub to comment on these and other feature requests.
45

56

6-
Please open a discussion on GitHub to comment on these and other feature requests.
7+
8+
Ideas for v0.8.6
9+
----------------
10+
11+
+ Add is_deleted flag on sheets that are deleted. So ents have a chance to update its references to that sheet.
12+
Then rebuild graph.
13+
+ arv should have priority over scimrc.
14+
+ rethink overlap. it shows incorrectly if text does not fit in the current LINE
15+
+ user customizable UI header (bar)
16+
+ modify search procedure. highlight matches
17+
+ yank.c functions should receive yanklist pointer as parameter, rather than use yanklist global variable.
18+
this could allow future use of registers to copy to and paste from.
19+
+ registers for yanking
20+
+ use yanklist for added/removed in undo?
21+
22+
23+
***********
24+
v0.8.5
25+
05/05/2025: fixed ‘zip_error_to_str’ deprecated message
26+
changed do_autobackup definition
27+
FIX in paste of cells transposed. Destination position was calculated wrong.
28+
fix spurious circular deps across sheets (issue #903) thanks to DHMike57
29+
12/02/2025: Add theme files into Makefile #930
30+
PR 921 - fix invalid chars in file name cause segfault (issue #922)
31+
PR 931 - fix issue #928 - Reproducible segfault reading python-written xlsx
32+
11/11/2024: PR 909 - fix spurious error message with @IF command (issue #910)
33+
11/11/2024: PR 911 - fix memory leak and segfault in @replace (issue #912)
34+
26/11/2024: PR 920 - fix in replace and sevaluate (issue #919)
35+
26/11/2024: PR 917 - fix range not updating with getent (issue #918)
36+
16/10/2024: PR 896 - work on issue 813 - fix in subtottal
37+
16/10/2024: PR 898 - work on issue 897 - fix in lua evaluation
38+
16/10/2024: PR 900 - work on issue 899 - minor modification in @dts validation
39+
16/10/2024: PR 902 - work on issue 901 - keep sheet/cursor position when saving file
40+
16/08/2024: PR 888 - replace all /bin/bash with a unix agnostic /usr/bin/env bash
41+
16/08/2024: PR 887 - explicit left markdown alignment
42+
743

844
***********
945
v0.8.4
@@ -30,25 +66,6 @@ v0.8.4
3066

3167

3268

33-
Ideas for v0.8.5
34-
----------------
35-
36-
+ Add is_deleted flag on sheets that are deleted. So ents have a chance to update its references to that sheet.
37-
Then rebuild graph.
38-
+ arv should have priority over scimrc.
39-
+ rethink overlap. it shows incorrectly if text does not fit in the current LINE
40-
+ user customizable UI header (bar)
41-
+ modify search procedure. highlight matches
42-
+ yank.c functions should receive yanklist pointer as parameter, rather than use yanklist global variable.
43-
this could allow future use of registers to copy to and paste from.
44-
+ registers for yanking
45-
+ use yanklist for added/removed in undo?
46-
47-
48-
49-
50-
51-
5269

5370

5471
***********

‎Readme.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
</h1>
44

55

6-
# NOTE 06/01/2023:
7-
This project needs some help.
8-
This is a one person project and lost sponsoring in the last months. There are only just a few left. I want to still maintain and develop sc-im, but I am the only income in my family and its becoming difficult to work as much as I would want.
6+
# NOTE 05/21/2025:
7+
New release v0.8.5 - This project needs your help!
8+
This is a one person project and have very little sponsoring. I want to still maintain and develop sc-im, but I am the only income in my family and its becoming difficult to work as much as I would want.
99
If you can make a donation (see at the bottom), please do. Your help would be really appreciated!!
1010
Thanks.
1111

‎examples/markdown/markdown-table-alignment.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| Ingredient | Amount | unit |
2-
|-----------:|-----------:|-----------:|
3-
| Sardines | 1.00 | kilo |
4-
| Garlick | 3.00 | toes |
5-
| Parsley | 1.00 | bunch |
6-
| White wine | 1.00 | bottle |
1+
| Ingredient (def: left) | Shop: (left) | Amount (right) | Unit (center) |
2+
|------------------------|:-------------------|---------------:|:-------------:|
3+
| Sardines | Fish Market | 1.00 | kilo |
4+
| Garlick | Vegetables Inc. | 3.00 | toes |
5+
| Parsley | Vegetables Inc. | 1.00 | bunch |
6+
| White wine | Rosemary's Spirits | 1.00 | bottle |

‎src/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ prefix = /usr/local
66

77
EXDIR = $(prefix)/bin
88
HELPDIR = $(prefix)/share/$(name)
9+
THEMEDIR = $(prefix)/share/themes
910
LIBDIR = $(prefix)/share/doc/$(name)
1011

1112
# This is where the man page goes.
@@ -176,12 +177,14 @@ install :
176177
install -m 644 $(wildcard plot_*) $(DESTDIR)$(HELPDIR)/
177178
install -d $(DESTDIR)$(MANDIR)/
178179
install -m 644 sc-im.1 $(DESTDIR)$(MANDIR)/$(name).1
180+
install -d $(DESTDIR)$(THEMEDIR)
181+
install -m 644 ../themes/* $(DESTDIR)$(THEMEDIR)
179182

180183
uninstall :
181184
-rm $(DESTDIR)$(prefix)/bin/$(name)
182185
-rm $(DESTDIR)$(HELPDIR)/$(name)_help
183-
-rm $(DESTDIR)$(HELPDIR)/plot*
184186
-rm $(DESTDIR)$(MANDIR)/$(name).1
187+
-rm -r $(DESTDIR)$(HELPDIR)
185188

186189
$(name) : $(OBJS)
187190
$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)

‎src/actions/filter.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2013-2021, Andrés Martinelli <andmarti@gmail.com> *
2+
* Copyright (c) 2013-2025, Andrés G. Martinelli <andmarti@gmail.com> *
33
* All rights reserved. *
44
* *
55
* This file is a part of sc-im *
@@ -17,16 +17,16 @@
1717
* documentation and/or other materials provided with the distribution. *
1818
* 3. All advertising materials mentioning features or use of this software *
1919
* must display the following acknowledgement: *
20-
* This product includes software developed by Andrés Martinelli *
20+
* This product includes software developed by Andrés G. Martinelli *
2121
* <andmarti@gmail.com>. *
22-
* 4. Neither the name of the Andrés Martinelli nor the *
22+
* 4. Neither the name of the Andrés G. Martinelli nor the *
2323
* names of other contributors may be used to endorse or promote products *
2424
* derived from this software without specific prior written permission. *
2525
* *
26-
* THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''AS IS'' AND ANY *
26+
* THIS SOFTWARE IS PROVIDED BY ANDRÉS G. MARTINELLI ''AS IS'' AND ANY *
2727
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED *
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE *
29-
* DISCLAIMED. IN NO EVENT SHALL ANDRES MARTINELLI BE LIABLE FOR ANY *
29+
* DISCLAIMED. IN NO EVENT SHALL ANDRÉS G. MARTINELLI BE LIABLE FOR ANY *
3030
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
3131
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;*
3232
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND *
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* \file filter.c
40-
* \author Andrés Martinelli <andmarti@gmail.com>
40+
* \author Andrés G. Martinelli <andmarti@gmail.com>
4141
* \date 2017-07-18
4242
* \brief TODO Write a tbrief file description.
4343
*/

‎src/actions/filter.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2013-2021, Andrés Martinelli <andmarti@gmail.com> *
2+
* Copyright (c) 2013-2025, Andrés G. Martinelli <andmarti@gmail.com> *
33
* All rights reserved. *
44
* *
55
* This file is a part of sc-im *
@@ -17,16 +17,16 @@
1717
* documentation and/or other materials provided with the distribution. *
1818
* 3. All advertising materials mentioning features or use of this software *
1919
* must display the following acknowledgement: *
20-
* This product includes software developed by Andrés Martinelli *
20+
* This product includes software developed by Andrés G. Martinelli *
2121
* <andmarti@gmail.com>. *
22-
* 4. Neither the name of the Andrés Martinelli nor the *
22+
* 4. Neither the name of the Andrés G. Martinelli nor the *
2323
* names of other contributors may be used to endorse or promote products *
2424
* derived from this software without specific prior written permission. *
2525
* *
26-
* THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''AS IS'' AND ANY *
26+
* THIS SOFTWARE IS PROVIDED BY ANDRÉS G. MARTINELLI ''AS IS'' AND ANY *
2727
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED *
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE *
29-
* DISCLAIMED. IN NO EVENT SHALL ANDRES MARTINELLI BE LIABLE FOR ANY *
29+
* DISCLAIMED. IN NO EVENT SHALL ANDRÉS G. MARTINELLI BE LIABLE FOR ANY *
3030
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
3131
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;*
3232
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND *
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* \file filter.h
40-
* \author Andrés Martinelli <andmarti@gmail.com>
40+
* \author Andrés G. Martinelli <andmarti@gmail.com>
4141
* \date 2017-07-18
4242
* \brief Header file for filter.c
4343
*/

‎src/actions/freeze.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2013-2021, Andrés Martinelli <andmarti@gmail.com> *
2+
* Copyright (c) 2013-2025, Andrés G. Martinelli <andmarti@gmail.com> *
33
* All rights reserved. *
44
* *
55
* This file is a part of sc-im *
@@ -17,16 +17,16 @@
1717
* documentation and/or other materials provided with the distribution. *
1818
* 3. All advertising materials mentioning features or use of this software *
1919
* must display the following acknowledgement: *
20-
* This product includes software developed by Andrés Martinelli *
20+
* This product includes software developed by Andrés G. Martinelli *
2121
* <andmarti@gmail.com>. *
22-
* 4. Neither the name of the Andrés Martinelli nor the *
22+
* 4. Neither the name of the Andrés G. Martinelli nor the *
2323
* names of other contributors may be used to endorse or promote products *
2424
* derived from this software without specific prior written permission. *
2525
* *
26-
* THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''AS IS'' AND ANY *
26+
* THIS SOFTWARE IS PROVIDED BY ANDRÉS G. MARTINELLI ''AS IS'' AND ANY *
2727
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED *
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE *
29-
* DISCLAIMED. IN NO EVENT SHALL ANDRES MARTINELLI BE LIABLE FOR ANY *
29+
* DISCLAIMED. IN NO EVENT SHALL ANDRÉS G. MARTINELLI BE LIABLE FOR ANY *
3030
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
3131
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;*
3232
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND *
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* \file freeze.c
40-
* \author Andrés Martinelli <andmarti@gmail.com>
40+
* \author Andrés G. Martinelli <andmarti@gmail.com>
4141
* \date 28/05/2021
4242
* \brief source code for handling the freeze of rows and columns.
4343
*/

‎src/actions/freeze.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2013-2021, Andrés Martinelli <andmarti@gmail.com> *
2+
* Copyright (c) 2013-2025, Andrés G. Martinelli <andmarti@gmail.com> *
33
* All rights reserved. *
44
* *
55
* This file is a part of sc-im *
@@ -17,16 +17,16 @@
1717
* documentation and/or other materials provided with the distribution. *
1818
* 3. All advertising materials mentioning features or use of this software *
1919
* must display the following acknowledgement: *
20-
* This product includes software developed by Andrés Martinelli *
20+
* This product includes software developed by Andrés G. Martinelli *
2121
* <andmarti@gmail.com>. *
22-
* 4. Neither the name of the Andrés Martinelli nor the *
22+
* 4. Neither the name of the Andrés G. Martinelli nor the *
2323
* names of other contributors may be used to endorse or promote products *
2424
* derived from this software without specific prior written permission. *
2525
* *
26-
* THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''AS IS'' AND ANY *
26+
* THIS SOFTWARE IS PROVIDED BY ANDRÉS G. MARTINELLI ''AS IS'' AND ANY *
2727
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED *
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE *
29-
* DISCLAIMED. IN NO EVENT SHALL ANDRES MARTINELLI BE LIABLE FOR ANY *
29+
* DISCLAIMED. IN NO EVENT SHALL ANDRÉS G. MARTINELLI BE LIABLE FOR ANY *
3030
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
3131
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;*
3232
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND *
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* \file freeze.h
40-
* \author Andrés Martinelli <andmarti@gmail.com>
40+
* \author Andrés G. Martinelli <andmarti@gmail.com>
4141
* \date 2017-07-18
4242
* \brief Header file for freeze.c
4343
*/

0 commit comments

Comments
 (0)