From 047ddf2aae7f9289bd7b24f603c21a848ee0e55a Mon Sep 17 00:00:00 2001 From: Pedro Machado Manhaes de Castro Date: Thu, 24 Aug 2006 12:24:31 +0000 Subject: [PATCH] Changing the name from Curved_kernel to Circular_kernel_2 --- .gitattributes | 18 +++++++++--------- .../DxfArrayBenchmarks/Input_data.h | 0 .../Benchmarks/DxfArrayBenchmarks/benchmark.h | 0 .../benchmarks_arrangement.C | 0 .../Curved_kernel}/Benchmarks/Input_data.h | 0 .../Benchmarks/README_benchmark_CK2.txt | 0 .../Benchmarks/another_benchmark_program.C | 0 .../arrangement_traits/Input_data.h | 0 .../Benchmarks/arrangement_traits/IntStr.h | 0 .../Benchmarks/arrangement_traits/benchmark.h | 0 .../benchmarks_arrangement.C | 0 .../benchmarks_arrengement_traits.C | 0 .../Curved_kernel}/Benchmarks/benchmark.h | 0 .../Curved_kernel}/Benchmarks/benchmark_CK2.C | 0 .../Benchmarks/benchmarks_arrangement.C | 0 .../Benchmarks/bff_reader/Breader.C | 0 .../Benchmarks/bff_reader/readme.txt | 0 .../Benchmarks/dxf_to_bff/converter.C | 0 .../Benchmarks/dxf_to_bff/dxf_converter.h | 0 .../Benchmarks/dxf_to_bff/readme.txt | 0 .../incremental_insertion/Input_data.h | 0 .../incremental_insertion/benchmark.h | 0 .../benchmarks_arrangement.C | 0 .../Curved_kernel}/Benchmarks/makefile | 0 .../Benchmarks/parser/Report.pdf | Bin .../Benchmarks/parser/Report.tex | 0 .../Benchmarks/parser/benchmark_lexer.C | 0 .../Benchmarks/parser/benchmark_lexer.l | 0 .../Benchmarks/parser/benchmark_parser.C | 0 .../Benchmarks/parser/benchmark_parser.h | 0 .../Benchmarks/parser/benchmark_parser.tab.h | 0 .../Benchmarks/parser/benchmark_parser.y | 0 .../Benchmarks/parser/benchmark_visitor.C | 0 .../Benchmarks/parser/benchmark_visitor.h | 0 .../Benchmarks/parser/readme.txt | 0 .../Curved_kernel}/Benchmarks/readme.doc | Bin .../Curved_kernel}/Benchmarks/readme.pdf | 0 .../Curved_kernel}/Benchmarks/readme.sxw | Bin .../Curved_kernel}/TODO | 0 .../Curved_kernel}/changes.txt | 0 .../demo/Curved_kernel/GNUmakefile | 0 .../demo/Curved_kernel/Qt_widget_get_arc.cpp | 0 .../demo/Curved_kernel/Qt_widget_get_arc.h | 0 .../Curved_kernel/Qt_widget_get_segment.cpp | 0 .../Curved_kernel/Qt_widget_get_segment.h | 0 .../demo/Curved_kernel/data/circle_grid.cgal | 0 .../demo/Curved_kernel/data/circles_21.cgal | 0 .../demo/Curved_kernel/demo.cpp | 0 .../demo/Curved_kernel/demo.vcproj | 0 .../Curved_kernel/demo_Lazy_line_circle.cpp | 0 .../demo/Curved_kernel/demo_elias.cpp | 0 .../demo/Curved_kernel/demo_line.cpp | 0 .../demo/Curved_kernel/demo_line_circle.cpp | 0 .../demo/Curved_kernel/demo_viewer.cpp | 0 .../demo/Curved_kernel/get_arc.xpm | 0 .../demo/Curved_kernel/help/get_arc.jpeg | Bin .../demo/Curved_kernel/help/index.html | 0 .../Curved_kernel/help/planar_map_icon.jpeg | Bin .../demo/Curved_kernel/help/sweeper.jpeg | Bin .../demo/Curved_kernel/help/trash.jpeg | Bin .../demo/Curved_kernel/lines_icon.xpm | 0 .../demo/Curved_kernel/makefile | 0 .../demo/Curved_kernel/planar_map_icon.xpm | 0 .../demo/Curved_kernel/sweeper.xpm | 0 .../demo/Curved_kernel/trash.xpm | 0 .../doc_tex/Curved_kernel/CK.tex | 0 .../doc_tex/Curved_kernel/PkgDescription.tex | 0 .../doc_tex/Curved_kernel/main.tex | 0 .../AlgFunctorsConstruct.tex | 0 .../AlgFunctorsPredicates.tex | 0 .../Curved_kernel_ref/AlgebraicKernel_2_2.tex | 0 .../Algebraic_kernel_2_2.tex | 0 .../Curved_kernel_ref/Arrangements_traits.tex | 0 .../BasicGeometricKernel.tex | 0 .../Curved_kernel_ref/CircularArcPoint_2.tex | 0 .../Curved_kernel_ref/CircularArc_2.tex | 0 .../Curved_kernel_ref/CircularKernel.tex | 0 .../Curved_kernel_ref/Circular_arc_2.tex | 0 .../Circular_arc_point_2.tex | 0 .../Curved_kernel_ref/Circular_kernel.tex | 0 .../Exact_circular_kernel.tex | 0 .../Filtered_bbox_kernel.tex | 0 .../Filtered_hexagon_kernel.tex | 0 .../Filtered_interval_circular_kernel.tex | 0 .../Curved_kernel_ref/FunctorEqual.tex | 0 .../Curved_kernel_ref/FunctorsCompare.tex | 0 .../Curved_kernel_ref/FunctorsEquations.tex | 0 .../FunctorsOtherPredicates.tex | 0 .../GeomFunctorsConstructions.tex | 0 .../GeomFunctorsConstructors.tex | 0 .../Curved_kernel_ref/Global_functions.tex | 0 .../doc_tex/Curved_kernel_ref/Lazy_kernel.tex | 0 .../doc_tex/Curved_kernel_ref/LineArc_2.tex | 0 .../doc_tex/Curved_kernel_ref/Line_arc_2.tex | 0 .../PolynomialForCircles_2_2.tex | 0 .../Curved_kernel_ref/Polynomial_1.tex | 0 .../Curved_kernel_ref/Polynomial_1_2.tex | 0 .../Polynomial_for_circles_2_2.tex | 0 .../Curved_kernel_ref/RootForCircles_2_2.tex | 0 .../Root_for_circles_2_2.tex | 0 .../doc_tex/Curved_kernel_ref/intro.tex | 0 .../doc_tex/Curved_kernel_ref/main.tex | 0 .../Curved_kernel}/dont_submit | 0 .../examples/Curved_kernel/GNUmakefile | 0 ...cular_kernel_arrangement_Line_Circular.cpp | 0 .../example_Circular_kernel_arrangement.cpp | 0 ...cular_kernel_arrangement_Line_Circular.cpp | 0 ...e_Circular_kernel_arrangement_Line_arc.cpp | 0 .../example_Exact_circular_kernel.cpp | 0 ...ample_Lazy_Circular_kernel_arrangement.cpp | 0 ...cular_kernel_arrangement_Line_Circular.cpp | 0 ...y_Circular_kernel_arrangement_Line_arc.cpp | 0 .../example_arrangement_random_circles.cpp | 0 ...le_arrangement_random_circles_segments.cpp | 0 .../include/CGAL/Arr_circular_arc_traits.h | 0 .../CGAL/Arr_circular_arc_traits_checker.h | 0 .../CGAL/Arr_circular_arc_traits_tracer.h | 0 .../CGAL/Arr_circular_line_arc_traits.h | 0 .../include/CGAL/Arr_line_arc_traits.h | 0 .../include/CGAL/Circular_arc_2.h | 0 .../include/CGAL/Circular_arc_point_2.h | 0 .../include/CGAL/Circular_kernel.h | 0 .../CGAL/Curved_kernel/Circular_arc_2.h | 0 .../CGAL/Curved_kernel/Circular_arc_point_2.h | 0 .../include/CGAL/Curved_kernel/Line_arc_2.h | 0 .../function_objects_on_circle_2.h | 0 .../function_objects_on_line_2.h | 0 .../function_objects_polynomial_circular.h | 0 .../Curved_kernel/functions_on_circle_2.h | 0 .../CGAL/Curved_kernel/interface_macros.h | 0 .../internal_functions_on_circle_2.h | 0 .../internal_functions_on_circular_arc_2.h | 0 .../internal_functions_on_line_2.h | 0 .../internal_functions_on_line_arc_2.h | 0 .../intersection_line_2_circle_2_map.h | 0 .../include/CGAL/Curved_kernel_converter.h | 0 .../Curved_kernel_type_equality_wrapper.h | 0 .../include/CGAL/Exact_circular_kernel.h | 0 .../CGAL/Filtered_bbox_curved_kernel.h | 0 .../Circular_arc_endpoint_with_bbox_2.h | 0 .../Circular_arc_with_bbox_2.h | 0 .../Line_arc_with_bbox_2.h | 0 .../bbox_filtered_predicates.h | 0 .../CGAL/Filtered_hexagon_curved_kernel.h | 0 .../Circular_arc_with_hexagon_2.h | 0 .../Line_arc_with_hexagon_2.h | 0 .../hexagon_filtered_predicates.h | 0 .../hexagon_primitives.h | 0 .../CGAL/Filtered_interval_circular_kernel.h | 0 .../ah_filtered_predicates.h | 0 .../ah_primitives.h | 0 ...iltered_interval_circular_kernel_defines.h | 0 .../filtered_interval_circular_kernel_table.h | 0 ...interval_circular_kernel_table_generator.h | 0 .../include/CGAL/IO/Dxf_reader.h | 0 .../include/CGAL/IO/Dxf_variant_reader.h | 0 .../CGAL/IO/Qt_widget_circular_arc_2.h | 0 .../IO/Qt_widget_circular_arc_endpoint_2.h | 0 .../Qt_widget_circular_arc_with_hexagon_2.h | 0 .../include/CGAL/Lazy_curved_kernel.h | 0 .../CGAL/Lazy_curved_kernel_constructions.h | 0 .../Curved_kernel}/include/CGAL/Line_arc_2.h | 0 .../include/CGAL/Simple_circular_kernel.h | 0 .../CGAL/global_functions_on_circle_2.h | 0 .../global_functions_on_circular_arcs_2.h | 0 .../include/CGAL/global_functions_on_line_2.h | 0 .../CGAL/global_functions_on_line_arcs_2.h | 0 .../test/Curved_kernel/GNUmakefile | 0 .../CGAL/_test_circles_constructions.h | 0 .../include/CGAL/_test_circles_extention.h | 0 .../include/CGAL/_test_circles_predicates.h | 0 .../test/Curved_kernel/test_Circular_kernel.C | 0 .../Curved_kernel/test_Exact_curved_kernel.C | 0 .../test_Filtered_bbox_curved_kernel.C | 0 ...Filtered_bbox_hexagon_Lazy_curved_kernel.C | 0 .../test_Filtered_hexagon_kernel.C | 0 .../test_Filtered_interval_circular_kernel.C | 0 .../test/Curved_kernel/test_Lazy_Line_arc.C | 0 .../Curved_kernel/test_Lazy_curved_kernel.C | 0 .../test/Curved_kernel/test_Line_arc.C | 0 180 files changed, 9 insertions(+), 9 deletions(-) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/DxfArrayBenchmarks/Input_data.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/DxfArrayBenchmarks/benchmark.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/Input_data.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/README_benchmark_CK2.txt (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/another_benchmark_program.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/arrangement_traits/Input_data.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/arrangement_traits/IntStr.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/arrangement_traits/benchmark.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/arrangement_traits/benchmarks_arrangement.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/benchmark.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/benchmark_CK2.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/benchmarks_arrangement.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/bff_reader/Breader.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/bff_reader/readme.txt (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/dxf_to_bff/converter.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/dxf_to_bff/dxf_converter.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/dxf_to_bff/readme.txt (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/incremental_insertion/Input_data.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/incremental_insertion/benchmark.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/incremental_insertion/benchmarks_arrangement.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/makefile (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/Report.pdf (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/Report.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_lexer.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_lexer.l (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_parser.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_parser.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_parser.tab.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_parser.y (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_visitor.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/benchmark_visitor.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/parser/readme.txt (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/readme.doc (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/readme.pdf (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/Benchmarks/readme.sxw (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/TODO (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/changes.txt (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/GNUmakefile (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/Qt_widget_get_arc.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/Qt_widget_get_arc.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/Qt_widget_get_segment.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/Qt_widget_get_segment.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/data/circle_grid.cgal (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/data/circles_21.cgal (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo.vcproj (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo_Lazy_line_circle.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo_elias.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo_line.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo_line_circle.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/demo_viewer.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/get_arc.xpm (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/help/get_arc.jpeg (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/help/index.html (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/help/planar_map_icon.jpeg (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/help/sweeper.jpeg (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/help/trash.jpeg (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/lines_icon.xpm (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/makefile (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/planar_map_icon.xpm (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/sweeper.xpm (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/demo/Curved_kernel/trash.xpm (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel/CK.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel/PkgDescription.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel/main.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/AlgFunctorsConstruct.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/AlgFunctorsPredicates.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/AlgebraicKernel_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Algebraic_kernel_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Arrangements_traits.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/BasicGeometricKernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/CircularArcPoint_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/CircularArc_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/CircularKernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Circular_arc_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Circular_arc_point_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Circular_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Exact_circular_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Filtered_bbox_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Filtered_hexagon_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Filtered_interval_circular_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/FunctorEqual.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/FunctorsCompare.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/FunctorsEquations.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/FunctorsOtherPredicates.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/GeomFunctorsConstructions.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/GeomFunctorsConstructors.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Global_functions.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Lazy_kernel.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/LineArc_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Line_arc_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/PolynomialForCircles_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Polynomial_1.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Polynomial_1_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Polynomial_for_circles_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/RootForCircles_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/Root_for_circles_2_2.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/intro.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/doc_tex/Curved_kernel_ref/main.tex (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/dont_submit (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/GNUmakefile (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Circular_kernel_arrangement.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Exact_circular_kernel.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_arrangement_random_circles.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/examples/Curved_kernel/example_arrangement_random_circles_segments.cpp (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Arr_circular_arc_traits.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Arr_circular_arc_traits_checker.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Arr_circular_arc_traits_tracer.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Arr_circular_line_arc_traits.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Arr_line_arc_traits.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Circular_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Circular_arc_point_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Circular_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/Circular_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/Circular_arc_point_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/Line_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/function_objects_on_circle_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/function_objects_on_line_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/functions_on_circle_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/interface_macros.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/internal_functions_on_line_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel_converter.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Curved_kernel_type_equality_wrapper.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Exact_circular_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_bbox_curved_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_hexagon_curved_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/IO/Dxf_reader.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/IO/Dxf_variant_reader.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/IO/Qt_widget_circular_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Lazy_curved_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Lazy_curved_kernel_constructions.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Line_arc_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/Simple_circular_kernel.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/global_functions_on_circle_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/global_functions_on_circular_arcs_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/global_functions_on_line_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/include/CGAL/global_functions_on_line_arcs_2.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/GNUmakefile (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/include/CGAL/_test_circles_constructions.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/include/CGAL/_test_circles_extention.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/include/CGAL/_test_circles_predicates.h (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Circular_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Exact_curved_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Filtered_bbox_curved_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Filtered_hexagon_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Filtered_interval_circular_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Lazy_Line_arc.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Lazy_curved_kernel.C (100%) rename {Curved_kernel => Circular_kernel_2/Curved_kernel}/test/Curved_kernel/test_Line_arc.C (100%) diff --git a/.gitattributes b/.gitattributes index b2289a68067..568ddb3807a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -402,6 +402,15 @@ Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.eps -text svneol=un Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.gif -text svneol=unset#image/gif Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.pdf -text svneol=unset#application/pdf Box_intersection_d/test/Box_intersection_d/benchmark.plot -text svneol=native#application/postscript +Circular_kernel_2/Curved_kernel/Benchmarks/parser/Report.pdf -text svneol=unset#application/pdf +Circular_kernel_2/Curved_kernel/Benchmarks/readme.doc -text svneol=unset#application/msword +Circular_kernel_2/Curved_kernel/Benchmarks/readme.pdf -text svneol=unset#application/pdf +Circular_kernel_2/Curved_kernel/Benchmarks/readme.sxw -text +Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg -text svneol=unset#image/jpeg +Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/index.html svneol=native#text/html +Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg -text svneol=unset#image/jpeg +Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg -text svneol=unset#image/jpeg +Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/trash.jpeg -text svneol=unset#image/jpeg Circular_kernel_3/demo/Circular_kernel_3/demo_circle -text Circular_kernel_3/demo/Circular_kernel_3/images/arrow_01_down.xpm -text Circular_kernel_3/demo/Circular_kernel_3/images/arrow_01_left.xpm -text @@ -427,15 +436,6 @@ Convex_hull_2/demo/Convex_hull_2/help/index.html svneol=native#text/html Convex_hull_2/doc_tex/Convex_hull_2/saarhull.eps -text svneol=unset#application/postscript Convex_hull_2/doc_tex/Convex_hull_2/saarhull.gif -text svneol=unset#image/gif Convex_hull_2/doc_tex/Convex_hull_2/saarhull.pdf -text svneol=unset#application/pdf -Curved_kernel/Benchmarks/parser/Report.pdf -text svneol=unset#application/pdf -Curved_kernel/Benchmarks/readme.doc -text svneol=unset#application/msword -Curved_kernel/Benchmarks/readme.pdf -text svneol=unset#application/pdf -Curved_kernel/Benchmarks/readme.sxw -text -Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg -text svneol=unset#image/jpeg -Curved_kernel/demo/Curved_kernel/help/index.html svneol=native#text/html -Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg -text svneol=unset#image/jpeg -Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg -text svneol=unset#image/jpeg -Curved_kernel/demo/Curved_kernel/help/trash.jpeg -text svneol=unset#image/jpeg Developers_manual/doc_tex/Developers_manual/fig/Cartesian_ipoint.gif -text svneol=unset#image/gif Developers_manual/doc_tex/Developers_manual/fig/Cartesian_orientation.gif -text svneol=unset#image/gif Developers_manual/doc_tex/Developers_manual/fig/Object.eps -text svneol=unset#application/postscript diff --git a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/Input_data.h b/Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/Input_data.h similarity index 100% rename from Curved_kernel/Benchmarks/DxfArrayBenchmarks/Input_data.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/Input_data.h diff --git a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h b/Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h similarity index 100% rename from Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h diff --git a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C b/Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C similarity index 100% rename from Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C diff --git a/Curved_kernel/Benchmarks/Input_data.h b/Circular_kernel_2/Curved_kernel/Benchmarks/Input_data.h similarity index 100% rename from Curved_kernel/Benchmarks/Input_data.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/Input_data.h diff --git a/Curved_kernel/Benchmarks/README_benchmark_CK2.txt b/Circular_kernel_2/Curved_kernel/Benchmarks/README_benchmark_CK2.txt similarity index 100% rename from Curved_kernel/Benchmarks/README_benchmark_CK2.txt rename to Circular_kernel_2/Curved_kernel/Benchmarks/README_benchmark_CK2.txt diff --git a/Curved_kernel/Benchmarks/another_benchmark_program.C b/Circular_kernel_2/Curved_kernel/Benchmarks/another_benchmark_program.C similarity index 100% rename from Curved_kernel/Benchmarks/another_benchmark_program.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/another_benchmark_program.C diff --git a/Curved_kernel/Benchmarks/arrangement_traits/Input_data.h b/Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/Input_data.h similarity index 100% rename from Curved_kernel/Benchmarks/arrangement_traits/Input_data.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/Input_data.h diff --git a/Curved_kernel/Benchmarks/arrangement_traits/IntStr.h b/Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/IntStr.h similarity index 100% rename from Curved_kernel/Benchmarks/arrangement_traits/IntStr.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/IntStr.h diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h b/Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h similarity index 100% rename from Curved_kernel/Benchmarks/arrangement_traits/benchmark.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C b/Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C similarity index 100% rename from Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C b/Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C similarity index 100% rename from Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C diff --git a/Curved_kernel/Benchmarks/benchmark.h b/Circular_kernel_2/Curved_kernel/Benchmarks/benchmark.h similarity index 100% rename from Curved_kernel/Benchmarks/benchmark.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/benchmark.h diff --git a/Curved_kernel/Benchmarks/benchmark_CK2.C b/Circular_kernel_2/Curved_kernel/Benchmarks/benchmark_CK2.C similarity index 100% rename from Curved_kernel/Benchmarks/benchmark_CK2.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/benchmark_CK2.C diff --git a/Curved_kernel/Benchmarks/benchmarks_arrangement.C b/Circular_kernel_2/Curved_kernel/Benchmarks/benchmarks_arrangement.C similarity index 100% rename from Curved_kernel/Benchmarks/benchmarks_arrangement.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/benchmarks_arrangement.C diff --git a/Curved_kernel/Benchmarks/bff_reader/Breader.C b/Circular_kernel_2/Curved_kernel/Benchmarks/bff_reader/Breader.C similarity index 100% rename from Curved_kernel/Benchmarks/bff_reader/Breader.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/bff_reader/Breader.C diff --git a/Curved_kernel/Benchmarks/bff_reader/readme.txt b/Circular_kernel_2/Curved_kernel/Benchmarks/bff_reader/readme.txt similarity index 100% rename from Curved_kernel/Benchmarks/bff_reader/readme.txt rename to Circular_kernel_2/Curved_kernel/Benchmarks/bff_reader/readme.txt diff --git a/Curved_kernel/Benchmarks/dxf_to_bff/converter.C b/Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/converter.C similarity index 100% rename from Curved_kernel/Benchmarks/dxf_to_bff/converter.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/converter.C diff --git a/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h b/Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h similarity index 100% rename from Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h diff --git a/Curved_kernel/Benchmarks/dxf_to_bff/readme.txt b/Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/readme.txt similarity index 100% rename from Curved_kernel/Benchmarks/dxf_to_bff/readme.txt rename to Circular_kernel_2/Curved_kernel/Benchmarks/dxf_to_bff/readme.txt diff --git a/Curved_kernel/Benchmarks/incremental_insertion/Input_data.h b/Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/Input_data.h similarity index 100% rename from Curved_kernel/Benchmarks/incremental_insertion/Input_data.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/Input_data.h diff --git a/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h b/Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h similarity index 100% rename from Curved_kernel/Benchmarks/incremental_insertion/benchmark.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h diff --git a/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C b/Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C similarity index 100% rename from Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C diff --git a/Curved_kernel/Benchmarks/makefile b/Circular_kernel_2/Curved_kernel/Benchmarks/makefile similarity index 100% rename from Curved_kernel/Benchmarks/makefile rename to Circular_kernel_2/Curved_kernel/Benchmarks/makefile diff --git a/Curved_kernel/Benchmarks/parser/Report.pdf b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/Report.pdf similarity index 100% rename from Curved_kernel/Benchmarks/parser/Report.pdf rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/Report.pdf diff --git a/Curved_kernel/Benchmarks/parser/Report.tex b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/Report.tex similarity index 100% rename from Curved_kernel/Benchmarks/parser/Report.tex rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/Report.tex diff --git a/Curved_kernel/Benchmarks/parser/benchmark_lexer.C b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_lexer.C similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_lexer.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_lexer.C diff --git a/Curved_kernel/Benchmarks/parser/benchmark_lexer.l b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_lexer.l similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_lexer.l rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_lexer.l diff --git a/Curved_kernel/Benchmarks/parser/benchmark_parser.C b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.C similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_parser.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.C diff --git a/Curved_kernel/Benchmarks/parser/benchmark_parser.h b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.h similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_parser.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.h diff --git a/Curved_kernel/Benchmarks/parser/benchmark_parser.tab.h b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.tab.h similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_parser.tab.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.tab.h diff --git a/Curved_kernel/Benchmarks/parser/benchmark_parser.y b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.y similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_parser.y rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_parser.y diff --git a/Curved_kernel/Benchmarks/parser/benchmark_visitor.C b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_visitor.C similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_visitor.C rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_visitor.C diff --git a/Curved_kernel/Benchmarks/parser/benchmark_visitor.h b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_visitor.h similarity index 100% rename from Curved_kernel/Benchmarks/parser/benchmark_visitor.h rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/benchmark_visitor.h diff --git a/Curved_kernel/Benchmarks/parser/readme.txt b/Circular_kernel_2/Curved_kernel/Benchmarks/parser/readme.txt similarity index 100% rename from Curved_kernel/Benchmarks/parser/readme.txt rename to Circular_kernel_2/Curved_kernel/Benchmarks/parser/readme.txt diff --git a/Curved_kernel/Benchmarks/readme.doc b/Circular_kernel_2/Curved_kernel/Benchmarks/readme.doc similarity index 100% rename from Curved_kernel/Benchmarks/readme.doc rename to Circular_kernel_2/Curved_kernel/Benchmarks/readme.doc diff --git a/Curved_kernel/Benchmarks/readme.pdf b/Circular_kernel_2/Curved_kernel/Benchmarks/readme.pdf similarity index 100% rename from Curved_kernel/Benchmarks/readme.pdf rename to Circular_kernel_2/Curved_kernel/Benchmarks/readme.pdf diff --git a/Curved_kernel/Benchmarks/readme.sxw b/Circular_kernel_2/Curved_kernel/Benchmarks/readme.sxw similarity index 100% rename from Curved_kernel/Benchmarks/readme.sxw rename to Circular_kernel_2/Curved_kernel/Benchmarks/readme.sxw diff --git a/Curved_kernel/TODO b/Circular_kernel_2/Curved_kernel/TODO similarity index 100% rename from Curved_kernel/TODO rename to Circular_kernel_2/Curved_kernel/TODO diff --git a/Curved_kernel/changes.txt b/Circular_kernel_2/Curved_kernel/changes.txt similarity index 100% rename from Curved_kernel/changes.txt rename to Circular_kernel_2/Curved_kernel/changes.txt diff --git a/Curved_kernel/demo/Curved_kernel/GNUmakefile b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/GNUmakefile similarity index 100% rename from Curved_kernel/demo/Curved_kernel/GNUmakefile rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/GNUmakefile diff --git a/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.cpp diff --git a/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.h b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.h similarity index 100% rename from Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.h rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_arc.h diff --git a/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.cpp diff --git a/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.h b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.h similarity index 100% rename from Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.h rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/Qt_widget_get_segment.h diff --git a/Curved_kernel/demo/Curved_kernel/data/circle_grid.cgal b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/data/circle_grid.cgal similarity index 100% rename from Curved_kernel/demo/Curved_kernel/data/circle_grid.cgal rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/data/circle_grid.cgal diff --git a/Curved_kernel/demo/Curved_kernel/data/circles_21.cgal b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/data/circles_21.cgal similarity index 100% rename from Curved_kernel/demo/Curved_kernel/data/circles_21.cgal rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/data/circles_21.cgal diff --git a/Curved_kernel/demo/Curved_kernel/demo.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo.cpp diff --git a/Curved_kernel/demo/Curved_kernel/demo.vcproj b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo.vcproj similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo.vcproj rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo.vcproj diff --git a/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.cpp diff --git a/Curved_kernel/demo/Curved_kernel/demo_elias.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_elias.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo_elias.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_elias.cpp diff --git a/Curved_kernel/demo/Curved_kernel/demo_line.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_line.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo_line.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_line.cpp diff --git a/Curved_kernel/demo/Curved_kernel/demo_line_circle.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_line_circle.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo_line_circle.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_line_circle.cpp diff --git a/Curved_kernel/demo/Curved_kernel/demo_viewer.cpp b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_viewer.cpp similarity index 100% rename from Curved_kernel/demo/Curved_kernel/demo_viewer.cpp rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/demo_viewer.cpp diff --git a/Curved_kernel/demo/Curved_kernel/get_arc.xpm b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/get_arc.xpm similarity index 100% rename from Curved_kernel/demo/Curved_kernel/get_arc.xpm rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/get_arc.xpm diff --git a/Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg similarity index 100% rename from Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/get_arc.jpeg diff --git a/Curved_kernel/demo/Curved_kernel/help/index.html b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/index.html similarity index 100% rename from Curved_kernel/demo/Curved_kernel/help/index.html rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/index.html diff --git a/Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg similarity index 100% rename from Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/planar_map_icon.jpeg diff --git a/Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg similarity index 100% rename from Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/sweeper.jpeg diff --git a/Curved_kernel/demo/Curved_kernel/help/trash.jpeg b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/trash.jpeg similarity index 100% rename from Curved_kernel/demo/Curved_kernel/help/trash.jpeg rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/help/trash.jpeg diff --git a/Curved_kernel/demo/Curved_kernel/lines_icon.xpm b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/lines_icon.xpm similarity index 100% rename from Curved_kernel/demo/Curved_kernel/lines_icon.xpm rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/lines_icon.xpm diff --git a/Curved_kernel/demo/Curved_kernel/makefile b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/makefile similarity index 100% rename from Curved_kernel/demo/Curved_kernel/makefile rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/makefile diff --git a/Curved_kernel/demo/Curved_kernel/planar_map_icon.xpm b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/planar_map_icon.xpm similarity index 100% rename from Curved_kernel/demo/Curved_kernel/planar_map_icon.xpm rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/planar_map_icon.xpm diff --git a/Curved_kernel/demo/Curved_kernel/sweeper.xpm b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/sweeper.xpm similarity index 100% rename from Curved_kernel/demo/Curved_kernel/sweeper.xpm rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/sweeper.xpm diff --git a/Curved_kernel/demo/Curved_kernel/trash.xpm b/Circular_kernel_2/Curved_kernel/demo/Curved_kernel/trash.xpm similarity index 100% rename from Curved_kernel/demo/Curved_kernel/trash.xpm rename to Circular_kernel_2/Curved_kernel/demo/Curved_kernel/trash.xpm diff --git a/Curved_kernel/doc_tex/Curved_kernel/CK.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/CK.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel/CK.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/CK.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel/PkgDescription.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/PkgDescription.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel/PkgDescription.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/PkgDescription.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel/main.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/main.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel/main.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel/main.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsConstruct.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsConstruct.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsConstruct.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsConstruct.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsPredicates.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsPredicates.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsPredicates.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgFunctorsPredicates.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/AlgebraicKernel_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgebraicKernel_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/AlgebraicKernel_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/AlgebraicKernel_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Algebraic_kernel_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Algebraic_kernel_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Algebraic_kernel_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Algebraic_kernel_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Arrangements_traits.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Arrangements_traits.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Arrangements_traits.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Arrangements_traits.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/BasicGeometricKernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/BasicGeometricKernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/BasicGeometricKernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/BasicGeometricKernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArcPoint_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArcPoint_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/CircularArcPoint_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArcPoint_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArc_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArc_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/CircularArc_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularArc_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/CircularKernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularKernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/CircularKernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/CircularKernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_point_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_point_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_point_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_arc_point_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Circular_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Circular_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Exact_circular_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Exact_circular_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Exact_circular_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Exact_circular_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_bbox_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_bbox_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_bbox_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_bbox_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_hexagon_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_hexagon_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_hexagon_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_hexagon_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_interval_circular_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_interval_circular_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_interval_circular_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Filtered_interval_circular_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsEquations.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsEquations.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsEquations.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsEquations.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsOtherPredicates.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsOtherPredicates.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsOtherPredicates.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsOtherPredicates.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructions.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructions.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructions.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructions.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructors.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructors.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructors.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/GeomFunctorsConstructors.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Global_functions.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Global_functions.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Global_functions.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Global_functions.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Lazy_kernel.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Lazy_kernel.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Lazy_kernel.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Lazy_kernel.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/LineArc_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/LineArc_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/LineArc_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/LineArc_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Line_arc_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Line_arc_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Line_arc_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Line_arc_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/PolynomialForCircles_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/PolynomialForCircles_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/PolynomialForCircles_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/PolynomialForCircles_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_1_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_for_circles_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_for_circles_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_for_circles_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Polynomial_for_circles_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/RootForCircles_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/RootForCircles_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/RootForCircles_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/RootForCircles_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/Root_for_circles_2_2.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Root_for_circles_2_2.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/Root_for_circles_2_2.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/Root_for_circles_2_2.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/intro.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/intro.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/intro.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/intro.tex diff --git a/Curved_kernel/doc_tex/Curved_kernel_ref/main.tex b/Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/main.tex similarity index 100% rename from Curved_kernel/doc_tex/Curved_kernel_ref/main.tex rename to Circular_kernel_2/Curved_kernel/doc_tex/Curved_kernel_ref/main.tex diff --git a/Curved_kernel/dont_submit b/Circular_kernel_2/Curved_kernel/dont_submit similarity index 100% rename from Curved_kernel/dont_submit rename to Circular_kernel_2/Curved_kernel/dont_submit diff --git a/Curved_kernel/examples/Curved_kernel/GNUmakefile b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/GNUmakefile similarity index 100% rename from Curved_kernel/examples/Curved_kernel/GNUmakefile rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/GNUmakefile diff --git a/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Exact_circular_kernel.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Exact_circular_kernel.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Exact_circular_kernel.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Exact_circular_kernel.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.cpp diff --git a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.cpp b/Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.cpp similarity index 100% rename from Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.cpp rename to Circular_kernel_2/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.cpp diff --git a/Curved_kernel/include/CGAL/Arr_circular_arc_traits.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits.h similarity index 100% rename from Curved_kernel/include/CGAL/Arr_circular_arc_traits.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits.h diff --git a/Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h similarity index 100% rename from Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h diff --git a/Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h similarity index 100% rename from Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h diff --git a/Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h similarity index 100% rename from Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h diff --git a/Curved_kernel/include/CGAL/Arr_line_arc_traits.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_line_arc_traits.h similarity index 100% rename from Curved_kernel/include/CGAL/Arr_line_arc_traits.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Arr_line_arc_traits.h diff --git a/Curved_kernel/include/CGAL/Circular_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Circular_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_2.h diff --git a/Curved_kernel/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_point_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Circular_arc_point_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_point_2.h diff --git a/Curved_kernel/include/CGAL/Circular_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Circular_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Circular_kernel.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel_converter.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_converter.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel_converter.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_converter.h diff --git a/Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h similarity index 100% rename from Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h diff --git a/Curved_kernel/include/CGAL/Exact_circular_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Exact_circular_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Exact_circular_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Exact_circular_kernel.h diff --git a/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h diff --git a/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h diff --git a/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h diff --git a/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h diff --git a/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h diff --git a/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h similarity index 100% rename from Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h diff --git a/Curved_kernel/include/CGAL/IO/Dxf_reader.h b/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_reader.h similarity index 100% rename from Curved_kernel/include/CGAL/IO/Dxf_reader.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_reader.h diff --git a/Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h b/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h similarity index 100% rename from Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h diff --git a/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h diff --git a/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h similarity index 100% rename from Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h diff --git a/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h similarity index 100% rename from Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h diff --git a/Curved_kernel/include/CGAL/Lazy_curved_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Lazy_curved_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel.h diff --git a/Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h similarity index 100% rename from Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h diff --git a/Curved_kernel/include/CGAL/Line_arc_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Line_arc_2.h similarity index 100% rename from Curved_kernel/include/CGAL/Line_arc_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Line_arc_2.h diff --git a/Curved_kernel/include/CGAL/Simple_circular_kernel.h b/Circular_kernel_2/Curved_kernel/include/CGAL/Simple_circular_kernel.h similarity index 100% rename from Curved_kernel/include/CGAL/Simple_circular_kernel.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/Simple_circular_kernel.h diff --git a/Curved_kernel/include/CGAL/global_functions_on_circle_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circle_2.h similarity index 100% rename from Curved_kernel/include/CGAL/global_functions_on_circle_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circle_2.h diff --git a/Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h similarity index 100% rename from Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h diff --git a/Curved_kernel/include/CGAL/global_functions_on_line_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_2.h similarity index 100% rename from Curved_kernel/include/CGAL/global_functions_on_line_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_2.h diff --git a/Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h b/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h similarity index 100% rename from Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h rename to Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h diff --git a/Curved_kernel/test/Curved_kernel/GNUmakefile b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/GNUmakefile similarity index 100% rename from Curved_kernel/test/Curved_kernel/GNUmakefile rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/GNUmakefile diff --git a/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_constructions.h b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_constructions.h similarity index 100% rename from Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_constructions.h rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_constructions.h diff --git a/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_extention.h b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_extention.h similarity index 100% rename from Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_extention.h rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_extention.h diff --git a/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_predicates.h b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_predicates.h similarity index 100% rename from Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_predicates.h rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/include/CGAL/_test_circles_predicates.h diff --git a/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Circular_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Exact_curved_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Exact_curved_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Exact_curved_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Exact_curved_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_curved_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_curved_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Filtered_bbox_curved_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_curved_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_interval_circular_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_interval_circular_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Filtered_interval_circular_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Filtered_interval_circular_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C diff --git a/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C diff --git a/Curved_kernel/test/Curved_kernel/test_Line_arc.C b/Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Line_arc.C similarity index 100% rename from Curved_kernel/test/Curved_kernel/test_Line_arc.C rename to Circular_kernel_2/Curved_kernel/test/Curved_kernel/test_Line_arc.C