Cambios estilísticos

3 files changed, 53 insertions, 56 deletions

diff --git a/pia/n.lyx b/pia/n.lyx
index 309e23c..e73fb85 100644
--- a/pia/n.lyx
+++ b/pia/n.lyx
@@ -271,6 +271,22 @@ filename "n4.lyx"
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+lstset{language=Haskell}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Chapter
 El preludio estándar
 \end_layout
diff --git a/pia/n4.lyx b/pia/n4.lyx
index 409ac7c..4f72441 100644
--- a/pia/n4.lyx
+++ b/pia/n4.lyx
@@ -304,18 +304,13 @@ special =~ [()
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
+\begin_inset Newpage pagebreak
+\end_inset
 
 
-\backslash
-begin{samepage}
 \end_layout
 
-\end_inset
-
+\begin_layout Standard
 Las palabras reservadas son:
 \end_layout
 
@@ -361,19 +356,6 @@ reservedop =~
 \end_inset
 
 
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{samepage}
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
diff --git a/pia/n5.lyx b/pia/n5.lyx
index 40309cd..0909674 100644
--- a/pia/n5.lyx
+++ b/pia/n5.lyx
@@ -346,7 +346,7 @@ data Ordering = LT | EQ | GT
 
 \begin_layout Plain Layout
 
-	deriving (Eq, Ord, Enum, Read, Show, Bounded)
+    deriving (Eq, Ord, Enum, Read, Show, Bounded)
 \end_layout
 
 \begin_layout Plain Layout
@@ -360,57 +360,57 @@ class (Eq a) => Ord a where  {-# MINIMAL compare | (<=) #-}
 
 \begin_layout Plain Layout
 
-	compare :: a -> a -> Ordering
+    compare :: a -> a -> Ordering
 \end_layout
 
 \begin_layout Plain Layout
 
-	(<), (<=), (>=), (>) :: a -> a -> Bool
+    (<), (<=), (>=), (>) :: a -> a -> Bool
 \end_layout
 
 \begin_layout Plain Layout
 
-	max, min :: a -> a -> a
+    max, min :: a -> a -> a
 \end_layout
 
 \begin_layout Plain Layout
 
-	compare x y
+    compare x y
 \end_layout
 
 \begin_layout Plain Layout
 
-		| x == y    = EQ
+        | x == y    = EQ
 \end_layout
 
 \begin_layout Plain Layout
 
-		| x <= y    = LT
+        | x <= y    = LT
 \end_layout
 
 \begin_layout Plain Layout
 
-		| True      = GT
+        | True      = GT
 \end_layout
 
 \begin_layout Plain Layout
 
-	x <= y = compare x y /= GT
+    x <= y = compare x y /= GT
 \end_layout
 
 \begin_layout Plain Layout
 
-	x <  y = compare x y == LT
+    x <  y = compare x y == LT
 \end_layout
 
 \begin_layout Plain Layout
 
-	x >= y = compare x y /= LT
+    x >= y = compare x y /= LT
 \end_layout
 
 \begin_layout Plain Layout
 
-	x >  y = compare x y == GT
+    x >  y = compare x y == GT
 \end_layout
 
 \begin_layout Plain Layout
@@ -420,7 +420,7 @@ class (Eq a) => Ord a where  {-# MINIMAL compare | (<=) #-}
 
 \begin_layout Plain Layout
 
-	min x y = if x <= y then x else y
+    min x y = if x <= y then x else y
 \end_layout
 
 \end_inset
@@ -514,12 +514,12 @@ class Bounded a where
 
 \begin_layout Plain Layout
 
-	minBound :: a
+    minBound :: a
 \end_layout
 
 \begin_layout Plain Layout
 
-	maxBound :: a
+    maxBound :: a
 \end_layout
 
 \end_inset
@@ -577,12 +577,12 @@ class Enum a where
 
 \begin_layout Plain Layout
 
-	toEnum :: Int -> a
+    toEnum :: Int -> a
 \end_layout
 
 \begin_layout Plain Layout
 
-	fromEnum :: a -> Int
+    fromEnum :: a -> Int
 \end_layout
 
 \end_inset
@@ -785,7 +785,7 @@ class Read a where
 
 \begin_layout Plain Layout
 
-	readsPrec :: Int -> ReadS a
+    readsPrec :: Int -> ReadS a
 \end_layout
 
 \end_inset
@@ -1062,12 +1062,12 @@ until p f x  -- until p f aplica f hasta que se cumple p
 
 \begin_layout Plain Layout
 
-	| p x       = x
+    | p x       = x
 \end_layout
 
 \begin_layout Plain Layout
 
-	| otherwise = until p f (f x)
+    | otherwise = until p f (f x)
 \end_layout
 
 \end_inset
@@ -1234,7 +1234,12 @@ class (Eq a, Show a) => Num a where
 
 \begin_layout Plain Layout
 
-		{-# MINIMAL (+), (*), abs, signum, fromInteger, (negate | (-)) #-}
+        {-# MINIMAL (+), (*), abs, signum, fromInteger, #
+\end_layout
+
+\begin_layout Plain Layout
+
+          #         (negate | (-))                      #-}
 \end_layout
 
 \begin_layout Plain Layout
@@ -1292,7 +1297,7 @@ class (Real a, Enum a) => Integral a where
 
 \begin_layout Plain Layout
 
-		{-# MINIMAL quotRem, toInteger #-}
+        {-# MINIMAL quotRem, toInteger #-}
 \end_layout
 
 \begin_layout Plain Layout
@@ -1380,12 +1385,12 @@ class (Fractional a) => Floating a where
 
 \begin_layout Plain Layout
 
-    	{#- MINIMAL pi, exp, log, sin, cos, asin, acos, atan, sinh, cosh,
+    {-# MINIMAL pi, exp, log, sin, cos, asin, acos, atan, #
 \end_layout
 
 \begin_layout Plain Layout
 
-		            asinh, acosh, atanh #-}
+      #         sinh, cosh, asinh, acosh, atanh           #-}
 \end_layout
 
 \begin_layout Plain Layout
@@ -1433,6 +1438,10 @@ class (Fractional a) => Floating a where
 
 \begin_layout Plain Layout
 
+\end_layout
+
+\begin_layout Plain Layout
+
 class RealFrac a where  {-# MINIMAL properFraction #-}
 \end_layout
 
@@ -1799,20 +1808,10 @@ class Monad m where  {#- MINIMAL (>>=), return -#}
 _ -> k
 \end_layout
 
-\end_inset
-
+\begin_layout Plain Layout
 
 \end_layout
 
-\begin_layout Section
-Tipos monádicos
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-inline false
-status open
-
 \begin_layout Plain Layout
 
 data Either a b = Left a | Right b deriving (Eq, Ord, Read, Show)