Skip to content

Commit 14fa91c

Browse files
Merge remote-tracking branch 'upstream/develop' into my1
2 parents 2e48d32 + e99c7ac commit 14fa91c

File tree

8 files changed

+9351
-3556
lines changed

8 files changed

+9351
-3556
lines changed

.github/workflows/verifiers.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ jobs:
150150
# Install LaTeX so we can test generated LaTeX. We use extended packages:
151151
# texlive-extra-utils provides pdflatex
152152
# texlive-fonts-extra provides phonetic.sty
153-
# texlive-science provides accents.sty
154-
- run: sudo apt-get install texlive-latex-extra texlive-extra-utils texlive-fonts-extra texlive-science
153+
- run: sudo apt-get install texlive-latex-extra texlive-extra-utils texlive-fonts-extra
155154
# Here's an eXample of how to install "extra" LaTeX packages. See:
156155
# https://tex.stackexchange.com/questions/38978/how-can-i-manually-install-a-latex-package-debian-ubuntu-linux/39259#39259
157156
# - run: mkdir -p "$HOME/texmf"
@@ -190,7 +189,17 @@ jobs:
190189
- run: python3 scripts/latex_collector.py set.mm list-set.tex
191190
- run: pdflatex -halt-on-error list-set.tex 2>&1 | tee ,latex-output
192191
# Complain if the pdflatex output says something is invalid
193-
- run: "! grep ' invalid ' ,latex-output"
192+
- run: "! grep -e 'no output PDF file produced!' -e 'invalid' -e 'error' -e 'Error' -e 'Undefined' ,latex-output"
193+
# Check generated LaTeX, to ensure the TeX definitions are okay. iset.mm:
194+
- run: python3 scripts/latex_collector.py iset.mm list-iset.tex
195+
- run: pdflatex -halt-on-error list-iset.tex 2>&1 | tee ,latex-output
196+
# Complain if the pdflatex output says something is invalid
197+
- run: "! grep -e 'no output PDF file produced!' -e 'invalid' -e 'error' -e 'Error' -e 'Undefined' ,latex-output"
198+
# Check generated LaTeX, to ensure the TeX definitions are okay. nf.mm:
199+
- run: python3 scripts/latex_collector.py nf.mm list-nf.tex
200+
- run: pdflatex -halt-on-error list-nf.tex 2>&1 | tee ,latex-output
201+
# Complain if the pdflatex output says something is invalid
202+
- run: "! grep -e 'no output PDF file produced!' -e 'invalid' -e 'error' -e 'Error' -e 'Undefined' ,latex-output"
194203

195204
###########################################################
196205
smetamath-rs:

changes-set.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ The ones WITH "Notes" may have to be processed manually.
1414

