Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: HoTT/Coq-HoTT
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e9931e4855f238bec325e2c8c38d1cc7f38e825c
Choose a base ref
..
head repository: HoTT/Coq-HoTT
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60696f5dabcc4c5d308617517c431c42873d0530
Choose a head ref
Showing with 352 additions and 361 deletions.
  1. +1 −1 README.md
  2. +4 −4 STYLE.md
  3. +3 −3 contrib/SetoidRewrite.v
  4. +1 −1 etc/Book.py
  5. +1 −1 etc/coqcreplace.py
  6. +0 −14 etc/fix_end_newlines.sh
  7. +5 −0 etc/fix_trailing_whitespace.sh
  8. +1 −1 etc/generate_coqproject.sh
  9. +48 −48 etc/homotopy.css
  10. +1 −1 test/Algebra/Groups/Presentation.v
  11. +1 −1 test/Metatheory/FunextVarieties.v
  12. +3 −3 theories/Algebra/AbGroups/Abelianization.v
  13. +1 −1 theories/Algebra/AbSES/PullbackFiberSequence.v
  14. +2 −2 theories/Algebra/AbSES/Pushout.v
  15. +1 −1 theories/Algebra/Groups/FreeGroup.v
  16. +2 −2 theories/Algebra/Groups/Group.v
  17. +2 −2 theories/Algebra/Groups/GrpPullback.v
  18. +1 −1 theories/Algebra/Groups/Subgroup.v
  19. +2 −2 theories/Algebra/Rings/CRing.v
  20. +1 −1 theories/Algebra/Rings/Ideal.v
  21. +1 −1 theories/Algebra/Rings/QuotientRing.v
  22. +1 −1 theories/Algebra/Universal/Operation.v
  23. +1 −1 theories/Algebra/Universal/TermAlgebra.v
  24. +1 −1 theories/Analysis/Locator.v
  25. +1 −1 theories/Basics/Contractible.v
  26. +1 −1 theories/Basics/Decimal.v
  27. +7 −7 theories/Basics/Equivalences.v
  28. +1 −1 theories/Basics/Hexadecimal.v
  29. +1 −1 theories/Basics/Notations.v
  30. +1 −1 theories/Basics/Overture.v
  31. +1 −1 theories/Basics/PathGroupoids.v
  32. +2 −2 theories/BoundedSearch.v
  33. +1 −1 theories/Categories/FunctorCategory/Core.v
  34. +2 −2 theories/Categories/Monoidal/MonoidalCategory.v
  35. +4 −4 theories/Categories/SetCategory/Functors.v
  36. +1 −1 theories/Classes/implementations/family_prod.v
  37. +1 −1 theories/Classes/implementations/field_of_fractions.v
  38. +1 −1 theories/Classes/implementations/list.v
  39. +1 −1 theories/Classes/implementations/ne_list.v
  40. +18 −18 theories/Classes/interfaces/abstract_algebra.v
  41. +1 −1 theories/Classes/interfaces/orders.v
  42. +1 −1 theories/Classes/interfaces/rationals.v
  43. +3 −3 theories/Classes/tactics/ring_quote.v
  44. +1 −1 theories/Classes/theory/premetric.v
  45. +1 −1 theories/Classes/theory/rings.v
  46. +1 −1 theories/Classes/theory/ua_second_isomorphism.v
  47. +1 −1 theories/Colimits/Coeq.v
  48. +1 −1 theories/Colimits/Colimit.v
  49. +2 −2 theories/Colimits/Colimit_Pushout_Flattening.v
  50. +5 −5 theories/Colimits/GraphQuotient.v
  51. +1 −1 theories/Colimits/MappingCylinder.v
  52. +2 −2 theories/Colimits/Pushout.v
  53. +2 −2 theories/Colimits/Sequential.v
  54. +2 −2 theories/Colimits/SpanPushout.v
  55. +1 −1 theories/Cubical.v
  56. +4 −4 theories/Cubical/DPath.v
  57. +8 −8 theories/Cubical/PathSquare.v
  58. +1 −1 theories/Diagrams/Cocone.v
  59. +1 −1 theories/Diagrams/Cone.v
  60. +1 −1 theories/Diagrams/ParallelPair.v
  61. +1 −1 theories/Diagrams/Span.v
  62. +1 −1 theories/ExcludedMiddle.v
  63. +1 −1 theories/Extensions.v
  64. +1 −1 theories/Homotopy/Bouquet.v
  65. +2 −2 theories/Homotopy/ClassifyingSpace.v
  66. +5 −5 theories/Homotopy/ExactSequence.v
  67. +1 −1 theories/Homotopy/Hopf.v
  68. +1 −1 theories/Homotopy/Join/Core.v
  69. +2 −2 theories/Homotopy/Join/TriJoin.v
  70. +1 −1 theories/Homotopy/Smash.v
  71. +3 −3 theories/Homotopy/SuccessorStructure.v
  72. +2 −2 theories/Homotopy/Suspension.v
  73. +3 −3 theories/Homotopy/Syllepsis.v
  74. +4 −4 theories/Modalities/Descent.v
  75. +3 −3 theories/Modalities/Lex.v
  76. +2 −2 theories/Modalities/Localization.v
  77. +4 −4 theories/Modalities/Modality.v
  78. +1 −1 theories/Modalities/ReflectiveSubuniverse.v
  79. +2 −2 theories/Modalities/Separated.v
  80. +1 −1 theories/Pointed/Loops.v
  81. +2 −2 theories/Pointed/pFiber.v
  82. +1 −1 theories/Pointed/pSusp.v
  83. +1 −1 theories/PropResizing/ImpredicativeTruncation.v
  84. +1 −1 theories/Sets/GCH.v
  85. +2 −2 theories/Sets/GCHtoAC.v
  86. +2 −2 theories/Sets/Hartogs.v
  87. +1 −1 theories/Sets/Ordinals.v
  88. +1 −1 theories/Spaces/BAut.v
  89. +1 −1 theories/Spaces/BAut/Rigid.v
  90. +1 −1 theories/Spaces/Circle.v
  91. +3 −3 theories/Spaces/Finite/Finite.v
  92. +1 −1 theories/Spaces/Int.v
  93. +1 −1 theories/Spaces/Int/Spec.v
  94. +23 −23 theories/Spaces/Nat/Arithmetic.v
  95. +1 −1 theories/Spaces/No/Negation.v
  96. +1 −1 theories/Spaces/Pos.v
  97. +24 −24 theories/Spaces/Spheres.v
  98. +1 −1 theories/Spaces/Torus/Torus.v
  99. +7 −7 theories/Spaces/TwoSphere.v
  100. +1 −1 theories/Types/Bool.v
  101. +2 −2 theories/Types/Empty.v
  102. +2 −2 theories/Types/IWType.v
  103. +7 −7 theories/WildCat/Adjoint.v
  104. +4 −4 theories/WildCat/Coproducts.v
  105. +15 −15 theories/WildCat/Core.v
  106. +2 −2 theories/WildCat/Equiv.v
  107. +1 −1 theories/WildCat/EquivGpd.v
  108. +1 −1 theories/WildCat/Induced.v
  109. +9 −9 theories/WildCat/Monoidal.v
  110. +3 −3 theories/WildCat/NatTrans.v
  111. +1 −1 theories/WildCat/Opposite.v
  112. +6 −6 theories/WildCat/Prod.v
  113. +1 −1 theories/WildCat/Products.v
  114. +1 −1 theories/WildCat/Sigma.v
  115. +10 −10 theories/WildCat/Square.v
  116. +1 −1 theories/WildCat/ZeroGroupoid.v
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -99,4 +99,4 @@ More information can be found in the [Wiki][22].
[20]: https://code.visualstudio.com/
[21]: https://github.com/coq-community/vscoq

