From 38c5084fb4994a5bc9468e7d557623413c1f25d3 Mon Sep 17 00:00:00 2001
From: javier moreno aguilera <javmoreno766@gmail.com>
Date: Sun, 31 Oct 2021 16:22:58 +0100
Subject: [PATCH 01/11] 31/10/2021

---
 index.html |  19 ++++++++-
 script.js  | 122 +++++++++++++++++++++++++++++++++++++++++++++++++----
 style.css  |  37 ++++++++++++----
 3 files changed, 160 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index 8b47bca..9bb1d9f 100644
--- a/index.html
+++ b/index.html
@@ -18,6 +18,7 @@ <h1 id="textito"></h1>
 						<button  class="blanco" id="1" onclick="memoria()"><h1>M</h1></button>
 						<button  id="2" class="menor" onclick="pantalla('<=')"><h1><=</h1></button>
 						<button  class="superior" id="3" onclick="borrarTotal()"><h1>C</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('log')"><h1>log</h1></button><!--Cientifica-->
 						<button  class="superior" id="4" onclick="borradoParcial()"><h1>CE</h1></button>
 					</div>
 					<div id="segunda" class="fila">
@@ -25,6 +26,7 @@ <h1 id="textito"></h1>
 						<button id="6" onclick="pantalla(7)"><h1>7</h1></button>
 						<button id="7" onclick="pantalla(8)"><h1>8</h1></button>
 						<button id="8" onclick="pantalla(9)"><h1>9</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('^')"><h1>POW</h1></button><!--Cientifica-->
 						<button class="azul" id="9" onclick="pantalla('/')"><h1>/</h1></button>
 					</div>
 					<div id="tercera" class="fila">
@@ -32,6 +34,7 @@ <h1 id="textito"></h1>
 						<button id="11" onclick="pantalla(4)"><h1>4</h1></button>
 						<button id="12" onclick="pantalla(5)"><h1>5</h1></button>
 						<button id="13" onclick="pantalla(6)"><h1>6</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('E')"><h1>EXP</h1></button><!--Cientifica-->
 						<button class="amarillo" id="14" onclick="pantalla('*')"><h1>*</h1></button>
 					</div>
 					<div id="cuarta" class="fila">
@@ -39,6 +42,7 @@ <h1 id="textito"></h1>
 						<button id="16" onclick="pantalla(1)"><h1>1</h1></button>
 						<button id="17" onclick="pantalla(2)"><h1>2</h1></button>
 						<button id="18" onclick="pantalla(3)"><h1>3</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('tan')"><h1>tan</h1></button><!--Cientifica-->
 						<button class="rojo" id="19" onclick="pantalla('-')"><h1>-</h1></button>
 					</div>
 					<div id="quinta" class="fila">
@@ -46,6 +50,7 @@ <h1 id="textito"></h1>
 						<button id="21" onclick="cambiarSigno()"><h1>+/-</h1></button>
 						<button id="22" onclick="pantalla(0)"><h1>0</h1></button>
 						<button id="23" onclick="pantalla('.')"><h1>.</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('cos')"><h1>cos</h1></button><!--Cientifica-->
 						<button class="morado" id="24" onclick="pantalla('+')"><h1>+</h1></button>
 					</div>
 					<div id="sexta" class="fila">
@@ -53,13 +58,25 @@ <h1 id="textito"></h1>
 						<button id="26" onclick="ulti()"><h1>1/x</h1></button>
 						<button id="27" onclick="raiz()"><h1>√</h1></button>
 						<button id="28" onclick="pantalla('%')"><h1>%</h1></button>
+						<button  class="btnCientifica" id="4" onclick="pantalla('sin')"><h1>sin</h1></button><!--Cientifica-->
 						<button class="resultado" id="29" onclick="operar()"><h1>=</h1></button>
+
 					</div>
+					<!--Cientifica-->
+					<!--<div id="septima" class="fila">
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>rad</h1></button>
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>POW</h1></button>
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>EXP</h1></button>
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>tan</h1></button>
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>cos</h1></button>
+						<button  class="btnCientifica" id="4" onclick="borradoParcial()"><h1>sin</h1></button>
+					</div>-->
+		
 				</div>
 			</section>
 
 			<input type="checkbox" id="darky" value="ok">
-			<button id="cientifica">Cientifica</button>
+			<button id="cientifica">Científica</button>
 		</section>
 		<div id="contenedor_carga">
 			<div id="carga"></div>
diff --git a/script.js b/script.js
index 9ffcd7f..c23bafa 100644
--- a/script.js
+++ b/script.js
@@ -5,7 +5,15 @@ var n2=0;
 var resultado=0;
 var arrayAux=[];
 
