From b1a53be897b1159012d5100d6163d2ec8f2c1968 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Wed, 21 Feb 2024 18:23:45 +0100 Subject: [PATCH 01/12] New banner --- src/Oscar.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Oscar.jl b/src/Oscar.jl index ee88287a68fe..e06c10a57065 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,13 +39,13 @@ if Sys.iswindows() end function _print_banner() - println(" ----- ----- ----- - ----- ") - println("| | | | | | | | | | ") - println("| | | | | | | | ") - println("| | ----- | | | |----- ") - println("| | | | |-----| | | ") - println("| | | | | | | | | | ") - println(" ----- ----- ----- - - - - ") + println(" _____ _____ _____ _ ____ ") + println("/ \ / \ / \ / \ | \ ") + println("| | | | / \ | | ") + println("| | \_____ | | | |____/ ") + println("| | \ | |_____| | \ ") + println("| | | | | | | \ ") + println("\_____/ \_____/ \_____/ | | | \ ") println() println("...combining (and extending) ANTIC, GAP, Polymake and Singular") print("Version") From fc8e2d4458527d571968c3f6db5dd6cffc8b882d Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Wed, 21 Feb 2024 18:29:41 +0100 Subject: [PATCH 02/12] Raw strings to avoid '\' being treated as escaping --- src/Oscar.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Oscar.jl b/src/Oscar.jl index e06c10a57065..553d1361449b 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,13 +39,13 @@ if Sys.iswindows() end function _print_banner() - println(" _____ _____ _____ _ ____ ") - println("/ \ / \ / \ / \ | \ ") - println("| | | | / \ | | ") - println("| | \_____ | | | |____/ ") - println("| | \ | |_____| | \ ") - println("| | | | | | | \ ") - println("\_____/ \_____/ \_____/ | | | \ ") + println(raw" _____ _____ _____ _ ____ ") + println(raw"/ \ / \ / \ / \ | \ ") + println(raw"| | | | / \ | | ") + println(raw"| | \_____ | | | |____/ ") + println(raw"| | \ | |_____| | \ ") + println(raw"| | | | | | | \ ") + println(raw"\_____/ \_____/ \_____/ | | | \ ") println() println("...combining (and extending) ANTIC, GAP, Polymake and Singular") print("Version") From 04027885a37f7c0a88b2b312a3beb0f5b98a7215 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Thu, 22 Feb 2024 09:40:34 +0100 Subject: [PATCH 03/12] figlet style OSCAR banner, update README.md --- README.md | 18 +++++------------- src/Oscar.jl | 20 +++++--------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 3b7cc0b38e6f..5aad90d4b9f3 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,11 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ```julia julia> using Oscar - ----- ----- ----- - ----- -| | | | | | | | | | -| | | | | | | | -| | ----- | | | |----- -| | | | |-----| | | -| | | | | | | | | | - ----- ----- ----- - - - - - -...combining (and extending) ANTIC, GAP, Polymake and Singular -Version 1.1.0-DEV ... -... which comes with absolutely no warranty whatsoever -Type: '?Oscar' for more information -(c) 2019-2024 by The OSCAR Development Team + ___ ____ ____ _ ____ + / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular +| | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information +| |_| |___) | |___ / ___ \| _ < | + \___/\____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV julia> k, a = quadratic_field(-5) (Imaginary quadratic field defined by x^2 + 5, sqrt(-5)) diff --git a/src/Oscar.jl b/src/Oscar.jl index 553d1361449b..aed692390204 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,21 +39,11 @@ if Sys.iswindows() end function _print_banner() - println(raw" _____ _____ _____ _ ____ ") - println(raw"/ \ / \ / \ / \ | \ ") - println(raw"| | | | / \ | | ") - println(raw"| | \_____ | | | |____/ ") - println(raw"| | \ | |_____| | \ ") - println(raw"| | | | | | | \ ") - println(raw"\_____/ \_____/ \_____/ | | | \ ") - println() - println("...combining (and extending) ANTIC, GAP, Polymake and Singular") - print("Version") - printstyled(" $VERSION_NUMBER ", color = :green) - print("... \n ... which comes with absolutely no warranty whatsoever") - println() - println("Type: '?Oscar' for more information") - println("(c) 2019-2024 by The OSCAR Development Team") + println(raw" ___ ____ ____ _ ____ ") + println(raw" / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular") + println(raw"| | | \___ \| | / _ \ | |_) | | Type \"?Oscar\" for more information") + println(raw"| |_| |___) | |___ / ___ \| _ < | ") + println(raw" \___/\____/ \____/_/ \_\_| \_\ | " * "Version $VERSION_NUMBER") end From cde55766d857c61f3389c42f87e11098a7663e13 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Thu, 22 Feb 2024 10:43:38 +0100 Subject: [PATCH 04/12] Remove README.md julia syntax color While it is possible to have Julia syntax highlighting in REPL (terminal or command line) using for example OhMyREPL, the first-time user will probably not have this. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5aad90d4b9f3..c5c6613387bc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Polymake, Antic and Singular. OSCAR requires Julia 1.6 or newer. In principle it can be installed and used like any other Julia package; doing so will take a couple of minutes: -```julia +``` julia> using Pkg julia> Pkg.add("Oscar") julia> using Oscar @@ -31,7 +31,7 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ## Examples of usage -```julia +``` julia> using Oscar ___ ____ ____ _ ____ / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular @@ -99,7 +99,7 @@ by Submodule with 1 generator Of course, the cornerstones are also available directly: -```julia +``` julia> C = Polymake.polytope.cube(3); julia> C.F_VECTOR From 2dff6f5ebd652965b41bcfc38dbd9a593c235a14 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Thu, 22 Feb 2024 12:00:40 +0100 Subject: [PATCH 05/12] More similarity to logo from website --- README.md | 10 +++++----- src/Oscar.jl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c5c6613387bc..968218ae3d8f 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ``` julia> using Oscar - ___ ____ ____ _ ____ - / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular -| | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information -| |_| |___) | |___ / ___ \| _ < | - \___/\____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV + ___ ____ ____ _ _.__ + / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular +| | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information +| |_| |___) | |___ / /_\ \| |_ < | + \_|_/\____/ \____/_/ _ \_\_| \_\ | Version 1.1.0-DEV julia> k, a = quadratic_field(-5) (Imaginary quadratic field defined by x^2 + 5, sqrt(-5)) diff --git a/src/Oscar.jl b/src/Oscar.jl index aed692390204..9ac277ec19b3 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,11 +39,11 @@ if Sys.iswindows() end function _print_banner() - println(raw" ___ ____ ____ _ ____ ") - println(raw" / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular") - println(raw"| | | \___ \| | / _ \ | |_) | | Type \"?Oscar\" for more information") - println(raw"| |_| |___) | |___ / ___ \| _ < | ") - println(raw" \___/\____/ \____/_/ \_\_| \_\ | " * "Version $VERSION_NUMBER") + println(raw" ___ ____ ____ _ _.__ ") + println(raw" / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular") + println(raw"| | | \_|_ \| | / . \ | |_) | | Type \"?Oscar\" for more information") + println(raw"| |_| |___) | |___ / /_\ \| |_ < | ") + println(raw" \_|_/\____/ \____/_/ _ \_\_| \_\ | " * "Version $VERSION_NUMBER") end From d7c3193452d75f52cafa6c6e701e183f5d18de10 Mon Sep 17 00:00:00 2001 From: Erik Paemurru <143521159+paemurru@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:31:58 +0100 Subject: [PATCH 06/12] Triple quoted string, manual link, text to top row Co-authored-by: Max Horn --- src/Oscar.jl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Oscar.jl b/src/Oscar.jl index 9ac277ec19b3..d91006322263 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,11 +39,12 @@ if Sys.iswindows() end function _print_banner() - println(raw" ___ ____ ____ _ _.__ ") - println(raw" / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular") - println(raw"| | | \_|_ \| | / . \ | |_) | | Type \"?Oscar\" for more information") - println(raw"| |_| |___) | |___ / /_\ \| |_ < | ") - println(raw" \_|_/\____/ \____/_/ _ \_\_| \_\ | " * "Version $VERSION_NUMBER") + println( + raw""" ___ ____ ____ _ _.__ | Combining ANTIC, GAP, Polymake, Singular + / | \/ ___| / ___| / \ | |_ \ | Type "?Oscar" for more information + | | | \_|_ \| | / . \ | |_) | | Manual: https://docs.oscar-system.org + | |_| |___) | |___ / /_\ \| |_ < | + \_|_/\____/ \____/_/ _ \_\_| \_\ | Version """ * $VERSION_NUMBER) end From 49178b77b1879e1cea976395ecec7d836b0122df Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Thu, 22 Feb 2024 15:47:06 +0100 Subject: [PATCH 07/12] Fix string, remove text from top line --- README.md | 2 +- src/Oscar.jl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 968218ae3d8f..9b36f2eb4ab2 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ julia> using Oscar ___ ____ ____ _ _.__ / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular | | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information -| |_| |___) | |___ / /_\ \| |_ < | +| |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org \_|_/\____/ \____/_/ _ \_\_| \_\ | Version 1.1.0-DEV julia> k, a = quadratic_field(-5) diff --git a/src/Oscar.jl b/src/Oscar.jl index d91006322263..a5d701c952b2 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -40,11 +40,11 @@ end function _print_banner() println( - raw""" ___ ____ ____ _ _.__ | Combining ANTIC, GAP, Polymake, Singular - / | \/ ___| / ___| / \ | |_ \ | Type "?Oscar" for more information - | | | \_|_ \| | / . \ | |_) | | Manual: https://docs.oscar-system.org - | |_| |___) | |___ / /_\ \| |_ < | - \_|_/\____/ \____/_/ _ \_\_| \_\ | Version """ * $VERSION_NUMBER) + raw""" ___ ____ ____ _ _.__ + / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular + | | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information + | |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org + \_|_/\____/ \____/_/ _ \_\_| \_\ | Version """ * "$VERSION_NUMBER") end From c7230b1d49d50598e46a5cd3cb3d9158cf9c9ee6 Mon Sep 17 00:00:00 2001 From: Erik Paemurru <143521159+paemurru@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:17:43 +0100 Subject: [PATCH 08/12] Remove dot from top row in README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lars Göttgens --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b36f2eb4ab2..1d2e1d34ff4b 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ``` julia> using Oscar - ___ ____ ____ _ _.__ + ___ ____ ____ _ _ __ / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular | | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information | |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org From 4bacba244c68dde90828c8454d801f30f2199cf8 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Thu, 22 Feb 2024 16:19:11 +0100 Subject: [PATCH 09/12] Remove dot from top row in Oscar.jl --- src/Oscar.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oscar.jl b/src/Oscar.jl index a5d701c952b2..241249ac73c5 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -40,7 +40,7 @@ end function _print_banner() println( - raw""" ___ ____ ____ _ _.__ + raw""" ___ ____ ____ _ _ __ / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular | | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information | |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org From 769ac387a438332122bedd3b84bc814aba83ec19 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Fri, 23 Feb 2024 16:27:23 +0100 Subject: [PATCH 10/12] Banner without vertical bars inside the letters --- README.md | 10 +++++----- src/Oscar.jl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1d2e1d34ff4b..4f13f2731d06 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ``` julia> using Oscar - ___ ____ ____ _ _ __ - / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular -| | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information -| |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org - \_|_/\____/ \____/_/ _ \_\_| \_\ | Version 1.1.0-DEV + ___ ____ ____ _ ____ + / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular +| | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information +| |_| |___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org + \___/\____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV julia> k, a = quadratic_field(-5) (Imaginary quadratic field defined by x^2 + 5, sqrt(-5)) diff --git a/src/Oscar.jl b/src/Oscar.jl index 241249ac73c5..9ac57630a587 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -40,11 +40,11 @@ end function _print_banner() println( - raw""" ___ ____ ____ _ _ __ - / | \/ ___| / ___| / \ | |_ \ | Combining ANTIC, GAP, Polymake, Singular - | | | \_|_ \| | / . \ | |_) | | Type "?Oscar" for more information - | |_| |___) | |___ / /_\ \| |_ < | Manual: https://docs.oscar-system.org - \_|_/\____/ \____/_/ _ \_\_| \_\ | Version """ * "$VERSION_NUMBER") + raw""" ___ ____ ____ _ ____ + / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular + | | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information + | |_| |___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org + \___/\____/ \____/_/ \_\_| \_\ | Version """ * "$VERSION_NUMBER") end From 4756e745390b909e0b228f146386a1ca81159b8b Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Tue, 27 Feb 2024 14:53:27 +0100 Subject: [PATCH 11/12] Increase distance between O and S --- README.md | 10 +++++----- src/Oscar.jl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 4f13f2731d06..d52ab946e242 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ in the OSCAR manual to learn more on how to contribute to OSCAR. ``` julia> using Oscar - ___ ____ ____ _ ____ - / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular -| | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information -| |_| |___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org - \___/\____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV + ___ ____ ____ _ ____ + / _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular +| | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information +| |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org + \___/ |____/ \____/_/ \_\_| \_\ | Version 1.1.0-DEV julia> k, a = quadratic_field(-5) (Imaginary quadratic field defined by x^2 + 5, sqrt(-5)) diff --git a/src/Oscar.jl b/src/Oscar.jl index c0271ffa2966..06b65f04831f 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -40,11 +40,11 @@ end function _print_banner() println( - raw""" ___ ____ ____ _ ____ - / _ \/ ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular - | | | \___ \| | / _ \ | |_) | | Type "?Oscar" for more information - | |_| |___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org - \___/\____/ \____/_/ \_\_| \_\ | Version """ * "$VERSION_NUMBER") + raw""" ___ ____ ____ _ ____ + / _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular + | | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information + | |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org + \___/ |____/ \____/_/ \_\_| \_\ | Version """ * "$VERSION_NUMBER") end From e44be1cd4317870fe4f0c2e29e729d45d7350bc2 Mon Sep 17 00:00:00 2001 From: Erik Paemurru Date: Tue, 27 Feb 2024 15:48:41 +0100 Subject: [PATCH 12/12] Print one-line banner for small terminals --- src/Oscar.jl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Oscar.jl b/src/Oscar.jl index 06b65f04831f..8eccd2d5acc4 100644 --- a/src/Oscar.jl +++ b/src/Oscar.jl @@ -39,16 +39,18 @@ if Sys.iswindows() end function _print_banner() - println( - raw""" ___ ____ ____ _ ____ - / _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular - | | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information - | |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org - \___/ |____/ \____/_/ \_\_| \_\ | Version """ * "$VERSION_NUMBER") + if displaysize(stdout)[2] >= 79 + println( + raw""" ___ ____ ____ _ ____ + / _ \ / ___| / ___| / \ | _ \ | Combining ANTIC, GAP, Polymake, Singular + | | | |\___ \| | / _ \ | |_) | | Type "?Oscar" for more information + | |_| | ___) | |___ / ___ \| _ < | Manual: https://docs.oscar-system.org + \___/ |____/ \____/_/ \_\_| \_\ | Version """ * "$VERSION_NUMBER") + else + println("OSCAR $VERSION_NUMBER https://docs.oscar-system.org Type \"?Oscar\" for help") + end end - - function __init__() if Sys.iswindows() windows_error()