1515
PROPOSED:
1616
Date Old New Notes
17+
proposed fidmfisupp fdmfifsupp merge duplicate theorems
18+
proposed grplmulf1o grpladdf1o
1719
proposed df-rgmod df-rlm
1820
proposed crglmod crlm
1921
proposed nfiundg nfiund
@@ -85,12 +87,39 @@ make a github issue.)
8587
DONE:
8688
Date Old New Notes
8789
16-May-25 boolesineq [same] Moved from ET's mathbox to TA's mathbox
90+
10-May-25 ghmquskerlem1 [same] Moved from TA's mathbox to main set.mm
91+
10-May-25 ghmquskerlem2 [same] Moved from TA's mathbox to main set.mm
92+
10-May-25 ghmquskerlem3 [same] Moved from TA's mathbox to main set.mm
93+
10-May-25 gicqusker [same] Moved from TA's mathbox to main set.mm
94+
10-May-25 ghmquskerco [same] Moved from TA's mathbox to main set.mm
95+
10-May-25 ecref [same] Moved from TA's mathbox to main set.mm
96+
10-May-25 eqg0el [same] Moved from TA's mathbox to main set.mm
97+
6-May-25 brif1 [same] Moved from SN's mathbox to main set.mm
98+
6-May-25 bianbi [same] Moved from PM's mathbox to main set.mm
99+
6-May-25 andiff anbiim Moved from MKU's mathbox to main set.mm
100+
6-May-25 elrnmpt1d [same] Moved from GS's mathbox to main set.mm
101+
6-May-25 imadisjlnd [same] Moved from SP's mathbox to main set.mm
102+
6-May-25 fimassd [same] Moved from GS's mathbox to main set.mm
103+
6-May-25 fvmptd4 [same] Moved from SN's mathbox to main set.mm
104+
6-May-25 imaexd [same] Moved from TA's mathbox to main set.mm
105+
5-May-25 0qs [same] Moved from PM's mathbox to main set.mm
106+
5-May-25 qseq1d [same] Moved from PM's mathbox to main set.mm
107+
5-May-25 idomdomd [same] Moved from TA's mathbox to main set.mm
108+
5-May-25 idomringd [same] Moved from TA's mathbox to main set.mm
109+
4-May-25 crngcomd [same] Moved from SN's mathbox to main set.mm
110+
4-May-25 crng12d [same] Moved from SN's mathbox to main set.mm
111+
4-May-25 isdomn3 [same] Moved from SO's mathbox to main set.mm
88112
2-May-25 bj-sbnf sbnf Moved from BJ's mathbox to main set.mm
113+
1-May-25 rnexd [same] Moved from TA's mathbox to main set.mm
114+
1-May-25 imaexd [same] Moved from TA's mathbox to main set.mm
89115
30-Apr-25 idomrootle [same] Moved from SO's mathbox to main set.mm
90116
30-Apr-25 ply1ascl0 [same] Moved from TA's mathbox to main set.mm
91117
30-Apr-25 hashf1dmcdm [same] Moved from BT's mathbox to main set.mm
92118
25-Apr-25 mon1pid [same] Moved from SO's mathbox to main set.mm
93119
27-Apr-25 df-cnfld [same] Use maps-to notation
120+
26-Apr-25 fsuppfund [same] Moved from SN's mathbox to main set.mm
121+
26-Apr-25 fsuppss [same] Moved from SN's mathbox to main set.mm
122+
26-Apr-25 fsuppsssuppgd [same] Moved from SN's mathbox to main set.mm
94123
25-Apr-25 logi [same] Moved from SF's mathbox to main set.mm
95124
25-Apr-25 rspceb2dv [same] Moved from ZW's mathbox to main set.mm
96125
25-Apr-25 efcld [same] Moved from TA's mathbox to main set.mm

