solving conflict, update

docs/src/polynomial.md

@@ -150,7 +150,7 @@ ordering_lp(nvars::Int = 1)
 ```
 
 ```@docs
-ordering_rp(nvars::Int = 1)
+ordering_ip(nvars::Int = 1)
 ```
 
 ```@docs
@@ -182,7 +182,7 @@ ordering_ls(nvars::Int = 1)
 ```
 
 ```@docs
-ordering_rs(nvars::Int = 1)
+ordering_is(nvars::Int = 1)
 ```
 
 ```@docs

src/poly/orderings.jl

@@ -9,8 +9,6 @@ function AbstractAlgebra.expressify(a::sordering; context = nothing)
  for i in a.data
  if i.order == ringorder_lp
  this = Expr(:call, :ordering_lp, i.size)
- elseif i.order == ringorder_rp
- this = Expr(:call, :ordering_ip, i.size)
  elseif i.order == ringorder_ip
  this = Expr(:call, :ordering_ip, i.size)
  elseif i.order == ringorder_dp
@@ -25,8 +23,6 @@ function AbstractAlgebra.expressify(a::sordering; context = nothing)
  this = Expr(:call, :ordering_Ip, i.size)
  elseif i.order == ringorder_ls
  this = Expr(:call, :ordering_ls, i.size)
- elseif i.order == ringorder_rs
- this = Expr(:call, :ordering_is, i.size)
  elseif i.order == ringorder_is
  this = Expr(:call, :ordering_is, i.size)
  elseif i.order == ringorder_ds
@@ -106,7 +102,7 @@ lexicographical ordering (:lex).
 ordering_lp(nvars::Int = 1) = _basic_ordering(Singular.ringorder_lp, nvars)
 
 @doc raw"""
- ordering_rp(nvars::Int = 1)
+ ordering_ip(nvars::Int = 1)
 
 Represents a block of at least `nvars` variables with the
 inverse lexicographical ordering (:invlex).
@@ -176,7 +172,7 @@ negative lexicographical ordering (:neglex).
 ordering_ls(nvars::Int = 1) = _basic_ordering(Singular.ringorder_ls, nvars)
 
 @doc raw"""
- ordering_rs(nvars::Int = 1)
+ ordering_is(nvars::Int = 1)
 
 Represents a block of at least `nvars` variables with the
 negative inverse lexicographical ordering (:neginvlex).
@@ -337,14 +333,10 @@ function is_ordering_symbolic_with_symbol(a::sordering)
  o = a.data[1].order
  if o == ringorder_lp
  return (true, :lex)
- elseif o == ringorder_rp
- return (true, :invlex)
  elseif o == ringorder_ip
  return (true, :invlex)
  elseif o == ringorder_ls
  return (true, :neglex)
- elseif o == ringorder_rs
- return (true, :neginvlex)
  elseif o == ringorder_is
  return (true, :neginvlex)
  elseif o == ringorder_dp