# HG changeset patch # User wenzelm # Date 1273666646 -7200 # Node ID 952b2b102a0a39778ccc9c3c957e9c46231c532a # Parent 015bd9d4fd852ccf1c558339e70a8ba784a866cb removed obsolete CVS Ids; diff -r 015bd9d4fd85 -r 952b2b102a0a src/CCL/IsaMakefile --- a/src/CCL/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/CCL/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for CCL # diff -r 015bd9d4fd85 -r 952b2b102a0a src/CTT/IsaMakefile --- a/src/CTT/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/CTT/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for CTT # diff -r 015bd9d4fd85 -r 952b2b102a0a src/CTT/README.html --- a/src/CTT/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/CTT/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/Cube/IsaMakefile --- a/src/Cube/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/Cube/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for Cube # diff -r 015bd9d4fd85 -r 952b2b102a0a src/Cube/README.html --- a/src/Cube/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/Cube/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/FOL/IsaMakefile --- a/src/FOL/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/FOL/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for FOL # diff -r 015bd9d4fd85 -r 952b2b102a0a src/FOL/README.html --- a/src/FOL/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/FOL/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/FOL/document/root.tex --- a/src/FOL/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/FOL/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{isabelle,isabellesym} \usepackage{pdfsetup} diff -r 015bd9d4fd85 -r 952b2b102a0a src/FOLP/IsaMakefile --- a/src/FOLP/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/FOLP/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for FOLP # diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Extraction/Greatest_Common_Divisor.thy --- a/src/HOL/Extraction/Greatest_Common_Divisor.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Extraction/Greatest_Common_Divisor.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Extraction/Greatest_Common_Divisor.thy - ID: $Id$ Author: Stefan Berghofer, TU Muenchen Helmut Schwichtenberg, LMU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Extraction/QuotRem.thy --- a/src/HOL/Extraction/QuotRem.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Extraction/QuotRem.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Extraction/QuotRem.thy - ID: $Id$ Author: Stefan Berghofer, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Hahn_Banach/README.html --- a/src/HOL/Hahn_Banach/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Hahn_Banach/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Hoare/document/root.tex --- a/src/HOL/Hoare/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Hoare/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{report} \usepackage{graphicx} \usepackage[english]{babel} diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/IOA/Asig.thy --- a/src/HOL/IOA/Asig.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/IOA/Asig.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/IOA/Asig.thy - ID: $Id$ Author: Tobias Nipkow & Konrad Slind Copyright 1994 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/IOA/IOA.thy --- a/src/HOL/IOA/IOA.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/IOA/IOA.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/IOA/IOA.thy - ID: $Id$ Author: Tobias Nipkow & Konrad Slind Copyright 1994 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/IOA/README.html --- a/src/HOL/IOA/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/IOA/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/IOA/Solve.thy --- a/src/HOL/IOA/Solve.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/IOA/Solve.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/IOA/Solve.thy - ID: $Id$ Author: Tobias Nipkow & Konrad Slind Copyright 1994 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/ABexp.thy --- a/src/HOL/Induct/ABexp.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/ABexp.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Induct/ABexp.thy - ID: $Id$ Author: Stefan Berghofer, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/Com.thy --- a/src/HOL/Induct/Com.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/Com.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ -(* Title: HOL/Induct/Com - ID: $Id$ +(* Title: HOL/Induct/Com.thy Author: Lawrence C Paulson, Cambridge University Computer Laboratory Copyright 1997 University of Cambridge diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/Ordinals.thy --- a/src/HOL/Induct/Ordinals.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/Ordinals.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Induct/Ordinals.thy - ID: $Id$ Author: Stefan Berghofer and Markus Wenzel, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/PropLog.thy --- a/src/HOL/Induct/PropLog.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/PropLog.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Induct/PropLog.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1994 TU Muenchen & University of Cambridge *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/README.html --- a/src/HOL/Induct/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/Sigma_Algebra.thy --- a/src/HOL/Induct/Sigma_Algebra.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/Sigma_Algebra.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Induct/Sigma_Algebra.thy - ID: $Id$ Author: Markus Wenzel, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Induct/Term.thy --- a/src/HOL/Induct/Term.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Induct/Term.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Induct/Term.thy - ID: $Id$ Author: Stefan Berghofer, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Isar_Examples/README.html --- a/src/HOL/Isar_Examples/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Isar_Examples/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/Commutation.thy --- a/src/HOL/Lambda/Commutation.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/Commutation.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/Commutation.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1995 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/InductTermi.thy --- a/src/HOL/Lambda/InductTermi.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/InductTermi.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/InductTermi.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1998 TU Muenchen diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/Lambda.thy --- a/src/HOL/Lambda/Lambda.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/Lambda.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/Lambda.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1995 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/ListApplication.thy --- a/src/HOL/Lambda/ListApplication.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/ListApplication.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/ListApplication.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1998 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/ListBeta.thy --- a/src/HOL/Lambda/ListBeta.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/ListBeta.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/ListBeta.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1998 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/ListOrder.thy --- a/src/HOL/Lambda/ListOrder.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/ListOrder.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/ListOrder.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1998 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/ParRed.thy --- a/src/HOL/Lambda/ParRed.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/ParRed.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/ParRed.thy - ID: $Id$ Author: Tobias Nipkow Copyright 1995 TU Muenchen diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/README.html --- a/src/HOL/Lambda/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/Standardization.thy --- a/src/HOL/Lambda/Standardization.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/Standardization.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/Standardization.thy - ID: $Id$ Author: Stefan Berghofer Copyright 2005 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/Type.thy --- a/src/HOL/Lambda/Type.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/Type.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Lambda/Type.thy - ID: $Id$ Author: Stefan Berghofer Copyright 2000 TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lambda/document/root.tex --- a/src/HOL/Lambda/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lambda/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{graphicx} \usepackage[english]{babel} diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Lattice/document/root.tex --- a/src/HOL/Lattice/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Lattice/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{isabelle,isabellesym,pdfsetup} \usepackage[only,bigsqcap]{stmaryrd} diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Matrix/document/root.tex --- a/src/HOL/Matrix/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Matrix/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{isabelle,isabellesym} diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/README.html --- a/src/HOL/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Tools/Qelim/ferrante_rackoff.ML --- a/src/HOL/Tools/Qelim/ferrante_rackoff.ML Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Tools/Qelim/ferrante_rackoff.ML Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Tools/Qelim/ferrante_rackoff.ML - ID: $Id$ Author: Amine Chaieb, TU Muenchen Ferrante and Rackoff's algorithm for quantifier elimination in dense diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Tools/Qelim/ferrante_rackoff_data.ML --- a/src/HOL/Tools/Qelim/ferrante_rackoff_data.ML Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Tools/Qelim/ferrante_rackoff_data.ML Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Tools/Qelim/ferrante_rackoff_data.ML - ID: $Id$ Author: Amine Chaieb, TU Muenchen Context data for Ferrante and Rackoff's algorithm for quantifier diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Unix/Unix.thy --- a/src/HOL/Unix/Unix.thy Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Unix/Unix.thy Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,4 @@ (* Title: HOL/Unix/Unix.thy - ID: $Id$ Author: Markus Wenzel, TU Muenchen *) diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/Word/document/root.tex --- a/src/HOL/Word/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/Word/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{graphicx,isabelle,isabellesym} \usepackage{pdfsetup} diff -r 015bd9d4fd85 -r 952b2b102a0a src/HOL/ZF/document/root.tex --- a/src/HOL/ZF/document/root.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/HOL/ZF/document/root.tex Wed May 12 14:17:26 2010 +0200 @@ -1,6 +1,3 @@ - -% $Id$ - \documentclass[11pt,a4paper]{article} \usepackage{isabelle,isabellesym} diff -r 015bd9d4fd85 -r 952b2b102a0a src/LCF/IsaMakefile --- a/src/LCF/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/LCF/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for LCF # diff -r 015bd9d4fd85 -r 952b2b102a0a src/LCF/README.html --- a/src/LCF/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/LCF/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/Sequents/IsaMakefile --- a/src/Sequents/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/Sequents/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for Sequents # diff -r 015bd9d4fd85 -r 952b2b102a0a src/Sequents/README.html --- a/src/Sequents/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/Sequents/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/Tools/WWW_Find/doc/design.tex --- a/src/Tools/WWW_Find/doc/design.tex Wed May 12 14:02:50 2010 +0200 +++ b/src/Tools/WWW_Find/doc/design.tex Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -% $Id$ -% % vim:nojs: tw=76 sw=4 sts=4 fo=awn fdm=marker % % 20090406 T. Bourke diff -r 015bd9d4fd85 -r 952b2b102a0a src/Tools/WWW_Find/www/find_theorems.js --- a/src/Tools/WWW_Find/www/find_theorems.js Wed May 12 14:02:50 2010 +0200 +++ b/src/Tools/WWW_Find/www/find_theorems.js Wed May 12 14:17:26 2010 +0200 @@ -1,4 +1,4 @@ -/* $Id$ +/* * Author: Timothy Bourke, NICTA */ var utf8 = new Object(); diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/AC/README.html --- a/src/ZF/AC/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/AC/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/Coind/README.html --- a/src/ZF/Coind/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/Coind/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/Constructible/README.html --- a/src/ZF/Constructible/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/Constructible/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/IMP/README.html --- a/src/ZF/IMP/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/IMP/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/IsaMakefile --- a/src/ZF/IsaMakefile Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/IsaMakefile Wed May 12 14:17:26 2010 +0200 @@ -1,5 +1,3 @@ -# -# $Id$ # # IsaMakefile for ZF # diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/README.html --- a/src/ZF/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/Resid/README.html --- a/src/ZF/Resid/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/Resid/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - - diff -r 015bd9d4fd85 -r 952b2b102a0a src/ZF/ex/README.html --- a/src/ZF/ex/README.html Wed May 12 14:02:50 2010 +0200 +++ b/src/ZF/ex/README.html Wed May 12 14:17:26 2010 +0200 @@ -1,7 +1,5 @@ - -