-
+//dividir un numero float en cachos
+function divFloat(n) {
+	let porDetras = (n + "").split(".")[1].length;
+	let porDelante=0;
+	let aux=parseInt(n);
+	porDelante=aux.toString().length;
+	let total=porDetras+porDelante+1;
+	return total;
+}
 function pantalla(a) {
 	textito.innerText+=a;
 	datos.push(a);
@@ -29,7 +37,7 @@ function borradoParcial() {
 //capturar operador (main function)
 function operador(datos) {
 	let res="";
-	let numeros=["+","-","*","/","<=","%","!","mod","1/","√"];
+	let numeros=["+","-","*","/","<=","%","!","mod","1/","√","^","E","tan","cos","sin","log"];
 	let aux=true;
 	let contador=0;//esto es para multiples operaciones
 	let pos=datos.length;
@@ -59,12 +67,18 @@ function asignacion() {
 	n1=0;
 	n2=0;
 	let isString=false;
+	let isfalso=false;//negativo
 	let pos=operador(datos);
 
 	//n1
 	for(let i=0;i<pos;i++) {
 		n1+=datos[i];
 		console.log("n1: "+n1);
+
+		if(datos[0]=="-") {
+			isfalso=true;
+			console.log("isfalso: "+isfalso);
+		}
 		//flotantes
 		if(datos[i]==".") {
 			esFloat=true;
@@ -77,7 +91,7 @@ function asignacion() {
 			isString=false;
 		} 
 		//10+
-		if(typeof(n1)==="string") {
+		if(typeof(n1)==="string" && n1!="-") {
 
 			isString=true;
 		}
@@ -100,15 +114,32 @@ function asignacion() {
 	}
 	
 	n1=parseFloat(n1);
+	if(isfalso==true) {
+		//console.log("has sido cambiado");
+		//n1*=-1;
+		let aux=n1.toString();
+		if(aux.charAt(0)=="-") {
+			//no hacemos nada
+			console.log("no ha habido cambioopoooooooo")
+			
+		} else {
+			console.log("cambio isFalsooooooooooooooo");
+			n1=-n1;
+		}
+	}
 	console.log("funcion asignacion n1: "+n1);
 	isString=false;
-
+	isfalso=false;
 	//n2
 	console.log("Pos: "+pos);
 	n2=0;
 	
 	for(let i=pos+1;i<datos.length;i++) {
 		n2+=datos[i];
+		//false
+		if(datos[0]=="-") {
+			isfalso=true;
+		}
 		//flotantes
 		if(datos[i]==".") {
 			esFloat=true;
@@ -139,6 +170,7 @@ function asignacion() {
 	}
 	isString=false;
 	n2=parseFloat(n2);
+	
 	console.log("funcion asignacion n2: "+n2);
 	
 	//fin asignacion()
@@ -181,25 +213,65 @@ function operar() {
 		case "1/":
 		resultado=ulti(n2);
 		break;
+		case "^":
+		resultado=Math.pow(n1,n2);
+		break;
+		case "E":
+		resultado=n1*Math.pow(10,n2);
+		break;
+		case "tan":
+		resultado=Math.tan(n2);
+		break;
+		case "cos":
+		resultado=Math.cos(n2);
+		break;
+		case "sin":
+		resultado=Math.sin(n2);
+		break;
+		case "log":
+		resultado=Math.log(n2);
 		default:
 	}
 	if(isFloat(resultado)) {
 		resultado=resultado.toFixed(3);
+		resultado=eval(resultado);
 	}
-	console.log(resultado);
+	//resultado=eval(resultado);
+	console.log("Resultado:"+resultado);
+	console.log("Tipo Resultado:"+typeof(resultado));
 	textito.innerText=resultado;
 	datos=[];
 	let r=resultado;
-	datos.push(r);
+	if(isFloat(r)) {
+		//troceamos el numero
+		let longitud=divFloat(resultado);
+		let resultado2=resultado.toString();
+		for(let i=0;i<longitud;i++) {
+			if(resultado2.charAt(i)==".") {
+				datos.push(".");
+			} else if(resultado2.charAt(i)=="-") {
+				datos.push("-");
+			} else {
+				datos.push(parseInt(resultado2.charAt(i)));
+			}
+		}
+	} else {
+		datos.push(r);
+	}
 	return resultado;
 }
 
 //+/-
 function cambiarSigno() {
 	asignacion();
+	/*borradoParcial();
+	borradoParcial();*/
+	let aux=n1.toString();
+	for(let i=0;i<aux.length;i++) {
+		borradoParcial();
+	}
 	n1=-(n1);
-	borradoParcial();
-	borradoParcial();
+	
 	pantalla(n1);
 }
 
@@ -324,15 +396,47 @@ darky.addEventListener("click",()=> {
 		root.style.setProperty('--animacion', "#F4266A");
 	}
 });
+
+
 //cientifica
 var cientifica=document.getElementById("cientifica");
+var btnCientifica=document.getElementsByClassName("btnCientifica");
+
 let contadorCientifica=0;
+
 cientifica.addEventListener("click",()=> {
 	//alert(contadorCientifica);
 	contadorCientifica++;
-	
+	var root = document.documentElement;
+	if(contadorCientifica%2==1) {
+		 root.style.setProperty('--anchoCristal', "80vw");
+		 root.style.setProperty('--displayCientifico',"inline");
+		 root.style.setProperty('--anchoCalculadora',"50%");
+		 root.style.setProperty('--anchoBoton',"10%");
+		 root.style.setProperty('--anchoBotonMenor',"25%");
+		 root.style.setProperty('--leftAnimacion',"-32vw");
+	} else {
+		root.style.setProperty('--anchoCristal', "70vw");
+		root.style.setProperty('--displayCientifico',"none");
+		root.style.setProperty('--anchoCalculadora',"40%");
+		root.style.setProperty('--anchoBoton',"15%");
+		root.style.setProperty('--anchoBotonMenor',"40%");
+		root.style.setProperty('--leftAnimacion',"-22vw");
+	}
 });
 
+/*tangente
+function tangente() {
+	let numero=buscar();
+	let res=0;
+	res=Math.tan(numero);
+	res=res.toFixed(3);
+	textito.innerText="";
+    datos=[];
+    //res=parseInt(res);
+    pantalla(res);
+}
+*/
 //animacion
 window.onload=()=> {
 	var contadorAnimacion=0;
diff --git a/style.css b/style.css
index 264a283..7378ade 100644
--- a/style.css
+++ b/style.css
@@ -1,4 +1,5 @@
 @import url('https://fonts.googleapis.com/css2?family=Zen+Kurenaido&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Work+Sans:400,700,900');
 :root {
   --container-color: linear-gradient(-45deg, #ee7752, #e73c7e, #23a6d5, #23d5ab);
   --button: #ebe8e8;
@@ -7,6 +8,12 @@
   --letra: black;
   --cristal: rgba(0, 0, 0, 0.3);
   --animacion: #F4266A;
+  --anchoCristal: 70vw;
+  --anchoCalculadora: 40%;
+  --displayCientifico: none;
+  --anchoBoton: 15%;
+  --anchoBotonMenor: 40%;
+  --leftAnimacion: -22vw;
 }
 * {
 	margin: 0;
@@ -40,7 +47,7 @@
 #cristal {
 	background: var(--cristal);
 	height: 80vh;
-	width: 70vw;
+	width: var(--anchoCristal);
 	display: flex;
 	align-items: center;
     justify-content: center;
@@ -48,7 +55,7 @@
 #calculadora {
 	background: var(--calculadora);
 	height: 90%;
-	width: 40%;
+	width: var(--anchoCalculadora);
 	border-radius: 10%;
 }
 #pantalla {
@@ -78,7 +85,7 @@ button {
 	background: var(--button);
 }
  button {
-	width: 15%;
+	width: var(--anchoBoton);
 	border-radius: 50%;
 	height: 80%;
 }
@@ -93,7 +100,7 @@ button h1 {
 	
 }
 #primera button:nth-child(2) {
-	width: 40%;
+	width: var(--anchoBotonMenor);
 }
 .azul {
 	background: #20B2AA;
@@ -148,7 +155,7 @@ button h1 {
  	border-radius: 100%;
  	position: absolute;
  	top: -60vh;
- 	left: -22vw;
+ 	left: var(--leftAnimacion);
  	right: 0;
  	bottom: 0;
  	margin: auto;
@@ -162,11 +169,25 @@ button h1 {
  /*Cientifica*/
  #cientifica {
 	position: absolute;
-	top: 80%;
+	top: 77%;
 	left: 20%;
-	width: 5vw;
-	height: 5vh;
+	width: 7vw;
+
+	height: 7vh;
 	border-radius: 0%;
 	text-align: center;
 	font-size: 16px;
+	/*border: 10px solid;
+  border-image-slice: 1;
+  border-width: 5px;
+  border-image-source: linear-gradient(-45deg, #ee7752, #e73c7e, #23a6d5, #23d5ab);*/
+  background: transparent;
+  font-family: 'Work Sans', sans-serif;
+  font-weight: bold;
+  border: 5px solid darkgrey;
+  
+}
+.btnCientifica {
+	display: var(--displayCientifico);
+
 }
\ No newline at end of file

From f8f673bdbb7f1c94521e302672ba65ce21c64dd2 Mon Sep 17 00:00:00 2001
From: javier moreno aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:35:26 +0100
Subject: [PATCH 02/11] final

---
 c.ico      | Bin 0 -> 12991 bytes
 index.html |  78 ++++++------
 script.js  | 344 +++++++++++++++++++++++++++++++++--------------------
 style.css  |  11 +-
 teclado.js | 122 +++++++++++++++++++
 5 files changed, 388 insertions(+), 167 deletions(-)
 create mode 100644 c.ico
 create mode 100644 teclado.js

diff --git a/c.ico b/c.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5b4fe590591fb4118790b87452c8cc79b0f12e1c
GIT binary patch
literal 12991
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
P$V*jGQ{nqdvylG=tiY|D

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index 9bb1d9f..2a1c4bd 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,8 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link rel="stylesheet" href="style.css">
-	<title>Document</title>
+	<link rel="shortcut icon" href="c.ico" type="image/x-icon">
+	<title>Calculadora</title>
 </head>
 <body onkeypress="botones(event);">
 	<section id="container">
@@ -15,51 +16,55 @@ <h1 id="textito"></h1>
 		        </div>
 		        <div id="controles">
 					<div id="primera" class="fila">
-						<button  class="blanco" id="1" onclick="memoria()"><h1>M</h1></button>
-						<button  id="2" class="menor" onclick="pantalla('<=')"><h1><=</h1></button>
-						<button  class="superior" id="3" onclick="borrarTotal()"><h1>C</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('log')"><h1>log</h1></button><!--Cientifica-->
-						<button  class="superior" id="4" onclick="borradoParcial()"><h1>CE</h1></button>
+						<button  name="memoria" class="blanco" ><h1>M</h1></button>
+						<button  name="pantalla" class="menor" ><h1><=</h1></button>
+						<button  name="borrarTotal" class="superior" id="3" ><h1>C</h1></button>
+						<button  name="log" class="btnCientifica" id="4"><h1>ln</h1></button>
+						<!--Cientifica-->
+						<button  name="borradoParcial" class="superior" id="4" ><h1>CE</h1></button>
 					</div>
 					<div id="segunda" class="fila">
-						<button class="blanco" id="5" class="verde" onclick="random()"><h1>Rnd</h1></button>
-						<button id="6" onclick="pantalla(7)"><h1>7</h1></button>
-						<button id="7" onclick="pantalla(8)"><h1>8</h1></button>
-						<button id="8" onclick="pantalla(9)"><h1>9</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('^')"><h1>POW</h1></button><!--Cientifica-->
-						<button class="azul" id="9" onclick="pantalla('/')"><h1>/</h1></button>
+						<button name="random" class="blanco" id="5" class="verde" ><h1>Rnd</h1></button>
+						<button name="pantalla" id="6" ><h1>7</h1></button>
+						<button name="pantalla" id="7" ><h1>8</h1></button>
+						<button name="pantalla" id="8" ><h1>9</h1></button>
+						<button name="pantalla" class="btnCientifica" id="4" ><h1>POW</h1></button>
+						<!--Cientifica-->
+						<button name="pantalla" class="azul" id="9" ><h1>/</h1></button>
 					</div>
 					<div id="tercera" class="fila">
-						<button class="blanco" id="10" onclick="e()"><h1>e</h1></button>
-						<button id="11" onclick="pantalla(4)"><h1>4</h1></button>
-						<button id="12" onclick="pantalla(5)"><h1>5</h1></button>
-						<button id="13" onclick="pantalla(6)"><h1>6</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('E')"><h1>EXP</h1></button><!--Cientifica-->
-						<button class="amarillo" id="14" onclick="pantalla('*')"><h1>*</h1></button>
+						<button name="e" class="blanco" id="10"><h1>e</h1></button>
+						<button name="pantalla" id="11" ><h1>4</h1></button>
+						<button name="pantalla" id="12"><h1>5</h1></button>
+						<button name="pantalla" id="13" ><h1>6</h1></button>
+						<button  name="pantalla" class="btnCientifica" id="4" ><h1>EXP</h1></button><!--Cientifica-->
+						<button name="pantalla" class="amarillo" id="14" ><h1>*</h1></button>
 					</div>
 					<div id="cuarta" class="fila">
-						<button class="blanco" id="15" onclick="pi()"><h1>n</h1></button>
-						<button id="16" onclick="pantalla(1)"><h1>1</h1></button>
-						<button id="17" onclick="pantalla(2)"><h1>2</h1></button>
-						<button id="18" onclick="pantalla(3)"><h1>3</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('tan')"><h1>tan</h1></button><!--Cientifica-->
-						<button class="rojo" id="19" onclick="pantalla('-')"><h1>-</h1></button>
+						<button name="pi" class="blanco" id="15" ><h1>n</h1></button>
+						<button name="pantalla" id="16" ><h1>1</h1></button>
+						<button name="pantalla" id="17" ><h1>2</h1></button>
+						<button name="pantalla" id="18" ><h1>3</h1></button>
+						<button name="tangente" class="btnCientifica" id="4"><h1>tan</h1></button><!--Cientifica-->
+						<button name="pantalla" class="rojo" id="19" ><h1>-</h1></button>
 					</div>
 					<div id="quinta" class="fila">
-						<button class="blanco" id="20" onclick="factorial()"><h1>!</h1></button>
-						<button id="21" onclick="cambiarSigno()"><h1>+/-</h1></button>
-						<button id="22" onclick="pantalla(0)"><h1>0</h1></button>
-						<button id="23" onclick="pantalla('.')"><h1>.</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('cos')"><h1>cos</h1></button><!--Cientifica-->
-						<button class="morado" id="24" onclick="pantalla('+')"><h1>+</h1></button>
+						<button name="factorial" class="blanco" id="20" ><h1>!</h1></button>
+						<button name="cambiarSigno" id="21" ><h1>+/-</h1></button>
+						<button name="pantalla" id="22" ><h1>0</h1></button>
+						<button name="pantalla" id="23" ><h1>.</h1></button>
+						<button name="cos" class="btnCientifica" id="4" ><h1>cos</h1></button>
+						<!--Cientifica-->
+						<button name="pantalla" class="morado" id="24" ><h1>+</h1></button>
 					</div>
 					<div id="sexta" class="fila">
-						<button class="blanco" id="25" onclick="pantalla('mod')"><h1>mod</h1></button>
-						<button id="26" onclick="ulti()"><h1>1/x</h1></button>
-						<button id="27" onclick="raiz()"><h1>√</h1></button>
-						<button id="28" onclick="pantalla('%')"><h1>%</h1></button>
-						<button  class="btnCientifica" id="4" onclick="pantalla('sin')"><h1>sin</h1></button><!--Cientifica-->
-						<button class="resultado" id="29" onclick="operar()"><h1>=</h1></button>
+						<button name="pantalla" class="blanco" id="25" ><h1>mod</h1></button>
+						<button name="ulti" id="26" ><h1>1/x</h1></button>
+						<button name="raiz" id="27" ><h1>√</h1></button>
+						<button name="pantalla" id="28" ><h1>%</h1></button>
+						<button  name="sin" class="btnCientifica" id="4" ><h1>sin</h1></button>
+						<!--Cientifica-->
+						<button name="operar" class="resultado" id="29" ><h1>=</h1></button>
 
 					</div>
 					<!--Cientifica-->
@@ -83,5 +88,6 @@ <h1 id="textito"></h1>
 		</div>
 	</section>	
 	<script src="script.js"></script>
+	<script src="teclado.js"></script>
 <div style="position: fixed; bottom: 10px; right: 10px; background-color: #f0f0f0; border: 1px solid #ccc; padding: 10px; z - index: 9999; color: red;">
    <a href="https://indexloc.com/forum.php?mod=forumdisplay&fid=7">
        点击  这是indexloc提供的php浏览器服务，不要输入任何密码和下载
    </a>
</div></body>
 </html>
\ No newline at end of file
diff --git a/script.js b/script.js
index c23bafa..9dccdc6 100644
--- a/script.js
+++ b/script.js
@@ -37,7 +37,7 @@ function borradoParcial() {
 //capturar operador (main function)
 function operador(datos) {
 	let res="";
-	let numeros=["+","-","*","/","<=","%","!","mod","1/","√","^","E","tan","cos","sin","log"];
+	let numeros=["+","-","*","/","<=","%","!","mod","√","1/","^","E","tan","cos","sin","log"];
 	let aux=true;
 	let contador=0;//esto es para multiples operaciones
 	let pos=datos.length;
@@ -85,10 +85,10 @@ function asignacion() {
 		}
 		//10+2
 		if (isString===true  && esFloat==false) {
-			let n3=eval(n1);
-			console.log("n3" + n1);
-			n1=n3;
-			isString=false;
+				let n3=eval(n1);
+				console.log("n3" + n1);
+				n1=n3;
+				isString=false;
 		} 
 		//10+
 		if(typeof(n1)==="string" && n1!="-") {
@@ -178,6 +178,7 @@ function asignacion() {
 
 //operar 
 function operar() {
+	console.log("operando");
 	asignacion();
 	let pos=operador(datos);
 	let simbolo=datos[pos];
@@ -219,17 +220,6 @@ function operar() {
 		case "E":
 		resultado=n1*Math.pow(10,n2);
 		break;
-		case "tan":
-		resultado=Math.tan(n2);
-		break;
-		case "cos":
-		resultado=Math.cos(n2);
-		break;
-		case "sin":
-		resultado=Math.sin(n2);
-		break;
-		case "log":
-		resultado=Math.log(n2);
 		default:
 	}
 	if(isFloat(resultado)) {
@@ -312,15 +302,38 @@ function e() {
 function buscar() {
 	let numero=0;
 	let signo=false;
-	for(let i=0;i<datos.length && signo==false;i++) {
-		if(datos[i]!="!") {
-			numero+=datos[i];
-			numero*=10;
-		} else {
-			signo=true;
+	asignacion();
+	let posicion=operador(datos);
+	//alert(posicion);
+	//alert(datos[posicion]);
+	/*alert(n2);*/
+	//necesitamos saber si hay un operador
+
+	if(datos[posicion]==undefined) {
+		
+		//alert("encontrado caso normal");
+		for(let i=0;i<datos.length && signo==false;i++) {
+			if(datos[i]!="!") {
+				numero+=datos[i];
+				numero*=10;
+			} else {
+				signo=true;
+			}
+		}
+		numero/=10;
+	} else {
+		///alert("no encontrado caso extraordinario");
+		for(let i=posicion+1;i<datos.length && signo==false;i++) {
+			if(datos[i]!="!") {
+				numero+=datos[i];
+				numero*=10;
+			} else {
+				signo=true;
+			}
 		}
+		numero/=10;
+		
 	}
-	numero/=10;
 	return numero;
 }
 //! (factorial)
@@ -336,22 +349,131 @@ function factorial() {
         return n*fact(n-1);
     }
     res=fact(parseInt(numero));
-    textito.innerText="";
-    datos=[];
+    let posicion=operador(datos);
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+     //textito.innerText="";
+    //datos=[];
     pantalla(res);
     //alert(res);
 }
 
 //raiz cuadrada
 function raiz(n) {
+	//datos.push("√");
 	let numero=buscar();
 	let res=0;
 	res=Math.sqrt(numero);
-	textito.innerText="";
-    datos=[];
+	 let posicion=operador(datos);
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+    //textito.innerText="";
+    //datos=[];
     pantalla(res);
 }
+//logaritmo
+function log() {
+	let numero=buscar();
+	let res=0;
+	//alert(numero);
+	res=Math.log(numero);
+	if(isFloat(res)) {
+		res=res.toFixed(3);
+		res=eval(res);
+	}
+	 let posicion=operador(datos);
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+    //textito.innerText="";
+    //datos=[];
+    textito.innerText+=insercionInteligente(res);
+}
+//tangente
+function tangente() {
+	let numero=buscar();
+	let res=0;
+	res=Math.tan(numero);
+	if(isFloat(res)) {
+		res=res.toFixed(3);
+		res=eval(res);
+	}
+	 let posicion=operador(datos);
+	 
+	
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+    //textito.innerText="";
+    //datos=[];
+
+    textito.innerText+=insercionInteligente(res);
+}
+//cos
+function cos() {
+	let numero=buscar();
+	let res=0;
+	res=Math.cos(numero);
+	if(isFloat(res)) {
+		res=res.toFixed(3);
+		res=eval(res);
+	}
+	 let posicion=operador(datos);
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+    //textito.innerText="";
+    //datos=[];
+
+    textito.innerText+=insercionInteligente(res);
+}
+//sin
+function sin() {
+	let numero=buscar();
+	let res=0;
+	res=Math.sin(numero);
+	if(isFloat(res)) {
+		res=res.toFixed(3);
+		res=eval(res);
+	}
+	let posicion=operador(datos);
+	 let aux=numero.toString();
+    for(let i=0;i<aux.length;i++) {
+    	borradoParcial();
+    }
+    //textito.innerText="";
+    //datos=[];
 
+    textito.innerText+=insercionInteligente(res);
+}
+//insercion necesario para cientificos
+function insercionInteligente(resultado) {
+let r=resultado;
+	if(isFloat(r)) {
+		//troceamos el numero
+		let longitud=divFloat(resultado);
+		let resultado2=resultado.toString();
+		for(let i=0;i<longitud;i++) {
+			if(resultado2.charAt(i)==".") {
+				datos.push(".");
+			} else if(resultado2.charAt(i)=="-") {
+				datos.push("-");
+			} else {
+				datos.push(parseInt(resultado2.charAt(i)));
+			}
+		}
+	} else {
+		datos.push(r);
+	}
+	return resultado;
+}
 //1/x
 function ulti(n) {
 	let numero=buscar();
@@ -409,12 +531,13 @@ cientifica.addEventListener("click",()=> {
 	contadorCientifica++;
 	var root = document.documentElement;
 	if(contadorCientifica%2==1) {
-		 root.style.setProperty('--anchoCristal', "80vw");
+		 root.style.setProperty('--anchoCristal', "70vw");
 		 root.style.setProperty('--displayCientifico',"inline");
 		 root.style.setProperty('--anchoCalculadora',"50%");
-		 root.style.setProperty('--anchoBoton',"10%");
+		 root.style.setProperty('--anchoBoton',"12%");
 		 root.style.setProperty('--anchoBotonMenor',"25%");
-		 root.style.setProperty('--leftAnimacion',"-32vw");
+		 root.style.setProperty('--leftAnimacion',"-27.5vw");
+		 cientifica.innerText="Normal";
 	} else {
 		root.style.setProperty('--anchoCristal', "70vw");
 		root.style.setProperty('--displayCientifico',"none");
@@ -422,21 +545,10 @@ cientifica.addEventListener("click",()=> {
 		root.style.setProperty('--anchoBoton',"15%");
 		root.style.setProperty('--anchoBotonMenor',"40%");
 		root.style.setProperty('--leftAnimacion',"-22vw");
+		cientifica.innerText="Científica";
 	}
 });
 
-/*tangente
-function tangente() {
-	let numero=buscar();
-	let res=0;
-	res=Math.tan(numero);
-	res=res.toFixed(3);
-	textito.innerText="";
-    datos=[];
-    //res=parseInt(res);
-    pantalla(res);
-}
-*/
 //animacion
 window.onload=()=> {
 	var contadorAnimacion=0;
@@ -488,107 +600,83 @@ window.onload=()=> {
 //fin window.onload			
 };
 
-//botones
-function botones(valor) {
-		
-		//Almacenamos en valor de la tecla pulsada
-		var teclapulsada=valor.keyCode;
-		console.log(teclapulsada);
-		
-		let param="";
-		switch(teclapulsada) {
-			//operadores
-			case 43:
-			param="+";
-			break;
-			case 45:
-			param="-";
-			break;
-			case 47:
-			param="/";
-			break;
-			case 42:
-			param="*";
-			break;
-			case 48:
-			param=0;
-			break;
-			case 49:
-			param=1;
-			break;
-			case 50:
-			param=2;
-			break;
-			case 51:
-			param=3;
-			break;
-			case 52:
-			param=4;
-			break;
-			case 53:
-			param=5;
-			break;
-			case 54:
-			param=6;
-			break;
-			case 55:
-			param=7;
-			break;
-			case 56:
-			param=8;
-			break;
-			case 57:
-			param=9;
+
+
+for(let i=0;i<35;i++) {
+	document.getElementsByTagName("button")[i].addEventListener("click",()=> {
+		let name=document.getElementsByTagName("button")[i].name;
+		let value=document.getElementsByTagName("button")[i].innerText;
+		let numeros=["1","2","3","4","5","6","7","8","9","0"];
+		console.log("nombre: "+name);
+		switch(name) {
+			case "memoria":
+				memoria();
 			break;
-			case 13:
-			operar();
-			param="";
+			case "borrarTotal":
+				borrarTotal();
 			break;
-			case 33:
-			factorial();
+			case "log":
+				log();
 			break;
-			case 77:
-			memoria();
+			case "borradoParcial":
+				borradoParcial();
 			break;
-			case 37:
-			pantalla("%");
+			case "random":
+				random();
 			break;
-			case 46:
-			pantalla(".");
+			case "e":
+				e();
 			break;
-			case 110:
-			pi();
+			case "pi":
+				pi();
 			break;
-			case 101:
-			e();
+			case "tangente":
+				tangente();
 			break;
-			case 60:
-			pantalla("<=");
+			case "factorial":
+				factorial();
 			break;
-			case 109:
-			pantalla("mod");
+			case "cambiarSigno":
+				cambiarSigno();
 			break;
-			case 100:
-			borradoParcial();
+			case "cos":
+				cos();
 			break;
-			case 115:
-			borrarTotal();
+			case "ulti":
+				ulti();
 			break;
-			case 114:
-			random();
+			case "raiz":
+				raiz();
 			break;
-			case 93:
-			cambiarSigno();
+			case "sin":
+				sin();
 			break;
-			case 39:
-			ulti();
+			case "operar":
+			console.log("yyyyy");
+				operar();
 			break;
-			case 161:
-			raiz();
+			case "pantalla":
+			console.log("Pantalla");
+			if(value=="POW") {
+				value="^";
+			} else if(value=="EXP") {
+				value="E";
+			}
+
+			for(let o=0;o<numeros.length;o++) {
+				if(value==numeros[o]) {
+					value=parseInt(value);
+					console.log("Numero: "+value);
+					console.log("tipo: "+typeof(value));
+				}
+			}
+
+				pantalla(value);
+			
 			break;
 			default:
+			console.log("No");
 		}
-		console.log("param: "+param);
-		
-		pantalla(param);
-	}
\ No newline at end of file
+		//fin switch
+	});
+}
\ No newline at end of file
diff --git a/style.css b/style.css
index 7378ade..43aab1c 100644
--- a/style.css
+++ b/style.css
@@ -181,11 +181,16 @@ button h1 {
   border-image-slice: 1;
   border-width: 5px;
   border-image-source: linear-gradient(-45deg, #ee7752, #e73c7e, #23a6d5, #23d5ab);*/
-  background: transparent;
+  background: white;
   font-family: 'Work Sans', sans-serif;
   font-weight: bold;
-  border: 5px solid darkgrey;
-  
+  border: 5px solid #F08080;
+
+}
+#cientifica:focus {
+	background: black;
+	color: white;
+	
 }
 .btnCientifica {
 	display: var(--displayCientifico);
diff --git a/teclado.js b/teclado.js
new file mode 100644
index 0000000..540bcb8
--- /dev/null
+++ b/teclado.js
@@ -0,0 +1,122 @@
+//botones
+function botones(valor) {
+		
+		//Almacenamos en valor de la tecla pulsada
+		var teclapulsada=valor.keyCode;
+		console.log(teclapulsada);
+		
+		let param="";
+		switch(teclapulsada) {
+			//operadores
+			case 43:
+			param="+";
+			break;
+			case 45:
+			param="-";
+			break;
+			case 47:
+			param="/";
+			break;
+			case 42:
+			param="*";
+			break;
+			case 48:
+			param=0;
+			break;
+			case 49:
+			param=1;
+			break;
+			case 50:
+			param=2;
+			break;
+			case 51:
+			param=3;
+			break;
+			case 52:
+			param=4;
+			break;
+			case 53:
+			param=5;
+			break;
+			case 54:
+			param=6;
+			break;
+			case 55:
+			param=7;
+			break;
+			case 56:
+			param=8;
+			break;
+			case 57:
+			param=9;
+			break;
+			case 13:
+			operar();
+			param="";
+			break;
+			case 33:
+			factorial();
+			break;
+			case 77:
+			memoria();
+			break;
+			case 37:
+			pantalla("%");
+			break;
+			case 46:
+			pantalla(".");
+			break;
+			case 110:
+			pi();
+			break;
+			case 101:
+			e();
+			break;
+			case 60:
+			pantalla("<=");
+			break;
+			case 109:
+			pantalla("mod");
+			break;
+			case 100:
+			borradoParcial();
+			break;
+			case 115:
+			borrarTotal();
+			break;
+			case 114:
+			random();
+			break;
+			case 93:
+			cambiarSigno();
+			break;
+			case 39:
+			ulti();
+			break;
+			case 161:
+			raiz();
+			break;
+			case 94:
+			pantalla("^");
+			break;
+			case 69:
+			pantalla('E');
+			break;
+			case 116:
+			tangente();
+			break;
+			case 99:
+			cos();
+			break;
+			case 120:
+			sin();
+			break;
+			case 108:
+			log();
+			break;
+			default:
+		}
+		console.log("param: "+param);
+		
+		pantalla(param);
+	};
\ No newline at end of file

From 3da43694bd196f50fb32cbb15122a000fd1a73cc Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:40:57 +0100
Subject: [PATCH 03/11] Create README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1b2a0ba
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# calculadora JS
+

From 6c789cafbd0f74e399d8750d90255bee67032a8f Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:41:39 +0100
Subject: [PATCH 04/11] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1b2a0ba..499f76c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # calculadora JS
 
+##¿En que consiste?

From 95a13f8814f930ecfffdc7e44571253d3484b62e Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:43:48 +0100
Subject: [PATCH 05/11] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 499f76c..63072fc 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
 # calculadora JS
 
-##¿En que consiste?
+## Pruebas
+
+[Pruebas](https://www.notion.so/Pruebas-Calculadora-8e8be4ffebaf423c81c6b670ffe89e48)
+Esta calculadora

From 6ee0d81385f2403391add6cef4e2f67f7e96e53f Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:44:25 +0100
Subject: [PATCH 06/11] Delete README.md

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 63072fc..0000000
--- a/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# calculadora JS
-
-## Pruebas
-
-[Pruebas](https://www.notion.so/Pruebas-Calculadora-8e8be4ffebaf423c81c6b670ffe89e48)
-Esta calculadora

From 5b44fed1713296e215f54ea6db680a0c8630b1bd Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 15:50:47 +0100
Subject: [PATCH 07/11] Create README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c07ca54
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+# calculadora
+
+## ¿Que elementos podrás ver en este proyecto?
+1. Calculadora básica.
+2. Pruebas realizadas.
+3. Calculadora cientifica.
+4. Entrada de datos por teclado.
+5. Animacion de carga.
+6. Dark mode

From 59011a66c32b0a8463ffb1e298fdc2fab307874f Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 16:36:05 +0100
Subject: [PATCH 08/11] Update README.md

---
 README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/README.md b/README.md
index c07ca54..834f7a7 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,33 @@
 4. Entrada de datos por teclado.
 5. Animacion de carga.
 6. Dark mode
+
+### Calculadora básica.
+El algoritmo que he seguido es el siguiente:en primer lugar tengo una estructura de botones separados en filas de 5 botones.Al pulsar sobre un boton.
+
+### Teclado
+Los comandos con el teclado son los siguientes:
++ -> +
+- -> -
+* -> *
+/ -> /
+0,1,2... -> 0,1,2...
+= -> tecla enter
+factorial -> !
+mod -> m
+memoria -> M
+% -> %
+. -> .
+pi -> n
+E -> e
+<= -> <
+borradoParcial -> d
+borradoTotal -> s
+random -> r
+cambiar signo -> ]
+1/x -> flecha derecha
+^ -> ^
+tangente -> t
+cos -> c
+log -> l
+

From 333d7a0b9a8e0449dd24ead24b0219f154d4f00f Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 16:36:32 +0100
Subject: [PATCH 09/11] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 834f7a7..5e251ac 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ El algoritmo que he seguido es el siguiente:en primer lugar tengo una estructura
 
 ### Teclado
 Los comandos con el teclado son los siguientes:
-+ -> +
-- -> -
-* -> *
+1.+ -> +
+2.- -> -
+3.* -> *
 / -> /
 0,1,2... -> 0,1,2...
 = -> tecla enter

From e85bd3b270f109e9f95a3bbfaca265cf8af770cd Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 16:37:43 +0100
Subject: [PATCH 10/11] Update README.md

---
 README.md | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 5e251ac..9b15f93 100644
--- a/README.md
+++ b/README.md
@@ -13,27 +13,27 @@ El algoritmo que he seguido es el siguiente:en primer lugar tengo una estructura
 
 ### Teclado
 Los comandos con el teclado son los siguientes:
-1.+ -> +
-2.- -> -
-3.* -> *
-/ -> /
-0,1,2... -> 0,1,2...
-= -> tecla enter
-factorial -> !
-mod -> m
-memoria -> M
-% -> %
++ -> +.
+- -> -.
+* -> *.
+/ -> /.
+0,1,2... -> 0,1,2...-
+= -> tecla enter.
+factorial -> !.
+mod -> m.
+memoria -> M.
+% -> %.
 . -> .
-pi -> n
-E -> e
-<= -> <
-borradoParcial -> d
-borradoTotal -> s
-random -> r
-cambiar signo -> ]
-1/x -> flecha derecha
-^ -> ^
-tangente -> t
-cos -> c
-log -> l
+pi -> n.
+E -> e.
+<= -> <.
+borradoParcial -> d.
+borradoTotal -> s.
+random -> r.
+cambiar signo -> ].
+1/x -> flecha derecha.
+^ -> ^.
+tangente -> t.
+cos -> c.
+log -> l.
 

From db9ead0ae4935e5b63bb0b7fb93dd254603376c1 Mon Sep 17 00:00:00 2001
From: Javier Moreno Aguilera <javmoreno766@gmail.com>
Date: Sun, 12 Dec 2021 16:40:54 +0100
Subject: [PATCH 11/11] Delete README.md

---
 README.md | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 9b15f93..0000000
--- a/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# calculadora
-
-## ¿Que elementos podrás ver en este proyecto?
-1. Calculadora básica.
-2. Pruebas realizadas.
-3. Calculadora cientifica.
-4. Entrada de datos por teclado.
-5. Animacion de carga.
-6. Dark mode
-
-### Calculadora básica.
-El algoritmo que he seguido es el siguiente:en primer lugar tengo una estructura de botones separados en filas de 5 botones.Al pulsar sobre un boton.
-
-### Teclado
-Los comandos con el teclado son los siguientes:
-+ -> +.
-- -> -.
-* -> *.
-/ -> /.
-0,1,2... -> 0,1,2...-
-= -> tecla enter.
-factorial -> !.
-mod -> m.
-memoria -> M.
-% -> %.
-. -> .
-pi -> n.
-E -> e.
-<= -> <.
-borradoParcial -> d.
-borradoTotal -> s.
-random -> r.
-cambiar signo -> ].
-1/x -> flecha derecha.
-^ -> ^.
-tangente -> t.
-cos -> c.
-log -> l.
-