discouraged

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15997,6 +15997,7 @@ New usage of "df-gdiv" is discouraged (2 uses).
1599715997
New usage of "df-ghomOLD" is discouraged (1 uses).
1599815998
New usage of "df-gid" is discouraged (1 uses).
1599915999
New usage of "df-ginv" is discouraged (1 uses).
16000+
New usage of "df-grisom" is discouraged (0 uses).
1600016001
New usage of "df-grpo" is discouraged (1 uses).
1600116002
New usage of "df-gt" is discouraged (2 uses).
1600216003
New usage of "df-gte" is discouraged (2 uses).
@@ -16559,6 +16560,7 @@ New usage of "ela" is discouraged (3 uses).
1655916560
New usage of "elabOLD" is discouraged (0 uses).
1656016561
New usage of "elabgOLD" is discouraged (0 uses).
1656116562
New usage of "elabgtOLD" is discouraged (0 uses).
16563+
New usage of "elabgtOLDOLD" is discouraged (0 uses).
1656216564
New usage of "elat2" is discouraged (4 uses).
1656316565
New usage of "elatcv0" is discouraged (0 uses).
1656416566
New usage of "elbdop" is discouraged (4 uses).
@@ -16993,6 +16995,7 @@ New usage of "hbsb2a" is discouraged (2 uses).
1699316995
New usage of "hbsb2e" is discouraged (0 uses).
1699416996
New usage of "hbsb3" is discouraged (2 uses).
1699516997
New usage of "hbsbwOLD" is discouraged (0 uses).
16998+
New usage of "hbsbwOLDOLD" is discouraged (0 uses).
1699616999
New usage of "hcau" is discouraged (4 uses).
1699717000
New usage of "hcaucvg" is discouraged (1 uses).
1699817001
New usage of "hcauseq" is discouraged (0 uses).
@@ -17403,7 +17406,6 @@ New usage of "idrval" is discouraged (2 uses).
1740317406
New usage of "idunop" is discouraged (1 uses).
1740417407
New usage of "ifchhv" is discouraged (22 uses).
1740517408
New usage of "ifhvhv0" is discouraged (48 uses).
17406-
New usage of "ifpnOLD" is discouraged (0 uses).
1740717409
New usage of "iidn3" is discouraged (1 uses).
1740817410
New usage of "iihalf1cnOLD" is discouraged (0 uses).
1740917411
New usage of "iihalf2cnOLD" is discouraged (0 uses).
@@ -19119,7 +19121,6 @@ New usage of "sbc4rexgOLD" is discouraged (0 uses).
1911919121
New usage of "sbc5ALT" is discouraged (0 uses).
1912019122
New usage of "sbc6gOLD" is discouraged (0 uses).
1912119123
New usage of "sbcbi" is discouraged (2 uses).
19122-
New usage of "sbcbi2OLD" is discouraged (0 uses).
1912319124
New usage of "sbcbiVD" is discouraged (0 uses).
1912419125
New usage of "sbcco" is discouraged (1 uses).
1912519126
New usage of "sbcco3g" is discouraged (0 uses).
@@ -20581,7 +20582,8 @@ Proof modification of "elALT" is discouraged (16 steps).
2058120582
Proof modification of "elALT2" is discouraged (48 steps).
2058220583
Proof modification of "elabOLD" is discouraged (10 steps).
2058320584
Proof modification of "elabgOLD" is discouraged (47 steps).
20584-
Proof modification of "elabgtOLD" is discouraged (83 steps).
20585+
Proof modification of "elabgtOLD" is discouraged (141 steps).
20586+
Proof modification of "elabgtOLDOLD" is discouraged (83 steps).
2058520587
Proof modification of "eleq2dALT" is discouraged (62 steps).
2058620588
Proof modification of "eleq2w2ALT" is discouraged (50 steps).
2058720589
Proof modification of "elex22VD" is discouraged (111 steps).
@@ -20939,7 +20941,8 @@ Proof modification of "hbimpgVD" is discouraged (165 steps).
2093920941
Proof modification of "hbnae-o" is discouraged (11 steps).
2094020942
Proof modification of "hbntal" is discouraged (48 steps).
2094120943
Proof modification of "hbra2VD" is discouraged (26 steps).
20942-
Proof modification of "hbsbwOLD" is discouraged (15 steps).
20944+
Proof modification of "hbsbwOLD" is discouraged (85 steps).
20945+
Proof modification of "hbsbwOLDOLD" is discouraged (15 steps).
2094320946
Proof modification of "helloworld" is discouraged (29 steps).
2094420947
Proof modification of "hhssbnOLD" is discouraged (39 steps).
2094520948
Proof modification of "hirstL-ax3" is discouraged (34 steps).
@@ -20961,7 +20964,6 @@ Proof modification of "idn1" is discouraged (5 steps).
2096120964
Proof modification of "idn2" is discouraged (7 steps).
2096220965
Proof modification of "idn3" is discouraged (15 steps).
2096320966
Proof modification of "idrefALT" is discouraged (126 steps).
20964-
Proof modification of "ifpnOLD" is discouraged (41 steps).
2096520967
Proof modification of "iidn3" is discouraged (8 steps).
2096620968
Proof modification of "iihalf1cnOLD" is discouraged (125 steps).
2096720969
Proof modification of "iihalf2cnOLD" is discouraged (160 steps).
@@ -21504,7 +21506,6 @@ Proof modification of "sbc5ALT" is discouraged (76 steps).
2150421506
Proof modification of "sbc6gOLD" is discouraged (30 steps).
2150521507
Proof modification of "sbc8g" is discouraged (55 steps).
2150621508
Proof modification of "sbcbi" is discouraged (33 steps).
21507-
Proof modification of "sbcbi2OLD" is discouraged (16 steps).
2150821509
Proof modification of "sbcbiVD" is discouraged (59 steps).
2150921510
Proof modification of "sbceqalOLD" is discouraged (73 steps).
2151021511
Proof modification of "sbcgOLD" is discouraged (8 steps).

0 commit comments

Comments
 (0)