Como en el libro

README-en.md

@@ -1,4 +1,3 @@
-
 # Using functions in C++ - DVD Info
 
 
@@ -9,13 +8,13 @@
 
 A good way to organize and structure computer programs is dividing them into smaller parts using functions. Each function carries out a specific task of the problem that we are solving.
 
-You've seen that all programs written in C++ must contain the `main` function where the program begins. You've probably already used functions such as `pow`, `sin`, `cos`, or `sqrt` from the `cmath` library. Since in almost all of the upcoming lab activities you will continue using pre-defined functions, you need to understand how to work with them. In future exercises  you will learn how to design and validate functions. In this laboratory experience you will search and display information contained in a DVD data base to practice declaring simple functions and invoking pre-defined functions.
+You've seen that all programs written in C++ must contain the `main` function where the program begins. You've probably already used functions such as `pow`, `sin`, `cos`, or `sqrt` from the `cmath` library. Since in almost all of the upcoming lab activities you will continue using pre-defined functions, you need to understand how to work with them. In future exercises  you will learn how to design and validate functions. In this laboratory experience you will search and display information contained in a DVD data base to practice declaring simple functions and calling pre-defined functions.
 
 
 ##Objectives:
 
 1. Identify the parts of a function: return type, name, list of parameters, and body. 
-2. Invoke pre-defined functions by passing arguments by value ("pass by value"), and by reference ("pass by reference"). 
+2. Call pre-defined functions by passing arguments by value ("pass by value"), and by reference ("pass by reference"). 
 3. Implement a simple function that utilizes parameters by reference.
 
 
@@ -27,7 +26,7 @@ Before you get to the laboratory you should have:
 
     a. the basic elements of a function definition in C++
 
-    b. how to invoke functions in C++
+    b. how to call functions in C++
 
     c. the difference between parameters that are passed by value and by reference
 
@@ -59,13 +58,13 @@ For example,
 
 would be the header of the function called `example`, which returns an integer value. The function receives as arguments an integer value (and will store a copy in `var1`), a value of type `float` (and will store a copy in `var2`) and the reference to a variable of type `char` that will be stored in the reference variable `var3`. Note that `var3` has a & symbol before the name of the variable. This indicates that `var3` will contain the reference to a character.
 
-###Invoking
+###Calling
 
-If we want to store the value of the `example` function's result in a variable `result` (that would be of type integer), we invoke the function by passing arguments as follows:
+If we want to store the value of the `example` function's result in a variable `result` (that would be of type integer), we call the function by passing arguments as follows:
 
 `result=example(2, 3.5, unCar);`
 
-Note that as the function is invoked, you don't include the type of the variables in the arguments. As in the definition for the function `example`, the third parameter `&var3` is a reference variable; what is being sent to the third argument when invoking the function is a *reference* to the variable `unCar`. Any changes that are made on the variable `var3` will change the contents of the variable `unCar`.
+Note that as the function is called, you don't include the type of the variables in the arguments. As in the definition for the function `example`, the third parameter `&var3` is a reference variable; what is being sent to the third argument when calling the function is a *reference* to the variable `unCar`. Any changes that are made on the variable `var3` will change the contents of the variable `unCar`.
 
 You can also use the function's result without having to store it in a variable. For example you could print it:
 
@@ -117,15 +116,15 @@ All of the above functions have the same name, `example`, but different paramete
 In that last example, the function `example` is overloaded since there are 5 functions with different signatures but with the same name.
 
 
-###Values by default
+### Default values
 
 Values by default can be assigned to the parameters of the functions starting from the first parameter to the right. It is not necessary to initialize all of the parameters, but the ones that are initialized should be consecutive: parameters in between two parameters cannot be left uninitialized. This allows calling the function without having to send values in the positions that correspond to the initialized parameters.
 
-**Examples of function headers and valid invocations:**
+**Examples of function headers and valid function calls:**
 
 1. **Headers:** `int example(int var1, float var2, int var3 = 10)` Here `var3` is initialized to 10.
 
-    **Invocations:**
+    **Calls:**
 
     a. `example(5, 3.3, 12)` This function call assigns the value 5 to `var1`, the value 3.3 to `var2`, and the value of 12 to `var3`.
 
@@ -134,7 +133,7 @@ Values by default can be assigned to the parameters of the functions starting fr
 2. **Header:** `int example(int var1, float var2=5.0, int var3 = 10)`
 Here `var2` is initialized to 5 and `var3` to 10.
 
-    **Invocations:**
+    **Calls:**
 
     a. `example(5, 3.3, 12)` This function call assigns the value 5 to `var1`, the value 3.3 to `var2`, and the value 12 to `var3`.
 
@@ -143,7 +142,7 @@ Here `var2` is initialized to 5 and `var3` to 10.
     c. `example(5)` In this function call only the first parameter is given a value, and the last two parameters will be assigned  values by default. That is, `var1` will be 5, `var2` will be 5.0, and `var3` will be 10.
 
 
-**Example of a valid function header with invalid invocations:**
+**Example of a valid function header with invalid function calls:**
 
 1. **Header:** `int example(int var1, float var2=5.0, int var3 = 10)` 
 
@@ -151,7 +150,7 @@ Here `var2` is initialized to 5 and `var3` to 10.
 
     a. `example(5, , 10)` This function call is **invalid** because it leaves an empty space in the middle argument.
 