[22]: https://github.com/HoTT/HoTT/wiki
[22]: https://github.com/HoTT/HoTT/wiki
8 changes: 4 additions & 4 deletions STYLE.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
<!-- *generated with [DocToc](https://github.com/thlorenz/doctoc)* -->
<!-- Ali: VSCode is able to do the TOC using the "Markdown All in One" extension. Section numbering too! -->
## Table of Contents
## Table of Contents

- [1. Conventions And Style Guide](#1-conventions-and-style-guide)
- [1.1. Organization](#11-organization)
@@ -676,7 +676,7 @@ in `bar` appropriately.

(It is possible to explicitly declare and name universes globally with
the `Universe` command, but we are not using that in the HoTT
library. Universes declared with `Universe` will be discharged on each
library. Universes declared with `Universe` will be discharged on each
section definition independently.)

Unfortunately it is not currently possible to declare the universe
@@ -1124,7 +1124,7 @@ where they are defined.
The unification algorithm used by `apply` is different and often
less powerful than the one used by `refine`, though it is
occasionally better at pattern matching.

Here are some tips:
- If `apply` fails with a unification error you think it shouldn't
have, try `rapply`.
@@ -1135,7 +1135,7 @@ where they are defined.
- If you don't want Coq to create evars for certain subgoals,
add an `s` to the tactic name to make it use `simple refine`.


## 1.12. Contributing to the library ##

### 1.12.1. Fork & Pull ###
6 changes: 3 additions & 3 deletions contrib/SetoidRewrite.v
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ Proof.
intros f1 f2.
apply (is0functor_postcomp a b c g ).
Defined.

#[export] Instance IsProper_catcomp {A : Type} `{Is1Cat A}
{a b c : A}
: CMorphisms.Proper (GpdHom ==> GpdHom ==> GpdHom)
@@ -111,7 +111,7 @@ Proof.
exact eq_g.
Defined.

#[export] Instance gpd_hom_to_hom_proper {A B: Type} `{Is0Gpd A}
#[export] Instance gpd_hom_to_hom_proper {A B: Type} `{Is0Gpd A}
{R : Relation B} (F : A -> B)
`{CMorphisms.Proper _ (GpdHom ==> R) F}
: CMorphisms.Proper (Hom ==> R) F.
@@ -194,7 +194,7 @@ Defined.

Proposition nat_equiv_faithful {A B : Type}
{F G : A -> B} `{Is1Functor _ _ F}
`{!Is0Functor G, !Is1Functor G}
`{!Is0Functor G, !Is1Functor G}
`{!HasEquivs B} (tau : NatEquiv F G)
: Faithful F -> Faithful G.
Proof.
2 changes: 1 addition & 1 deletion etc/Book.py
Original file line number Diff line number Diff line change
@@ -190,7 +190,7 @@ def die(msg):
content = content[content.index('\n')+1:]
# Update Book_X_Y_Z
book = "_".join(map(str,entry['number']))
# content = re.sub('Book_[0-9_]*[0-9]', 'Book_{0}'.format(book), content)
# content = re.sub('Book_[0-9_]*[0-9]', 'Book_{0}'.format(book), content)
# content = re.sub('Definition Book_[0-9_]*[0-9]', 'Definition Book_{0}'.format(book), content)
# previous two removed since they break Exercise 2.2 and 2.3
# It is a common error to write things like Lemma_X_Y_Z instead of Book_X_Y_Z,
2 changes: 1 addition & 1 deletion etc/coqcreplace.py
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ def replace(vfile):
if not match:
break
lines[i] = replace_match(match, coqc_replace, lines[i])

attempts += 1
with open(vfile, 'w', encoding="utf-8") as f:
f.write(''.join(lines))
14 changes: 0 additions & 14 deletions etc/fix_end_newlines.sh

This file was deleted.

5 changes: 5 additions & 0 deletions etc/fix_trailing_whitespace.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

# This command removes trailing whitespace from all files in the repository.

git grep -l -z -E '\s+$' | xargs -0 sed -i 's/\s\+$//'
2 changes: 1 addition & 1 deletion etc/generate_coqproject.sh
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ else
fi

## List untracked .v files
#UNTRACKED_V_FILES=$(git ls-files --others --exclude-standard "*.v")
#UNTRACKED_V_FILES=$(git ls-files --others --exclude-standard "*.v")

## Combine untracked and tracked .v files
printf -v UNSORTED_V_FILES '%s\n%s' "$TRACKED_V_FILES" "$UNTRACKED_V_FILES"
96 changes: 48 additions & 48 deletions etc/homotopy.css
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
text in crazy fonts and colors. */

body { padding: 0px 0px;
margin: 0px 0px;
margin: 0px 0px;
background-color: white }

#page { display: block;
@@ -18,7 +18,7 @@ body { padding: 0px 0px;
border-bottom-style: solid;
border-width: thin }

#header h1 { padding: 0;
#header h1 { padding: 0;
margin: 0;}


@@ -45,28 +45,28 @@ body { padding: 0px 0px;
#main .keyword { color : #cf1d1d }
#main { color: black }

.section {padding-top: 13px;
padding-bottom: 13px;
padding-left: 3px;
.section {padding-top: 13px;
padding-bottom: 13px;
padding-left: 3px;
margin-top: 5px;
margin-bottom: 5px;
font-size : 175% }

h2.section {padding-left: 3px;
padding-top: 12px;
padding-bottom: 10px;
h2.section {padding-left: 3px;
padding-top: 12px;
padding-bottom: 10px;
font-size : 130% }

h3.section {padding-left: 3px;
padding-top: 7px;
padding-bottom: 7px;
h3.section {padding-left: 3px;
padding-top: 7px;
padding-bottom: 7px;
font-size : 115% }

h4.section {
h4.section {
background-color: white;
padding-left: 0px;
padding-top: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-top: 0px;
padding-bottom: 0px;
font-size : 100%;
font-style : bold;
text-decoration : underline;
@@ -81,45 +81,45 @@ h4.section {
padding-bottom: 10px;
border-style: plain}

.inlinecode {
.inlinecode {
display: inline;
/* font-size: 125%; */
color: #666666;
font-family: monospace }
font-family: monospace }

.doc .inlinecode {
.doc .inlinecode {
display: inline;
font-size: 120%;
font-size: 120%;
color: rgb(30%,30%,70%);
font-family: monospace }
font-family: monospace }

.doc .inlinecode .id {
color: rgb(30%,30%,70%);
}
.doc .inlinecode .id {
color: rgb(30%,30%,70%);
}

.inlinecodenm {
.inlinecodenm {
display: inline;
color: #444444;
}

.doc .code {
.doc .code {
display: inline;
font-size: 120%;
color: rgb(30%,30%,70%);
font-family: monospace }
font-size: 120%;
color: rgb(30%,30%,70%);
font-family: monospace }

.comment {
.comment {
display: inline;
font-family: monospace;
color: rgb(50%,50%,80%);
}
color: rgb(50%,50%,80%);
}

.code {
.code {
display: block;
/* padding-left: 15px; */
font-size: 110%;
font-size: 110%;
font-family: monospace;
}
}

table.infrule {
border: 0px;
@@ -141,7 +141,7 @@ tr.infrulemiddle hr {
}

.infrulenamecol {
color: rgb(60%,60%,60%);
color: rgb(60%,60%,60%);
font-size: 80%;
padding-left: 1em;
padding-bottom: 0.1em
@@ -154,55 +154,55 @@ tr.infrulemiddle hr {

.id { display: inline; }

.id[type="constructor"] {
.id[type="constructor"] {
color: rgb(60%,0%,0%);
}

.id[type="var"] {
.id[type="var"] {
color: rgb(40%,0%,40%);
}

.id[type="variable"] {
.id[type="variable"] {
color: rgb(40%,0%,40%);
}

.id[type="definition"] {
.id[type="definition"] {
color: rgb(0%,40%,0%);
}

.id[type="abbreviation"] {
.id[type="abbreviation"] {
color: rgb(0%,40%,0%);
}

.id[type="lemma"] {
.id[type="lemma"] {
color: rgb(0%,40%,0%);
}

.id[type="instance"] {
.id[type="instance"] {
color: rgb(0%,40%,0%);
}

.id[type="projection"] {
.id[type="projection"] {
color: rgb(0%,40%,0%);
}

.id[type="method"] {
.id[type="method"] {
color: rgb(0%,40%,0%);
}

.id[type="inductive"] {
.id[type="inductive"] {
color: rgb(0%,0%,80%);
}

.id[type="record"] {
.id[type="record"] {
color: rgb(0%,0%,80%);
}

.id[type="class"] {
.id[type="class"] {
color: rgb(0%,0%,80%);
}

.id[type="keyword"] {
.id[type="keyword"] {
color : #cf1d1d;
/* color: black; */
}
2 changes: 1 addition & 1 deletion test/Algebra/Groups/Presentation.v
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ Local Open Scope mc_mult_scope.
Check ⟨ x | x * x * x , -x ⟩.
Check ⟨ x , y | x * y , x * y * x , x * (-y) * x * x * x⟩.
Check ⟨ x , y , z | x * y * z , x * -z , x * y⟩.

2 changes: 1 addition & 1 deletion test/Metatheory/FunextVarieties.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From HoTT.Metatheory Require Import FunextVarieties.
From HoTT.Metatheory Require Import FunextVarieties.

(** Checking the universes of FunextVarieties.v *)

6 changes: 3 additions & 3 deletions theories/Algebra/AbGroups/Abelianization.v
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ From this we can show that Abel G is an abelian group.
In fact this models the following HIT:
HIT Abel (G : Group) :=
HIT Abel (G : Group) :=
| ab : G -> Abel G
| ab_comm : forall x y z, ab (x * (y * z)) = ab (x * (z * y)).
@@ -77,7 +77,7 @@ Section Abel.
Global Instance istrunc_abel : IsHSet Abel := _.

(** We can derive the induction principle from the ones for truncation and the coequalizer. *)
Definition Abel_ind (P : Abel -> Type) `{forall x, IsHSet (P x)}
Definition Abel_ind (P : Abel -> Type) `{forall x, IsHSet (P x)}
(a : forall x, P (ab x)) (c : forall x y z, DPath P (ab_comm x y z)
(a (x * (y * z))) (a (x * (z * y))))
: forall (x : Abel), P x.
@@ -111,7 +111,7 @@ Section Abel.
Defined.

(** Here is a simpler version of Abel_ind when our target is an HProp. This lets us discard all the higher paths. *)
Definition Abel_ind_hprop (P : Abel -> Type) `{forall x, IsHProp (P x)}
Definition Abel_ind_hprop (P : Abel -> Type) `{forall x, IsHProp (P x)}
(a : forall x, P (ab x)) : forall (x : Abel), P x.
Proof.
srapply (Abel_ind _ a).
2 changes: 1 addition & 1 deletion theories/Algebra/AbSES/PullbackFiberSequence.v
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ Require Import Basics Types HSet HFiber Limits.Pullback.
Require Import WildCat Pointed.Core Homotopy.ExactSequence.
Require Import Groups.QuotientGroup.
Require Import AbGroups.AbelianGroup AbGroups.AbPullback AbGroups.Biproduct.
Require Import AbSES.Core AbSES.Pullback.
Require Import AbSES.Core AbSES.Pullback.
Require Import Modalities.Identity Modalities.Modality Truncations.Core.

Local Open Scope pointed_scope.
4 changes: 2 additions & 2 deletions theories/Algebra/AbSES/Pushout.v
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ Proof.
+ exact (ap (fun x => _ + g1.1 x) (grp_unit_l _)^).
Defined.

Definition abses_pushout_path_data_1 `{Univalence} {A A' B : AbGroup} (f : A $-> A') {E : AbSES B A}
Definition abses_pushout_path_data_1 `{Univalence} {A A' B : AbGroup} (f : A $-> A') {E : AbSES B A}
: fmap (abses_pushout f) (Id E) = Id (abses_pushout f E).
Proof.
srapply path_sigma_hprop.
@@ -243,7 +243,7 @@ Proof.
- snrefine (ab_pushout_rec ab_biprod_inl _ _).
+ exact (functor_ab_biprod f grp_homo_id).
+ reflexivity.
- intro a'.
- intro a'.
apply path_prod.
+ simpl.
exact (ap _ (grp_homo_unit f) @ right_identity _).
2 changes: 1 addition & 1 deletion theories/Algebra/Groups/FreeGroup.v
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ Section Reduction.

Local Notation "[ x ]" := (word_sing x).

(** Now we wish to define the free group on A as the following HIT:
(** Now we wish to define the free group on A as the following HIT:
HIT N(A) : hSet
| eta : Words -> N(A)
Loading