-    b. `example()` This function call is **invalid** because `var1` was not assigned a default value. A valid invocation to the function `example` needs at least one argument (the first). 
+    b. `example()` This function call is **invalid** because `var1` was not assigned a default value. A valid call to the function `example` needs at least one argument (the first). 
 
 **Examples of invalid function headers:**
 
@@ -173,13 +172,20 @@ DVD stands for "digital versatile disk" or "digital video disk", which is an opt
 ---
 
 
-!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-01.html"
+!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-01.html"
+<br>
+
+!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-03.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-03.html"
+!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-11.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-11.html"
+!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-12.html"
+<br>
+
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-12.html"
 ---
 
 ---
@@ -201,13 +207,13 @@ Airplane! (Paramount/ Blu-ray/ Checkpoint)|Paramount||Discontinued|5.1 DTS-HD|LB
 
 ###Exercise 1
 
-The first step in this lab experience is to familiarize yourself with the functions that are already defined in the code. Your tasks require that you imitate what the functions do, so it is important that you understand how to invoke, declare and define the functions. 
+The first step in this lab experience is to familiarize yourself with the functions that are already defined in the code. Your tasks require that you imitate what the functions do, so it is important that you understand how to call, declare and define the functions. 
 
 **Instructions**
 
 1. Open the project `DVDInfo` in Qt by double clicking the file `DVDInfo.pro` in the folder `Documents/eip/Functions-DVDInfo` on your computer. You may also access `http://bitbucket.org/eip-uprrp/functions-dvdinfo` to download the folder `Functions-DVDInfo` to your computer.
 
-2. Configure the project. The file `main.cpp` has the function invocations that you will use in the next exercises. The declarations and definitions of the functions that will be invoked can be found in the files `movie.h` and `movie.cpp`.
+2. Configure the project. The file `main.cpp` has the function calls that you will use in the next exercises. The declarations and definitions of the functions that will be called can be found in the files `movie.h` and `movie.cpp`.
 
 3. Double click on the file `movie.h` that contains this project's function prototypes. Go to `movie.h` and identify which functions are overloaded and describe why.
     
@@ -224,8 +230,9 @@ The first step in this lab experience is to familiarize yourself with the functi
 
 ---
 
-!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-06.html"
-
+!INCLUDE "../../eip-diagnostic/DVD/en/diag-dvd-06.html"
+<br>
+<br>
 
 ###Exercise 2
 
@@ -255,11 +262,11 @@ The functions whose prototypes are in `movie.h` are implemented in the file `mov
 
 2. Implement a function `getMovieStudio` that receives a string with the information of a movie and returns the name of the film's **studio**. Remember to add the function's prototype in the file `movie.h`. Invoke the function `getMovieStudio` in `main()` to display the name and studio of the movie in the position 75125 and demonstrate its functionality. 
 
-3. Implement an overloaded function `getMovieInfo` that returns the name of the studio as well as the name, rating, year and genre. Invoke the function `getMovieInfo` in `main()` to display the name, studio, rating, year and genre of the movie in the position 75125 and demonstrate its functionality.
+3. Implement an overloaded function `getMovieInfo` that returns the name of the studio as well as the name, rating, year and genre. Call the function `getMovieInfo` in `main()` to display the name, studio, rating, year and genre of the movie in the position 75125 and demonstrate its functionality.
 
-4. Implement a function `showMovieInLine` that **displays** the information the information displayed by `showMovie`, but in a single line. The function should have a parameter to receive a string of information of the movie. Invoke the function `showMovieInLine` in `main()` to display the information for the movie in position 75125 to demonstrate its functionality. 
+4. Implement a function `showMovieInLine` that **displays** the information the information displayed by `showMovie`, but in a single line. The function should have a parameter to receive a string of information of the movie. Call the function `showMovieInLine` in `main()` to display the information for the movie in position 75125 to demonstrate its functionality. 
 
-5. Implement a function `showMoviesInLine` that **displays** the same information displayed by `showMovies` (all of the movies within a range of positions) but in a single line per movie. For example, a function call would be: `showMoviesInLine(file, 148995, 149000);`. Invoke the function `showMoviesInLine` in `main()` to display the information and demonstrate its functionality.
+5. Implement a function `showMoviesInLine` that **displays** the same information displayed by `showMovies` (all of the movies within a range of positions) but in a single line per movie. For example, a function call would be: `showMoviesInLine(file, 148995, 149000);`. Call the function `showMoviesInLine` in `main()` to display the information and demonstrate its functionality.
 
 ---
 

README-es.md

@@ -1,4 +1,3 @@
-
 # Utilizando funciones en C++ - Información de DVDs
 
 ![main1.png](images/main1.png)
@@ -178,13 +177,17 @@ DVD son las siglas para “digital versatile disk” o “digital video disk”
 ---
 
 
-!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-01.html"
+!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-01.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-03.html"
+!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-03.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-11.html"
+!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-11.html"
+<br>
 
-!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-12.html"
+!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-12.html"
+<br>
 
 ---
 
@@ -229,7 +232,8 @@ El primer paso en esta experiencia de laboratorio es familiarizarte con las func
 
 ----
 
-!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-06.html"
+!INCLUDE "../../eip-diagnostic/DVD/es/diag-dvd-06.html"
+<br>
 
 
 ###Ejercicio 2
@@ -296,4 +300,3 @@ Utiliza "Entrega" en Moodle para entregar los archivos `main.cpp`, `movie.cpp` y
 ---
 
 ---
-